Merge pull request #1259 from pippotadde/pr_yellow_tests

Testing of a search pattern containing a space
Tests: add yellow submarine search case
2025-12-24 06:57:59 -05:00 · 2025-12-23 21:36:58 +04:00 · 2025-12-23 17:02:52 +01:00 · 2025-12-23 17:01:13 +01:00 · 2025-12-23 17:50:25 +04:00 · 2025-12-23 14:30:42 +01:00
133 changed files with 5061 additions and 1330 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,101 +11,148 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        os:
-          - macos-13
        target:
-          - native_dyn
-          - iOS_arm64
-          - iOS_x86_64
-    runs-on: ${{ matrix.os }}
+          - macos-aarch64-dyn
+          - macos-x86_64-dyn
+          - ios-arm64-dyn
+          - ios-x86_64-dyn
+        include:
+          - target: macos-aarch64-dyn
+            arch_name: arm64-apple-macos
+            run_test: true
+          - target: macos-x86_64-dyn
+            arch_name: x86_64-apple-darwin
+            run_test: true
+          - target: ios-arm64-dyn
+            arch_name: aarch64-apple-ios
+            run_test: false
+          - target: ios-x86_64-dyn
+            arch_name: x86-apple-ios-simulator
+            run_test: false
+    runs-on: macos-15

    env:
      HOME: /Users/runner
    steps:
      - name: Retrieve source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Install packages
        run: |
          brew update
-          brew unlink python3
-          # upgrade from python@3.12 to python@3.12.2 fails to overwrite those
-          rm -f /usr/local/bin/2to3 /usr/local/bin/2to3-3.12 /usr/local/bin/idle3 /usr/local/bin/idle3.12 /usr/local/bin/pydoc3 /usr/local/bin/pydoc3.12 /usr/local/bin/python3 /usr/local/bin/python3-config /usr/local/bin/python3.12 /usr/local/bin/python3.12-config
-          brew install pkg-config ninja meson
-        env:
-          HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
+          brew install ninja meson

      - name: Install dependencies
        uses: kiwix/kiwix-build/actions/dl_deps_archive@main
        with:
-          os_name: macos
          target_platform: ${{ matrix.target }}

      - name: Compile
        env:
-          PKG_CONFIG_PATH: ${{env.HOME}}/BUILD_${{matrix.target}}/INSTALL/lib/pkgconfig
-          CPPFLAGS: -I${{env.HOME}}/BUILD_native_dyn/INSTALL/include
+          PKG_CONFIG_PATH: ${{env.HOME}}/BUILD_${{matrix.arch_name}}/INSTALL/lib/pkgconfig
+          CPPFLAGS: -I${{env.HOME}}/BUILD_${{matrix.arch_name}}/INSTALL/include
          MESON_OPTION: --default-library=shared -Db_coverage=true
-          MESON_CROSSFILE: ${{env.HOME}}/BUILD_${{matrix.target}}/meson_cross_file.txt
+          MESON_CROSSFILE: ${{env.HOME}}/BUILD_${{matrix.arch_name}}/meson_cross_file.txt
        shell: bash
        run: |
-          if [[ ! "${{matrix.target}}" =~ native_.* ]]; then
+          if [ -e $MESON_CROSSFILE ]; then
            MESON_OPTION="$MESON_OPTION --cross-file $MESON_CROSSFILE -Dstatic-linkage=true"
          fi
          meson . build ${MESON_OPTION}
          ninja -C build

      - name: Test libkiwix
-        if: startsWith(matrix.target, 'native_')
+        if: matrix.run_test
        env:
          SKIP_BIG_MEMORY_TEST: 1
-          LD_LIBRARY_PATH: ${{env.HOME}}/BUILD_native_dyn/INSTALL/lib:${{env.HOME}}/BUILD_native_dyn/INSTALL/lib64
+          LD_LIBRARY_PATH: ${{env.HOME}}/BUILD_${{matrix.arch_name}}/INSTALL/lib:${{env.HOME}}/BUILD_${{matrix.arch_name}}/INSTALL/lib64
        run: meson test -C build --verbose

+  Windows:
+    runs-on: windows-2022
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
+
+      - name: Install packages
+        run:
+          choco install pkgconfiglite ninja
+
+      - name: Install python modules
+        run: pip3 install meson
+
+      - name: Setup MSVC compiler
+        uses: bus1/cabuild/action/msdevshell@v1
+        with:
+          architecture: x64
+
+      - name: Install dependencies
+        uses: kiwix/kiwix-build/actions/dl_deps_archive@main
+        with:
+          target_platform: win-x86_64-static
+
+      - name: Compile
+        shell: cmd
+        run: |
+          set PKG_CONFIG_PATH=%cd%\BUILD_win-amd64\INSTALL\lib\pkgconfig
+          set CPPFLAGS=-I%cd%\BUILD_win-amd64\INSTALL\include
+          meson.exe setup . build -Dwerror=false --default-library=static --buildtype=release
+          cd build
+          ninja.exe
+
+      - name: Test
+        shell: cmd
+        run: |
+          cd build
+          meson.exe test --verbose
+        env:
+          WAIT_TIME_FACTOR_TEST: 10
+
  Linux:
    strategy:
      fail-fast: false
      matrix:
-        name:
-          - native_static
-          - native_dyn
-          - android_arm
-          - android_arm64
-          - win32_static
-          - win32_dyn
+        target:
+          - linux-x86_64-static
+          - linux-x86_64-dyn
+          - android-arm
+          - android-arm64
+        image_variant: ['jammy']
        include:
-          - name: native_static
-            target: native_static
-            image_variant: focal
+          - target: linux-x86_64-static
            lib_postfix: '/x86_64-linux-gnu'
-          - name: native_dyn
-            target: native_dyn
-            image_variant: focal
+            arch_name: linux-x86_64
+            run_test: true
+            coverage: true
+          - target: linux-x86_64-dyn
            lib_postfix: '/x86_64-linux-gnu'
-          - name: android_arm
-            target: android_arm
-            image_variant: focal
+            arch_name: linux-x86_64
+            run_test: true
+            coverage: true
+          - target: android-arm
            lib_postfix: '/arm-linux-androideabi'
-          - name: android_arm64
-            target: android_arm64
-            image_variant: focal
+            arch_name: arm-linux-androideabi
+            run_test: false
+            coverage: false
+          - target: android-arm64
            lib_postfix: '/aarch64-linux-android'
-          - name: win32_static
-            target: win32_static
-            image_variant: f35
-            lib_postfix: '64'
-          - name: win32_dyn
-            target: win32_dyn
-            image_variant: f35
-            lib_postfix: '64'
+            arch_name: aarch64-linux-android
+            run_test: false
+            coverage: false
    env:
      HOME: /home/runner
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
    container:
-      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38"
+      image: "ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:2025-06-07"
    steps:
    - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
    - name: Install dependencies
      uses: kiwix/kiwix-build/actions/dl_deps_archive@main
      with:
@@ -114,38 +161,40 @@ jobs:
      shell: bash
      run: |
        meson --version
-        if [[ "${{matrix.target}}" =~ .*_dyn ]]; then
+        if [[ "${{matrix.target}}" =~ .*-dyn ]]; then
          MESON_OPTION="--default-library=shared"
        else
          MESON_OPTION="--default-library=static"
        fi
-        if [[ "${{matrix.target}}" =~ native_.* ]]; then
-          MESON_OPTION="$MESON_OPTION -Db_coverage=true"
+        if [ -e "${{env.HOME}}/BUILD_${{matrix.arch_name}}/meson_cross_file.txt" ]; then
+          MESON_OPTION="$MESON_OPTION --cross-file ${{env.HOME}}/BUILD_${{matrix.arch_name}}/meson_cross_file.txt"
        else
-          MESON_OPTION="$MESON_OPTION --cross-file $HOME/BUILD_${{matrix.target}}/meson_cross_file.txt"
+          MESON_OPTION="$MESON_OPTION -Db_coverage=true"
        fi
-        if [[ "${{matrix.target}}" =~ android_.* ]]; then
+        if [[ "${{matrix.target}}" =~ android-.* ]]; then
          MESON_OPTION="$MESON_OPTION -Dstatic-linkage=true"
        fi
        meson . build ${MESON_OPTION}
        cd build
        ninja
      env:
-        PKG_CONFIG_PATH: "/home/runner/BUILD_${{matrix.target}}/INSTALL/lib/pkgconfig:/home/runner/BUILD_${{matrix.target}}/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig"
-        CPPFLAGS: "-I/home/runner/BUILD_${{matrix.target}}/INSTALL/include"
+        PKG_CONFIG_PATH: "/home/runner/BUILD_${{matrix.arch_name}}/INSTALL/lib/pkgconfig:/home/runner/BUILD_${{matrix.arch_name}}/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig"
+        CPPFLAGS: "-I/home/runner/BUILD_${{matrix.arch_name}}/INSTALL/include"
    - name: Test
-      if: startsWith(matrix.target, 'native_')
+      if: matrix.run_test
      shell: bash
      run: |
        cd build
        meson test --verbose
-        ninja coverage
+        if [[ "${{matrix.coverage}}" = "true" ]]; then
+          ninja coverage
+        fi
      env:
-        LD_LIBRARY_PATH: "/home/runner/BUILD_${{matrix.target}}/INSTALL/lib:/home/runner/BUILD_${{matrix.target}}/INSTALL/lib${{matrix.lib_postfix}}"
+        LD_LIBRARY_PATH: "/home/runner/BUILD_${{matrix.arch_name}}/INSTALL/lib:/home/runner/BUILD_${{matrix.arch_name}}/INSTALL/lib${{matrix.lib_postfix}}"
        SKIP_BIG_MEMORY_TEST: 1

    - name: Publish coverage
-      if: startsWith(matrix.target, 'native_')
+      if: matrix.coverage
      uses: codecov/codecov-action@v3
      with:
        token: ${{ secrets.CODECOV_TOKEN }}
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -15,11 +15,15 @@ jobs:
      fail-fast: false
      matrix:
        distro:
-          - debian-unstable
+#          - debian-unstable
+#          - debian-trixie
+#          - debian-bookworm
+#          - debian-bullseye
+          - ubuntu-noble
          - ubuntu-jammy
-          - ubuntu-focal
+
    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4

      # Determine which PPA we should upload to
      - name: PPA
@@ -27,25 +31,54 @@ jobs:
        run: |
          if [[ $REF == refs/tags* ]]
          then
-            echo "::set-output name=ppa::kiwixteam/release"
+            echo "ppa=kiwixteam/release" >> $GITHUB_OUTPUT
          else
-            echo "::set-output name=ppa::kiwixteam/dev"
+            echo "ppa=kiwixteam/dev" >> $GITHUB_OUTPUT
          fi
        env:
          REF: ${{ github.ref }}

-      - uses: legoktm/gh-action-auto-dch@master
+      - uses: legoktm/gh-action-auto-dch@main
        with:
          fullname: Kiwix builder
          email: release+launchpad@kiwix.org
          distro: ${{ matrix.distro }}

-      - uses: legoktm/gh-action-build-deb@debian-unstable
-        if: matrix.distro == 'debian-unstable'
-        name: Build package for debian-unstable
-        id: build-debian-unstable
+#      - uses: legoktm/gh-action-build-deb@debian-unstable
+#        if: matrix.distro == 'debian-unstable'
+#        name: Build package for debian-unstable
+#        id: build-debian-unstable
+#        with:
+#          args: --no-sign
+#
+#      - uses: legoktm/gh-action-build-deb@b47978ba8498dc8b8153cc3b5f99a5fc1afa5de1 # pin@debian-trixie
+#        if: matrix.distro == 'debian-trixie'
+#        name: Build package for debian-trixie
+#        id: build-debian-trixie
+#        with:
+#          args: --no-sign
+#
+#      - uses: legoktm/gh-action-build-deb@1f4e86a6bb34aaad388167eaf5eb85d553935336 # pin@debian-bookworm
+#        if: matrix.distro == 'debian-bookworm'
+#        name: Build package for debian-bookworm
+#        id: build-debian-bookworm
+#        with:
+#          args: --no-sign
+#
+#      - uses: legoktm/gh-action-build-deb@084b4263209252ec80a75d2c78a586192c17f18d # pin@debian-bullseye
+#        if: matrix.distro == 'debian-bullseye'
+#        name: Build package for debian-bullseye
+#        id: build-debian-bullseye
+#        with:
+#          args: --no-sign
+
+      - uses: legoktm/gh-action-build-deb@9114a536498b65c40b932209b9833aa942bf108d # pin@ubuntu-noble
+        if: matrix.distro == 'ubuntu-noble'
+        name: Build package for ubuntu-noble
+        id: build-ubuntu-noble
        with:
          args: --no-sign
+          ppa: ${{ steps.ppa.outputs.ppa }}

      - uses: legoktm/gh-action-build-deb@ubuntu-jammy
        if: matrix.distro == 'ubuntu-jammy'
@@ -55,20 +88,12 @@ jobs:
          args: --no-sign
          ppa: ${{ steps.ppa.outputs.ppa }}

-      - uses: legoktm/gh-action-build-deb@ubuntu-focal
-        if: matrix.distro == 'ubuntu-focal'
-        name: Build package for ubuntu-focal
-        id: build-ubuntu-focal
-        with:
-          args: --no-sign
-          ppa: ${{ steps.ppa.outputs.ppa }}
-
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: Packages for ${{ matrix.distro }}
          path: output

-      - uses: legoktm/gh-action-dput@master
+      - uses: legoktm/gh-action-dput@main
        name: Upload dev package
        # Only upload on pushes to main
        if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && startswith(matrix.distro, 'ubuntu-')
@@ -77,7 +102,7 @@ jobs:
          repository: ppa:kiwixteam/dev
          packages: output/*_source.changes

-      - uses: legoktm/gh-action-dput@master
+      - uses: legoktm/gh-action-dput@main
        name: Upload release package
        if: github.event_name == 'release' && startswith(matrix.distro, 'ubuntu-')
        with:
--- a/56
+++ b/56
@@ -1,3 +1,59 @@
+libkiwix 14.1.1
+===============
+
+* Server:
+  - Fix regression for kiwix-serve --nosearchbar (@veloman-yunkan #1250)
+  - Avoid results content interpretation... crash in fulltext search (@vighnesh-sawant #1241)
+  - Fix for intermittent /content/blank.html errors (@veloman-yunkan #1249)
+
+libkiwix 14.1.0
+===============
+
+ * Server:
+  - Viewer detects & tracks intrapage navigation anchors too (@veloman-yunkan #1213)
+  - Add support for catalog only mode (@veloman-yunkan #1219)
+  - Add API which returns server access url (@vighnesh-sawant #1234)
+  - Fix chrome searchbar placeholder text overflow (@aditii2712 #1185)
+  - Fix magnet link queryStyring (@rgaudin #1160)
+  - Improve chrome printing stylesheet (@kelson42 #1202)
+  - Default white background (@kelson42 #1205)
+
+ * Other:
+  - Switched to the new libzim illustrations API (@veloman-yunkan #1226)
+  - Stop building Windows with DEBUG symbols in CI (@kelson42 #1165)
+  - Update many things in the CI/CD (@kelson42 #1203 #1194 #1209 #1207 #1235)
+  - Requires now libzim 9.4.0 (@kelson42 #1231)
+  - Fix compilation for FreeBSD (@OICe2 #1173 #1174)
+  - Wait up to 1s to let aria2c to start before complaining (@kelson42 #1169)
+
+libkiwix 14.0.0
+===============
+
+ * Server:
+  - Support of IPv6 (@veloman-yunkan @aryanA101a #1074 #1093)
+  - Better public IP configuration/detection (@sgourdas #1132)
+  - Fix API errors in catalog searches if Xapian keyword in used (@veloman-yunkan #1137)
+  - Clearly define which Web browsers are supported (@kelson42 @rgaudin @jaifroid @benoit74 #1132)
+  - Improve welcome page download buttons (@veloman-yunkan #1094)
+  - Better handling of external (non-HTTP) links (@veloman-yunkan #1123)
+  - Fix book illustration size on welcome page to 48x48 pixels (@veloman-yunkan #1127)
+  - Remove "Multiple Languages" in language filter (@veloman-yunkan #1098)
+  - Stop transforming tags casing (@kelson42 @veloman-yunkan #1079 #1121)
+  - ZIM file size consistently advertised in MiB (@harsha-mangena #1132)
+  - Few new supported languages in the filter (@kelson42 #1080)
+  - Improve accesskeys (@kelson42 #1075)
+  - Add OpenSearch <link> to head of pages (@kelson42 #1070)
+ * Compilation/Packaging:
+  - Multiple fixes around deb packaging (@kelson42 #1108 #1114 #1135)
+  - Generating of libkiwix.pc via Meson (@veloman-yunkan #1133)
+  - Native Windows CI/CD (@mgautierfr @kelson42 #1113 #1125)
+  - Better check (maximum) libzim version (@kelson42 #1124)
+  - Multiple automated tests improvements (@veloman-yunkan #1068 #1067)
+ * Other:
+  - Deleted supported env. variable `$KIWIX_DATA_DIR` and `kiwix::getDataDirectory()` (@sgourdas #1107)
+  - New string slugification for filenames (@shaopenglin #1105)
+  - Multiple improvements around aria2c download mgmt. (@veloman-yunkan #1097)
+
 libkiwix 13.1.0
 ===============

--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ GNU/Linux, macOS, Android, iOS, ...).

 [![Release](https://img.shields.io/github/v/tag/kiwix/libkiwix?label=release&sort=semver)](https://download.kiwix.org/release/libkiwix/)
 [![Repositories](https://img.shields.io/repology/repositories/libkiwix?label=repositories)](https://github.com/kiwix/libkiwix/wiki/Repology)
-[![Build Status](https://github.com/kiwix/libkiwix/workflows/CI/badge.svg?query=branch%3Amain)](https://github.com/kiwix/libkiwix/actions?query=branch%3Amain)
+[![Build Status](https://github.com/kiwix/libkiwix/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/kiwix/libkiwix/actions?query=branch%3Amain)
 [![Doc](https://readthedocs.org/projects/libkiwix/badge/?style=flat)](https://libkiwix.readthedocs.org/en/latest/?badge=latest)
 [![CodeFactor](https://www.codefactor.io/repository/github/kiwix/libkiwix/badge)](https://www.codefactor.io/repository/github/kiwix/libkiwix)
 [![Codecov](https://codecov.io/gh/kiwix/libkiwix/branch/main/graph/badge.svg)](https://codecov.io/gh/kiwix/libkiwix)
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,12 @@ Priority: optional
 Maintainer: Kiwix team <kiwix@kiwix.org>
 Build-Depends: debhelper-compat (= 13),
 meson,
- pkg-config,
- libzim-dev (>= 7.2.0~),
+ pkgconf,
+ libzim-dev (>= 9.0), libzim-dev (<< 10.0),
 libcurl4-gnutls-dev,
 libicu-dev,
 libgtest-dev,
 libkainjow-mustache-dev,
- liblzma-dev,
 libmicrohttpd-dev,
 libpugixml-dev,
 zlib1g-dev
@@ -22,12 +21,13 @@ Package: libkiwix-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libkiwix10 (= ${binary:Version}), ${misc:Depends}, python3,
- libzim-dev (>= 7.2.0~),
+Depends: libkiwix14 (= ${binary:Version}), ${misc:Depends}, python3,
+ libzim-dev (>= 9.0), libzim-dev (<< 10.0),
 libicu-dev,
 libpugixml-dev,
 libcurl4-gnutls-dev,
- libmicrohttpd-dev
+ libmicrohttpd-dev,
+ zlib1g-dev
 Description: library of common code for Kiwix (development)
 Kiwix is an offline Wikipedia reader. libkiwix provides the
 software core for Kiwix, and contains the code shared by all
@@ -35,11 +35,12 @@ Description: library of common code for Kiwix (development)
 .
 This package contains development files.

-Package: libkiwix10
+Package: libkiwix14
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, aria2
-Conflicts: libkiwix0, libkiwix3, libkiwix9
+Conflicts: libkiwix0, libkiwix3, libkiwix9, libkiwix10, libkiwix11, libkiwix12, libkiwix13
+Replaces: libkiwix0, libkiwix3, libkiwix9, libkiwix10, libkiwix11, libkiwix12, libkiwix13
 Description: library of common code for Kiwix
 Kiwix is an offline Wikipedia reader. libkiwix provides the
 software core for Kiwix, and contains the code shared by all
--- a/debian/libkiwix14.install
+++ b/debian/libkiwix14.install
--- a/include/common.h
+++ b/include/common.h
@@ -16,6 +16,7 @@

 namespace kiwix {

+enum class IpMode { IPV4, IPV6, ALL, AUTO }; // AUTO: Server decides the protocol
 typedef zim::size_type size_type;
 typedef zim::offset_type offset_type;

--- a/include/downloader.h
+++ b/include/downloader.h
@@ -168,8 +168,16 @@ class Download {
 */
 class Downloader
 {
- public:
-  Downloader();
+ public: // types
+  typedef std::vector<std::pair<std::string, std::string>> Options;
+
+ public: // functions
+  /*
+  * Create a new Downloader object.
+  *
+  * @param sessionFileDir: The directory where aria2 will store its session file.
+  */
+  explicit Downloader(std::string sessionFileDir);
  virtual ~Downloader();

  void close();
@@ -177,14 +185,22 @@ class Downloader
  /**
   * Start a new download.
   *
-   * This method is thread safe and return a pointer to a newly created `Download`.
+   * This method is thread safe and returns a pointer to a newly created
+   * `Download` or an existing one with a matching URI. In the latter case
+   * the options parameter is ignored, which can lead to surprising results.
+   * For example, if the old and new download requests (sharing the same URI)
+   * have different values for the download directory or output file name
+   * options, after the download is reported to be complete the downloaded file
+   * will be present only at the location specified for the first request.
+   *
   * User should call `update` on the returned `Download` to have an accurate status.
   *
   * @param uri: The uri of the thing to download.
+   * @param downloadDir: The download directory where the thing should be stored (takes precedence over any "dir" in `options`).
   * @param options: A series of pair <option_name, option_value> to pass to aria.
   * @return: The newly created Download.
   */
-  std::shared_ptr<Download> startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options = {});
+  std::shared_ptr<Download> startDownload(const std::string& uri, const std::string& downloadDir, Options options = {});

  /**
   * Get a download corrsponding to a download id (did)
@@ -206,7 +222,7 @@ class Downloader
   */
  std::vector<std::string> getDownloadIds() const;

- private:
+ private: // data
  mutable std::mutex m_lock;
  std::map<std::string, std::shared_ptr<Download>> m_knownDownloads;
  std::shared_ptr<Aria2> mp_aria;
--- a/src/server/i18n.h
+++ b/src/server/i18n.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Veloman Yunkan <veloman.yunkan@gmail.com>
+ * Copyright 2024 Veloman Yunkan <veloman.yunkan@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU  General Public License as published by
@@ -17,29 +17,15 @@
 * MA 02110-1301, USA.
 */

-#ifndef KIWIX_SERVER_I18N
-#define KIWIX_SERVER_I18N
+#ifndef KIWIX_I18N
+#define KIWIX_I18N

 #include <map>
 #include <string>
-#include <mustache.hpp>

 namespace kiwix
 {

-struct I18nString {
-  const char* const key;
-  const char* const value;
-};
-
-struct I18nStringTable {
-  const char* const lang;
-  const size_t entryCount;
-  const I18nString* const entries;
-
-  const char* get(const std::string& key) const;
-};
-
 std::string getTranslatedString(const std::string& lang, const std::string& key);

 namespace i18n
@@ -70,28 +56,6 @@ private:
  const std::string m_lang;
 };

-class GetTranslatedStringWithMsgId
-{
-  typedef kainjow::mustache::basic_data<std::string> MustacheString;
-  typedef std::pair<std::string, MustacheString> MsgIdAndTranslation;
-
-public:
-  explicit GetTranslatedStringWithMsgId(const std::string& lang) : m_lang(lang) {}
-
-  MsgIdAndTranslation operator()(const std::string& key) const
-  {
-    return {key, getTranslatedString(m_lang, key)};
-  }
-
-  MsgIdAndTranslation operator()(const std::string& key, const Parameters& params) const
-  {
-    return {key, expandParameterizedString(m_lang, key, params)};
-  }
-
-private:
-  const std::string m_lang;
-};
-
 } // namespace i18n

 class ParameterizedMessage
@@ -121,18 +85,8 @@ inline ParameterizedMessage nonParameterizedMessage(const std::string& msgId)
  return ParameterizedMessage(msgId, noParams);
 }

-struct LangPreference
-{
-  const std::string lang;
-  const float preference;
-};
-
-typedef std::vector<LangPreference> UserLangPreferences;
-
-UserLangPreferences parseUserLanguagePreferences(const std::string& s);
-
-std::string selectMostSuitableLanguage(const UserLangPreferences& prefs);
+std::string translateBookCategory(const std::string& lang, const std::string& category);

 } // namespace kiwix

-#endif // KIWIX_SERVER_I18N
+#endif // KIWIX_I18N
--- a/include/meson.build
+++ b/include/meson.build
@@ -7,10 +7,12 @@ headers = [
  'downloader.h',
  'search_renderer.h',
  'server.h',
+  'spelling_correction.h',
  'kiwixserve.h',
  'name_mapper.h',
  'tools.h',
-  'version.h'
+  'version.h',
+  'i18n.h'
 ]

 install_headers(headers, subdir:'kiwix')
--- a/include/name_mapper.h
+++ b/include/name_mapper.h
@@ -50,10 +50,13 @@ class HumanReadableNameMapper : public NameMapper {
    std::map<std::string, std::string> m_nameToId;

  public:
-    HumanReadableNameMapper(kiwix::Library& library, bool withAlias);
+    HumanReadableNameMapper(const kiwix::Library& library, bool withAlias);
    virtual ~HumanReadableNameMapper() = default;
    virtual std::string getNameForId(const std::string& id) const;
    virtual std::string getIdForName(const std::string& name) const;
+
+  private:
+    void mapName(const kiwix::Library& lib, std::string name, std::string id);
 };

 class UpdatableNameMapper : public NameMapper {
--- a/include/server.h
+++ b/include/server.h
@@ -22,6 +22,7 @@

 #include <string>
 #include <memory>
+#include "tools.h"

 namespace kiwix
 {
@@ -51,7 +52,7 @@ namespace kiwix
       void stop();

       void setRoot(const std::string& root);
-       void setAddress(const std::string& addr) { m_addr = addr; }
+       void setAddress(const std::string& addr);
       void setPort(int port) { m_port = port; }
       void setNbThreads(int threads) { m_nbThreads = threads; }
       void setMultiZimSearchLimit(unsigned int limit) { m_multizimSearchLimit = limit; }
@@ -62,14 +63,19 @@ namespace kiwix
        { m_withTaskbar = withTaskbar; m_withLibraryButton = withLibraryButton; }
       void setBlockExternalLinks(bool blockExternalLinks)
        { m_blockExternalLinks = blockExternalLinks; }
-       int getPort();
-       std::string getAddress();
+       void setCatalogOnlyMode(bool enable) { m_catalogOnlyMode = enable; }
+       void setContentServerUrl(std::string url) { m_contentServerUrl = url; }
+       void setIpMode(IpMode mode) { m_ipMode = mode; }
+       int getPort() const;
+       IpAddress getAddress() const;
+       IpMode getIpMode() const;
+       std::vector<std::string> getServerAccessUrls() const;

     protected:
       std::shared_ptr<Library> mp_library;
       std::shared_ptr<NameMapper> mp_nameMapper;
       std::string m_root = "";
-       std::string m_addr = "";
+       IpAddress m_addr;
       std::string m_indexTemplateString = "";
       int m_port = 80;
       int m_nbThreads = 1;
@@ -78,7 +84,10 @@ namespace kiwix
       bool m_withTaskbar = true;
       bool m_withLibraryButton = true;
       bool m_blockExternalLinks = false;
+       IpMode m_ipMode = IpMode::AUTO;
       int m_ipConnectionLimit = 0;
+       bool m_catalogOnlyMode = false;
+       std::string m_contentServerUrl;
       std::unique_ptr<InternalServer> mp_server;
  };
 }
--- a/include/spelling_correction.h
+++ b/include/spelling_correction.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2025 Veloman Yunkan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef KIWIX_SPELLING_CORRECTION_H
+#define KIWIX_SPELLING_CORRECTION_H
+
+#include <filesystem>
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace zim
+{
+class Archive;
+}
+
+namespace Xapian
+{
+class Database;
+}
+
+namespace kiwix
+{
+
+class SpellingsDB
+{
+public: // functions
+  SpellingsDB(const zim::Archive& archive, std::filesystem::path cacheDirPath);
+  ~SpellingsDB();
+
+  SpellingsDB(const SpellingsDB& ) = delete;
+  void operator=(const SpellingsDB& ) = delete;
+
+  std::vector<std::string> getSpellingCorrections(const std::string& word, uint32_t maxCount) const;
+
+private: // data
+  std::unique_ptr<Xapian::Database> impl_;
+};
+
+} // namespace kiwix
+
+#endif // KIWIX_SPELLING_CORRECTION_H
--- a/include/tools.h
+++ b/include/tools.h
@@ -24,8 +24,17 @@
 #include <vector>
 #include <map>
 #include <cstdint>
+#include "common.h"
+
+namespace kiwix
+{
+
+struct IpAddress
+{
+    std::string addr;  // IPv4 address
+    std::string addr6; // IPv6 address
+};

-namespace kiwix {
 typedef std::pair<std::string, std::string> LangNameCodePair;
 typedef std::vector<LangNameCodePair> FeedLanguages;
 typedef std::vector<std::string> FeedCategories;
@@ -37,26 +46,6 @@ typedef std::vector<std::string> FeedCategories;
 */
 std::string getCurrentDirectory();

-/**
- * Return the data directory.
- *
- * The data directory is a directory where to put data (zim files, ...)
- * It depends of the platform and it may be changed by user using environment variable.
- *
- * The resolution order is :
- * - `KIWIX_DATA_DIR` env variable (if set).
- * - On Windows :
- *    . `$APPDATA/kiwix` if $APPDATA is set
- *    . `$USERPROFILE/kiwix` if $USERPROFILE is set
- * - Else :
- *    . `$XDG_DATA_HOME/kiwix`if $XDG_DATA_HOME is set
- *    . `$HOME/.local/share/kiwx` if $HOWE is set
- * - current directory
- *
- * @return the path of the data directory (utf8 encoded)
- */
-std::string getDataDirectory();
-
 /** Return the path of the executable
 *
 * Some application may be packaged in auto extractible archive (Appimage) and the
@@ -210,13 +199,30 @@ bool fileReadable(const std::string& path);
 std::string getMimeTypeForFile(const std::string& filename);

 /** Provides all available network interfaces
+ *
+ * This function provides the available IPv4 and IPv6 network interfaces
+ * as a map from the interface name to its IPv4 and/or IPv6 address(es).
+ */
+std::map<std::string, IpAddress> getNetworkInterfacesIPv4Or6();
+
+/** Provides all available IPv4 network interfaces
 *
 * This function provides the available IPv4 network interfaces
+ * as a map from the interface name to its IPv4 address.
+ *
+ * Provided for backward compatibility with libkiwix v13.1.0.
 */
 std::map<std::string, std::string> getNetworkInterfaces();

 /** Provides the best IP address
- * This function provides the best IP address from the list given by getNetworkInterfaces
+ * This function provides the best IP addresses for both ipv4 and ipv6 protocols,
+ * in an IpAddress struct, based on the list given by getNetworkInterfacesIPv4Or6()
+ */
+IpAddress getBestPublicIps();
+
+/** Provides the best IPv4 adddress
+ * Equivalent to getBestPublicIp(false). Provided for backward compatibility
+ * with libkiwix v13.1.0.
 */
 std::string getBestPublicIp();

@@ -231,15 +237,15 @@ std::string beautifyFileSize(uint64_t number);

 /**
 * Load languages stored in an OPDS stream.
- * 
+ *
 * @param content the OPDS stream.
- * @return vector containing pairs of language code and their corresponding full language name. 
+ * @return vector containing pairs of language code and their corresponding full language name.
 */
 FeedLanguages readLanguagesFromFeed(const std::string& content);

 /**
 * Load categories stored in an OPDS stream .
- * 
+ *
 * @param content the OPDS stream.
 * @return vector containing category strings.
 */
@@ -247,10 +253,19 @@ FeedCategories readCategoriesFromFeed(const std::string& content);

 /**
 * Retrieve the full language name associated with a given ISO 639-3 language code.
- * 
+ *
 * @param lang ISO 639-3 language code.
 * @return full language name.
 */
 std::string getLanguageSelfName(const std::string& lang);
+
+/**
+ * Slugifies the filename by converting any characters reserved by the operating
+ * system to '_'. Note filename is only the file name and not a path.
+ *
+ * @param filename Valid UTF-8 encoded file name string. 
+ * @return slugified string.
+ */
+std::string getSlugifiedFileName(const std::string& filename);
 }
 #endif // KIWIX_TOOLS_H
--- a/kiwix.pc.in
+++ b/kiwix.pc.in
@@ -1,10 +0,0 @@
-prefix=@prefix@
-libdir=${prefix}/lib64
-includedir=${prefix}/include
-
-Name: libkiwix
-Description: A library that contains a lot of things used by used by other kiwix programs
-Version: @version@
-Requires: @requires@
-Libs: -L${libdir} -lkiwix @extra_libs@
-Cflags: -I${includedir}/ @extra_cflags@
--- a/meson.build
+++ b/meson.build
@@ -1,26 +1,61 @@
 project('libkiwix', 'cpp',
-  version : '13.1.0',
+  version : '14.1.1',
  license : 'GPLv3+',
  default_options : ['c_std=c11', 'cpp_std=c++17', 'werror=true'])

 compiler = meson.get_compiler('cpp')
-
 static_deps = get_option('static-linkage') or get_option('default_library') == 'static'
+extra_libs = []

-# See https://github.com/kiwix/libkiwix/issues/371
-if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(host_machine.cpu_family())
-  extra_libs = ['-latomic']
-else
-  extra_libs = []
+# Atomics as compiled by GCC or clang can lead to external references to
+# functions depending on the type size and the platform. LLVM provides them in
+# 'libcompiler_rt', which clang normally automatically links in, while GNU
+# provides them in 'libatomic', which GCC *does not* link in automatically (but
+# this is probably going to change, see
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358). Regardless of the setup
+# of the compiler driver itself (GCC or clang), we can thus assume that if some
+# atomic references can't be resolved, then 'libatomic' is missing.
+atomics_program = '''
+#include <atomic>
+#include <cstdint>
+
+using namespace std;
+
+int main() {
+  volatile atomic_bool a_b(true);
+  volatile atomic_ullong a_ull(-1);
+  // Next two lines are to cover atomic<socket_t> from 'httplib.h'.
+  volatile atomic<uint32_t> a_u32(-1);
+  volatile atomic<uint64_t> a_u64(-1);
+
+  return atomic_load(&a_b) == false && atomic_load(&a_ull) == 0 &&
+    atomic_load(&a_u32) == 0 && atomic_load(&a_u64) == 0;
+}
+'''
+if not compiler.links(atomics_program,
+                      name: 'compiler driver readily supports atomics')
+  libatomic = compiler.find_library('atomic')
+  compiler.links(atomics_program, name: 'atomics work with libatomic',
+                 dependencies: libatomic, required: true)
+  extra_libs += ['-latomic']
 endif

-if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd'
-  # C++ std::thread is implemented using pthread on linux by gcc
+# C++ std::thread is implemented using pthread on Linux by GCC, and on FreeBSD
+# for both GCC and LLVM.
+if (host_machine.system() == 'linux' and compiler.get_id() == 'gcc') or \
+   host_machine.system() == 'freebsd'
  thread_dep = dependency('threads')
 else
  thread_dep = dependency('', required:false)
 endif
+
 libicu_dep = dependency('icu-i18n', static:static_deps)
+if libicu_dep.version().version_compare('>= 76')
+  libicu_deps = [libicu_dep, dependency('icu-uc', static:static_deps)]
+else
+  libicu_deps = [libicu_dep]
+endif
+
 pugixml_dep = dependency('pugixml', static:static_deps)
 libcurl_dep = dependency('libcurl', static:static_deps)
 microhttpd_dep = dependency('libmicrohttpd', static:static_deps)
@@ -35,9 +70,10 @@ else
  error('Cannot found header mustache.hpp')
 endif

-libzim_dep = dependency('libzim', version : '>=8.1.0', static:static_deps)
+libzim_dep = dependency('libzim', version:['>=9.4.0', '<10.0.0'], static:static_deps)
+
 if not compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep)
-  error('Libzim seems to be compiled without xapian. Xapian support is mandatory.')
+  error('Libzim seems to be compiled without Xapian. Xapian support is mandatory.')
 endif


@@ -49,21 +85,25 @@ endif

 if host_machine.system() == 'windows'
  add_project_arguments('-DNOMINMAX', language: 'cpp')
+  extra_libs += ['-liphlpapi']
 endif

-all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zlib_dep, xapian_dep]
+if build_machine.system() == 'windows'
+  extra_libs += ['-lshlwapi', '-lwinmm']
+endif
+
+
+# Dependencies as string
+all_deps = [thread_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zlib_dep, xapian_dep]
+
+# Dependencies as array
+all_deps += libicu_deps

 inc = include_directories('include', extra_include)

 conf = configuration_data()
 conf.set('LIBKIWIX_VERSION', '"@0@"'.format(meson.project_version()))

-if build_machine.system() == 'windows'
-     extra_link_args = ['-lshlwapi', '-lwinmm']
-else
-     extra_link_args = []
-endif
-
 subdir('include')
 subdir('scripts')
 subdir('static')
@@ -73,17 +113,10 @@ if get_option('doc')
  subdir('docs')
 endif

-pkg_requires = ['libzim', 'icu-i18n', 'pugixml', 'libcurl', 'libmicrohttpd', 'xapian-core']
-
-pkg_conf = configuration_data()
-pkg_conf.set('prefix', get_option('prefix'))
-pkg_conf.set('requires', ' '.join(pkg_requires))
-pkg_conf.set('extra_libs', ' '.join(extra_libs))
-pkg_conf.set('extra_cflags', extra_cflags)
-pkg_conf.set('version', meson.project_version())
-configure_file(output : 'kiwix.pc',
-               configuration : pkg_conf,
-               input : 'kiwix.pc.in',
-               install_dir: get_option('libdir')+'/pkgconfig'
-              )
-
+pkg_mod = import('pkgconfig')
+pkg_mod.generate(libraries : [libkiwix] + extra_libs,
+                 version : meson.project_version(),
+                 name : 'libkiwix',
+                 filebase : 'libkiwix',
+                 description : 'A library that contains useful primitives that Kiwix readers have in common',
+                 extra_cflags: extra_cflags)
--- a/scripts/kiwix-compile-i18n
+++ b/scripts/kiwix-compile-i18n
@@ -61,7 +61,7 @@ lang_table_entry_cxx_template = '''

 cxxfile_template = '''// This file is automatically generated. Do not modify it.

-#include "server/i18n.h"
+#include "server/i18n_utils.h"

 namespace kiwix {
 namespace i18n {
--- a/scripts/kiwix-compile-resources
+++ b/scripts/kiwix-compile-resources
@@ -61,6 +61,32 @@ resource_decl_template = """{namespaces_open}
 extern const std::string {identifier};
 {namespaces_close}"""

+BINARY_RESOURCE_EXTENSIONS = {'.ico', '.png', '.ttf'}
+
+TEXT_RESOURCE_EXTENSIONS = {
+    '.css',
+    '.html',
+    '.js',
+    '.json',
+    '.svg',
+    '.tmpl',
+    '.webmanifest',
+    '.xml',
+}
+
+if not BINARY_RESOURCE_EXTENSIONS.isdisjoint(TEXT_RESOURCE_EXTENSIONS):
+    raise RuntimeError(f"The following file type extensions are declared to be both binary and text: {BINARY_RESOURCE_EXTENSIONS.intersection(TEXT_RESOURCE_EXTENSIONS)}")
+
+def is_binary_resource(filename):
+    _, extension = os.path.splitext(filename)
+    is_binary = extension in BINARY_RESOURCE_EXTENSIONS
+    is_text = extension in TEXT_RESOURCE_EXTENSIONS
+    if not is_binary and not is_text:
+        # all file type extensions of static resources must be listed
+        # in either BINARY_RESOURCE_EXTENSIONS or TEXT_RESOURCE_EXTENSIONS
+        raise RuntimeError(f"Unknown file type extension: {extension}")
+    return is_binary
+
 class Resource:
    def __init__(self, base_dirs, filename, cacheid=None):
        filename = filename
@@ -72,6 +98,8 @@ class Resource:
            try:
                with open(os.path.join(base_dir, filename), 'rb') as f:
                    self.data = f.read()
+                    if not is_binary_resource(filename):
+                        self.data = self.data.replace(b"\r\n", b"\n")
                found = True
                break
            except FileNotFoundError:
--- a/src/aria2.cpp
+++ b/src/aria2.cpp
@@ -4,6 +4,7 @@
 #include "xmlrpc.h"
 #include <iostream>
 #include <algorithm>
+#include <fstream>
 #include <sstream>
 #include <thread>
 #include <chrono>
@@ -29,18 +30,41 @@

 namespace kiwix {

-Aria2::Aria2():
+namespace {
+
+void pauseAnyActiveDownloads(const std::string& ariaSessionFilePath)
+{
+    std::ifstream inputFile(ariaSessionFilePath);
+    if ( !inputFile )
+        return;
+
+    std::ostringstream ss;
+    std::string line;
+    while ( std::getline(inputFile, line) ) {
+        if ( !startsWith(line, " pause=") ) {
+            ss << line << "\n";
+        }
+        if ( !line.empty() && line[0] != ' ' && line[0] != '#' ) {
+            ss << " pause=true\n";
+        }
+    }
+
+    std::ofstream outputFile(ariaSessionFilePath);
+    outputFile << ss.str();
+}
+
+} // unnamed namespace
+
+Aria2::Aria2(std::string sessionFileDir):
  mp_aria(nullptr),
  m_port(42042),
  m_secret(getNewRpcSecret())
 {
-  m_downloadDir = getDataDirectory();
-  makeDirectory(m_downloadDir);
  std::vector<const char*> callCmd;

  std::string rpc_port = "--rpc-listen-port=" + to_string(m_port);
-  std::string download_dir = "--dir=" + getDataDirectory();
-  std::string session_file = appendToDirectory(getDataDirectory(), "kiwix.session");
+  std::string session_file = appendToDirectory(sessionFileDir, "kiwix.session");
+  pauseAnyActiveDownloads(session_file);
  std::string session = "--save-session=" + session_file;
  std::string inputFile = "--input-file=" + session_file;
 //  std::string log_dir = "--log=\"" + logDir + "\"";
@@ -67,7 +91,6 @@ Aria2::Aria2():
  callCmd.push_back("--enable-rpc");
  callCmd.push_back(rpc_secret.c_str());
  callCmd.push_back(rpc_port.c_str());
-  callCmd.push_back(download_dir.c_str());
  if (fileReadable(session_file)) {
    callCmd.push_back(inputFile.c_str());
  }
@@ -97,20 +120,30 @@ Aria2::Aria2():
  curl_easy_setopt(p_curl, CURLOPT_PORT, m_port);
  curl_easy_setopt(p_curl, CURLOPT_POST, 1L);
  curl_easy_setopt(p_curl, CURLOPT_ERRORBUFFER, curlErrorBuffer);
+  curl_easy_setopt(p_curl, CURLOPT_TIMEOUT_MS, 100);

-  int watchdog = 50;
-  while(--watchdog) {
+  typedef std::chrono::duration<double> Seconds;
+
+  const double MAX_WAITING_TIME_SECONDS = 1;
+  const auto t0 = std::chrono::steady_clock::now();
+  bool maxWaitingTimeWasExceeded = false;
+
+  CURLcode res = CURLE_OK;
+  while ( !maxWaitingTimeWasExceeded ) {
    sleep(10);
    curlErrorBuffer[0] = 0;
-    auto res = curl_easy_perform(p_curl);
+    res = curl_easy_perform(p_curl);
    if (res == CURLE_OK) {
      break;
-    } else if (watchdog == 1) {
-      LOG_ARIA_ERROR();
    }
+
+    const auto dt = std::chrono::steady_clock::now() - t0;
+    const double elapsedTime = std::chrono::duration_cast<Seconds>(dt).count();
+    maxWaitingTimeWasExceeded = elapsedTime > MAX_WAITING_TIME_SECONDS;
  }
  curl_easy_cleanup(p_curl);
-  if (!watchdog) {
+  if ( maxWaitingTimeWasExceeded ) {
+    LOG_ARIA_ERROR();
    throw std::runtime_error("Cannot connect to aria2c rpc. Aria2c launch cmd : " + launchCmd);
  }
 }
--- a/src/aria2.h
+++ b/src/aria2.h
@@ -22,11 +22,10 @@ class Aria2
    std::unique_ptr<Subprocess> mp_aria;
    int m_port;
    std::string m_secret;
-    std::string m_downloadDir;
    std::string doRequest(const MethodCall& methodCall);

  public:
-    Aria2();
+    explicit Aria2(std::string sessionFileDir);
    virtual ~Aria2() = default;
    void close();

--- a/src/book.cpp
+++ b/src/book.cpp
@@ -82,10 +82,11 @@ void Book::update(const zim::Archive& archive) {
  m_size = static_cast<uint64_t>(getArchiveFileSize(archive)) << 10;

  m_illustrations.clear();
-  for ( const auto illustrationSize : archive.getIllustrationSizes() ) {
+  for ( const auto& illustrationInfo : archive.getIllustrationInfos() ) {
    const auto illustration = std::make_shared<Illustration>();
-    const zim::Item illustrationItem = archive.getIllustrationItem(illustrationSize);
-    illustration->width = illustration->height = illustrationSize;
+    const zim::Item illustrationItem = archive.getIllustrationItem(illustrationInfo);
+    illustration->width = illustrationInfo.width;
+    illustration->height = illustrationInfo.height;
    illustration->mimeType = illustrationItem.getMimetype();
    illustration->data = illustrationItem.getData();
    // NOTE: illustration->url is left uninitialized
--- a/src/downloader.cpp
+++ b/src/downloader.cpp
@@ -18,6 +18,7 @@
 */

 #include "downloader.h"
+#include "tools.h"
 #include "tools/pathTools.h"
 #include "tools/stringTools.h"

@@ -124,8 +125,8 @@ void Download::cancelDownload()
 }

 /* Constructor */
-Downloader::Downloader() :
-  mp_aria(new Aria2())
+Downloader::Downloader(std::string sessionFileDir) :
+  mp_aria(new Aria2(sessionFileDir))
 {
  try {
    for (auto gid : mp_aria->tellWaiting()) {
@@ -150,11 +151,20 @@ Downloader::Downloader() :
 /* Destructor */
 Downloader::~Downloader()
 {
+  close();
 }

 void Downloader::close()
 {
-  mp_aria->close();
+  if ( mp_aria ) {
+    try {
+      mp_aria->close();
+    } catch (const std::exception& err) {
+      std::cerr << "ERROR: Failed to save the downloader state: "
+                << err.what() << std::endl;
+    }
+    mp_aria.reset();
+  }
 }

 std::vector<std::string> Downloader::getDownloadIds() const {
@@ -166,13 +176,49 @@ std::vector<std::string> Downloader::getDownloadIds() const {
  return ret;
 }

-std::shared_ptr<Download> Downloader::startDownload(const std::string& uri, const std::vector<std::pair<std::string, std::string>>& options)
+namespace
+{
+
+bool downloadCanBeReused(const Download& d,
+                         const std::string& uri,
+                         const Downloader::Options& /*options*/)
+{
+  const auto& uris = d.getUris();
+  const bool sameURI = std::find(uris.begin(), uris.end(), uri) != uris.end();
+
+  if ( !sameURI )
+    return false;
+
+  switch ( d.getStatus() ) {
+  case Download::K_ERROR:
+  case Download::K_UNKNOWN:
+  case Download::K_REMOVED:
+    return false;
+
+  case Download::K_ACTIVE:
+  case Download::K_WAITING:
+  case Download::K_PAUSED:
+    return true; // XXX: what if options are different?
+
+  case Download::K_COMPLETE:
+    return fileExists(d.getPath()); // XXX: what if options are different?
+  }
+
+  return false;
+}
+
+} // unnamed namespace
+
+std::shared_ptr<Download> Downloader::startDownload(const std::string& uri, const std::string& downloadDir, Options options)
 {
  std::unique_lock<std::mutex> lock(m_lock);
+  options.erase(std::remove_if(options.begin(), options.end(), [](const auto& option) {
+    return option.first == "dir";
+  }), options.end());
+  options.push_back({"dir", downloadDir});
  for (auto& p: m_knownDownloads) {
    auto& d = p.second;
-    auto& uris = d->getUris();
-    if (std::find(uris.begin(), uris.end(), uri) != uris.end())
+    if ( downloadCanBeReused(*d, uri, options) )
      return d;
  }
  std::vector<std::string> uris = {uri};
--- a/src/html_dumper.cpp
+++ b/src/html_dumper.cpp
@@ -3,7 +3,7 @@
 #include "tools/otherTools.h"
 #include "tools.h"
 #include "tools/regexTools.h"
-#include "server/i18n.h"
+#include "server/i18n_utils.h"

 namespace kiwix
 {
@@ -27,6 +27,30 @@ std::string humanFriendlyTitle(std::string title)
  return humanFriendlyString;
 }

+kainjow::mustache::object getLangTag(const std::vector<std::string>& bookLanguages) {
+  std::string langShortString = "";
+  std::string langFullString = "???";
+
+  //if more than 1 languages then show "mul" else show the language
+  if(bookLanguages.size() > 1) {
+    std::vector<std::string> mulLanguages;
+    langShortString = "mul";
+    for (const auto& lang : bookLanguages) {
+      const std::string fullLang = getLanguageSelfName(lang);
+      mulLanguages.push_back(fullLang);
+    }
+    langFullString = kiwix::join(mulLanguages, ",");
+  } else if(bookLanguages.size() == 1) {
+    langShortString = bookLanguages[0];
+    langFullString = getLanguageSelfName(langShortString);
+  }
+
+  kainjow::mustache::object langTag;
+    langTag["langShortString"] = langShortString;
+    langTag["langFullString"] = langFullString;
+  return langTag;
+}
+
 kainjow::mustache::list getTagList(std::string tags)
 {
  const auto tagsList = kiwix::split(tags, ";", true, false);
@@ -72,17 +96,16 @@ std::string HTMLDumper::dumpPlainHTML(kiwix::Filter filter) const
      contentId = urlEncode(nameMapper->getNameForId(bookId));
    } catch (...) {}
    const auto bookDescription = bookObj.getDescription();
-    const auto langCode = bookObj.getCommaSeparatedLanguages();
    const auto bookIconUrl = rootLocation + "/catalog/v2/illustration/" + bookId +  "/?size=48";
    const auto tags = bookObj.getTags();
    const auto downloadAvailable = (bookObj.getUrl() != "");
+    const auto langTagObj = getLangTag(bookObj.getLanguages());
    std::string faviconAttr = "style=background-image:url(" + bookIconUrl + ")";
-    
    booksData.push_back(kainjow::mustache::object{
      {"id", contentId},
      {"title", bookTitle},
      {"description", bookDescription},
-      {"langCode", langCode},
+      {"langTag", langTagObj},
      {"faviconAttr", faviconAttr},
      {"tagList", getTagList(tags)},
      {"downloadAvailable", downloadAvailable}
@@ -107,6 +130,7 @@ std::string HTMLDumper::dumpPlainHTML(kiwix::Filter filter) const
             RESOURCE::templates::no_js_library_page_html,
             kainjow::mustache::object{
               {"root", rootLocation},
+               {"contentAccessUrl", onlyAsNonEmptyMustacheValue(contentAccessUrl)},
               {"books", booksData },
               {"searchQuery", searchQuery},
               {"languages", languages},
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -645,8 +645,6 @@ Xapian::Query buildXapianQueryFromFilterQuery(const Filter& filter)
  //queryParser.set_stemmer(Xapian::Stem(iso639_3ToXapian(???)));
  //queryParser.set_stemming_strategy(Xapian::QueryParser::STEM_SOME);
  const auto flags = Xapian::QueryParser::FLAG_PHRASE
-                   | Xapian::QueryParser::FLAG_BOOLEAN
-                   | Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE
                   | Xapian::QueryParser::FLAG_LOVEHATE
                   | Xapian::QueryParser::FLAG_WILDCARD
                   | partialQueryFlag;
--- a/src/library_dumper.h
+++ b/src/library_dumper.h
@@ -50,6 +50,13 @@ class LibraryDumper
   */
  void setRootLocation(const std::string& rootLocation) { this->rootLocation = rootLocation; }

+  /**
+   * Set the URL for accessing book content
+   *
+   * @param url the URL of the /content endpoint of the content server
+   */
+  void setContentAccessUrl(const std::string& url) { this->contentAccessUrl = url; }
+
  /**
   * Set some informations about the search results.
   *
@@ -58,10 +65,10 @@ class LibraryDumper
   * @param count the number of result of the current set (or page).
   */
  void setOpenSearchInfo(int totalResult, int startIndex, int count);
-  
+
  /**
   * Sets user default language
-   * 
+   *
   * @param userLang the user language to be set
   */
  void setUserLanguage(std::string userLang) { this->m_userLang = userLang; }
@@ -81,6 +88,7 @@ class LibraryDumper
  const kiwix::NameMapper* const nameMapper;
  std::string libraryId;
  std::string rootLocation;
+  std::string contentAccessUrl;
  std::string m_userLang;
  int m_totalResults;
  int m_startIndex;
--- a/src/meson.build
+++ b/src/meson.build
@@ -31,6 +31,7 @@ kiwix_sources = [
  'server/internalServer_catalog.cpp',
  'server/i18n.cpp',
  'opds_catalog.cpp',
+  'spelling_correction.cpp',
  'version.cpp'
 ]
 kiwix_sources += lib_resources
--- a/src/name_mapper.cpp
+++ b/src/name_mapper.cpp
@@ -24,33 +24,37 @@

 namespace kiwix {

-HumanReadableNameMapper::HumanReadableNameMapper(kiwix::Library& library, bool withAlias) {
-  for (auto& bookId: library.filter(kiwix::Filter().local(true).valid(true))) {
+HumanReadableNameMapper::HumanReadableNameMapper(const kiwix::Library& library, bool withAlias) {
+  for (auto& bookId: library.filter(kiwix::Filter())) {
    auto& currentBook = library.getBookById(bookId);
    auto bookName = currentBook.getHumanReadableIdFromPath();
    m_idToName[bookId] = bookName;
-    m_nameToId[bookName] = bookId;
+    mapName(library, bookName, bookId);

    if (!withAlias)
      continue;

    auto aliasName = replaceRegex(bookName, "", "_[[:digit:]]{4}-[[:digit:]]{2}$");
-    if (aliasName == bookName) {
-      continue;
-    }
-    if (m_nameToId.find(aliasName) == m_nameToId.end()) {
-      m_nameToId[aliasName] = bookId;
-    } else {
-      auto alreadyPresentPath = library.getBookById(m_nameToId[aliasName]).getPath();
-      std::cerr << "Path collision: " << alreadyPresentPath
-                << " and " << currentBook.getPath()
-                << " can't share the same URL path '" << aliasName << "'."
-                << " Therefore, only " << alreadyPresentPath
-                << " will be served." << std::endl;
+    if (aliasName != bookName) {
+      mapName(library, aliasName, bookId);
    }
  }
 }

+void HumanReadableNameMapper::mapName(const Library& library, std::string name, std::string bookId) {
+  if (m_nameToId.find(name) == m_nameToId.end()) {
+    m_nameToId[name] = bookId;
+  } else {
+    const auto& currentBook = library.getBookById(bookId);
+    auto alreadyPresentPath = library.getBookById(m_nameToId[name]).getPath();
+    std::cerr << "Path collision: '" << alreadyPresentPath
+              << "' and '" << currentBook.getPath()
+              << "' can't share the same URL path '" << name << "'."
+              << " Therefore, only '" << alreadyPresentPath
+              << "' will be served." << std::endl;
+  }
+}
+
 std::string HumanReadableNameMapper::getNameForId(const std::string& id) const {
  return m_idToName.at(id);
 }
--- a/src/opds_dumper.cpp
+++ b/src/opds_dumper.cpp
@@ -51,24 +51,26 @@ typedef kainjow::mustache::list IllustrationInfo;
 IllustrationInfo getBookIllustrationInfo(const Book& book)
 {
    kainjow::mustache::list illustrations;
-    if ( book.isPathValid() ) {
-      for ( const auto& illustration : book.getIllustrations() ) {
-        // For now, we are handling only sizexsize@1 illustration.
-        // So we can simply pass one size to mustache.
-        illustrations.push_back(kainjow::mustache::object{
-          {"icon_size", to_string(illustration->width)},
-          {"icon_mimetype", illustration->mimeType}
-        });
-      }
+    for ( const auto& illustration : book.getIllustrations() ) {
+      // For now, we are handling only sizexsize@1 illustration.
+      // So we can simply pass one size to mustache.
+      illustrations.push_back(kainjow::mustache::object{
+        {"icon_size", to_string(illustration->width)},
+        {"icon_mimetype", illustration->mimeType}
+      });
    }
    return illustrations;
 }

-std::string fullEntryXML(const Book& book, const std::string& rootLocation, const std::string& contentId)
+std::string fullEntryXML(const Book& book,
+                         const std::string& rootLocation,
+                         const std::string& contentAccessUrl,
+                         const std::string& contentId)
 {
    const auto bookDate = book.getDate() + "T00:00:00Z";
    const kainjow::mustache::object data{
      {"root",  rootLocation},
+      {"contentAccessUrl",  onlyAsNonEmptyMustacheValue(contentAccessUrl)},
      {"id", book.getId()},
      {"name", book.getName()},
      {"title", book.getTitle()},
@@ -105,7 +107,12 @@ std::string partialEntryXML(const Book& book, const std::string& rootLocation)
    return render_template(xmlTemplate, data);
 }

-BooksData getBooksData(const Library* library, const NameMapper* nameMapper, const std::vector<std::string>& bookIds, const std::string& rootLocation, bool partial)
+BooksData getBooksData(const Library* library,
+                       const NameMapper* nameMapper,
+                       const std::vector<std::string>& bookIds,
+                       const std::string& rootLocation,
+                       const std::string& contentAccessUrl,
+                       bool partial)
 {
  BooksData booksData;
  for ( const auto& bookId : bookIds ) {
@@ -114,7 +121,7 @@ BooksData getBooksData(const Library* library, const NameMapper* nameMapper, con
      const std::string contentId = nameMapper->getNameForId(bookId);
      const auto entryXML = partial
                          ? partialEntryXML(book, rootLocation)
-                          : fullEntryXML(book, rootLocation, contentId);
+                          : fullEntryXML(book, rootLocation, contentAccessUrl, contentId);
      booksData.push_back(kainjow::mustache::object{ {"entry", entryXML} });
    } catch ( const std::out_of_range& ) {
      // the book was removed from the library since its id was obtained
@@ -129,7 +136,7 @@ BooksData getBooksData(const Library* library, const NameMapper* nameMapper, con

 string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const std::string& query) const
 {
-  const auto booksData = getBooksData(library, nameMapper, bookIds, rootLocation, false);
+  const auto booksData = getBooksData(library, nameMapper, bookIds, rootLocation, contentAccessUrl, false);
  const kainjow::mustache::object template_data{
     {"date", gen_date_str()},
     {"root", rootLocation},
@@ -147,7 +154,7 @@ string OPDSDumper::dumpOPDSFeed(const std::vector<std::string>& bookIds, const s
 string OPDSDumper::dumpOPDSFeedV2(const std::vector<std::string>& bookIds, const std::string& query, bool partial) const
 {
  const auto endpointRoot = rootLocation + "/catalog/v2";
-  const auto booksData = getBooksData(library, nameMapper, bookIds, rootLocation, partial);
+  const auto booksData = getBooksData(library, nameMapper, bookIds, rootLocation, contentAccessUrl, partial);

  const char* const endpoint = partial ? "/partial_entries" : "/entries";
  const std::string url = endpoint + (query.empty() ? "" : "?" + query);
@@ -172,7 +179,7 @@ std::string OPDSDumper::dumpOPDSCompleteEntry(const std::string& bookId) const
  const std::string contentId = nameMapper->getNameForId(bookId);
  return XML_HEADER
         + "\n"
-         + fullEntryXML(book, rootLocation, contentId);
+         + fullEntryXML(book, rootLocation, contentAccessUrl, contentId);
 }

 std::string OPDSDumper::categoriesOPDSFeed() const
--- a/src/search_renderer.cpp
+++ b/src/search_renderer.cpp
@@ -32,7 +32,7 @@
 #include "libkiwix-resources.h"
 #include "tools/stringTools.h"

-#include "server/i18n.h"
+#include "server/i18n_utils.h"

 namespace kiwix
 {
@@ -58,7 +58,7 @@ ParameterizedMessage searchResultsPageHeaderMsg(const std::string& searchPattern
    return ParameterizedMessage("search-results-page-header",
                                {
                                  {"SEARCH_PATTERN", searchPattern},
-                                  {"START", r.get("start")->string_value()},
+                                  {"START", r.get("startLabel")->string_value()},
                                  {"END",   r.get("end")  ->string_value()},
                                  {"COUNT", r.get("count")->string_value()},
                                }
@@ -225,7 +225,8 @@ std::string SearchRenderer::renderTemplate(const std::string& tmpl_str, const Na
  results.set("items", items);
  results.set("count", kiwix::beautifyInteger(estimatedResultCount));
  results.set("start", kiwix::beautifyInteger(resultStart));
-  results.set("end", kiwix::beautifyInteger(std::min(resultStart+pageLength-1, estimatedResultCount)));
+  results.set("startLabel", kiwix::beautifyInteger(resultStart+1));
+  results.set("end", kiwix::beautifyInteger(std::min(resultStart+pageLength, estimatedResultCount)));

  // pagination
  auto pagination = buildPagination(
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -29,6 +29,22 @@

 namespace kiwix {

+namespace
+{
+
+std::string makeServerUrl(std::string host, int port, std::string root)
+{
+  const int httpDefaultPort = 80;
+
+  if (port == httpDefaultPort) {
+    return "http://" + host + root;
+  } else {
+    return "http://" + host + ":" + std::to_string(port) + root;
+  }
+}
+
+}  // unnamed namespace
+
 Server::Server(LibraryPtr library, std::shared_ptr<NameMapper> nameMapper) :
  mp_library(library),
  mp_nameMapper(nameMapper),
@@ -51,9 +67,18 @@ bool Server::start() {
    m_withTaskbar,
    m_withLibraryButton,
    m_blockExternalLinks,
+    m_ipMode,
    m_indexTemplateString,
-    m_ipConnectionLimit));
-  return mp_server->start();
+    m_ipConnectionLimit,
+    m_catalogOnlyMode,
+    m_contentServerUrl));
+  if (mp_server->start()) {
+    // this syncs m_addr of InternalServer and Server as they may diverge
+    m_addr = mp_server->getAddress();
+    return true;
+  } else {
+    return false;
+  }
 }

 void Server::stop() {
@@ -66,22 +91,53 @@ void Server::stop() {
 void Server::setRoot(const std::string& root)
 {
  m_root = root;
-  if (m_root[0] != '/') {
-    m_root = "/" + m_root;
-  }
-  if (m_root.back() == '/') {
-    m_root.erase(m_root.size() - 1);
+  while (!m_root.empty() && m_root.back() == '/')
+    m_root.pop_back();
+
+  while (!m_root.empty() && m_root.front() == '/')
+    m_root = m_root.substr(1);
+  m_root = m_root.empty() ? m_root : "/" + m_root;
+}
+
+void Server::setAddress(const std::string& addr)
+{
+  m_addr.addr.clear();
+  m_addr.addr6.clear();
+
+  if (addr.empty()) return;
+
+  if (addr.find(':') != std::string::npos) { // IPv6
+    m_addr.addr6 = (addr[0] == '[') ? addr.substr(1, addr.length() - 2) : addr; // Remove brackets if any
+  } else {
+    m_addr.addr = addr;
  }
 }

-int Server::getPort()
+int Server::getPort() const
 {
-  return mp_server->getPort();
+  return m_port;
 }

-std::string Server::getAddress()
+IpAddress Server::getAddress() const
 {
-  return mp_server->getAddress();
+  return m_addr;
+}
+
+IpMode Server::getIpMode() const
+{
+  return mp_server->getIpMode();
+}
+
+std::vector<std::string> Server::getServerAccessUrls() const
+{
+  std::vector<std::string> result;
+  if (!m_addr.addr.empty()) {
+    result.push_back(makeServerUrl(m_addr.addr, m_port, m_root));
+  }
+  if (!m_addr.addr6.empty()) {
+    result.push_back(makeServerUrl("[" + m_addr.addr6 + "]", m_port, m_root));
+  }
+  return result;
 }

 }
--- a/src/server/i18n.cpp
+++ b/src/server/i18n.cpp
@@ -17,7 +17,7 @@
 * MA 02110-1301, USA.
 */

-#include "i18n.h"
+#include "i18n_utils.h"

 #include "tools/otherTools.h"

@@ -193,4 +193,13 @@ std::string selectMostSuitableLanguage(const UserLangPreferences& prefs)
  return bestLangSoFar;
 }

+std::string translateBookCategory(const std::string& lang, const std::string& category)
+{
+    try {
+        return getTranslatedString(lang, "book-category." + category);
+    } catch (...) {
+        return category;
+    }
+}
+
 } // namespace kiwix
--- a/src/server/i18n_utils.h
+++ b/src/server/i18n_utils.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2022 Veloman Yunkan <veloman.yunkan@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#ifndef KIWIX_SERVER_I18N_UTILS
+#define KIWIX_SERVER_I18N_UTILS
+
+#include "i18n.h"
+#include <mustache.hpp>
+
+namespace kiwix
+{
+
+struct I18nString {
+  const char* const key;
+  const char* const value;
+};
+
+struct I18nStringTable {
+  const char* const lang;
+  const size_t entryCount;
+  const I18nString* const entries;
+
+  const char* get(const std::string& key) const;
+};
+
+namespace i18n
+{
+
+class GetTranslatedStringWithMsgId
+{
+  typedef kainjow::mustache::basic_data<std::string> MustacheString;
+  typedef std::pair<std::string, MustacheString> MsgIdAndTranslation;
+
+public:
+  explicit GetTranslatedStringWithMsgId(const std::string& lang) : m_lang(lang) {}
+
+  MsgIdAndTranslation operator()(const std::string& key) const
+  {
+    return {key, getTranslatedString(m_lang, key)};
+  }
+
+  MsgIdAndTranslation operator()(const std::string& key, const Parameters& params) const
+  {
+    return {key, expandParameterizedString(m_lang, key, params)};
+  }
+
+private:
+  const std::string m_lang;
+};
+
+} // namespace i18n
+
+struct LangPreference
+{
+  const std::string lang;
+  const float preference;
+};
+
+typedef std::vector<LangPreference> UserLangPreferences;
+
+UserLangPreferences parseUserLanguagePreferences(const std::string& s);
+
+std::string selectMostSuitableLanguage(const UserLangPreferences& prefs);
+
+} // namespace kiwix
+
+#endif // KIWIX_SERVER_I18N_UTILS
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -54,7 +54,7 @@ extern "C" {
 #include "search_renderer.h"
 #include "opds_dumper.h"
 #include "html_dumper.h"
-#include "i18n.h"
+#include "i18n_utils.h"

 #include <zim/uuid.h>
 #include <zim/error.h>
@@ -85,14 +85,18 @@ namespace kiwix {
 namespace
 {

-inline std::string normalizeRootUrl(std::string rootUrl)
+bool ipAvailable(const std::string addr)
 {
-  while ( !rootUrl.empty() && rootUrl.back() == '/' )
-    rootUrl.pop_back();
+  auto interfaces = kiwix::getNetworkInterfacesIPv4Or6();

-  while ( !rootUrl.empty() && rootUrl.front() == '/' )
-    rootUrl = rootUrl.substr(1);
-  return rootUrl.empty() ? rootUrl : "/" + rootUrl;
+  for (const auto& kv : interfaces) {
+    const auto& interfaceIps = kv.second;
+    if ((interfaceIps.addr == addr) || (interfaceIps.addr6 == addr)) {
+      return true;
+    }
+  }
+
+  return false;
 }

 std::string
@@ -111,9 +115,12 @@ std::string getSearchComponent(const RequestContext& request)
    return query.empty() ? query : "?" + query;
 }

-Filter get_search_filter(const RequestContext& request, const std::string& prefix="")
+Filter get_search_filter(const RequestContext& request, const std::string& prefix="", bool catalogOnlyMode = false)
 {
-    auto filter = kiwix::Filter().valid(true).local(true);
+    auto filter = kiwix::Filter();
+    if ( !catalogOnlyMode ) {
+      filter.valid(true).local(true);
+    }
    try {
      filter.query(request.get_argument(prefix+"q"));
    } catch (const std::out_of_range&) {}
@@ -407,7 +414,7 @@ public:

 InternalServer::InternalServer(LibraryPtr library,
                               std::shared_ptr<NameMapper> nameMapper,
-                               std::string addr,
+                               IpAddress addr,
                               int port,
                               std::string root,
                               int nbThreads,
@@ -416,11 +423,14 @@ InternalServer::InternalServer(LibraryPtr library,
                               bool withTaskbar,
                               bool withLibraryButton,
                               bool blockExternalLinks,
+                               IpMode ipMode,
                               std::string indexTemplateString,
-                               int ipConnectionLimit) :
+                               int ipConnectionLimit,
+                               bool catalogOnlyMode,
+                               std::string contentServerUrl) :
  m_addr(addr),
  m_port(port),
-  m_root(normalizeRootUrl(root)),
+  m_root(root),
  m_rootPrefixOfDecodedURL(m_root),
  m_nbThreads(nbThreads),
  m_multizimSearchLimit(multizimSearchLimit),
@@ -428,6 +438,7 @@ InternalServer::InternalServer(LibraryPtr library,
  m_withTaskbar(withTaskbar),
  m_withLibraryButton(withLibraryButton),
  m_blockExternalLinks(blockExternalLinks),
+  m_ipMode(ipMode),
  m_indexTemplateString(indexTemplateString.empty() ? RESOURCE::templates::index_html : indexTemplateString),
  m_ipConnectionLimit(ipConnectionLimit),
  mp_daemon(nullptr),
@@ -435,7 +446,9 @@ InternalServer::InternalServer(LibraryPtr library,
  mp_nameMapper(nameMapper ? nameMapper : std::shared_ptr<NameMapper>(&defaultNameMapper, NoDelete())),
  searchCache(getEnvVar<int>("KIWIX_SEARCH_CACHE_SIZE", DEFAULT_CACHE_SIZE)),
  suggestionSearcherCache(getEnvVar<int>("KIWIX_SUGGESTION_SEARCHER_CACHE_SIZE", std::max((unsigned int) (mp_library->getBookCount(true, true)*0.1), 1U))),
-  m_customizedResources(new CustomizedResources)
+  m_customizedResources(new CustomizedResources),
+  m_catalogOnlyMode(catalogOnlyMode),
+  m_contentServerUrl(contentServerUrl)
 {
  m_root = urlEncode(m_root);
 }
@@ -451,28 +464,62 @@ bool InternalServer::start() {
  if (m_verbose.load())
    flags |= MHD_USE_DEBUG;

-  struct sockaddr_in sockAddr;
-  memset(&sockAddr, 0, sizeof(sockAddr));
-  sockAddr.sin_family = AF_INET;
-  sockAddr.sin_port = htons(m_port);
-  if (m_addr.empty()) {
-    if (0 != INADDR_ANY) {
-      sockAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-    }
-    m_addr = kiwix::getBestPublicIp();
+
+  struct sockaddr_in sockAddr4={0};
+  sockAddr4.sin_family = AF_INET;
+  sockAddr4.sin_port = htons(m_port);
+  struct sockaddr_in6 sockAddr6={0};
+  sockAddr6.sin6_family = AF_INET6;
+  sockAddr6.sin6_port = htons(m_port);
+
+  if (m_addr.addr.empty() && m_addr.addr6.empty()) { // No ip address provided
+    if (m_ipMode == IpMode::AUTO) m_ipMode = IpMode::ALL;
+    sockAddr6.sin6_addr = in6addr_any;
+    sockAddr4.sin_addr.s_addr = htonl(INADDR_ANY);
+    IpAddress bestIps = kiwix::getBestPublicIps();
+    if (m_ipMode == IpMode::IPV4 || m_ipMode == IpMode::ALL) m_addr.addr = bestIps.addr;
+    if (m_ipMode == IpMode::IPV6 || m_ipMode == IpMode::ALL) m_addr.addr6 = bestIps.addr6;
  } else {
-    if (inet_pton(AF_INET, m_addr.c_str(), &(sockAddr.sin_addr.s_addr)) == 0) {
-      std::cerr << "Ip address " << m_addr << "  is not a valid ip address" << std::endl;
+    const std::string addr = !m_addr.addr.empty() ? m_addr.addr : m_addr.addr6;
+
+    if (m_ipMode != kiwix::IpMode::AUTO) {
+      std::cerr << "ERROR: When an IP address is provided the IP mode must not be set" << std::endl;
      return false;
    }
+
+    bool validV4 = inet_pton(AF_INET, m_addr.addr.c_str(), &(sockAddr4.sin_addr.s_addr)) == 1;
+    bool validV6 = inet_pton(AF_INET6, m_addr.addr6.c_str(), &(sockAddr6.sin6_addr.s6_addr)) == 1;
+
+    if (!validV4 && !validV6) {
+      std::cerr << "ERROR: invalid IP address: " << addr << std::endl;
+      return false;
+    }
+
+    if (!ipAvailable(addr)) {
+      std::cerr << "ERROR: IP address is not available on this system: " << addr << std::endl;
+      return false;
+    }
+
+    m_ipMode = !m_addr.addr.empty() ? IpMode::IPV4 : IpMode::IPV6;
  }
+
+  if (m_ipMode == IpMode::ALL) {
+    flags|=MHD_USE_DUAL_STACK;
+  } else if (m_ipMode == IpMode::IPV6) {
+    flags|=MHD_USE_IPv6;
+  }
+
+  struct sockaddr* sockaddr = (m_ipMode==IpMode::ALL || m_ipMode==IpMode::IPV6)
+                              ? (struct sockaddr*)&sockAddr6
+                              : (struct sockaddr*)&sockAddr4;
+
  mp_daemon = MHD_start_daemon(flags,
                            m_port,
                            NULL,
                            NULL,
                            &staticHandlerCallback,
                            this,
-                            MHD_OPTION_SOCK_ADDR, &sockAddr,
+                            MHD_OPTION_SOCK_ADDR, sockaddr,
                            MHD_OPTION_THREAD_POOL_SIZE, m_nbThreads,
                            MHD_OPTION_PER_IP_CONNECTION_LIMIT, m_ipConnectionLimit,
                            MHD_OPTION_END);
@@ -659,12 +706,10 @@ std::unique_ptr<Response> InternalServer::handle_request(const RequestContext& r
    return Response::build_redirect(contentUrl + query);
  } catch (std::exception& e) {
    fprintf(stderr, "===== Unhandled error : %s\n", e.what());
-    return HTTP500Response(request)
-         + ParameterizedMessage("non-translated-text", {{"MSG", e.what()}});
+    return HTTP500Response(request, m_root, request.get_full_url(), e.what());
  } catch (...) {
    fprintf(stderr, "===== Unhandled unknown error\n");
-    return HTTP500Response(request)
-         + nonParameterizedMessage("unknown-error");
+    return HTTP500Response(request, m_root, request.get_full_url());
  }
 }

@@ -795,6 +840,15 @@ std::string InternalServer::getNoJSDownloadPageHTML(const std::string& bookId, c
  );
 }

+void InternalServer::setContentAccessUrl(LibraryDumper& libDumper) const
+{
+  if ( !m_contentServerUrl.empty() ) {
+    libDumper.setContentAccessUrl(m_contentServerUrl + "/content");
+  } else if ( !m_catalogOnlyMode ) {
+    libDumper.setContentAccessUrl(m_root + "/content");
+  }
+}
+
 std::unique_ptr<Response> InternalServer::handle_no_js(const RequestContext& request)
 {
  const auto url = request.get_url();
@@ -802,12 +856,13 @@ std::unique_ptr<Response> InternalServer::handle_no_js(const RequestContext& req
  HTMLDumper htmlDumper(mp_library.get(), mp_nameMapper.get());
  htmlDumper.setRootLocation(m_root);
  htmlDumper.setLibraryId(getLibraryId());
+  setContentAccessUrl(htmlDumper);
  auto userLang = request.get_user_language();
  htmlDumper.setUserLanguage(userLang);
  std::string content;

  if (urlParts.size() == 1) {
-    auto filter = get_search_filter(request);
+    auto filter = get_search_filter(request, "", m_catalogOnlyMode);
    try {
      if (request.get_argument("category") == "") {
        filter.clearCategory();
@@ -937,7 +992,7 @@ std::unique_ptr<Response> InternalServer::handle_search_request(const RequestCon
  } catch(std::runtime_error& e) {
    // Searcher->search will throw a runtime error if there is no valid xapian database to do the search.
    // (in case of zim file not containing a index)
-    const auto cssUrl = renderUrl(m_root, RESOURCE::templates::url_of_search_results_css);
+    const auto cssUrl = renderUrl(m_root, RESOURCE::templates::url_of_search_results_css_tmpl);
    HTTPErrorResponse response(request, MHD_HTTP_NOT_FOUND,
                               "fulltext-search-unavailable",
                               "404-page-heading",
@@ -956,11 +1011,11 @@ std::unique_ptr<Response> InternalServer::handle_search_request(const RequestCon
    return response;
  }

-  const auto start = max(1u, request.get_optional_param("start", 1u));
+  const auto start = max(0u, request.get_optional_param("start", 0u));
  const auto pageLength = getSearchPageSize(request);

  /* Get the results */
-  SearchRenderer renderer(search->getResults(start-1, pageLength), start,
+  SearchRenderer renderer(search->getResults(start, pageLength), start,
                          search->getEstimatedMatches());
  renderer.setSearchPattern(searchInfo.pattern);
  renderer.setSearchBookQuery(searchInfo.bookFilterQuery);
@@ -1035,9 +1090,7 @@ std::unique_ptr<Response> InternalServer::handle_captured_external(const Request
    return UrlNotFoundResponse(request);
  }

-  auto data = get_default_data();
-  data.set("source", source);
-  return ContentResponse::build(RESOURCE::templates::captured_external_html, data, "text/html; charset=utf-8");
+  return BlockExternalLinkResponse(request, m_root, source);
 }

 std::unique_ptr<Response> InternalServer::handle_catch(const RequestContext& request)
@@ -1057,7 +1110,7 @@ std::vector<std::string>
 InternalServer::search_catalog(const RequestContext& request,
                               kiwix::OPDSDumper& opdsDumper)
 {
-    const auto filter = get_search_filter(request);
+    const auto filter = get_search_filter(request, "", m_catalogOnlyMode);
    std::vector<std::string> bookIdsToDump = mp_library->filter(filter);
    const auto totalResults = bookIdsToDump.size();
    const long count = request.get_optional_param("count", 10L);
@@ -1071,15 +1124,6 @@ InternalServer::search_catalog(const RequestContext& request,
 namespace
 {

-ParameterizedMessage suggestSearchMsg(const std::string& searchURL, const std::string& pattern)
-{
-  return ParameterizedMessage("suggest-search",
-                              {
-                                { "PATTERN",    pattern   },
-                                { "SEARCH_URL", searchURL }
-                              });
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // The content security policy below is set on responses to the /content
 // endpoint in order to prevent the ZIM content from interfering with the
@@ -1097,6 +1141,7 @@ const std::string CONTENT_CSP_HEADER =
            "allow-same-origin "
            "allow-modals "
            "allow-popups "
+            "allow-popups-to-escape-sandbox "
            "allow-forms "
            "allow-downloads;";

@@ -1133,9 +1178,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
  } catch (const std::out_of_range& e) {}

  if (archive == nullptr) {
-    const std::string searchURL = m_root + "/search?pattern=" + kiwix::urlEncode(pattern);
-    return UrlNotFoundResponse(request)
-           + suggestSearchMsg(searchURL, kiwix::urlDecode(pattern));
+    return NewHTTP404Response(request, m_root, m_root + url);
  }

  const std::string archiveUuid(archive->getUuid());
@@ -1180,9 +1223,7 @@ std::unique_ptr<Response> InternalServer::handle_content(const RequestContext& r
    if (m_verbose.load())
      printf("Failed to find %s\n", urlStr.c_str());

-    std::string searchURL = m_root + "/search?content=" + bookName + "&pattern=" + kiwix::urlEncode(pattern);
-    return UrlNotFoundResponse(request)
-           + suggestSearchMsg(searchURL, kiwix::urlDecode(pattern));
+    return NewHTTP404Response(request, m_root, m_root + url);
  }
 }

--- a/src/server/internalServer.h
+++ b/src/server/internalServer.h
@@ -27,6 +27,7 @@ extern "C" {

 #include "library.h"
 #include "name_mapper.h"
+#include "tools.h"

 #include <zim/search.h>
 #include <zim/suggestion.h>
@@ -89,12 +90,13 @@ class SearchInfo {

 typedef kainjow::mustache::data MustacheData;
 class OPDSDumper;
+class LibraryDumper;

 class InternalServer {
  public:
    InternalServer(LibraryPtr library,
                   std::shared_ptr<NameMapper> nameMapper,
-                   std::string addr,
+                   IpAddress addr,
                   int port,
                   std::string root,
                   int nbThreads,
@@ -103,8 +105,11 @@ class InternalServer {
                   bool withTaskbar,
                   bool withLibraryButton,
                   bool blockExternalLinks,
+                   IpMode ipMode,
                   std::string indexTemplateString,
-                   int ipConnectionLimit);
+                   int ipConnectionLimit,
+                   bool catalogOnlyMode,
+                   std::string zimViewerURL);
    virtual ~InternalServer();

    MHD_Result handlerCallback(struct MHD_Connection* connection,
@@ -116,8 +121,9 @@ class InternalServer {
                               void** cont_cls);
    bool start();
    void stop();
-    std::string getAddress() { return m_addr; }
-    int getPort() { return m_port; }
+    IpAddress getAddress() const { return m_addr; }
+    int getPort() const { return m_port; }
+    IpMode getIpMode() const { return m_ipMode; }

  private: // functions
    std::unique_ptr<Response> handle_request(const RequestContext& request);
@@ -157,6 +163,8 @@ class InternalServer {
    std::string getLibraryId() const;

    std::string getNoJSDownloadPageHTML(const std::string& bookId, const std::string& userLang) const;
+    OPDSDumper getOPDSDumper() const;
+    void setContentAccessUrl(LibraryDumper& libDumper) const;

  private: // types
    class LockableSuggestionSearcher;
@@ -164,7 +172,7 @@ class InternalServer {
    typedef ConcurrentCache<std::string, std::shared_ptr<LockableSuggestionSearcher>> SuggestionSearcherCache;

  private: // data
-    std::string m_addr;
+    IpAddress m_addr;
    int m_port;
    std::string m_root;                   // URI-encoded
    std::string m_rootPrefixOfDecodedURL; // URI-decoded
@@ -174,6 +182,7 @@ class InternalServer {
    bool m_withTaskbar;
    bool m_withLibraryButton;
    bool m_blockExternalLinks;
+    IpMode m_ipMode;
    std::string m_indexTemplateString;
    int m_ipConnectionLimit;
    struct MHD_Daemon* mp_daemon;
@@ -188,6 +197,9 @@ class InternalServer {

    class CustomizedResources;
    std::unique_ptr<CustomizedResources> m_customizedResources;
+
+    const bool m_catalogOnlyMode;
+    const std::string m_contentServerUrl;
 };

 }
--- a/src/server/internalServer_catalog.cpp
+++ b/src/server/internalServer_catalog.cpp
@@ -51,6 +51,15 @@ const std::string opdsMimeType[] = {

 } // unnamed namespace

+OPDSDumper InternalServer::getOPDSDumper() const
+{
+  kiwix::OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
+  opdsDumper.setRootLocation(m_root);
+  opdsDumper.setLibraryId(getLibraryId());
+  setContentAccessUrl(opdsDumper);
+  return opdsDumper;
+}
+
 std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& request)
 {
  if (m_verbose.load()) {
@@ -80,9 +89,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog(const RequestContext& r
  }

  zim::Uuid uuid;
-  kiwix::OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
+  kiwix::OPDSDumper opdsDumper = getOPDSDumper();
  std::vector<std::string> bookIdsToDump;
  if (url == "root.xml") {
    uuid = zim::Uuid::generate(host);
@@ -158,9 +165,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_root(const RequestCo

 std::unique_ptr<Response> InternalServer::handle_catalog_v2_entries(const RequestContext& request, bool partial)
 {
-  OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
+  kiwix::OPDSDumper opdsDumper = getOPDSDumper();
  const auto bookIds = search_catalog(request, opdsDumper);
  const auto opdsFeed = opdsDumper.dumpOPDSFeedV2(bookIds, request.get_query(), partial);
  return ContentResponse::build(
@@ -177,9 +182,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_complete_entry(const
    return UrlNotFoundResponse(request);
  }

-  OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
+  kiwix::OPDSDumper opdsDumper = getOPDSDumper();
  const auto opdsFeed = opdsDumper.dumpOPDSCompleteEntry(entryId);
  return ContentResponse::build(
             opdsFeed,
@@ -189,9 +192,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_complete_entry(const

 std::unique_ptr<Response> InternalServer::handle_catalog_v2_categories(const RequestContext& request)
 {
-  OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
+  kiwix::OPDSDumper opdsDumper = getOPDSDumper();
  return ContentResponse::build(
             opdsDumper.categoriesOPDSFeed(),
             opdsMimeType[OPDS_NAVIGATION_FEED]
@@ -200,9 +201,7 @@ std::unique_ptr<Response> InternalServer::handle_catalog_v2_categories(const Req

 std::unique_ptr<Response> InternalServer::handle_catalog_v2_languages(const RequestContext& request)
 {
-  OPDSDumper opdsDumper(mp_library.get(), mp_nameMapper.get());
-  opdsDumper.setRootLocation(m_root);
-  opdsDumper.setLibraryId(getLibraryId());
+  kiwix::OPDSDumper opdsDumper = getOPDSDumper();
  return ContentResponse::build(
             opdsDumper.languagesOPDSFeed(),
             opdsMimeType[OPDS_NAVIGATION_FEED]
--- a/src/server/request_context.cpp
+++ b/src/server/request_context.cpp
@@ -28,7 +28,7 @@
 #include <cctype>

 #include "tools/stringTools.h"
-#include "i18n.h"
+#include "i18n_utils.h"

 namespace kiwix {

--- a/src/server/response.cpp
+++ b/src/server/response.cpp
@@ -243,6 +243,23 @@ public:
    };
  }

+  static Data fromMsgId(const std::string& nonParameterizedMsgId)
+  {
+    return from(nonParameterizedMessage(nonParameterizedMsgId));
+  }
+
+  static Data staticMultiParagraphText(const std::string& msgIdPrefix, size_t n)
+  {
+    Object paragraphs;
+    for ( size_t i = 1; i <= n; ++i ) {
+      std::ostringstream oss;
+      oss << "p" << i;
+      const std::string pId = oss.str();
+      paragraphs[pId] = fromMsgId(msgIdPrefix + "." + pId);
+    }
+    return paragraphs;
+  }
+
  std::string asJSON() const;
  void dumpJSON(std::ostream& os) const;

@@ -368,6 +385,45 @@ std::unique_ptr<ContentResponse> ContentResponseBlueprint::generateResponseObjec
  return r;
 }

+NewHTTP404Response::NewHTTP404Response(const RequestContext& request,
+                                       const std::string& root,
+                                       const std::string& urlPath)
+  : ContentResponseBlueprint(&request,
+                             MHD_HTTP_NOT_FOUND,
+                             "text/html; charset=utf-8",
+                             RESOURCE::templates::sexy404_html,
+                             /*includeKiwixResponseData=*/true)
+{
+  *this->m_data = Data(Data::Object{
+                    {"root", root },
+                    {"url_path", urlPath},
+                    {"PAGE_TITLE",   Data::fromMsgId("new-404-page-title")},
+                    {"PAGE_HEADING", Data::fromMsgId("new-404-page-heading")},
+                    {"404_img_text", Data::fromMsgId("404-img-text")},
+                    {"path_was_not_found_msg", Data::fromMsgId("path-was-not-found")},
+                    {"advice", Data::staticMultiParagraphText("404-advice", 5)},
+  });
+}
+
+BlockExternalLinkResponse::BlockExternalLinkResponse(const RequestContext& request,
+                                       const std::string& root,
+                                       const std::string& externalUrl)
+  : ContentResponseBlueprint(&request,
+                             MHD_HTTP_OK,
+                             "text/html; charset=utf-8",
+                             RESOURCE::templates::captured_external_html,
+                             /*includeKiwixResponseData=*/true)
+{
+  *this->m_data = Data(Data::Object{
+                    {"root", root },
+                    {"external_link_detected", Data::fromMsgId("external-link-detected") },
+                    {"url", externalUrl },
+                    {"caution_warning", Data::fromMsgId("caution-warning") },
+                    {"external_link_intro", Data::fromMsgId("external-link-intro") },
+                    {"advice", Data::staticMultiParagraphText("external-link-advice", 3)},
+  });
+}
+
 HTTPErrorResponse::HTTPErrorResponse(const RequestContext& request,
                                     int httpStatusCode,
                                     const std::string& pageTitleMsgId,
@@ -383,8 +439,8 @@ HTTPErrorResponse::HTTPErrorResponse(const RequestContext& request,
  Data::List emptyList;
  *this->m_data = Data(Data::Object{
                    {"CSS_URL", Data::onlyAsNonEmptyValue(cssUrl) },
-                    {"PAGE_TITLE",   Data::from(nonParameterizedMessage(pageTitleMsgId))},
-                    {"PAGE_HEADING", Data::from(nonParameterizedMessage(headingMsgId))},
+                    {"PAGE_TITLE",   Data::fromMsgId(pageTitleMsgId)},
+                    {"PAGE_HEADING", Data::fromMsgId(headingMsgId)},
                    {"details", emptyList}
  });
 }
@@ -435,15 +491,30 @@ HTTP400Response::HTTP400Response(const RequestContext& request)
  *this += ParameterizedMessage("invalid-request", {{"url", requestUrl}});
 }

-HTTP500Response::HTTP500Response(const RequestContext& request)
-  : HTTPErrorResponse(request,
-                      MHD_HTTP_INTERNAL_SERVER_ERROR,
-                      "500-page-title",
-                      "500-page-heading",
-                      std::string(),
-                      /*includeKiwixResponseData=*/true)
+HTTP500Response::HTTP500Response(const RequestContext& request,
+                                 const std::string& root,
+                                 const std::string& urlPath,
+                                 const std::string& errorText)
+  : ContentResponseBlueprint(&request,
+                             MHD_HTTP_INTERNAL_SERVER_ERROR,
+                             "text/html; charset=utf-8",
+                             RESOURCE::templates::sexy500_html,
+                             /*includeKiwixResponseData=*/true)
 {
-  *this += nonParameterizedMessage("500-page-text");
+  auto pageParams = Data::Object{
+    {"root", root },
+    {"url_path", urlPath},
+    {"PAGE_TITLE",   Data::fromMsgId("500-page-title")},
+    {"PAGE_HEADING", Data::fromMsgId("500-page-heading")},
+    {"PAGE_TEXT",    Data::fromMsgId("500-page-text")},
+    {"500_img_text", Data::fromMsgId("500-img-text")},
+  };
+
+  if ( !errorText.empty() ) {
+    pageParams["error"] = errorText;
+  }
+
+  *this->m_data = Data(pageParams);
 }

 std::unique_ptr<Response> Response::build_416(size_t resourceLength)
--- a/src/server/response.h
+++ b/src/server/response.h
@@ -27,7 +27,7 @@
 #include <mustache.hpp>
 #include "byte_range.h"
 #include "etag.h"
-#include "i18n.h"
+#include "i18n_utils.h"

 #include <zim/item.h>

@@ -145,6 +145,13 @@ protected: //data
  std::unique_ptr<Data> m_data;
 };

+struct NewHTTP404Response : ContentResponseBlueprint
+{
+  NewHTTP404Response(const RequestContext& request,
+                     const std::string& root,
+                     const std::string& urlPath);
+};
+
 struct HTTPErrorResponse : ContentResponseBlueprint
 {
  HTTPErrorResponse(const RequestContext& request,
@@ -173,9 +180,12 @@ struct HTTP400Response : HTTPErrorResponse
  explicit HTTP400Response(const RequestContext& request);
 };

-struct HTTP500Response : HTTPErrorResponse
+struct HTTP500Response : ContentResponseBlueprint
 {
-  explicit HTTP500Response(const RequestContext& request);
+  HTTP500Response(const RequestContext& request,
+                  const std::string& root,
+                  const std::string& urlPath,
+                  const std::string& error = "");
 };

 class ItemResponse : public Response {
@@ -190,6 +200,13 @@ class ItemResponse : public Response {
    std::string m_mimeType;
 };

+struct BlockExternalLinkResponse : ContentResponseBlueprint
+{
+  BlockExternalLinkResponse(const RequestContext& request,
+                            const std::string& root,
+                            const std::string& externalUrl);
+};
+
 }

 #endif //KIWIXLIB_SERVER_RESPONSE_H
--- a/src/spelling_correction.cpp
+++ b/src/spelling_correction.cpp
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2025 Veloman Yunkan
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU  General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+#include "spelling_correction.h"
+#include "zim/archive.h"
+
+#include <sstream>
+#include <stdexcept>
+
+#include <xapian.h>
+
+namespace kiwix
+{
+
+namespace
+{
+
+std::vector<std::string> getAllTitles(const zim::Archive& a)
+{
+  std::vector<std::string> result;
+  for (const auto& entry : a.iterByPath() ) {
+     result.push_back(entry.getTitle());
+  }
+  return result;
+}
+
+void createXapianDB(std::string path, const zim::Archive& archive)
+{
+  const int flags = Xapian::DB_BACKEND_GLASS|Xapian::DB_CREATE;
+  const auto tmpDbPath = path + ".tmp";
+  Xapian::WritableDatabase db(tmpDbPath, flags);
+  for (const auto& t : getAllTitles(archive)) {
+    db.add_spelling(t);
+  }
+  db.commit();
+  db.compact(path, Xapian::DBCOMPACT_SINGLE_FILE);
+  db.close();
+  std::filesystem::remove_all(tmpDbPath);
+}
+
+std::string spellingsDBPathForZIMArchive(std::filesystem::path cacheDirPath, const zim::Archive& a)
+{
+  // The version of spellings DB must be updated each time an important change
+  // to the implementation is made that renders using the previous version
+  // impossible or undesirable.
+  const char SPELLINGS_DB_VERSION[] = "0.1";
+
+  std::ostringstream filename;
+  filename << a.getUuid() << ".spellingsdb.v" << SPELLINGS_DB_VERSION;
+  return (cacheDirPath / filename.str()).string();
+}
+
+std::unique_ptr<Xapian::Database> openOrCreateXapianDB(std::filesystem::path cacheDirPath, const zim::Archive& archive)
+{
+  const auto path = spellingsDBPathForZIMArchive(cacheDirPath, archive);
+  try
+  {
+    return std::make_unique<Xapian::Database>(path);
+  }
+  catch (const Xapian::DatabaseOpeningError& )
+  {
+    createXapianDB(path, archive);
+    return std::make_unique<Xapian::Database>(path);
+  }
+}
+
+} // unnamed namespace
+
+SpellingsDB::SpellingsDB(const zim::Archive& archive, std::filesystem::path cacheDirPath)
+  : impl_(openOrCreateXapianDB(cacheDirPath, archive))
+{
+}
+
+SpellingsDB::~SpellingsDB()
+{
+}
+
+std::vector<std::string> SpellingsDB::getSpellingCorrections(const std::string& word, uint32_t maxCount) const
+{
+  if ( maxCount > 1 ) {
+    throw std::runtime_error("More than one spelling correction was requested");
+  }
+
+  std::vector<std::string> result;
+  const auto term = impl_->get_spelling_suggestion(word, 3);
+  if ( !term.empty() ) {
+    result.push_back(term);
+  }
+  return result;
+}
+
+} // namespace kiwix
--- a/src/tools/languageTools.cpp
+++ b/src/tools/languageTools.cpp
@@ -10,10 +10,12 @@ namespace

 // These mappings are not provided by the ICU library, any such mappings can be manually added here
 std::map<std::string, std::string> iso639_3 = {
+    {"ami", "Amis"},
    {"atj", "atikamekw"},
    {"azb", "آذربایجان دیلی"},
    {"bcl", "central bikol"},
    {"bgs", "tagabawa"},
+    {"blk", "ပအိုဝ်ႏ"},
    {"bxr", "буряад хэлэн"},
    {"cbk", "chavacano"},
    {"cdo", "閩東語"},
@@ -23,13 +25,16 @@ std::map<std::string, std::string> iso639_3 = {
    {"eml", "emiliân-rumagnōl"},
    {"fbs", "српскохрватски"},
    {"fon", "fɔ̀ngbè"},
+    {"gcr", "Kriyòl gwiyannen"},
    {"guw", "Gungbe"},
    {"hbs", "srpskohrvatski"},
+    {"hyw", "հայերէն/հայերեն"},
    {"ido", "ido"},
    {"kbp", "kabɩyɛ"},
    {"kld", "Gamilaraay"},
    {"lbe", "лакку маз"},
    {"lbj", "ལ་དྭགས་སྐད་"},
+    {"lld", "ladin"},
    {"map", "Austronesian"},
    {"mhr", "марий йылме"},
    {"mnw", "ဘာသာမန်"},
@@ -41,10 +46,15 @@ std::map<std::string, std::string> iso639_3 = {
    {"olo", "livvi"},
    {"pih", "Pitcairn-Norfolk"},
    {"pnb", "Western Panjabi"},
+    {"pwn", "Pinayuanan"},
    {"rmr", "Caló"},
    {"rmy", "romani shib"},
    {"roa", "romance languages"},
-    {"twi", "twi"},
+    {"skr", "سرائیکی"},
+    {"szy", "Sakizaya"},
+    {"tay", "Tayal"},
+    {"tgl", "Wikang Tagalog"},
+    {"twi", "Akwapem Twi"},
 // ICU for Ubuntu versions <= focal (20.04) returns "" for the language code ""
 // unlike the later versions - which returns "und". We map this value to "Undetermined" for a common ground.
    {"", "Undetermined"},
@@ -58,6 +68,7 @@ void fillLanguagesMap()
        const kiwix::ICULanguageInfo lang(*icuLangPtr);
        iso639_3.insert({lang.iso3Code(), lang.selfName()});
    }
+    iso639_3.erase("mul");
 }

 } // unnamed namespace
--- a/src/tools/networkTools.cpp
+++ b/src/tools/networkTools.cpp
@@ -19,6 +19,7 @@
 */

 #include "tools.h"
+#include "stringTools.h"
 #include <tools/networkTools.h>

 #include <stdio.h>
@@ -32,13 +33,16 @@
 #include <stdexcept>

 #ifdef _WIN32
+#include <iphlpapi.h>
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <iostream>
 #else
 #include <unistd.h>
-#include <sys/ioctl.h>
+#include <arpa/inet.h>
+#include <ifaddrs.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <net/if.h>
 #include <netdb.h>
 #endif
@@ -47,6 +51,12 @@
 #include <sys/sockio.h>
 #endif

+namespace kiwix
+{
+
+namespace
+{
+
 size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdata)
 {
  auto str = static_cast<std::stringstream*>(userdata);
@@ -54,7 +64,15 @@ size_t write_callback_to_iss(char* ptr, size_t size, size_t nmemb, void* userdat
  return nmemb;
 }

-std::string kiwix::download(const std::string& url) {
+void updatePublicIpAddress(IpAddress& publicIpAddr, const IpAddress& interfaceIpAddr)
+{
+  if (publicIpAddr.addr.empty())  publicIpAddr.addr  = interfaceIpAddr.addr;
+  if (publicIpAddr.addr6.empty()) publicIpAddr.addr6 = interfaceIpAddr.addr6;
+}
+
+} // unnamed namespace
+
+std::string download(const std::string& url) {
  auto curl = curl_easy_init();
  std::stringstream ss;
  curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
@@ -75,103 +93,161 @@ std::string kiwix::download(const std::string& url) {
  return ss.str();
 }

-std::map<std::string, std::string> kiwix::getNetworkInterfaces() {
-  std::map<std::string, std::string> interfaces;
+namespace
+{

 #ifdef _WIN32
-  SOCKET sd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
-  if (sd == INVALID_SOCKET) {
-    std::cerr << "Failed to get a socket. Error " << WSAGetLastError() << std::endl;
-    return interfaces;
-  }

-  INTERFACE_INFO InterfaceList[20];
-  unsigned long nBytesReturned;
-  if (WSAIoctl(sd, SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList,
-      sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR) {
-    std::cerr << "Failed calling WSAIoctl: error " << WSAGetLastError() << std::endl;
-    return interfaces;
-  }
+std::map<std::string, IpAddress> getNetworkInterfacesWin() {
+  std::map<std::string, IpAddress> interfaces;

-  int nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO);
-  for (int i = 0; i < nNumInterfaces; ++i) {
-    sockaddr_in *pAddress;
-    pAddress = (sockaddr_in *) & (InterfaceList[i].iiAddress.AddressIn);
-    if(pAddress->sin_family == AF_INET) {
-    /* Add to the map */
-    std::string interfaceName = std::string(inet_ntoa(pAddress->sin_addr));
-    interfaces[interfaceName] = interfaceName;
-    }
-  }
-#else
-  /* Get Network interfaces information */
-  char buf[16384];
-  struct ifconf ifconf;
-  int fd = socket(PF_INET, SOCK_DGRAM, 0); /* Only IPV4 */
-  ifconf.ifc_len = sizeof(buf);
-  ifconf.ifc_buf=buf;
-  if(ioctl(fd, SIOCGIFCONF, &ifconf)!=0) {
-    perror("ioctl(SIOCGIFCONF)");
-  }
+  const int working_buffer_size = 15000;
+  const int max_tries = 3;

-  /* Go through each interface */
-  struct ifreq *ifreq;
-  ifreq = ifconf.ifc_req;
-  for (int i = 0; i < ifconf.ifc_len; ) {
-    if (ifreq->ifr_addr.sa_family == AF_INET) {
-      /* Get the network interface ip */
-      char host[128] = { 0 };
-      const int error = getnameinfo(&(ifreq->ifr_addr), sizeof(ifreq->ifr_addr),
-                                    host, sizeof(host),
-                                    0, 0, NI_NUMERICHOST);
-      if (!error) {
-        std::string interfaceName = std::string(ifreq->ifr_name);
-        std::string interfaceIp = std::string(host);
-        /* Add to the map */
-        interfaces[interfaceName] = interfaceIp;
-      } else {
-        perror("getnameinfo()");
-      }
+  ULONG flags = GAA_FLAG_INCLUDE_PREFIX;
+
+  // default to unspecified address family (both)
+  ULONG family = AF_UNSPEC;
+
+  ULONG outBufLen = working_buffer_size;
+  ULONG Iterations = 0;
+  DWORD dwRetVal = 0;
+  PIP_ADAPTER_ADDRESSES interfacesHead = NULL;
+
+  // Successively allocate the required memory until GetAdaptersAddresses does not
+  // results in ERROR_BUFFER_OVERFLOW for a maximum of max_tries
+  do{
+    interfacesHead = (IP_ADAPTER_ADDRESSES *) malloc(outBufLen);
+    if (interfacesHead == NULL) {
+      std::cerr << "Memory allocation failed for IP_ADAPTER_ADDRESSES struct" << std::endl;
+      return interfaces;
    }

-    /* some systems have ifr_addr.sa_len and adjust the length that
-     * way, but not mine. weird */
-    size_t len;
-#ifndef __linux__
-    len = IFNAMSIZ + ifreq->ifr_addr.sa_len;
-#else
-    len = sizeof(*ifreq);
-#endif
-    ifreq = (struct ifreq*)((char*)ifreq+len);
-    i += len;
+    dwRetVal = GetAdaptersAddresses(family, flags, NULL, interfacesHead, &outBufLen);
+  } while ((dwRetVal == ERROR_BUFFER_OVERFLOW) && (Iterations < max_tries));
+
+  if (dwRetVal == NO_ERROR) {
+    PIP_ADAPTER_UNICAST_ADDRESS pUnicast = NULL;
+    unsigned int i = 0;
+    for (PIP_ADAPTER_ADDRESSES temp = interfacesHead; temp != NULL;
+    temp = temp->Next) {
+      pUnicast = temp->FirstUnicastAddress;
+            if (pUnicast != NULL) {
+                for (i = 0; pUnicast != NULL; i++){
+                  if (pUnicast->Address.lpSockaddr->sa_family == AF_INET)
+                  {
+                      sockaddr_in *si = (sockaddr_in *)(pUnicast->Address.lpSockaddr);
+                      char host[INET_ADDRSTRLEN]={0};
+                      inet_ntop(AF_INET, &(si->sin_addr), host, sizeof(host));
+                      interfaces[temp->AdapterName].addr=host;
+                  }
+                  else if (pUnicast->Address.lpSockaddr->sa_family == AF_INET6)
+                  {
+                      sockaddr_in6 *si = (sockaddr_in6 *)(pUnicast->Address.lpSockaddr);
+                      char host[INET6_ADDRSTRLEN]={0};
+                      inet_ntop(AF_INET6, &(si->sin6_addr), host, sizeof(host));
+                      if (!IN6_IS_ADDR_LINKLOCAL(&(si->sin6_addr)))
+                        interfaces[temp->AdapterName].addr6=host;
+                  }
+                  pUnicast = pUnicast->Next;
+                }
+            }
+    }
+  } else {
+    std::cerr << "Call to GetAdaptersAddresses failed with error: "<< dwRetVal << std::endl;
  }
-#endif
+
+  if (interfacesHead) free(interfacesHead);
+
  return interfaces;
 }

-std::string kiwix::getBestPublicIp() {
-  auto interfaces = getNetworkInterfaces();
+#else

+std::map<std::string, IpAddress> getNetworkInterfacesPosix() {
+  std::map<std::string, IpAddress> interfaces;
+
+  struct ifaddrs *interfacesHead;
+  if (getifaddrs(&interfacesHead) == -1) {
+      perror("getifaddrs");
+  }
+
+  for (ifaddrs *temp = interfacesHead; temp != NULL; temp = temp->ifa_next) {
+      if (temp->ifa_addr == NULL) continue;
+
+      if (temp->ifa_addr->sa_family == AF_INET) {
+          sockaddr_in *si = (sockaddr_in *)(temp->ifa_addr);
+          char host[INET_ADDRSTRLEN] = {0};
+          inet_ntop(AF_INET, &(si->sin_addr), host, sizeof(host));
+          interfaces[temp->ifa_name].addr=host;
+      } else if (temp->ifa_addr->sa_family == AF_INET6) {
+          sockaddr_in6 *si = (sockaddr_in6 *)(temp->ifa_addr);
+          char host[INET6_ADDRSTRLEN] = {0};
+          inet_ntop(AF_INET6, &(si->sin6_addr), host, sizeof(host));
+          if (!IN6_IS_ADDR_LINKLOCAL(&(si->sin6_addr)))
+            interfaces[temp->ifa_name].addr6=host;
+      }
+  }
+
+  freeifaddrs(interfacesHead);
+
+  return interfaces;
+}
+
+#endif
+
+} // unnamed namespace
+
+std::map<std::string, IpAddress> getNetworkInterfacesIPv4Or6() {
+#ifdef _WIN32
+  return getNetworkInterfacesWin();
+#else
+  return getNetworkInterfacesPosix();
+#endif
+}
+
+std::map<std::string, std::string> getNetworkInterfaces() {
+  std::map<std::string, std::string> result;
+  for ( const auto& kv : getNetworkInterfacesIPv4Or6() ) {
+      const std::string& interfaceName = kv.first;
+      const auto& ipAddresses = kv.second;
+      if ( !ipAddresses.addr.empty() ) {
+        result[interfaceName] = ipAddresses.addr;
+      }
+  }
+  return result;
+}
+
+IpAddress getBestPublicIps() {
+  IpAddress bestPublicIps;
+  std::map<std::string, IpAddress> interfaces = getNetworkInterfacesIPv4Or6();
 #ifndef _WIN32
-  const char* const prioritizedNames[] =
-      { "eth0", "eth1", "wlan0", "wlan1", "en0", "en1" };
-  for(auto name: prioritizedNames) {
-    auto it = interfaces.find(name);
-    if(it != interfaces.end()) {
-      return it->second;
+  const char* const prioritizedNames[] = { "eth0", "eth1", "wlan0", "wlan1", "en0", "en1" };
+  for (const auto& name : prioritizedNames) {
+    const auto it = interfaces.find(name);
+    if (it != interfaces.end()) {
+      updatePublicIpAddress(bestPublicIps, it->second);
    }
  }
 #endif
-
-  const char* const prefixes[] = { "192.168", "172.16.", "10.0" };
-  for(auto prefix : prefixes){
-    for(auto& itr : interfaces) {
-      auto interfaceIp = itr.second;
-      if (interfaceIp.find(prefix) == 0) {
-        return interfaceIp;
+  const char* const v4prefixes[] = { "192.168", "172.16", "10.0" };
+  for (const auto& prefix : v4prefixes) {
+    for (const auto& kv : interfaces) {
+      const auto& interfaceIps = kv.second;
+      if (kiwix::startsWith(interfaceIps.addr, prefix)) {
+        updatePublicIpAddress(bestPublicIps, interfaceIps);
      }
    }
  }

-  return "127.0.0.1";
+  updatePublicIpAddress(bestPublicIps, {"127.0.0.1", "::1"});
+
+  return bestPublicIps;
 }
+
+std::string getBestPublicIp()
+{
+  return getBestPublicIps().addr;
+}
+
+} // namespace kiwix
--- a/src/tools/otherTools.cpp
+++ b/src/tools/otherTools.cpp
@@ -32,7 +32,7 @@
 #endif

 #include "tools/stringTools.h"
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 #include "libkiwix-resources.h"

 #include <map>
--- a/src/tools/pathTools.cpp
+++ b/src/tools/pathTools.cpp
@@ -320,16 +320,6 @@ bool kiwix::fileReadable(const std::string& path)
 #endif
 }

-bool makeDirectory(const std::string& path)
-{
-#ifdef _WIN32
-  int status = _wmkdir(Utf8ToWide(path).c_str());
-#else
-  int status = mkdir(path.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-#endif
-  return status == 0;
-}
-
 std::string makeTmpDirectory()
 {
 #ifdef _WIN32
@@ -438,52 +428,6 @@ std::string kiwix::getCurrentDirectory()
  return ret;
 }

-std::string kiwix::getDataDirectory()
-{
-// Try to get the dataDir from the `KIWIX_DATA_DIR` env var
-#ifdef _WIN32
-  wchar_t* cDataDir = ::_wgetenv(L"KIWIX_DATA_DIR");
-  if (cDataDir != nullptr) {
-    return WideToUtf8(cDataDir);
-  }
-#else
-  char* cDataDir = ::getenv("KIWIX_DATA_DIR");
-  if (cDataDir != nullptr) {
-    return cDataDir;
-  }
-#endif
-
-// Compute the dataDir from the user directory.
-  std::string dataDir;
-#ifdef _WIN32
-  cDataDir = ::_wgetenv(L"APPDATA");
-  if (cDataDir == nullptr)
-    cDataDir = ::_wgetenv(L"USERPROFILE");
-  if (cDataDir != nullptr)
-    dataDir = WideToUtf8(cDataDir);
-#else
-  cDataDir = ::getenv("XDG_DATA_HOME");
-  if (cDataDir != nullptr) {
-    dataDir = cDataDir;
-  } else {
-    cDataDir = ::getenv("HOME");
-    if (cDataDir != nullptr) {
-      dataDir = cDataDir;
-      dataDir = appendToDirectory(dataDir, ".local");
-      dataDir = appendToDirectory(dataDir, "share");
-    }
-  }
-#endif
-  if (!dataDir.empty()) {
-    dataDir = appendToDirectory(dataDir, "kiwix");
-    makeDirectory(dataDir);
-    return dataDir;
-  }
-
-// Let's use the currentDirectory
-  return getCurrentDirectory();
-}
-
 static std::map<std::string, std::string> extMimeTypes = {
 { "html", "text/html"},
 { "htm", "text/html"},
--- a/src/tools/pathTools.h
+++ b/src/tools/pathTools.h
@@ -29,7 +29,6 @@ std::wstring Utf8ToWide(const std::string& str);

 unsigned int getFileSize(const std::string& path);
 std::string getFileSizeAsString(const std::string& path);
-bool makeDirectory(const std::string& path);
 std::string makeTmpDirectory();
 bool copyFile(const std::string& sourcePath, const std::string& destPath);
 bool writeTextFile(const std::string& path, const std::string& content);
--- a/src/tools/stringTools.cpp
+++ b/src/tools/stringTools.cpp
@@ -32,6 +32,7 @@

 #include <iostream>
 #include <iomanip>
+#include <regex>

 /* tell ICU where to find its dat file (tables) */
 void kiwix::loadICUExternalTables()
@@ -256,7 +257,7 @@ std::string kiwix::urlDecode(const std::string& value, bool component)

    // If there aren't enough characters left for this to be a
    // valid escape code, just use the character and move on
-    if (it > value.end() - 3) {
+    if (value.end() - it < 3) {
      os << *it;
      continue;
    }
@@ -439,3 +440,13 @@ template<>
 std::string kiwix::extractFromString(const std::string& str) {
  return str;
 }
+
+std::string kiwix::getSlugifiedFileName(const std::string& filename)
+{
+#ifdef _WIN32
+  const std::regex reservedCharsReg(R"([<>:"/\\|?*])");
+#else
+  const std::regex reservedCharsReg("/");
+#endif
+  return std::regex_replace(filename, reservedCharsReg, "_"); 
+}
--- a/src/tools/stringTools.h
+++ b/src/tools/stringTools.h
@@ -66,6 +66,9 @@ std::string ucAll(const std::string& word);
 std::string lcAll(const std::string& word);
 std::string ucFirst(const std::string& word);
 std::string lcFirst(const std::string& word);
+
+/* This function is broken, related Github issue 
+ * https://github.com/kiwix/libkiwix/issues/1188 */ 
 std::string toTitle(const std::string& word);

 std::string normalize(const std::string& word);
--- a/static/i18n_resources_list.txt
+++ b/static/i18n_resources_list.txt
@@ -13,8 +13,10 @@ skin/i18n/fr.json
 skin/i18n/ha.json
 skin/i18n/he.json
 skin/i18n/hi.json
+skin/i18n/hu.json
 skin/i18n/hy.json
 skin/i18n/ia.json
+skin/i18n/id.json
 skin/i18n/ig.json
 skin/i18n/it.json
 skin/i18n/ja.json
@@ -23,10 +25,14 @@ skin/i18n/ku-latn.json
 skin/i18n/lb.json
 skin/i18n/mk.json
 skin/i18n/ms.json
+skin/i18n/nb.json
 skin/i18n/nl.json
 skin/i18n/nqo.json
 skin/i18n/or.json
 skin/i18n/pl.json
+skin/i18n/pt-br.json
+skin/i18n/pt.json
+skin/i18n/ro.json
 skin/i18n/ru.json
 skin/i18n/sc.json
 skin/i18n/sk.json
@@ -34,6 +40,7 @@ skin/i18n/skr-arab.json
 skin/i18n/sl.json
 skin/i18n/sq.json
 skin/i18n/sv.json
+skin/i18n/sw.json
 skin/i18n/te.json
 skin/i18n/test.json
 skin/i18n/tr.json
--- a/static/resources_list.txt
+++ b/static/resources_list.txt
@@ -1,18 +1,25 @@
 skin/caret.png
 skin/bittorrent.png
 skin/magnet.png
+skin/404.svg
+skin/500.svg
+skin/blocklink.svg
 skin/feed.svg
 skin/langSelector.svg
 skin/download.png
+skin/download-white.svg
 skin/hash.png
 skin/search-icon.svg
 skin/iso6391To3.js
 skin/isotope.pkgd.min.js
 skin/index.js
 skin/autoComplete/autoComplete.min.js
+skin/error.css
+skin/print.css
 skin/kiwix.css
 skin/taskbar.css
 skin/index.css
+skin/fonts/DMSans-Regular.ttf
 skin/fonts/Poppins.ttf
 skin/fonts/Roboto.ttf
 skin/search_results.css
@@ -37,10 +44,12 @@ templates/catalog_v2_entry.xml
 templates/catalog_v2_partial_entry.xml
 templates/catalog_v2_categories.xml
 templates/catalog_v2_languages.xml
-templates/url_of_search_results_css
+templates/url_of_search_results_css.tmpl
 templates/viewer_settings.js
 templates/no_js_library_page.html
 templates/no_js_download.html
+templates/sexy404.html
+templates/sexy500.html
 opensearchdescription.xml
 ft_opensearchdescription.xml
 catalog_v2_searchdescription.xml
--- a/static/skin/404.svg
+++ b/static/skin/404.svg
--- a/static/skin/500.svg
+++ b/static/skin/500.svg
--- a/static/skin/autoComplete/css/autoComplete.css
+++ b/static/skin/autoComplete/css/autoComplete.css
@@ -23,6 +23,9 @@

 .autoComplete_wrapper > ul {
  position: absolute;
+  min-width: 100%;
+  width: fit-content;
+  max-width: 600px;
  max-height: 226px;
  overflow-y: scroll;
  top: 100%;
@@ -60,6 +63,11 @@
  transition: all 0.2s ease;
 }

+.autoComplete_wrapper > ul > li > a {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .autoComplete_wrapper > ul > li::selection {
  color: rgba(#ffffff, 0);
  background-color: rgba(#ffffff, 0);
--- a/static/skin/blocklink.svg
+++ b/static/skin/blocklink.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 1742.79 1984.21" xmlns="http://www.w3.org/2000/svg"><ellipse cx="667.97" cy="1872.93" fill="#c7c8ca" rx="649.71" ry="111.28"/><path d="m933.76 1775.81c0-29.5-23.92-53.42-53.42-53.42h-163.28c-24.37 0-45.97-15.91-52.98-39.26l-105.96-347.65 18.1-9.63c251.03-105.38 519.58 82.75 706.54-97.93l1.17-1.17c23.21-21.02 46.27-42.47 114.72.29 73.56 46.12 236 166.53 309.71 372.32 0 0 44.66-15.91 32.25-70.49-12.41-54.73-102.89-212.36-287.96-352.18-33.86-25.69-64.36-47-89.76-64.07 36.93-158.21-155.14-349.11-342.69-259.21-134.57-126.54-284.6-178.2-422.67-176.16-365.6 5.11-647.58 386.04-344.3 749.45l.58.58c4.67 5.55 9.49 11.09 14.3 16.64 19.7 23.64 32.69 44.51 43.93 81.29l90.34 296.57h-31.96c-29.48 0-53.42 23.94-53.42 53.42h121.43l204.04 96.47c12.55-26.71 1.17-58.53-25.4-71.08l-53.56-25.25h153.83c0-29.48-23.94-53.42-53.42-53.42h-139.38c-24.37 0-45.97-15.91-52.98-39.26l-71.66-235.42c-17.81-61.88 23.21-102.31 61.74-107.13 35.17-4.38 52.83 18.39 69.47 73.27l63.63 208.85h-31.96c-29.48 0-53.42 23.94-53.42 53.42h121.43l204.04 96.47c12.55-26.71 1.17-58.53-25.4-71.08l-53.56-25.25h177.88z"/><path d="m545.68 2.53h52.19v1441.85h-52.19z" fill="#f89a16" transform="matrix(.9855856 -.16917749 .16917749 .9855856 -114.16 107.17)"/><path d="m581.21 624.21-55.8-17.21-93.34-544.54 53.51 3.6z" fill="#da7c2b"/><path d="m981.62 279.44c-30.85 1.91-83.72 3.58-83.72 3.58l79.01-31.06-43.25-251.96-933.66 160.24 56.63 330 68.11 13.66s-38.47 19-60.89 28.37l22.52 131.23 933.66-160.24z" fill="#f89a16"/><circle cx="1144.16" cy="1031.93" fill="#fff" r="82.26" transform="matrix(.70710678 -.70710678 .70710678 .70710678 -394.57 1111.29)"/><circle cx="1124.15" cy="1004.52" r="52.63" transform="matrix(.41786707 -.90850818 .90850818 .41786707 -258.21 1606.05)"/><g fill="#fff"><path d="m387.43 559.95-69.59-57.58 107.75-360.2 93.69-15.45 226.75 308.17-45.64 75.04-312.97 50.02zm-11.05-75.33 25.78 21.33 266.91-42.65 15.63-25.7-187.97-255.46-31.41 5.18-88.94 297.31z"/><path d="m526.16 300.48 5.44 89.61-20.72 3.32-28.24-85.96-9.08-47.73 43.52-6.98 9.08 47.73zm18.46 103.04 7.02 36.88-41.43 6.64-7.02-36.88z"/></g></svg>
--- a/static/skin/download-white.svg
+++ b/static/skin/download-white.svg
@@ -0,0 +1,6 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+<g id="SVGRepo_iconCarrier"> <g id="Interface / Download"> <path id="Vector" d="M6 21H18M12 3V17M12 17L17 12M12 17L7 12" stroke="#f6f5f4" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/> </g> </g>
+</svg>
--- a/static/skin/error.css
+++ b/static/skin/error.css
@@ -0,0 +1,159 @@
+@font-face {
+  font-family:"DM Sans";
+  font-style:  normal;
+  font-weight: 400;
+  src : url('../skin/fonts/DMSans-Regular.ttf?KIWIXCACHEID');
+}
+@font-face {
+  font-family:"DM Sans Bold";
+  font-style:  normal;
+  font-weight: 700;
+  src : url('../skin/fonts/DMSans-Regular.ttf?KIWIXCACHEID');
+}
+
+body {
+  background: linear-gradient(to bottom right, #ffffff, #e6e6e6);
+  background-repeat: no-repeat;
+  background-attachment: fixed;
+}
+
+header {
+  width: 100%;
+  margin: auto;
+  text-align: center;
+
+  margin-top: 15%;
+  margin-bottom: 15%;
+}
+
+header img {
+  width: 60%;
+  min-width: 200px;
+  max-width: 500px;
+  max-height: 300px;
+}
+
+section {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+header, .intro {
+  font-family: "DM Sans";
+}
+
+.intro {
+  font-size: 1em;
+  padding: 0 10%;
+  line-height: 1.2em;
+  text-align: center;
+}
+
+.intro h1 {
+  line-height: 1.1em;
+  font-family: "DM Sans Bold";
+  font-size: 1.2em;
+}
+
+.intro code {
+  font-family: monospace;
+  font-size: 1.1em;
+  word-break: break-all;
+}
+
+.intro a, .intro a:active, .intro a:visited {
+  color: #00b4e4;
+  text-decoration: none;
+  word-break: break-all;
+}
+
+.advice {
+  width: 80%;
+  margin: auto;
+  margin-bottom: 15%;
+  margin-top: 5em;
+
+  background-color: #ffffff;
+  border-radius: 1rem;
+  border: 1px solid #b7b7b7;
+
+  padding: 2em;
+
+  font-family: "DM Sans";
+  font-size: .9em;
+  box-sizing: border-box;
+
+  align-items: normal;
+}
+
+.advice p {
+  margin-bottom: 1em;
+}
+
+.advice p:first-child {
+  margin-top: 0;
+}
+
+.advice p.list-intro {
+  margin: 0;
+}
+
+.advice ul {
+  list-style-type: square;
+  margin: 0;
+  padding: 0 1em;
+}
+
+.advice ul li {
+  line-height: 2em;
+}
+
+.advice p:last-child {
+  margin-bottom: 0;
+}
+
+
+/* sm: 640px+ */
+@media (width >= 40rem) {
+  header {
+    margin-bottom: 1em;
+    margin-top: 5em;
+  }
+
+  header img {
+    width: 50%;
+  }
+
+  .intro h1 {
+    font-size: 2em;
+  }
+
+  .advice {
+    width: 50%;
+  }
+}
+
+/* xl: 1280px+ */
+@media (width >= 80rem) {
+  .intro h1 {
+    font-size: 3.4em;
+  }
+}
+
+/* 2xl: 1536px+ */
+@media (width >= 96rem) {
+  header img {
+    width: 25%;
+    min-width: 200px;
+    max-width: 500px;
+    max-height: 300px;
+  }
+
+  .advice {
+    width: 25%;
+    min-width: 200px;
+    min-width: 300px;
+    max-width: 500px;
+  }
+}
--- a/static/skin/fonts/DMSans-Regular.ttf
+++ b/static/skin/fonts/DMSans-Regular.ttf
--- a/static/skin/i18n.js
+++ b/static/skin/i18n.js
@@ -23,7 +23,8 @@ const Translations = {
      return;

    const errorMsg = `Error loading translations for language '${lang}': `;
-    this.promises[lang] = fetch(`./skin/i18n/${lang}.json`).then(async (resp) => {
+    const translationJsonUrl = import.meta.resolve(`./i18n/${lang}.json`);
+    this.promises[lang] = fetch(translationJsonUrl).then(async (resp) => {
      if ( resp.ok ) {
        this.data[lang] = JSON.parse(await resp.text());
      } else {
@@ -190,8 +191,40 @@ function initUILanguageSelector(activeLanguage, languageChangeCallback) {
  languageSelector.onchange = languageChangeCallback;
 }

+function parseDom(html) {
+  const domParser = new DOMParser();
+  return domParser.parseFromString(html, "text/html").documentElement;
+}
+
+function translatePageInWindow(w) {
+  if ( w.KIWIX_RESPONSE_TEMPLATE && w.KIWIX_RESPONSE_DATA ) {
+    const template = parseDom(w.KIWIX_RESPONSE_TEMPLATE).textContent;
+
+    // w.KIWIX_RESPONSE_DATA may belong to a different context and running
+    // I18n.render() on it directly won't work correctly
+    // because the type checks (obj.__proto__ == ???.prototype) in
+    // I18n.instantiateParameterizedMessages() will fail (String.prototype
+    // refers to different objects in different contexts).
+    // Work arround that issue by copying the object into our context.
+    const params = JSON.parse(JSON.stringify(w.KIWIX_RESPONSE_DATA));
+
+    const newHtml = I18n.render(template, params);
+    w.document.documentElement.innerHTML = parseDom(newHtml).innerHTML;
+  }
+}
+
+function translateSelf() {
+  if ( window.KIWIX_RESPONSE_TEMPLATE && window.KIWIX_RESPONSE_DATA ) {
+    setUserLanguage(getUserLanguage(), () => {
+      translatePageInWindow(window)
+    });
+  }
+};
+
 window.$t = $t;
 window.getUserLanguage = getUserLanguage;
 window.setUserLanguage = setUserLanguage;
 window.initUILanguageSelector = initUILanguageSelector;
+window.translatePageInWindow = translatePageInWindow;
 window.I18n = I18n;
+window.addEventListener('load', translateSelf);
--- a/static/skin/i18n/ar.json
+++ b/static/skin/i18n/ar.json
@@ -2,6 +2,9 @@
 	"@metadata": {
 		"authors": [
 			"Asma",
+			"Hamoudak",
+			"Meno25",
+			"Mohammed Qays",
 			"Ravan",
 			"محمد أحمد عبد الفتاح"
 		]
@@ -12,7 +15,7 @@
 	"no-book-found": "لا يوجد كتاب يطابق معايير الاختيار",
 	"url-not-found": "لم يتم العثور على عنوان URL المطلوب \"{{url}}\" على هذا الخادم.",
 	"suggest-search": "قم بإجراء بحث عن النص الكامل لـ <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
-	"random-article-failure": "مع الأسف! فشل اختيار مقال عشوائي :(",
+	"random-article-failure": "للأسف ! فشل في اختيار مقال عشوائي  :(",
 	"invalid-raw-data-type": "{{DATATYPE}} ليس طلبًا صالحًا للمحتوى الأولي.",
 	"no-value-for-arg": "لم يتم تقديم قيمة للوسيطة {{ARGUMENT}}",
 	"no-query": "لم يتم تقديم ملخص.",
@@ -21,13 +24,32 @@
 	"400-page-heading": "طلب غير صالح",
 	"404-page-title": "المحتوى غير موجود",
 	"404-page-heading": "لم يتم العثور عليه",
-	"500-page-title": "خطأ في الخادم الداخلي",
-	"500-page-heading": "خطأ في الخادم الداخلي",
-	"fulltext-search-unavailable": "البحث عن النص الكامل غير متاح",
-	"no-search-results": "محرك البحث عن النص الكامل غير متاح لهذا المحتوى.",
-	"library-button-text": "اذهب لصفحة الترحيب",
-	"home-button-text": "انتقل إلى الصفحة الرئيسية لـ \"{{BOOK_TITLE}}\"",
+	"500-page-title": "خطأ داخلي بالخادم",
+	"500-page-heading": "عفواً، الصفحة لا تعمل.",
+	"500-page-text": "لا يمكن إرسال المسار المطلوب بشكل صحيح:",
+	"fulltext-search-unavailable": "البحث في كامل النص غير متاح",
+	"no-search-results": "محرك البحث في كامل النص غير متوفر لهذا المحتوي.",
+	"library-button-text": "توجه إلي صفحة الترحيب",
+	"home-button-text": "انتقل إلى الصفحة الرئيسة لـ '{{{BOOK_TITLE}}}'",
 	"random-page-button-text": "اذهب إلى صفحة عشوائية",
-	"searchbox-tooltip": "بحث \"{{BOOK_TITLE}}\"",
-	"confusion-of-tongues": "قد يشارك في البحث كتابان أو أكثر بلغات مختلفة، مما قد يؤدي إلى نتائج محيرة."
+	"searchbox-tooltip": "ابحث عن '{{{BOOK_TITLE}}}'",
+	"confusion-of-tongues": "قد يشارك في البحث كتابان أو أكثر بلغات مختلفة، مما قد يؤدي إلى نتائج محيرة.",
+	"direct-download-alt-text": "التنزيل مباشرة عبر بروتوكول HTTP(S)",
+	"hash-download-link-text": "المجموع الإختباري لخوارزمية SHA-256",
+	"hash-download-alt-text": "عرض المجموع الإختباري لخوارزمية SHA-256 للملف",
+	"magnet-link-text": "رابط جاذب",
+	"magnet-alt-text": "التنزيل بواسطة الرابط الجاذب",
+	"torrent-download-link-text": "بت تورنت",
+	"torrent-download-alt-text": "التنزيل بواسطة بت تورنت",
+	"unknown-error": "خطأ غير معروف",
+	"book-category.wikibooks": "ويكي الكتب",
+	"book-category.wikinews": "ويكي الأخبار",
+	"book-category.wikipedia": "ويكيبيديا",
+	"book-category.wikiquote": "ويكي الإقتباس",
+	"book-category.wikisource": "ويكي مصدر",
+	"book-category.wikispecies": "ويكي أنواع",
+	"book-category.wikiversity": "ويكي الجامعة",
+	"book-category.wikivoyage": "ويكي الرحلات",
+	"book-category.wiktionary": "ويكي القاموس",
+	"book-category.other": "أخرى {كتب أخري}"
 }
--- a/static/skin/i18n/bn.json
+++ b/static/skin/i18n/bn.json
@@ -1,13 +1,24 @@
 {
 	"@metadata": {
 		"authors": [
+			"Nokib Sarkar",
 			"আফতাবুজ্জামান"
 		]
 	},
 	"name": "বাংলা",
 	"404-page-heading": "পাওয়া যায়নি",
+	"new-404-page-title": "পাতা পাওয়া যায়নি",
+	"new-404-page-heading": "ওহ! পাতা খুঁজে পাওয়া যায়নি",
+	"404-img-text": "পাওয়া যায়নি!",
+	"path-was-not-found": "অনুরোধ করা পথটি পাওয়া যায়নি:",
+	"404-advice.p1": "আপনি যে বিষয়বস্তু খুঁজছেন তা এখনও উপলব্ধ থাকতে পারে, তবে এটি জিম ফাইলের মধ্যে অন্য কোনও জায়গায় অবস্থিত হতে পারে।",
+	"404-advice.p4": "আপনি যে তথ্য খুঁজছেন তার সাথে সম্পর্কিত কীওয়ার্ড বা শিরোনাম খুঁজুন।",
 	"500-page-title": "অভ্যন্তরীণ সার্ভার ত্রুটি",
 	"500-page-heading": "অভ্যন্তরীণ সার্ভার ত্রুটি",
+	"external-link-intro": "আপনি অনলাইনে যাওয়ার জন্য কিউইক্সের জিম রিডার ছেড়ে দিতে চলেছেন",
+	"external-link-advice.p1": "আপনি যে লিঙ্কটিতে প্রবেশ করার চেষ্টা করছেন তা আপনার অফলাইন প্যাকেজের অংশ নয় এবং এর জন্য ইন্টারনেট সংযোগ প্রয়োজন।",
+	"external-link-advice.p2": "আপনি যদি অনলাইনে যেতে পারেন, তাহলে লিঙ্কটি খোলার চেষ্টা করতে পারেন।",
+	"external-link-advice.p3": "অন্যথায়, আপনি আপনার ব্রাউজারের পিছন বোতাম ব্যবহার করে আপনার ZIM-এর অফলাইন বিষয়বস্তুতে ফিরে যেতে পারেন।",
 	"search-result-book-info": "{{BOOK_TITLE}} থেকে",
 	"word-count": "{{COUNT}}টি শব্দ",
 	"library-button-text": "স্বাগত পাতায় চলুন",
@@ -16,5 +27,15 @@
 	"search": "অনুসন্ধান",
 	"welcome-to-kiwix-server": "কিউইক্স সার্ভারে স্বাগতম",
 	"download-links-title": "বই ডাউনলোড করুন",
-	"preview-book": "প্রাকদর্শন"
+	"preview-book": "প্রাকদর্শন",
+	"book-category.wikibooks": "উইকিবই",
+	"book-category.wikinews": "উইকিসংবাদ",
+	"book-category.wikipedia": "উইকিপিডিয়া",
+	"book-category.wikiquote": "উইকিউক্তি",
+	"book-category.wikisource": "উইকিসংকলন",
+	"book-category.wikispecies": "উইকিপ্রজাতি",
+	"book-category.wikiversity": "উইকিবিশ্ববিদ্যালয়",
+	"book-category.wikivoyage": "উইকিভ্রমণ",
+	"book-category.wiktionary": "উইকিঅভিধান",
+	"book-category.other": "অন্যান্য"
 }
--- a/static/skin/i18n/dag.json
+++ b/static/skin/i18n/dag.json
@@ -42,14 +42,14 @@
 	"book-filtering-all-categories": "Pubu zaa",
 	"book-filtering-all-languages": "Bala zaa",
 	"count-of-matching-books": "{{COUNT}} Buku(nima)",
-	"download": "Yihibu",
+	"download": "Deebu",
 	"direct-download-link-text": "Tibi",
 	"direct-download-alt-text": "Tibi deebu",
 	"hash-download-link-text": "Sha256 hash",
 	"hash-download-alt-text": "Deebu daliŋ",
 	"welcome-to-kiwix-server": "Maraba Kiwix tum tumda",
 	"download-links-heading": "Deemi soli zaŋ n-ti <b><i>{{BOOK_TITLE}}</i></b>",
-	"download-links-title": "Yaa mi buku",
-	"preview-book": "Labi lihi",
+	"download-links-title": "Deemi buku",
+	"preview-book": "Daŋyuli",
 	"unknown-error": "Chiriŋ din bi tooi baŋ"
 }
--- a/static/skin/i18n/de.json
+++ b/static/skin/i18n/de.json
@@ -1,8 +1,11 @@
 {
 	"@metadata": {
 		"authors": [
+			"AnnaTheProgrammer777",
 			"IMayBeABitShy",
+			"Justman10000",
 			"Lucas Werkmeister",
+			"MoritzMT20",
 			"Rofiatmustapha12",
 			"ThisCarthing"
 		]
@@ -35,9 +38,9 @@
 	"search-result-book-info": "von {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} Wörter",
 	"library-button-text": "Zur Willkommensseite gehen",
-	"home-button-text": "Zur Hauptseite von '{{BOOK_TITLE}}' gehen",
+	"home-button-text": "Zur Hauptseite von '{{{BOOK_TITLE}}}' gehen",
 	"random-page-button-text": "Zu einer zufällig ausgewählten Seite gehen",
-	"searchbox-tooltip": "Nach '{{BOOK_TITLE}}' suchen",
+	"searchbox-tooltip": "'{{{BOOK_TITLE}}}' durchsuchen",
 	"confusion-of-tongues": "Zwei oder mehr Bücher unterschiedlicher Sprachen werden durchsucht, was zu unübersichtlichen Ergebnissen führen kann.",
 	"welcome-page-overzealous-filter": "Keine Ergebnisse gefunden. Möchten Sie den <a href=\"{{URL}}\">Filter zurücksetzen</a>?",
 	"powered-by-kiwix-html": "Angetrieben durch &nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
@@ -47,20 +50,30 @@
 	"count-of-matching-books": "{{COUNT}} Bücher",
 	"download": "Herunterladen",
 	"direct-download-link-text": "Direkt",
-	"direct-download-alt-text": "direkt herunterladen",
-	"hash-download-link-text": "Sha256 Hash",
-	"hash-download-alt-text": "Hash herunterladen",
+	"direct-download-alt-text": "Direktes Herunterladen über HTTP(S)",
+	"hash-download-link-text": "SHA-256 Prüfsumme",
+	"hash-download-alt-text": "SHA-256-Dateiprüfsumme anzeigen",
 	"magnet-link-text": "Magnet Link",
-	"magnet-alt-text": "Magnet Link herunterladen",
-	"torrent-download-link-text": "Torrent-Datei",
-	"torrent-download-alt-text": "Torrent herunterladen",
+	"magnet-alt-text": "Download über Magnet-Link",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Herunterladen über BitTorrent",
 	"library-opds-feed-all-entries": "ODPS Feed der Bibliothek - Alle Einträge",
-	"filter-by-tag": "Nach Tag \"{{TAG}}\" filtern",
-	"stop-filtering-by-tag": "Filterung nach Tag \"{{TAG}}\" aufheben",
+	"filter-by-tag": "Nach Tag \"{{{TAG}}}\" filtern",
+	"stop-filtering-by-tag": "Filterung nach Tag \"{{{TAG}}}\" aufheben",
 	"library-opds-feed-parameterised": "ODPS Feed der Bibliothek - Einträge mit {{#LANG}\nSprache {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategorie: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}}{{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Wilkommen beim Kiwix Server",
 	"download-links-heading": "Download Links für <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Buch herunterladen",
 	"preview-book": "Vorschau",
-	"unknown-error": "Unbekannter Fehler"
+	"unknown-error": "Unbekannter Fehler",
+	"book-category.wikibooks": "Wikibooks",
+	"book-category.wikinews": "Wikinews",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversity",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wiktionary",
+	"book-category.other": "Andere"
 }
--- a/static/skin/i18n/dga.json
+++ b/static/skin/i18n/dga.json
@@ -1,8 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
-			"Alhaji Yakubu",
-			"Amire80"
+			"Alhaji Yakubu"
 		]
 	},
 	"welcome-page-overzealous-filter": "Duoro kyebe. <a href=\"{{URL}}\">E na boɔra ka fo</a>?",
--- a/static/skin/i18n/el.json
+++ b/static/skin/i18n/el.json
@@ -1,10 +1,18 @@
 {
 	"@metadata": {
 		"authors": [
+			"Jimkats",
 			"Kelson",
-			"Norhorn"
+			"Norhorn",
+			"Ανώνυμος Βικιπαιδιστής"
 		]
 	},
+	"name": "Αγγλικά",
+	"suggest-full-text-search": "περιέχει '{{{SEARCH_TERMS}}}'...",
+	"no-such-book": "Δεν υπάρχει τέτοιο βιβλίο: {{BOOK_NAME}}",
+	"caution-warning": "Προσοχή!",
+	"search-result-book-info": "από {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} λέξεις",
 	"welcome-page-overzealous-filter": "Κανένα αποτέλεσμα. Θέλετε να <a href=\"{{URL}}\">επαναφέρετε το φίλτρο</a>;",
 	"powered-by-kiwix-html": "Με την υποστήριξη by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
 	"search": "Αναζήτηση",
@@ -15,8 +23,14 @@
 	"direct-download-link-text": "Απευθείας",
 	"direct-download-alt-text": "άμεση λήψη",
 	"hash-download-alt-text": "λήψη αναγνωριστικού",
-	"torrent-download-link-text": "Αρχείο torrent",
-	"torrent-download-alt-text": "λήψη torrent",
-	"filter-by-tag": "Φίλτρο ανά ετικέτα \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Διακοπή φίλτρου ανά ετικέτα \"{{TAG}}\""
+	"magnet-alt-text": "λήψη μαγνήτη",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Λήψη μέσω BitTorrent",
+	"filter-by-tag": "Φιλτράρισμα κατά ετικέτα \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Διακοπή φιλτραρίσματος κατά ετικέτα \"{{{TAG}}}\"",
+	"welcome-to-kiwix-server": "Καλώς ορίσατε στον διακομιστή Kiwix",
+	"download-links-heading": "Λήψη συνδέσμων για <b><i>{{BOOK_TITLE}}</i></b>",
+	"download-links-title": "Κατεβάστε το βιβλίο",
+	"preview-book": "Προεπισκόπηση",
+	"unknown-error": "Άγνωστο σφάλμα"
 }
--- a/static/skin/i18n/en.json
+++ b/static/skin/i18n/en.json
@@ -20,9 +20,25 @@
 	, "400-page-heading" : "Invalid request"
 	, "404-page-title" : "Content not found"
 	, "404-page-heading" : "Not Found"
+	, "new-404-page-title" : "Page not found"
+	, "new-404-page-heading" : "Oops. Page not found."
+	, "404-img-text": "Not found!"
+	, "path-was-not-found": "The requested path was not found:"
+	, "404-advice.p1": "The content you're looking for may still be available, but it might be located at a different place within the ZIM file."
+	, "404-advice.p2": "Please:"
+	, "404-advice.p3": "Try using the search function to find the content you want"
+	, "404-advice.p4": "Look for keywords or titles related to the information you're seeking"
+	, "404-advice.p5": "This approach should help you locate the desired content, even if the original link isn't working properly."
 	, "500-page-title" : "Internal Server Error"
-	, "500-page-heading" : "Internal Server Error"
-	, "500-page-text": "An internal server error occured. We are sorry about that :/"
+	, "500-page-heading" : "Oops. Page isn't working."
+	, "500-page-text": "The requested path cannot be properly delivered:"
+	, "500-img-text": "Page isn't working"
+	, "external-link-detected" : "External Link Detected"
+	, "caution-warning" : "Caution!"
+	, "external-link-intro" : "You are about to leave Kiwix's ZIM reader to go online to"
+	, "external-link-advice.p1": "The link you're trying to access is not part of your offline package and requires an internet connection."
+	, "external-link-advice.p2": "If you can go online, you can attempt to open the link."
+	, "external-link-advice.p3": "You can otherwise return to your ZIM's offline content by using your browser's back button."
 	, "fulltext-search-unavailable" : "Fulltext search unavailable"
 	, "no-search-results": "The fulltext search engine is not available for this content."
 	, "search-results-page-title": "Search: {{SEARCH_PATTERN}}"
@@ -31,9 +47,9 @@
 	, "search-result-book-info": "from {{BOOK_TITLE}}"
 	, "word-count": "{{COUNT}} words"
 	, "library-button-text": "Go to welcome page"
-	, "home-button-text": "Go to the main page of '{{BOOK_TITLE}}'"
+	, "home-button-text": "Go to the main page of '{{{BOOK_TITLE}}}'"
 	, "random-page-button-text": "Go to a randomly selected page"
-	, "searchbox-tooltip": "Search '{{BOOK_TITLE}}'"
+	, "searchbox-tooltip": "Search '{{{BOOK_TITLE}}}'"
 	, "confusion-of-tongues": "Two or more books in different languages would participate in search, which may lead to confusing results."
 	, "welcome-page-overzealous-filter": "No result. Would you like to <a href=\"{{URL}}\">reset filter</a>?"
 	, "powered-by-kiwix-html": "Powered by&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>"
@@ -43,16 +59,16 @@
 	, "count-of-matching-books": "{{COUNT}} book(s)"
 	, "download": "Download"
 	, "direct-download-link-text": "Direct"
-	, "direct-download-alt-text": "direct download"
-	, "hash-download-link-text": "Sha256 hash"
-	, "hash-download-alt-text": "download hash"
+	, "direct-download-alt-text": "Download directly via HTTP(S)"
+	, "hash-download-link-text": "SHA-256 checksum"
+	, "hash-download-alt-text": "Display SHA-256 file checksum"
 	, "magnet-link-text": "Magnet link"
-	, "magnet-alt-text": "download magnet"
-	, "torrent-download-link-text": "Torrent file"
-	, "torrent-download-alt-text": "download torrent"
+	, "magnet-alt-text": "Download via Magnet link"
+	, "torrent-download-link-text": "BitTorrent"
+	, "torrent-download-alt-text": "Download via BitTorrent"
 	, "library-opds-feed-all-entries": "Library OPDS Feed - All entries"
-	, "filter-by-tag": "Filter by tag \"{{TAG}}\""
-	, "stop-filtering-by-tag": "Stop filtering by tag \"{{TAG}}\""
+	, "filter-by-tag": "Filter by tag \"{{{TAG}}}\""
+	, "stop-filtering-by-tag": "Stop filtering by tag \"{{{TAG}}}\""
 	, "library-opds-feed-parameterised": "Library OPDS Feed - entries matching {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}"
 	, "welcome-to-kiwix-server": "Welcome to Kiwix Server"
 	, "download-links-heading": "Download links for <b><i>{{BOOK_TITLE}}</i></b>"
@@ -60,4 +76,23 @@
 	, "preview-book": "Preview"
 	, "non-translated-text": "{{MSG}}"
 	, "unknown-error": "Unknown error"
+	, "book-category.gutenberg": "Gutenberg"
+	, "book-category.iFixit": "iFixit"
+	, "book-category.mooc": "MOOC"
+	, "book-category.phet": "Phet"
+	, "book-category.stack_exchange": "Stack Exchange"
+	, "book-category.ted": "Ted"
+	, "book-category.vikidia": "Vikidia"
+	, "book-category.wikibooks": "Wikibooks"
+	, "book-category.wikihow": "wikiHow"
+	, "book-category.wikinews": "Wikinews"
+	, "book-category.wikipedia": "Wikipedia"
+	, "book-category.wikiquote": "Wikiquote"
+	, "book-category.wikisource": "Wikisource"
+	, "book-category.wikispecies": "Wikispecies"
+	, "book-category.wikiversity": "Wikiversity"
+	, "book-category.wikivoyage": "Wikivoyage"
+	, "book-category.wiktionary": "Wiktionary"
+	, "book-category.other": "Other"
+	, "text-loading-content": "Loading Content"
 }
--- a/static/skin/i18n/es.json
+++ b/static/skin/i18n/es.json
@@ -1,21 +1,25 @@
 {
 	"@metadata": {
 		"authors": [
+			"AlexanderFF",
 			"Fitoschido",
+			"Laranxa",
 			"Ovruni",
+			"Sinopsistrans",
 			"SpikeShroom",
 			"Vis4valentine"
 		]
 	},
-	"name": "español",
+	"name": "Español",
 	"suggest-full-text-search": "que contenga \"{{{SEARCH_TERMS}}}\"...",
 	"no-such-book": "No existe el libro: {{BOOK_NAME}}",
 	"too-many-books": "Demasiadas solicitudes de libros ({{NB_BOOKS}}) donde el límite es {{LIMIT}}",
-	"no-book-found": "Ningún libro coincide con los criterios de selección.",
+	"no-book-found": "Ningún libro coincide con los criterios de selección",
 	"url-not-found": "La URL solicitada \"{{url}}\" no se encontró en este servidor.",
 	"suggest-search": "Haga una búsqueda de texto completo para <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "¡Ups! Error al elegir un artículo aleatorio :(",
 	"invalid-raw-data-type": "{{DATATYPE}} no es una solicitud válida de contenido en crudo.",
+	"invalid-request": "La URL solicitada \"{{{url}}}\" no es una solicitud válida.",
 	"no-value-for-arg": "No se ha proporcionado ningún valor para el argumento {{ARGUMENT}}",
 	"no-query": "No se ha proporcionado ninguna consulta.",
 	"raw-entry-not-found": "No se puede encontrar la entrada {{DATATYPE}} {{ENTRY}}",
@@ -23,14 +27,36 @@
 	"400-page-heading": "Solicitud inválida",
 	"404-page-title": "Contenido no encontrado",
 	"404-page-heading": "No encontrado",
+	"new-404-page-title": "Página no encontrada",
+	"new-404-page-heading": "Ups. Página no encontrado.",
+	"404-img-text": "¡No encontrado!",
+	"path-was-not-found": "La pagina solicitada no se ha encontrado:",
+	"404-advice.p1": "El contenido que está buscando podría estar disponible pero podría estar localizado en un lugar diferente dentro del archivo ZIM.",
+	"404-advice.p2": "Por favor:",
+	"404-advice.p3": "Intente usar la función de búsqueda para encontrar el contenido que desea",
+	"404-advice.p4": "Mire por palabras clave o títulos relacionados a la información que está buscando",
+	"404-advice.p5": "Este método debería ayudarle a localizar el contenido deseado incluso si el enlace original no funciona correctamente.",
 	"500-page-title": "Error interno del servidor",
-	"500-page-heading": "Error interno del servidor",
+	"500-page-heading": "Ups. La página no funciona.",
+	"500-page-text": "La pagina solicitada no se puede cargar correctamente:",
+	"500-img-text": "La página no está funcionando",
+	"external-link-detected": "Enlace externo detectado",
+	"caution-warning": "¡Precaución!",
+	"external-link-intro": "Usted está apunto de abandonar el lector ZIM de Kiwix para ir a",
+	"external-link-advice.p1": "El enlace al que está tratando de acceder no es parte de su descarga sin conexión y requiere de conexión a internet.",
+	"external-link-advice.p2": "Si usted puede conectarse en linea puede intentar abrir el enlace.",
+	"external-link-advice.p3": "De lo contrario, puede volver al contenido sin conexión de su ZIM utilizando el botón atrás del navegador.",
 	"fulltext-search-unavailable": "Búsqueda de texto completo no disponible",
 	"no-search-results": "El motor de búsqueda de texto completo no está disponible para este contenido.",
+	"search-results-page-title": "Buscar: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Resultados <b>{{START}}-{{END}}</b> de <b>{{COUNT}}</b> para <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"empty-search-results-page-header": "No se encontraron resultados para <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"search-result-book-info": "a partir de {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} palabras",
 	"library-button-text": "Ir a la página de bienvenida",
-	"home-button-text": "Ir a la página principal de '{{BOOK_TITLE}}'",
+	"home-button-text": "Ir a la página principal de '{{{BOOK_TITLE}}}'",
 	"random-page-button-text": "Ir a una página seleccionada al azar",
-	"searchbox-tooltip": "Buscar '{{BOOK_TITLE}}'",
+	"searchbox-tooltip": "Buscar '{{{BOOK_TITLE}}}'",
 	"confusion-of-tongues": "Dos o más libros en diferentes idiomas participarían en la búsqueda, lo que puede llevar a resultados confusos.",
 	"welcome-page-overzealous-filter": "Sin resultados. ¿Quieres <a href=\"{{URL}}\">restablecer el filtro</a> ?",
 	"powered-by-kiwix-html": "Desarrollado por&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
@@ -40,18 +66,39 @@
 	"count-of-matching-books": "{{COUNT}} libro(s)",
 	"download": "Descargar",
 	"direct-download-link-text": "Directamente",
-	"direct-download-alt-text": "descarga directa",
-	"hash-download-link-text": "hash sha256",
-	"hash-download-alt-text": "descargar hash",
+	"direct-download-alt-text": "Descargar directamente vía HTTP(S)",
+	"hash-download-link-text": "Suma de verificación SHA-256",
+	"hash-download-alt-text": "Mostrar la suma de verificación de archivos SHA-256",
 	"magnet-link-text": "Enlace magnético",
-	"magnet-alt-text": "Descargar link magnético",
-	"torrent-download-link-text": "Archivo de torrent",
-	"torrent-download-alt-text": "descargar torrent",
-	"filter-by-tag": "Filtrar por etiqueta \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Dejar de filtrar por etiqueta \"{{TAG}}\"",
+	"magnet-alt-text": "Descargar mediante enlace Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Descargar a través de BitTorrent",
+	"library-opds-feed-all-entries": "Biblioteca OPDS Feed - Todas las entradas",
+	"filter-by-tag": "Filtrar por etiqueta \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Dejar de filtrar por etiqueta \"{{{TAG}}}\"",
 	"library-opds-feed-parameterised": "Feed OPDS de la biblioteca: entradas que coinciden con {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}} {{#TAG}}\nEtiqueta: {{TAG}} {{/TAG}}{{#Q}}\nConsulta: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Bienvenido al servidor Kiwix",
 	"download-links-heading": "Enlaces de descarga para <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Descargar libro",
-	"preview-book": "Previsualizar"
+	"preview-book": "Previsualizar",
+	"unknown-error": "Error desconocido",
+	"book-category.gutenberg": "Gutenberg",
+	"book-category.iFixit": "iFixit",
+	"book-category.mooc": "MOOC",
+	"book-category.phet": "Phet",
+	"book-category.stack_exchange": "Stack Exchange",
+	"book-category.ted": "Ted",
+	"book-category.vikidia": "Vikidia",
+	"book-category.wikibooks": "Wikilibros",
+	"book-category.wikihow": "wikiHow",
+	"book-category.wikinews": "Wikinoticias",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikiespecies",
+	"book-category.wikiversity": "Wikiversidad",
+	"book-category.wikivoyage": "Wikiviajes",
+	"book-category.wiktionary": "Wikcionario",
+	"book-category.other": "Otros",
+	"text-loading-content": "Cargando contenido"
 }
--- a/static/skin/i18n/fi.json
+++ b/static/skin/i18n/fi.json
@@ -3,28 +3,56 @@
 		"authors": [
 			"MITO",
 			"Nike",
-			"Pyscowicz"
+			"Pyscowicz",
+			"Samoasambia"
 		]
 	},
 	"name": "suomi",
 	"suggest-full-text-search": "sisältää '{{{SEARCH_TERMS}}}'...",
+	"no-such-book": "Kirjaa {{BOOK_NAME}} ei ole olemassa",
 	"url-not-found": "Pyydettyä URL-osoitetta \"{{url}}\" ei löytynyt tältä palvelimelta.",
 	"400-page-title": "Virheellinen pyyntö",
 	"400-page-heading": "Virheellinen pyyntö",
 	"404-page-title": "Sisältöä ei löytynyt",
 	"404-page-heading": "Ei löytynyt",
+	"new-404-page-title": "Sivua ei löytynyt",
+	"new-404-page-heading": "Hupsista. Artikkelia ei löytynyt.",
+	"404-img-text": "Ei löytynyt!",
+	"path-was-not-found": "Pyydettyä polkua ei löytynyt:",
 	"500-page-title": "Sisäinen palvelinvirhe",
-	"500-page-heading": "Sisäinen palvelinvirhe",
+	"500-page-heading": "Hupsista. Sivu ei toimi.",
+	"500-img-text": "Sivu ei toimi",
+	"external-link-detected": "Ulkoinen linkki havaittu",
+	"caution-warning": "Huomio!",
+	"external-link-intro": "Olet poistumassa Kiwixin ZIM-lukijasta siirtyäksesi verkkoon",
+	"search-results-page-title": "Haku: {{SEARCH_PATTERN}}",
+	"word-count": "{{COUNT}} sanaa",
 	"library-button-text": "Siirry tervetulosivulle",
-	"home-button-text": "Siirry kirjan '{{BOOK_TITLE}}' etusivulle",
+	"home-button-text": "Siirry kirjan '{{{BOOK_TITLE}}}' etusivulle",
 	"random-page-button-text": "Siirry satunnaiselle sivulle",
-	"searchbox-tooltip": "Hae '{{BOOK_TITLE}}'",
+	"searchbox-tooltip": "Hae kirjasta '{{{BOOK_TITLE}}}'",
 	"search": "Hae",
 	"book-filtering-all-categories": "Kaikki luokat",
 	"book-filtering-all-languages": "Kaikki kielet",
+	"count-of-matching-books": "{{COUNT}} kirja(a)",
 	"download": "Lataa",
-	"torrent-download-link-text": "Torrent-tiedosto",
+	"magnet-link-text": "Magnet-linkki",
+	"magnet-alt-text": "lataa magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "lataa torrent-tiedosto",
 	"filter-by-tag": "Suodata tunnisteen ”{{TAG}}” mukaan",
 	"download-links-title": "Lataa kirja",
-	"preview-book": "Esikatsele"
+	"preview-book": "Esikatsele",
+	"unknown-error": "Tuntematon virhe",
+	"book-category.wikibooks": "Wikikirjasto",
+	"book-category.wikinews": "Wikiuutiset",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikisitaatit",
+	"book-category.wikisource": "Wikiaineisto",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiopisto",
+	"book-category.wikivoyage": "Wikimatkat",
+	"book-category.wiktionary": "Wikisanakirja",
+	"book-category.other": "Muu",
+	"text-loading-content": "Ladataan sisältöä"
 }
--- a/static/skin/i18n/fr.json
+++ b/static/skin/i18n/fr.json
@@ -2,7 +2,10 @@
 	"@metadata": {
 		"authors": [
 			"Adriendelucca",
+			"Benoit74",
+			"Derugon",
 			"Gomoko",
+			"Goombiis",
 			"Melimeli",
 			"Stephane",
 			"Thibaut120094",
@@ -29,9 +32,25 @@
 	"400-page-heading": "Requête non valide",
 	"404-page-title": "Contenu non trouvé",
 	"404-page-heading": "Non trouvé",
+	"new-404-page-title": "Page non trouvée",
+	"new-404-page-heading": "Oups. Page non trouvée.",
+	"404-img-text": "Non trouvée !",
+	"path-was-not-found": "Le chemin demandé n’a pas été trouvé :",
+	"404-advice.p1": "Le contenu que vous recherchez peut toujours être disponible, mais il peut être positionné à un endroit différent dans le fichier ZIM.",
+	"404-advice.p2": "Veuillez :",
+	"404-advice.p3": "Essayer d’utiliser la fonction de recherche pour trouver le contenu que vous souhaitez",
+	"404-advice.p4": "Rechercher des mots-clés ou des titres liés aux informations que vous recherchez",
+	"404-advice.p5": "Cette approche devrait vous aider à localiser le contenu souhaité, même si le lien d’origine ne fonctionne pas correctement.",
 	"500-page-title": "Erreur interne du serveur",
-	"500-page-heading": "Erreur interne du serveur",
-	"500-page-text": "Une erreur de serveur interne s'est produite. Nous en sommes désolés :/",
+	"500-page-heading": "Oups, la page ne fonctionne pas.",
+	"500-page-text": "Le chemin demandé ne peut pas être fourni correctement :",
+	"500-img-text": "La page ne fonctionne pas",
+	"external-link-detected": "Lien externe détecté",
+	"caution-warning": "Attention !",
+	"external-link-intro": "Vous êtes sur le point de quitter le lecteur ZIM de Kiwix pour vous connecter à",
+	"external-link-advice.p1": "Le lien que vous essayez de suivre ne fait pas partie de votre forfait hors ligne et nécessite une connexion Internet.",
+	"external-link-advice.p2": "Si vous pouvez vous connecter en ligne, vous pouvez essayer d’ouvrir le lien.",
+	"external-link-advice.p3": "Vous pouvez également revenir au contenu hors ligne de votre ZIM en utilisant le bouton Retour de votre navigateur.",
 	"fulltext-search-unavailable": "Recherche en texte intégral non disponible",
 	"no-search-results": "Le moteur de recherche en texte intégral n’est pas disponible pour ce contenu.",
 	"search-results-page-title": "Rechercher : {{SEARCH_PATTERN}}",
@@ -40,9 +59,9 @@
 	"search-result-book-info": "à partir de {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} mots",
 	"library-button-text": "Aller à la page de bienvenue",
-	"home-button-text": "Aller à la page principale de « {{BOOK_TITLE}} »",
+	"home-button-text": "Aller à la page principale de « {{{BOOK_TITLE}}} »",
 	"random-page-button-text": "Aller à une page sélectionnée aléatoirement",
-	"searchbox-tooltip": "Rechercher « {{BOOK_TITLE}} »",
+	"searchbox-tooltip": "Rechercher « {{{BOOK_TITLE}}} »",
 	"confusion-of-tongues": "Deux livres ou plus dans des langues différentes participeraient à la recherche, ce qui pourrait conduire à des résultats confus.",
 	"welcome-page-overzealous-filter": "Aucun résultat. Souhaitez-vous <a href=\"{{URL}}\">réinitialiser le filtre</a> ?",
 	"powered-by-kiwix-html": "Propulsé par <a href=\"https://kiwix.org/\">Kiwix</a>",
@@ -52,20 +71,31 @@
 	"count-of-matching-books": "{{COUNT}} livre(s)",
 	"download": "Télécharger",
 	"direct-download-link-text": "Direct",
-	"direct-download-alt-text": "téléchargement direct",
-	"hash-download-link-text": "Hachage sha256",
-	"hash-download-alt-text": "télécharger le hachage",
+	"direct-download-alt-text": "Télécharger directement via HTTP(S)",
+	"hash-download-link-text": "Hachage SHA-256",
+	"hash-download-alt-text": "Affiche le hachage SHA-256 du fichier",
 	"magnet-link-text": "Lien Magnet",
-	"magnet-alt-text": "télécharger le lien Magnet",
-	"torrent-download-link-text": "Fichier torrent",
-	"torrent-download-alt-text": "télécharger le torrent",
+	"magnet-alt-text": "Télécharger via le lien Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Télécharger via BitTorrent",
 	"library-opds-feed-all-entries": "Flux OPDS de la bibliothèque – Toutes les entrées",
-	"filter-by-tag": "Filtrer par la balise « {{TAG}} »",
-	"stop-filtering-by-tag": "Arrêter le filtrage par la balise « {{TAG}} »",
+	"filter-by-tag": "Filtrer par le tag \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Arrêter de filtrer par le tag \"{{{TAG}}}\"",
 	"library-opds-feed-parameterised": "Flux OPDS de la bibliothèque – Entrées correspondant à {{#LANG}} :\n ▪ Langue : {{LANG}} {{/LANG}}{{#CATEGORY}}\n ▪ Catégorie : {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n ▪ Étiquette : {{TAG}} {{/TAG}}{{#Q}}\n ▪ Requête : {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Bienvenue sur le Serveur Kiwix",
 	"download-links-heading": "Liens de téléchargement pour <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Télécharger le livre",
 	"preview-book": "Aperçu",
-	"unknown-error": "Erreur inconnue"
+	"unknown-error": "Erreur inconnue",
+	"book-category.wikibooks": "Wikilivres",
+	"book-category.wikinews": "Wikinews",
+	"book-category.wikipedia": "Wikipédia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversité",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wiktionnaire",
+	"book-category.other": "Autre",
+	"text-loading-content": "Chargement du contenu"
 }
--- a/static/skin/i18n/he.json
+++ b/static/skin/i18n/he.json
@@ -22,9 +22,19 @@
 	"400-page-heading": "בקשה בלתי־תקינה",
 	"404-page-title": "התוכן לא נמצא",
 	"404-page-heading": "לא נמצא",
+	"new-404-page-title": "הדף לא נמצא",
+	"new-404-page-heading": "אופס. הדף לא נמצא.",
+	"404-img-text": "לא נמצא!",
+	"path-was-not-found": "הנתיב המבוקש לא נמצא:",
+	"404-advice.p2": "בבקשה:",
+	"404-advice.p3": "לנסות להשתמש ביכולת החיפוש כדי למצוא את התוכן המבוקש",
 	"500-page-title": "שגיאת שרת פנימית",
-	"500-page-heading": "שגיאת שרת פנימית",
-	"500-page-text": "אירעה שגיאת שרת פנימית. אנחנו מצטערים על זה :/",
+	"500-page-heading": "אופס. הדף לא עובד.",
+	"500-page-text": "אי אפשר למסור את הנתיב המבוקש כראוי:",
+	"500-img-text": "הדף לא עובד",
+	"external-link-detected": "התגלה קישור חיצוני",
+	"caution-warning": "זהירות!",
+	"external-link-advice.p2": "אם יש לך איך להתחבר לאינטרנט, אפשר לנסות לפתוח את הקישור.",
 	"fulltext-search-unavailable": "חיפוש בטקסט מלא אינו זמין",
 	"no-search-results": "מנוע החיפוש בטקסט מלא אינו זמין עבור התוכן הזה.",
 	"search-results-page-title": "חיפוש: {{SEARCH_PATTERN}}",
@@ -33,9 +43,9 @@
 	"search-result-book-info": "מתוך {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} מילים",
 	"library-button-text": "מעבר לדף הבית \"ברוך בואך\"",
-	"home-button-text": "מעבר לדף הראשי של \"{{BOOK_TITLE}}\"",
+	"home-button-text": "מעבר לדף הראשי של ‚{{{BOOK_TITLE}}}’",
 	"random-page-button-text": "מעבר לדף שנבחר אקראית",
-	"searchbox-tooltip": "חיפוש \"{{BOOK_TITLE}}\"",
+	"searchbox-tooltip": "חיפוש אחר ‚{{{BOOK_TITLE}}}’",
 	"confusion-of-tongues": "שני ספרים או יותר בשפות שונות ישתתפו בחיפוש, מה שעלול להוביל לתוצאות מבלבלות.",
 	"welcome-page-overzealous-filter": "אין תוצאות. האם <a href=\"{{URL}}\">לאפס את המסנן</a>?",
 	"powered-by-kiwix-html": "מופעל על־ידי&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
@@ -45,20 +55,33 @@
 	"count-of-matching-books": "{{COUNT}} ספרים",
 	"download": "הורדה",
 	"direct-download-link-text": "ישירה",
-	"direct-download-alt-text": "הורדה ישירה",
-	"hash-download-link-text": "גיבוב Sha256",
-	"hash-download-alt-text": "הורדת גיבוב",
+	"direct-download-alt-text": "הורדה ישירה דרך HTTP(S)",
+	"hash-download-link-text": "סיכום ביקורת Sha256",
+	"hash-download-alt-text": "הצגת סיכום ביקורת SHA-256",
 	"magnet-link-text": "קישור Magnet",
-	"magnet-alt-text": "הורדת magnet",
-	"torrent-download-link-text": "קובץ טורנט",
-	"torrent-download-alt-text": "הורדת טורנט",
+	"magnet-alt-text": "הורדה באמצעות קישור magnet",
+	"torrent-download-link-text": "ביטורנט",
+	"torrent-download-alt-text": "הורדה באמצעות ביטורנט",
 	"library-opds-feed-all-entries": "הזנת ספריית OPDS - כל הרשומות",
-	"filter-by-tag": "סינון לפי התג \"{{TAG}}\"",
-	"stop-filtering-by-tag": "להפסיק סינון לפי התג \"{{TAG}}\"",
+	"filter-by-tag": "לסנן לפי התג \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "להפסיק סינון לפי התג \"{{{TAG}}}\"",
 	"library-opds-feed-parameterised": "הזנת ספריית OPDS - רשומות שתואמות ל{{#LANG}}\nשפה: {{LANG}} {{/LANG}}{{#CATEGORY}}\nקטגוריה: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nתג: {{TAG}} {{/TAG}}{{#Q}}\nשאילתה: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "ברוך בואך לשרת קיוויקס",
 	"download-links-heading": "הורדת קישורים עבור <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "הורדת ספר",
 	"preview-book": "תצוגה מקדימה",
-	"unknown-error": "שגיאה בלתי־ידועה"
+	"unknown-error": "שגיאה בלתי־ידועה",
+	"book-category.gutenberg": "גוטנברג",
+	"book-category.vikidia": "ויקידיה",
+	"book-category.wikibooks": "ויקיספר",
+	"book-category.wikinews": "ויקיחדשות",
+	"book-category.wikipedia": "ויקיפדיה",
+	"book-category.wikiquote": "ויקיציטוט",
+	"book-category.wikisource": "ויקיטקסט (Wikisource)",
+	"book-category.wikispecies": "ויקימינים",
+	"book-category.wikiversity": "ויקיברסיטה",
+	"book-category.wikivoyage": "ויקימסע",
+	"book-category.wiktionary": "ויקימילון",
+	"book-category.other": "אחר",
+	"text-loading-content": "התוכן נטען"
 }
--- a/static/skin/i18n/hi.json
+++ b/static/skin/i18n/hi.json
@@ -52,5 +52,15 @@
 	"welcome-to-kiwix-server": "कीविक्स सर्वर में आपका स्वागत है",
 	"download-links-heading": "<b><i>{{BOOK_TITLE}}</i></b> के लिए डाउनलोड लिंक",
 	"download-links-title": "पुस्तक डाउनलोड करें",
-	"preview-book": "पूर्वावलोकन"
+	"preview-book": "पूर्वावलोकन",
+	"book-category.wikibooks": "विकिपुस्तक",
+	"book-category.wikinews": "विकिसमाचार",
+	"book-category.wikipedia": "विकिपीडिया",
+	"book-category.wikiquote": "विकिसूक्ति",
+	"book-category.wikisource": "विकिस्रोत",
+	"book-category.wikispecies": "विकिप्रजाति",
+	"book-category.wikiversity": "विकिविश्वविद्यालय",
+	"book-category.wikivoyage": "विकियात्रा",
+	"book-category.wiktionary": "विकिकोश",
+	"book-category.other": "अन्य"
 }
--- a/static/skin/i18n/hu.json
+++ b/static/skin/i18n/hu.json
@@ -0,0 +1,39 @@
+{
+	"@metadata": {
+		"authors": [
+			"Eukarióta",
+			"Urbalazs"
+		]
+	},
+	"name": "Magyar",
+	"400-page-title": "Érvénytelen kérés",
+	"400-page-heading": "Érvénytelen kérés",
+	"404-page-title": "A tartalom nem található",
+	"404-page-heading": "Nem található",
+	"new-404-page-title": "Az oldal nem található",
+	"new-404-page-heading": "Hoppá! Az oldal nem található.",
+	"404-img-text": "Nem található!",
+	"path-was-not-found": "A kért útvonal nem található:",
+	"404-advice.p1": "A keresett tartalom továbbra is elérhető lehet, de előfordulhat, hogy más helyen található a ZIM-fájlon belül.",
+	"search": "Keresés",
+	"download": "Letöltés",
+	"hash-download-link-text": "SHA-256 ellenőrzőösszeg",
+	"hash-download-alt-text": "SHA-256 fájl-ellenőrzőösszeg megjelenítése",
+	"torrent-download-link-text": "BitTorrent",
+	"welcome-to-kiwix-server": "Üdvözli a Kiwix-kiszolgáló!",
+	"download-links-heading": "Letöltési hivatkozások ehhez: <b><i>{{BOOK_TITLE}}</i></b>",
+	"download-links-title": "Könyv letöltése",
+	"preview-book": "Előnézet",
+	"unknown-error": "Ismeretlen hiba",
+	"book-category.wikibooks": "Wikikönyvek",
+	"book-category.wikinews": "Wikihírek",
+	"book-category.wikipedia": "Wikipédia",
+	"book-category.wikiquote": "Wikidézet",
+	"book-category.wikisource": "Wikiforrás",
+	"book-category.wikispecies": "Wikifajok",
+	"book-category.wikiversity": "Wikiegyetem",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wikiszótár",
+	"book-category.other": "Egyéb",
+	"text-loading-content": "Tartalom betöltése"
+}
--- a/static/skin/i18n/hy.json
+++ b/static/skin/i18n/hy.json
@@ -13,9 +13,20 @@
 	"400-page-heading": "Անվավեր հարցում",
 	"404-page-title": "Սխալ հասցե",
 	"404-page-heading": "Սխալ հասցե",
+	"500-img-text": "Էջը չի աշխատում",
 	"library-button-text": "Գրադարանի էջ",
 	"home-button-text": "Դեպի '{{BOOK_TITLE}}'֊ի գլխավոր էջը",
 	"random-page-button-text": "Բացել պատահական էջ",
 	"searchbox-tooltip": "Որոնել '{{BOOK_TITLE}}'֊ում",
-	"book-filtering-all-categories": "Բոլոր կատեգորիաներ"
+	"book-filtering-all-categories": "Բոլոր կատեգորիաներ",
+	"book-category.wikibooks": "Վիքիգրքեր",
+	"book-category.wikinews": "Վիքիլուրեր",
+	"book-category.wikipedia": "Վիքիպեդիա",
+	"book-category.wikiquote": "Վիքիքաղվածք",
+	"book-category.wikisource": "Վիքիդարան",
+	"book-category.wikispecies": "Վիքիցեղեր",
+	"book-category.wikiversity": "Վիքիլսարան",
+	"book-category.wikivoyage": "Վիքիճամփորդ",
+	"book-category.wiktionary": "Վիքիբառարան",
+	"book-category.other": "Այլ"
 }
--- a/static/skin/i18n/ia.json
+++ b/static/skin/i18n/ia.json
@@ -13,7 +13,8 @@
 	"url-not-found": "Le URL reuqestate \"{{url}}\" non ha essite trovate sur iste servitor.",
 	"suggest-search": "Facer un recerca in texto complete de <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "Ups! Non poteva eliger un articulo aleatori :(",
-	"invalid-raw-data-type": "{{DATATYPE}} non es un request valide pro contento crude.",
+	"invalid-raw-data-type": "{{DATATYPE}} non es un requesta valide pro contento brute.",
+	"invalid-request": "Le URL requestate “{{{url}}}” non es un requesta valide.",
 	"no-value-for-arg": "Necun valor fornite pro le argumento {{ARGUMENT}}",
 	"no-query": "Necun consulta fornite.",
 	"raw-entry-not-found": "Non pote trovar le entrata {{ENTRY}} del typo {{DATATYPE}}",
@@ -21,14 +22,36 @@
 	"400-page-heading": "Requesta invalide",
 	"404-page-title": "Contento non trovate",
 	"404-page-heading": "Non trovate",
+	"new-404-page-title": "Pagina non trovate",
+	"new-404-page-heading": "Pagina non trovate.",
+	"404-img-text": "Non trovate!",
+	"path-was-not-found": "Le percurso requestate non ha essite trovate:",
+	"404-advice.p1": "Le contento que tu cerca pote esser ancora disponibile, ma illo pote esser situate alterubi in le file ZIM.",
+	"404-advice.p2": "Per favor:",
+	"404-advice.p3": "Tenta usar le function de recerca pro trovar le contento desirate",
+	"404-advice.p4": "Cerca parolas-clave o titulos associate al information que tu cerca",
+	"404-advice.p5": "Iste approche deberea adjutar te a localisar le contento desirate, mesmo si le ligamine original non functiona correctemente.",
 	"500-page-title": "Error interne del servitor",
-	"500-page-heading": "Error interne del servitor",
+	"500-page-heading": "Le pagina non functiona.",
+	"500-page-text": "Le percurso requestate non pote esser livrate correctemente:",
+	"500-img-text": "Le pagina non functiona",
+	"external-link-detected": "Ligamine externe detegite",
+	"caution-warning": "Attention!",
+	"external-link-intro": "Tu es sur le puncto de quitar le lector ZIM de Kiwix pro connecter te al rete e visitar",
+	"external-link-advice.p1": "Le ligamine al qual tu tenta acceder non face parte de nostre pacchetto de uso foras de linea e require un connexion a internet.",
+	"external-link-advice.p2": "Si tu pote connecter te al rete, tu pote tentar aperir le ligamine.",
+	"external-link-advice.p3": "Si non, tu pote retornar al contento de uso foras de linea de tu ZIM usante le button Retro del navigator.",
 	"fulltext-search-unavailable": "Le recerca in texto complete es indisponibile",
 	"no-search-results": "Le motor de recerca in texto complete non es disponibile pro iste contento.",
+	"search-results-page-title": "Cercar: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Resultatos <b>{{START}}-{{END}}</b> de <b>{{COUNT}}</b> pro <b>“{{{SEARCH_PATTERN}}}”</b>",
+	"empty-search-results-page-header": "Necun resultato ha essite trovate pro <b>“{{{SEARCH_PATTERN}}}”</b>",
+	"search-result-book-info": "de {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} parolas",
 	"library-button-text": "Ir al pagina de benvenita",
-	"home-button-text": "Ir al pagina principal de ''{{BOOK_TITLE}}",
+	"home-button-text": "Ir al pagina principal de ‘{{{BOOK_TITLE}}}’",
 	"random-page-button-text": "Ir a un pagina seligite aleatorimente",
-	"searchbox-tooltip": "Cercar '{{BOOK_TITLE}}'",
+	"searchbox-tooltip": "Cercar in ‘{{{BOOK_TITLE}}}’",
 	"confusion-of-tongues": "Duo o plus libros in differente linguas participarea in le recerca, lo que pote menar a resultatos confuse.",
 	"welcome-page-overzealous-filter": "Nulle resultato. Vole tu <a href=\"{{URL}}\">reinitialisar le filtro</a>?",
 	"powered-by-kiwix-html": "Actionate per&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
@@ -38,19 +61,31 @@
 	"count-of-matching-books": "{{COUNT}} libro(s)",
 	"download": "Discargar",
 	"direct-download-link-text": "Directe",
-	"direct-download-alt-text": "discargamento directe",
-	"hash-download-link-text": "Hash SHA256",
-	"hash-download-alt-text": "hash del discargamento",
+	"direct-download-alt-text": "Discargamento directe per HTTP(S)",
+	"hash-download-link-text": "Summa de controlo SHA-256",
+	"hash-download-alt-text": "Monstrar le summa de controlo SHA-256 del file",
 	"magnet-link-text": "Ligamine Magnet",
-	"magnet-alt-text": "ligamine \"magnet\" de discargamento",
-	"torrent-download-link-text": "File Torrent",
-	"torrent-download-alt-text": "discargar Torrent",
+	"magnet-alt-text": "Discargar con ligamine Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Discargar per medio de BitTorrent",
 	"library-opds-feed-all-entries": "Fluxo OPDS del bibliotheca – Tote le entratas",
-	"filter-by-tag": "Filtrar per etiquetta \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Non plus filtrar per etiquetta \"{{TAG}}\"",
+	"filter-by-tag": "Filtrar per etiquetta “{{{TAG}}}”",
+	"stop-filtering-by-tag": "Non plus filtrar per etiquetta “{{{TAG}}}”",
 	"library-opds-feed-parameterised": "Fluxo OPDS del bibliotheca – Entratas correspondente a {{#LANG}}\nLingua {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategoria: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nEtiquetta: {{TAG}} {{/TAG}}{{#Q}}\nConsulta: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Benvenite al servitor Kiwix",
 	"download-links-heading": "Discargar ligamines pro <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Discargar libro",
-	"preview-book": "Previsualisation"
+	"preview-book": "Previsualisation",
+	"unknown-error": "Error incognite",
+	"book-category.wikibooks": "Wikilibros",
+	"book-category.wikinews": "Wikinovas",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversitate",
+	"book-category.wikivoyage": "Wikiviage",
+	"book-category.wiktionary": "Wiktionario",
+	"book-category.other": "Altere",
+	"text-loading-content": "Carga contento"
 }
--- a/static/skin/i18n/id.json
+++ b/static/skin/i18n/id.json
@@ -0,0 +1,74 @@
+{
+	"@metadata": {
+		"authors": [
+			"Akmaie Ajam"
+		]
+	},
+	"name": "Bahasa Inggris",
+	"suggest-full-text-search": "mengandung '{{{SEARCH_TERMS}}}'...",
+	"no-such-book": "Tidak ada buku seperti ini: {{BOOK_NAME}}",
+	"too-many-books": "Terlalu banyak buku yang diminta ({{NB_BOOKS}}) dimana batasnya adalah {{LIMIT}}",
+	"no-book-found": "Tidak ada buku yang sesuai kriteria yang dipilih",
+	"url-not-found": "URL yang diminta \"{{url}}\" tidak ditemukan di server ini.",
+	"suggest-search": "Lakukan pencarian teks lengkap untuk <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
+	"random-article-failure": "Waduh! Gagal memilih artikel acak :(",
+	"invalid-raw-data-type": "{{DATATYPE}} bukan permintaan yang sah untuk konten mentah.",
+	"invalid-request": "URL yang diminta \"{{{url}}}\" bukan permintaan yang sah.",
+	"no-value-for-arg": "Tidak ada nilai yang diberikan untuk argumen {{ARGUMENT}}",
+	"no-query": "Tidak ada kueri yang diberikan.",
+	"raw-entry-not-found": "Tidak dapat menemukan entri {{DATATYPE}} {{ENTRY}}",
+	"400-page-title": "Permintaan tidak sah",
+	"400-page-heading": "Permintaan tidak sah",
+	"404-page-title": "Konten tidak ditemukan",
+	"404-page-heading": "Tidak Ditemukan",
+	"500-page-title": "Kesalahan Server Internal",
+	"500-page-heading": "Kesalahan Server Internal",
+	"500-page-text": "Terjadi kesalahan server internal. Kami mohon maaf atas hal ini :/",
+	"fulltext-search-unavailable": "Pencarian teks lengkap tidak tersedia",
+	"no-search-results": "Mesin pencari teks lengkap tidak tersedia untuk konten ini.",
+	"search-results-page-title": "Pencarian: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Hasil <b>{{START}}-{{END}}</b> dari <b>{{COUNT}}</b> untuk <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"empty-search-results-page-header": "Tidak ada hasil yang ditemukan untuk <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"search-result-book-info": "dari {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} kata",
+	"library-button-text": "Pergi ke halaman selamat datang",
+	"home-button-text": "Buka halaman utama '{{BOOK_TITLE}}'",
+	"random-page-button-text": "Buka halaman yang dipilih secara acak",
+	"searchbox-tooltip": "Cari '{{BOOK_TITLE}}'",
+	"confusion-of-tongues": "Dua buku atau lebih dalam bahasa berbeda dapat muncul dalam hasil pencarian, yang dapat memicu hasil yang membingungkan.",
+	"welcome-page-overzealous-filter": "Tidak ada hasil. Apakah Anda ingin <a href=\"{{URL}}\">mengatur ulang filter</a>?",
+	"powered-by-kiwix-html": "Didukung oleh <a href=\"https://kiwix.org\">Kiwix</a>",
+	"search": "Cari",
+	"book-filtering-all-categories": "Semua kategori",
+	"book-filtering-all-languages": "Semua bahasa",
+	"count-of-matching-books": "{{COUNT}} buku",
+	"download": "Unduh",
+	"direct-download-link-text": "Langsung",
+	"direct-download-alt-text": "Unduh langsung melalui HTTP(S)",
+	"hash-download-link-text": "Checksum SHA-256",
+	"hash-download-alt-text": "Tampilkan checksum berkas SHA-256",
+	"magnet-link-text": "Tautan magnet",
+	"magnet-alt-text": "Unduh melalui tautan Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Unduh melalui BitTorrent",
+	"library-opds-feed-all-entries": "Umpan OPDS Perpustakaan - Semua entri",
+	"filter-by-tag": "Saring berdasarkan tag \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Berhenti penyaringan berdasarkan tag \"{{{TAG}}}\"",
+	"library-opds-feed-parameterised": "Umpan OPDS Perpustakaan - entri yang cocok dengan {{#LANG}}\nBahasa: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nKueri: {{Q}} {{/Q}}",
+	"welcome-to-kiwix-server": "Selamat datang di Server Kiwix",
+	"download-links-heading": "Tautan unduhan untuk <b><i>{{BOOK_TITLE}}</i></b>",
+	"download-links-title": "Unduh buku",
+	"preview-book": "Pratayang",
+	"unknown-error": "Kesalahan yang tidak diketahui",
+	"book-category.wikibooks": "Wikibuku",
+	"book-category.wikinews": "Wikiberita",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikikutip",
+	"book-category.wikisource": "Wikisumber",
+	"book-category.wikispecies": "Wikispesies",
+	"book-category.wikiversity": "Wikiversitas",
+	"book-category.wikivoyage": "Wikiwisata",
+	"book-category.wiktionary": "Wikikamus",
+	"book-category.other": "Lainnya",
+	"text-loading-content": "Memuat Konten"
+}
--- a/static/skin/i18n/it.json
+++ b/static/skin/i18n/it.json
@@ -3,8 +3,10 @@
 		"authors": [
 			"Albano",
 			"Beta16",
+			"Clorofolle",
 			"Luca.favorido",
-			"McDutchie"
+			"McDutchie",
+			"Wheelygay"
 		]
 	},
 	"name": "italiano",
@@ -21,23 +23,47 @@
 	"400-page-heading": "Richiesta non valida",
 	"404-page-title": "Contenuto non trovato",
 	"404-page-heading": "Non trovato",
+	"new-404-page-title": "Pagina non trovata",
+	"new-404-page-heading": "Oops. Pagina non trovata.",
+	"404-img-text": "Non trovato!",
 	"500-page-title": "Errore interno del server",
-	"500-page-heading": "Errore interno del server",
-	"500-page-text": "Si è verificato un errore interno del server. Ci dispiace :/",
+	"500-page-heading": "Oops. La pagina non funziona.",
+	"500-page-text": "Il percorso richiesto non può essere fornito correttamente:",
+	"caution-warning": "Attenzione!",
 	"search-results-page-title": "Cerca: {{SEARCH_PATTERN}}",
 	"search-results-page-header": "Risultati <b>{{START}}-{{END}}</b> di <b>{{COUNT}}</b> per <b>\"{{{SEARCH_PATTERN}}}\"</b>",
 	"empty-search-results-page-header": "Non è stato trovato alcun risultato per <b>\"{{{SEARCH_PATTERN}}}\"</b>",
 	"search-result-book-info": "da {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} parole",
 	"library-button-text": "Vai alla pagina di benvenuto",
-	"home-button-text": "Vai alla pagina principale di '{{BOOK_TITLE}}'",
+	"home-button-text": "Vai alla pagina principale di '{{{BOOK_TITLE}}}'",
 	"random-page-button-text": "Vai a una pagina selezionata casualmente",
-	"searchbox-tooltip": "Cerca '{{BOOK_TITLE}}'",
+	"searchbox-tooltip": "Cerca '{{{BOOK_TITLE}}}'",
+	"welcome-page-overzealous-filter": "Nessun risultato. Vuoi <a href=\"{{URL}}\">reimpostare il filtro</a>?",
+	"search": "Cerca",
 	"book-filtering-all-categories": "Tutte le categorie",
 	"book-filtering-all-languages": "Tutte le lingue",
 	"count-of-matching-books": "{{COUNT}} libro/i",
 	"download": "Scarica",
+	"direct-download-link-text": "Download diretto",
+	"direct-download-alt-text": "Scarica direttamente tramite HTTP(S)",
+	"magnet-alt-text": "Scarica tramite collegamento Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Scarica tramite BitTorrent",
+	"welcome-to-kiwix-server": "Benvenuti al server Kiwix",
+	"download-links-heading": "Link per scaricare <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Scarica libro",
 	"preview-book": "Anteprima",
-	"unknown-error": "Errore sconosciuto"
+	"unknown-error": "Errore sconosciuto",
+	"book-category.wikibooks": "Wikibooks",
+	"book-category.wikinews": "Wikinotizie",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversità",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wikizionario",
+	"book-category.other": "Altro",
+	"text-loading-content": "Caricamento contenuto"
 }
--- a/static/skin/i18n/ko.json
+++ b/static/skin/i18n/ko.json
@@ -1,19 +1,80 @@
 {
 	"@metadata": {
 		"authors": [
+			"YeBoy371",
 			"Ykhwong"
 		]
 	},
 	"name": "한국어",
 	"suggest-full-text-search": "'{{{SEARCH_TERMS}}}' 포함...",
 	"no-such-book": "해당 책이 없습니다: {{BOOK_NAME}}",
+	"too-many-books": "요청된 책이 너무 많습니다. ({{NB_BOOKS}}) 한도는 {{LIMIT}}입니다.",
+	"no-book-found": "선택 기준에 해당하는 책이 없습니다",
+	"url-not-found": "\"{{url}}\" 요청 URL은 이 서버에서 찾을 수 없습니다.",
+	"suggest-search": "<a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>에 대한 전문 검색을 수행해 보세요",
+	"random-article-failure": "이런! 임의 문서를 선택하지 못했습니다 :(",
+	"invalid-raw-data-type": "{{DATATYPE}} 값은 원시 콘텐츠에 대한 유효한 요청이 아닙니다.",
+	"invalid-request": "\"{{{url}}}\" 요청 URL은 유효한 요청이 아닙니다.",
+	"no-value-for-arg": "{{ARGUMENT}} 인수에 지정된 값이 없습니다",
+	"no-query": "지정된 쿼리가 없습니다.",
+	"raw-entry-not-found": "{{DATATYPE}} 항목인 {{ENTRY}} 항목을 찾을 수 없습니다",
 	"400-page-title": "잘못된 요청",
 	"400-page-heading": "잘못된 요청",
 	"404-page-title": "내용이 없습니다",
 	"404-page-heading": "찾을 수 없음",
+	"new-404-page-title": "페이지를 찾을 수 없습니다",
+	"new-404-page-heading": "이런. 페이지를 찾을 수 없습니다.",
+	"404-img-text": "찾을 수 없습니다!",
+	"path-was-not-found": "요청한 경로를 찾을 수 없습니다:",
+	"404-advice.p3": "원하는 콘텐츠를 찾으려면 검색 기능을 사용해 보세요",
 	"500-page-title": "내부 서버 오류",
-	"500-page-heading": "내부 서버 오류",
+	"500-page-heading": "죄송합니다. 문서가 동작하지 않습니다.",
+	"500-page-text": "요청된 경로를 제대로 전달할 수 없습니다:",
+	"500-img-text": "문서가 동작하지 않습니다",
+	"external-link-detected": "외부 링크가 발견되었습니다",
+	"caution-warning": "경고!",
 	"fulltext-search-unavailable": "전문 검색을 사용할 수 없습니다",
+	"no-search-results": "이 콘텐츠에는 전문 검색 엔진을 사용할 수 없습니다.",
+	"search-results-page-title": "검색: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "<b>\"{{{SEARCH_PATTERN}}}\"</b>에 대한 <b>{{COUNT}}</b>개 중 <b>{{START}}-{{END}}</b> 결과",
+	"empty-search-results-page-header": "<b>\"{{{SEARCH_PATTERN}}}\"</b>의 결과가 없습니다",
+	"search-result-book-info": "{{BOOK_TITLE}}에서",
+	"word-count": "단어 {{COUNT}}개",
+	"home-button-text": "'{{{BOOK_TITLE}}}'의 메인 페이지로 이동",
 	"random-page-button-text": "무작위로 선택된 문서로 이동",
-	"preview-book": "미리 보기"
+	"searchbox-tooltip": "'{{{BOOK_TITLE}}}' 검색",
+	"welcome-page-overzealous-filter": "결과가 없습니다. <a href=\"{{URL}}\">필터를 재설정</a>하시겠습니까?",
+	"powered-by-kiwix-html": "<a href=\"https://kiwix.org\">Kiwix</a>에서 제공",
+	"search": "검색",
+	"book-filtering-all-categories": "모든 분류",
+	"book-filtering-all-languages": "모든 언어",
+	"count-of-matching-books": "책 {{COUNT}}권",
+	"download": "다운로드",
+	"direct-download-link-text": "직접",
+	"direct-download-alt-text": "HTTP(S)를 통해 직접 다운로드",
+	"hash-download-link-text": "SHA-256 체크섬",
+	"hash-download-alt-text": "SHA-256 파일 체크섬 표시",
+	"magnet-link-text": "마그넷 링크",
+	"magnet-alt-text": "마그넷 링크를 통해 다운로드",
+	"torrent-download-link-text": "비트토렌트",
+	"torrent-download-alt-text": "비트토렌트를 통해 다운로드",
+	"library-opds-feed-all-entries": "라이브러리 OPDS 피드 - 모든 항목",
+	"filter-by-tag": "\"{{{TAG}}}\" 태그로 필터링",
+	"stop-filtering-by-tag": "\"{{{TAG}}}\" 태그로 필터링 중지",
+	"library-opds-feed-parameterised": "라이브러리 OPDS 피드 - {{#LANG}} 일치 항목\n언어: {{LANG}} {{/LANG}}{{#CATEGORY}}\n분류: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n태그: {{TAG}} {{/TAG}}{{#Q}}\n쿼리: {{Q}} {{/Q}}",
+	"welcome-to-kiwix-server": "Kiwix Server에 오신 것을 환영합니다",
+	"download-links-heading": "<b><i>{{BOOK_TITLE}}</i></b>의 링크 다운로드",
+	"download-links-title": "책 다운로드",
+	"preview-book": "미리 보기",
+	"unknown-error": "알 수 없는 오류",
+	"book-category.wikibooks": "위키책",
+	"book-category.wikinews": "위키뉴스",
+	"book-category.wikipedia": "위키백과",
+	"book-category.wikiquote": "위키인용집",
+	"book-category.wikisource": "위키문헌",
+	"book-category.wikispecies": "위키생물종",
+	"book-category.wikiversity": "위키배움터",
+	"book-category.wikivoyage": "위키여행",
+	"book-category.wiktionary": "위키낱말사전",
+	"book-category.other": "기타"
 }
--- a/static/skin/i18n/lb.json
+++ b/static/skin/i18n/lb.json
@@ -7,17 +7,32 @@
 		]
 	},
 	"name": "Lëtzebuergesch",
+	"suggest-full-text-search": "enthält '{{{SEARCH_TERMS}}}'...",
+	"no-such-book": "Buch net fonnt: {{BOOK_NAME}}",
+	"too-many-books": "Ze vill Bicher ugefrot ({{NB_BOOKS}}), d'Limitt läit bei {{LIMIT}}",
+	"url-not-found": "Déi ugefroten URL „{{url}}“ gouf op dësem Server net fonnt.",
 	"suggest-search": "Maacht eng Volltext-Sich fir <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "Ups! Et konnt keen zoufällegen Artikel ausgewielt ginn :(",
 	"404-page-title": "Inhalt net fonnt",
 	"404-page-heading": "Net fonnt",
+	"new-404-page-title": "Säit net fonnt",
+	"new-404-page-heading": "Ups. Säit net fonnt.",
+	"404-img-text": "Net fonnt!",
 	"500-page-title": "Interne Feeler um Server",
-	"500-page-heading": "Interne Feeler um Server",
+	"500-page-heading": "Ups. D'Säit funktionéiert net.",
 	"500-page-text": "Et ass en interne Serverfeeler opgetrueden. Mir entschëllegen eis dofir :/",
+	"500-img-text": "Säit funktionéiert net",
+	"external-link-detected": "Externe Link entdeckt",
+	"caution-warning": "Opgepasst!",
 	"fulltext-search-unavailable": "Volltext-Sich net verfügbar",
-	"home-button-text": "Gitt op d'Haaptsäit vun '{{BOOK_TITLE}}'",
+	"search-results-page-title": "Sichen: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Resultater <b>{{START}}-{{END}}</b> vu(n) <b>{{COUNT}}</b> fir <b>„{{{SEARCH_PATTERN}}}“</b>",
+	"empty-search-results-page-header": "Keng Resultater fonnt fir <b>„{{{SEARCH_PATTERN}}}“</b>",
+	"search-result-book-info": "aus {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} Wierder",
+	"home-button-text": "Op d'Haaptsäit vun '{{{BOOK_TITLE}}}' goen",
 	"random-page-button-text": "Gitt op eng zoufälleg gewielte Säit",
-	"searchbox-tooltip": "No '{{BOOK_TITLE}}' sichen",
+	"searchbox-tooltip": "No '{{{BOOK_TITLE}}}' sichen",
 	"welcome-page-overzealous-filter": "Kee Resultat. Wëllt Dir <a href=\"{{URL}}\">de Filter zrécksetzen</a>?",
 	"search": "Sichen",
 	"book-filtering-all-categories": "All Kategorien",
@@ -25,6 +40,18 @@
 	"count-of-matching-books": "{{COUNT}} Buch/Bicher",
 	"download": "Eroflueden",
 	"direct-download-link-text": "Direkt",
+	"torrent-download-link-text": "BitTorrent",
 	"download-links-title": "Buch eroflueden",
-	"unknown-error": "Onbekannte Feeler"
+	"unknown-error": "Onbekannte Feeler",
+	"book-category.stack_exchange": "Stack Exchange",
+	"book-category.wikibooks": "Wikibooks",
+	"book-category.wikinews": "Wikinews",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversity",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wiktionnaire",
+	"book-category.other": "Anerer"
 }
--- a/static/skin/i18n/mk.json
+++ b/static/skin/i18n/mk.json
@@ -22,9 +22,25 @@
 	"400-page-heading": "Неважечко барање",
 	"404-page-title": "Содржината не е најдена",
 	"404-page-heading": "Не е најдено",
+	"new-404-page-title": "Страницата не е пронајдена",
+	"new-404-page-heading": "Ах! Страницата не е пронајдена.",
+	"404-img-text": "Не е најдено!",
+	"path-was-not-found": "Не ја најдов побараната патека:",
+	"404-advice.p1": "Содржината што ја барате може сепак да е достапна, но може да се наоѓа на друго место во рамките на ZIM-податотеката.",
+	"404-advice.p2": "Ве молиме:",
+	"404-advice.p3": "Пробајте да ја употребите функцијата за пребарување за да ја најдете содржината што ви треба",
+	"404-advice.p4": "Барајте клучни зборови или наслови поврзани со информациите што ви требаат",
+	"404-advice.p5": "Овој приод треба да ви помогне да ја најдете саканата содржина, дури и ако изворната врска не работи правилно.",
 	"500-page-title": "Внатрешна грешка во опслужувачот",
-	"500-page-heading": "Внатрешна грешка во опслужувачот",
-	"500-page-text": "Настана внатрешна грешка во опслужувачот. Жал ни е :/",
+	"500-page-heading": "Страницата не работи.",
+	"500-page-text": "Побараната патека не може правилно да се достави:",
+	"500-img-text": "Страницата не работи.",
+	"external-link-detected": "Најдена е надворешна врска",
+	"caution-warning": "Внимание!",
+	"external-link-intro": "На пат сте да го напуштите ZIM-читачот на Кивикс за да појдете на",
+	"external-link-advice.p1": "Врската што пробувате да ја отворите не е дел од вашиот вонмрежен пакет и бара семрежна врска.",
+	"external-link-advice.p2": "Ако можете да се поврзете со семрежнето, пробајте да ја отворите врската.",
+	"external-link-advice.p3": "Во спротивно можете повторно да пробате да ја отворите вонмрежната содржина на вашиот ZIM стискајќи на копчето за враќање назад на вашиот прелистувач.",
 	"fulltext-search-unavailable": "Целотекстното пребарување е недостапно",
 	"no-search-results": "Погонот за целотекстно пребарување не е достапен за оваа содржина.",
 	"search-results-page-title": "Пребарување: {{SEARCH_PATTERN}}",
@@ -33,9 +49,9 @@
 	"search-result-book-info": "од {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} зборови",
 	"library-button-text": "Оди на воведната страница",
-	"home-button-text": "Оди на главната страница на „{{BOOK_TITLE}}“",
+	"home-button-text": "Оди на главната страница на „{{{BOOK_TITLE}}}“",
 	"random-page-button-text": "Оди на случајно избрана страница",
-	"searchbox-tooltip": "Пребарај го „{{BOOK_TITLE}}“",
+	"searchbox-tooltip": "Пребарај по „{{{BOOK_TITLE}}}“",
 	"confusion-of-tongues": "Во пребарувањето ќе учествуваат две или повеќе книги на различни јазици, што може да довете до збунувачки исход.",
 	"welcome-page-overzealous-filter": "Нема исход. Дали би сакале да го <a href=\"{{URL}}\">поништите филтерот</a>?",
 	"powered-by-kiwix-html": "Овозможено од&nbsp;<a href=\"https://kiwix.org\">Кивикс</a>",
@@ -45,20 +61,39 @@
 	"count-of-matching-books": "{{COUNT}} книги",
 	"download": "Преземи",
 	"direct-download-link-text": "Непосредно",
-	"direct-download-alt-text": "непосредно преземање",
-	"hash-download-link-text": "Sha256-тараба",
-	"hash-download-alt-text": "преземи тараба",
+	"direct-download-alt-text": "Непосредно преземање преку HTTP(S)",
+	"hash-download-link-text": "Контролен збир Sha256",
+	"hash-download-alt-text": "Прикажи контролен збир SHA-256 на податотеката",
 	"magnet-link-text": "Магнетна врска",
-	"magnet-alt-text": "преземи магнет",
-	"torrent-download-link-text": "Торентна податотека",
-	"torrent-download-alt-text": "преземи торент",
+	"magnet-alt-text": "Преземи преку Magnet-врска",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Преземи преку BitTorrent",
 	"library-opds-feed-all-entries": "Библиотечен тековник на OPDS — Сите ставки",
-	"filter-by-tag": "Филтрирај по ознаката „{{TAG}}“",
-	"stop-filtering-by-tag": "Запри филтрирање по ознаката „{{TAG}}“",
+	"filter-by-tag": "Филтрирај по ознаката „{{{TAG}}}“",
+	"stop-filtering-by-tag": "Запри филтрирање по ознаката „{{{TAG}}}“",
 	"library-opds-feed-parameterised": "Библиотечен тековник на OPDS — ставки што одговараат на {{#LANG}}\nЈазик: {{LANG}} {{/LANG}}{{#CATEGORY}}\nКатегорија: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nОзнака: {{TAG}} {{/TAG}}{{#Q}}\nБарање: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Добре дојдовте на Опслужувачот на Кивикс",
 	"download-links-heading": "Врски за преземање на <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Преземи книга",
 	"preview-book": "Преглед",
-	"unknown-error": "Непозната грешка"
+	"unknown-error": "Непозната грешка",
+	"book-category.gutenberg": "Гутенберг",
+	"book-category.iFixit": "iFixit",
+	"book-category.mooc": "MOOC",
+	"book-category.phet": "Phet",
+	"book-category.stack_exchange": "Stack Exchange",
+	"book-category.ted": "Ted",
+	"book-category.vikidia": "Викидија",
+	"book-category.wikibooks": "Викикниги",
+	"book-category.wikihow": "wikiHow",
+	"book-category.wikinews": "Викивести",
+	"book-category.wikipedia": "Википедија",
+	"book-category.wikiquote": "Викицитат",
+	"book-category.wikisource": "Викиизвор",
+	"book-category.wikispecies": "Викивидови",
+	"book-category.wikiversity": "Викиуниверзитет",
+	"book-category.wikivoyage": "Википатување",
+	"book-category.wiktionary": "Викиречник",
+	"book-category.other": "друго",
+	"text-loading-content": "Ја вчитувам содржината"
 }
--- a/static/skin/i18n/nb.json
+++ b/static/skin/i18n/nb.json
@@ -0,0 +1,74 @@
+{
+	"@metadata": {
+		"authors": [
+			"TorgeirS"
+		]
+	},
+	"name": "Engelsk",
+	"suggest-full-text-search": "inneholder '{{{SEARCH_TERMS}}}'...",
+	"no-such-book": "Finner ingen slik bok: {{BOOK_NAME}}",
+	"too-many-books": "Det er forespurt for mange bøker {{NB_BOOKS}} der grensen er {{LIMIT}}",
+	"no-book-found": "Ingen bøker med treff på utvalgkriteriene",
+	"url-not-found": "Den forespurte webadressen «{{url}}» ble ikke funnet på denne serveren.",
+	"suggest-search": "Gjør et fulltekstsøk etter <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
+	"random-article-failure": "Oops! Klarte ikke å hente en tilfeldig artikkel :(",
+	"invalid-raw-data-type": "{{DATATYPE}} er ikke en gyldig forespørsel etter uformatert innhold.",
+	"invalid-request": "Den forespurte URL-en \"{{{url}}}\" er ikke en gyldig forespørsel.",
+	"no-value-for-arg": "Ingen verdi angitt for argumentet {{ARGUMENT}}",
+	"no-query": "Ingen søkeord oppgitt.",
+	"raw-entry-not-found": "Finner ikke {{DATATYPE}}-oppføringen {{ENTRY}}",
+	"400-page-title": "Ugyldig forespørsel",
+	"400-page-heading": "Ugyldig forespørsel",
+	"404-page-title": "Finner ikke innhold",
+	"404-page-heading": "Ikke funnet",
+	"500-page-title": "Intern serverfeil",
+	"500-page-heading": "Intern serverfeil",
+	"500-page-text": "Det oppstod en intern serverfeil. Vi beklager det :/",
+	"fulltext-search-unavailable": "Fulltekstsøk utilgjengelig",
+	"no-search-results": "Søkemotoren for fulltekstsøk er ikke tilgjengelig for dette innholdet.",
+	"search-results-page-title": "Søk: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Resultater <b>{{START}}-{{END}}</b> av <b>{{COUNT}}</b> for <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"empty-search-results-page-header": "Ingen resultater ble funnet for <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"search-result-book-info": "fra {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} ord",
+	"library-button-text": "Gå til velkomstsiden",
+	"home-button-text": "Gå til hovedsiden for '{{BOOK_TITLE}}'",
+	"random-page-button-text": "Gå til en tilfeldig valgt side",
+	"searchbox-tooltip": "Søk etter '{{BOOK_TITLE}}'",
+	"confusion-of-tongues": "To eller flere bøker på forskjellige språk vil inngå i søket, noe som kan gi forvirrende resultater.",
+	"welcome-page-overzealous-filter": "Ingen resultater. Vil du <a href=\"{{URL}}\">tilbakestille filteret</a>?",
+	"powered-by-kiwix-html": "Drevet av <a href=\"https://kiwix.org\">Kiwix</a>",
+	"search": "Søk",
+	"book-filtering-all-categories": "Alle kategorier",
+	"book-filtering-all-languages": "Alle språk",
+	"count-of-matching-books": "{{COUNT}} bok/bøker",
+	"download": "Last ned",
+	"direct-download-link-text": "Direkte",
+	"direct-download-alt-text": "Last ned direkte via HTTP(S)",
+	"hash-download-link-text": "SHA-256 kontrollsum",
+	"hash-download-alt-text": "Vis filens SHA-256 kontrollsum",
+	"magnet-link-text": "Magnetlenke",
+	"magnet-alt-text": "Last ned via Magnetlenke",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Last ned via BitTorrent",
+	"library-opds-feed-all-entries": "Biblioteks OPDS-feed - Alle oppføringer",
+	"filter-by-tag": "Filtrer etter taggen \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Slutt å filtrere etter taggen \"{{{TAG}}}\"",
+	"library-opds-feed-parameterised": "Biblioteks OPDS-feed - oppføringer som samsvarer med {{#LANG}}\nSpråk: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTagg: {{TAG}} {{/TAG}}{{#Q}}\nSpørring: {{Q}} {{/Q}}",
+	"welcome-to-kiwix-server": "Velkommen til Kiwix Server",
+	"download-links-heading": "Nedlastingslenker for <b><i>{{BOOK_TITLE}}</i></b>",
+	"download-links-title": "Last ned bok",
+	"preview-book": "Forhåndsvisning",
+	"unknown-error": "Ukjent feil",
+	"book-category.wikibooks": "Wikibooks",
+	"book-category.wikinews": "Wikinews",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversity",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wiktionary",
+	"book-category.other": "Annet",
+	"text-loading-content": "Laster innhold"
+}
--- a/static/skin/i18n/nl.json
+++ b/static/skin/i18n/nl.json
@@ -1,8 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
+			"ABPMAB",
 			"Kelson",
 			"McDutchie",
+			"Siebrand",
 			"Vistaus"
 		]
 	},
@@ -15,6 +17,7 @@
 	"suggest-search": "In volledige tekst zoeen naar <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "Oeps! Kan geen willekeurig artikel kiezen :(",
 	"invalid-raw-data-type": "{{DATATYPE}} is geen geldig verzoek voor onbewerkte inhoud.",
+	"invalid-request": "De gevraagde URL “{{{url}}}” is onjuist.",
 	"no-value-for-arg": "Er is geen waarde opgegeven bij {{ARGUMENT}}",
 	"no-query": "Er is geen zoekterm opgegeven.",
 	"raw-entry-not-found": "Kan het {{DATATYPE}}-item {{ENTRY}} niet vinden",
@@ -22,14 +25,36 @@
 	"400-page-heading": "Ongeldig verzoek",
 	"404-page-title": "Inhoud niet gevonden",
 	"404-page-heading": "Niet gevonden",
+	"new-404-page-title": "Pagina niet gevonden",
+	"new-404-page-heading": "Oeps. Pagina niet gevonden.",
+	"404-img-text": "Niet gevonden!",
+	"path-was-not-found": "Het gevraagde pad is niet gevonden:",
+	"404-advice.p1": "De inhoud die u zoekt is mogelijk toch beschikbaar, maar kan zich ergens anders in het ZIM-bestand bevinden.",
+	"404-advice.p2": "U kunt:",
+	"404-advice.p3": "De zoekfunctie proberen om de gewenste inhoud te vinden",
+	"404-advice.p4": "Trefwoorden of titels opzoeken die verband houden met de informatie die u zoekt",
+	"404-advice.p5": "Met deze aanpak kunt u hopelijk de gewenste inhoud vinden, ook als de oorspronkelijke koppeling niet goed werkt.",
 	"500-page-title": "Interne serverfout",
-	"500-page-heading": "Interne serverfout",
+	"500-page-heading": "Oeps. De pagina werkt niet.",
+	"500-page-text": "Het aangevraagde pad kan niet goed beschikbaar worden gesteld:",
+	"500-img-text": "Pagina werkt niet",
+	"external-link-detected": "Externe koppeling gedetecteerd",
+	"caution-warning": "Voorzichtig!",
+	"external-link-intro": "U staat op het punt de ZIM-lezer van Kiwix te verlaten om online te gaan naar",
+	"external-link-advice.p1": "De koppeling die u probeert te openen, maakt geen deel uit van uw offline-pakket en vereist een internetverbinding.",
+	"external-link-advice.p2": "Als u online kunt gaan, kunt u proberen de koppeling te openen.",
+	"external-link-advice.p3": "Anders kunt u met de terugknop van uw browser terugkeren naar de offline-inhoud van uw ZIM.",
 	"fulltext-search-unavailable": "Zoeken in volledige tekst is niet beschikbaar",
 	"no-search-results": "De zoekmachine voor volledige tekst is niet beschikbaar voor deze inhoud.",
+	"search-results-page-title": "Zoeken: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Resultaten <b>{{START}}-{{END}}</b> van <b>{{COUNT}}</b> voor <b>“{{{SEARCH_PATTERN}}}”</b>",
+	"empty-search-results-page-header": "Er zijn geen resultaten gevonden voor <b>“{{{SEARCH_PATTERN}}}”</b>",
+	"search-result-book-info": "uit {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} woorden",
 	"library-button-text": "Naar de welkomstpagina",
-	"home-button-text": "Naar de hoofdpagina van ‘{{BOOK_TITLE}}’",
+	"home-button-text": "Naar de hoofdpagina van ‘{{{BOOK_TITLE}}}’",
 	"random-page-button-text": "Naar een willekeurig geselecteerde pagina gaan",
-	"searchbox-tooltip": "Naar ‘{{BOOK_TITLE}}’ zoeken",
+	"searchbox-tooltip": "‘{{{BOOK_TITLE}}}’ doorzoeken",
 	"confusion-of-tongues": "Er zouden twee of meer boeken in verschillende talen deelnemen aan de zoekopdracht, wat tot verwarrende resultaten kan leiden.",
 	"welcome-page-overzealous-filter": "Geen resultaat. Wilt u <a href=\"{{URL}}\">het filter resetten</a>?",
 	"powered-by-kiwix-html": "Mogelijk gemaakt door <a href=\"https://kiwix.org\">Kiwix</a>",
@@ -39,19 +64,31 @@
 	"count-of-matching-books": "{{COUNT}} boek(en)",
 	"download": "Downloaden",
 	"direct-download-link-text": "Direct",
-	"direct-download-alt-text": "directe download",
-	"hash-download-link-text": "SHA256-hash",
-	"hash-download-alt-text": "controlesom (hash) van de download",
+	"direct-download-alt-text": "Direct downloaden via HTTP(S)",
+	"hash-download-link-text": "SHA-256-controlesom",
+	"hash-download-alt-text": "De SHA-256-controlesom van het bestand weergeven",
 	"magnet-link-text": "Magnet-link",
-	"magnet-alt-text": "magnet-link van de download",
-	"torrent-download-link-text": "Torrent-bestand",
-	"torrent-download-alt-text": "torrent downloaden",
+	"magnet-alt-text": "Downloaden via Magnet-link",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Downloaden via BitTorrent",
 	"library-opds-feed-all-entries": "OPDS-feed bibliotheek: alle vermeldingen",
-	"filter-by-tag": "Filteren op label “{{TAG}}”",
-	"stop-filtering-by-tag": "Niet meer filteren op label “{{TAG}}”",
+	"filter-by-tag": "Filteren op label “{{{TAG}}}”",
+	"stop-filtering-by-tag": "Niet meer filteren op label “{{{TAG}}}”",
 	"library-opds-feed-parameterised": "OPDS-feed bibliotheek: vermeldingen die overeenkomen met {{#LANG}}\nTaal: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategorie: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nLabel: {{TAG}} {{/TAG}}{{#Q}}\nZoekopdracht: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Welkom bij de Kiwix-server",
 	"download-links-heading": "Downloadkoppelingen voor <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Boek downloaden",
-	"preview-book": "Voorvertoning"
+	"preview-book": "Voorvertoning",
+	"unknown-error": "Onbekende fout",
+	"book-category.wikibooks": "Wikibooks",
+	"book-category.wikinews": "Wikinieuws",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversity",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "WikiWoordenboek",
+	"book-category.other": "Overige",
+	"text-loading-content": "Inhoud laden"
 }
--- a/static/skin/i18n/nqo.json
+++ b/static/skin/i18n/nqo.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Amire80",
 			"Lancine.kounfantoh.fofana"
 		]
 	},
--- a/static/skin/i18n/or.json
+++ b/static/skin/i18n/or.json
@@ -1,7 +1,8 @@
 {
 	"@metadata": {
 		"authors": [
-			"Gouri"
+			"Gouri",
+			"Psubhashish"
 		]
 	},
 	"name": "ଓଡ଼ିଆ",
@@ -10,7 +11,7 @@
 	"too-many-books": "ଅତ୍ୟଧିକ ବହି ଅନୁରୋଧ (${{NB_BOOKS}}) ଯେଉଁଠାରେ ସୀମା ${{LIMIT}} |",
 	"no-book-found": "କୌଣସି ପୁସ୍ତକ ଚଯ଼ନ ମାନଦଣ୍ଡ ସହ ମେଳ ଖାଉନାହିଁ ।",
 	"url-not-found": "ଅନୁରୋଧ କରାଯାଇଥିବା URL \"{{url}}\" ଏହି ସର୍ଭରରେ ମିଳିଲା ନାହିଁ |",
-	"suggest-search": "<a href=\"${{{SEARCH_URL}}}\">${{PATTERN}} for</a> ପାଇଁ ଏକ ସମ୍ପୂର୍ଣ୍ଣ ପାଠ ସନ୍ଧାନ କର |",
+	"suggest-search": "<a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a> ପାଇଁ ପୂରା ପାଠ ଖୋଜନ୍ତୁ |",
 	"random-article-failure": "ଓହୋ! ଏକ ଅନିୟମିତ ପ୍ରବନ୍ଧ ବାଛିବାରେ ବିଫଳ :(",
 	"invalid-raw-data-type": "{{DATATYPE}} କଞ୍ଚା ବିଷୟବସ୍ତୁ ପାଇଁ ଏକ ବ valid ଧ ଅନୁରୋଧ ନୁହେଁ |",
 	"no-value-for-arg": "ଯୁକ୍ତି ପାଇଁ କୌଣସି ମୂଲ୍ଯ଼ ପ୍ରଦାନ କରାଯାଇନାହିଁ ${{ARGUMENT}}",
--- a/static/skin/i18n/pl.json
+++ b/static/skin/i18n/pl.json
@@ -34,5 +34,6 @@
 	"torrent-download-link-text": "Plik torrent",
 	"welcome-to-kiwix-server": "Witamy na serwerze Kiwix",
 	"download-links-title": "Pobierz książkę",
-	"preview-book": "Podgląd"
+	"preview-book": "Podgląd",
+	"book-category.other": "Inne"
 }
--- a/static/skin/i18n/pt-br.json
+++ b/static/skin/i18n/pt-br.json
@@ -0,0 +1,76 @@
+{
+	"@metadata": {
+		"authors": [
+			"Eduardoaddad",
+			"Klgor1803",
+			"Obiru",
+			"Re demz",
+			"YoReaper"
+		]
+	},
+	"name": "Português",
+	"suggest-full-text-search": "Contendo '{{{SEARCH_TERMS}}}'...",
+	"no-such-book": "Não existe o livro: {{BOOK_NAME}}",
+	"too-many-books": "Muitos livros solicitados {{NB_BOOKS}} mas o limite é {{LIMIT}}",
+	"no-book-found": "Nenhum livro corresponde os critérios de seleção",
+	"url-not-found": "O URL \"{{url}}\" não foi encontrado neste servidor.",
+	"suggest-search": "Fazer uma pesquisa de texto completo para <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
+	"random-article-failure": "Ops! Falha ao escolher um artigo aleatório :(",
+	"invalid-raw-data-type": "{{DATATYPE}} não é uma solicitação válida para conteúdo bruto.",
+	"invalid-request": "O URL solicitado \"{{{url}}}\" não é uma solicitação válida.",
+	"no-value-for-arg": "Nenhum valor para o argumento {{ARGUMENT}}",
+	"no-query": "Nenhuma consulta fornecida.",
+	"400-page-title": "Requisição inválida",
+	"400-page-heading": "Requisição inválida",
+	"404-page-title": "Conteúdo não encontrado",
+	"404-page-heading": "Não encontrado",
+	"500-page-title": "Erro interno do servidor",
+	"500-page-heading": "Erro interno do servidor",
+	"500-page-text": "Aconteceu um erro interno do servidor. Nós pedimos desculpas sobre isso :/",
+	"caution-warning": "Cuidado!",
+	"fulltext-search-unavailable": "Busca por texto completo está indisponível",
+	"no-search-results": "O motor de busca de texto completo não está disponível para este conteúdo.",
+	"search-results-page-title": "Buscar: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Resultados <b>{{START}}-{{END}}</b> de <b>{{COUNT}}</b> para <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"empty-search-results-page-header": "Nenhum resultado encontrado para <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"search-result-book-info": "de {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} palavras",
+	"library-button-text": "Ir para página inicial",
+	"home-button-text": "Ir para página principal de '{{BOOK_TITLE}}'",
+	"random-page-button-text": "Ir para uma página aleatória",
+	"searchbox-tooltip": "Buscar '{{BOOK_TITLE}}'",
+	"confusion-of-tongues": "Dois ou mais livros em diferentes idiomas podem participar da pesquisa, isso pode proporcionar resultados confusos.",
+	"welcome-page-overzealous-filter": "Nenhum resultado. Gostaria de <a href=\"{{URL}}\">redefinir o filtro</a> ?",
+	"powered-by-kiwix-html": "Desenvolvido por <a href=\"https://kiwix.org\">Kiwix</a>",
+	"search": "Pesquisar",
+	"book-filtering-all-categories": "Todas as categorias",
+	"book-filtering-all-languages": "Todos os idiomas",
+	"count-of-matching-books": "{{COUNT}} livro(s)",
+	"download": "Baixar",
+	"direct-download-link-text": "Direto",
+	"direct-download-alt-text": "Baixar diretamente por HTTP(S)",
+	"hash-download-link-text": "Verificação SHA-256",
+	"hash-download-alt-text": "Exibir arquivo de verificação SHA-256",
+	"magnet-link-text": "Link Magnet",
+	"magnet-alt-text": "Baixar por link Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Baixar via BitTorrent",
+	"library-opds-feed-all-entries": "Feed OPDS da biblioteca - Todas as entradas",
+	"filter-by-tag": "Filtrar por etiqueta \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Parar de filtrar por etiqueta \"{{{TAG}}}\"",
+	"library-opds-feed-parameterised": "Biblioteca OPDS Feed - entradas que correspondem a {{#LANG}}\nIdioma: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategoria: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nConsulta: {{Q}} {{/Q}}",
+	"welcome-to-kiwix-server": "Bem vindo ao servidor Kiwix",
+	"download-links-heading": "Links para baixar <b><i>{{BOOK_TITLE}}</i></b>",
+	"download-links-title": "Download do livro",
+	"preview-book": "Pré-visualizar",
+	"unknown-error": "Erro desconhecido",
+	"book-category.wikibooks": "Wikilivros",
+	"book-category.wikinews": "Wikinotícias",
+	"book-category.wikipedia": "Wikipédia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispécies",
+	"book-category.wikiversity": "Wikiversidade",
+	"book-category.wiktionary": "Wikcionário",
+	"book-category.other": "Outro"
+}
--- a/static/skin/i18n/pt.json
+++ b/static/skin/i18n/pt.json
@@ -0,0 +1,73 @@
+{
+	"@metadata": {
+		"authors": [
+			"B3rnas"
+		]
+	},
+	"name": "português",
+	"suggest-full-text-search": "contendo '{{{SEARCH_TERMS}}}'...",
+	"no-such-book": "Não existe o livro: {{BOOK_NAME}}",
+	"too-many-books": "Demasiadas solicitações de livros ({{NB_BOOKS}}) onde o limite é {{LIMIT}}",
+	"no-book-found": "Nenhum livro corresponde aos critérios de seleção",
+	"url-not-found": "A URL solicitada \"{{url}}\" não foi encontrada neste servidor.",
+	"suggest-search": "Faça uma pesquisa de texto completo para <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
+	"random-article-failure": "Ups! Erro ao eleger um artigo aleatório :(",
+	"invalid-raw-data-type": "{{DATATYPE}} não é uma solicitação válida para conteúdo bruto.",
+	"invalid-request": "A URL solicitada \"{{{url}}}\" não é uma solicitação válida.",
+	"no-value-for-arg": "Nenhum valor fornecido para o argumento {{ARGUMENT}}",
+	"no-query": "Nenhuma consulta fornecida.",
+	"raw-entry-not-found": "Não é possível encontrar a entrada {{DATATYPE}} {{ENTRY}}",
+	"400-page-title": "Solicitação inválida",
+	"400-page-heading": "Solicitação inválida",
+	"404-page-title": "Conteúdo não encontrado",
+	"404-page-heading": "Não encontrado",
+	"500-page-title": "Erro interno do servidor",
+	"500-page-heading": "Erro interno do servidor",
+	"500-page-text": "Ocorreu um erro interno do servidor. Lamentamos por isso :/",
+	"fulltext-search-unavailable": "Pesquisa de texto completo indisponível",
+	"no-search-results": "O motor de busca de texto completo não está disponível para este conteúdo.",
+	"search-results-page-title": "Pesquisar: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Resultados <b>{{START}}-{{END}}</b> de <b>{{COUNT}}</b> para <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"empty-search-results-page-header": "Nenhum resultado foi encontrado para <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"search-result-book-info": "de {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} palavras",
+	"library-button-text": "Ir para página inicial",
+	"home-button-text": "Vá para a página principal de '{{BOOK_TITLE}}'",
+	"random-page-button-text": "Vá para uma página selecionada aleatoriamente",
+	"searchbox-tooltip": "Procurar '{{BOOK_TITLE}}'",
+	"confusion-of-tongues": "Dois ou mais livros em idiomas diferentes participariam da pesquisa, o que poderia levar a resultados confusos.",
+	"welcome-page-overzealous-filter": "Nenhum resultado. Gostaria de <a href=\"{{URL}}\">redefinir o filtro</a> ?",
+	"powered-by-kiwix-html": "Desenvolvido por <a href=\"https://kiwix.org\">Kiwix</a>",
+	"search": "Pesquisar",
+	"book-filtering-all-categories": "Todas as categorias",
+	"book-filtering-all-languages": "Todos os idiomas",
+	"count-of-matching-books": "{{COUNT}} livro(s)",
+	"download": "Transferir",
+	"direct-download-link-text": "Direto",
+	"direct-download-alt-text": "Descarregar diretamente através de HTTP (S)",
+	"hash-download-link-text": "Verificação SHA-256",
+	"hash-download-alt-text": "Exibir arquivo de verificação SHA-256",
+	"magnet-link-text": "Link magnético",
+	"magnet-alt-text": "Descarregar através do link Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Descarregar através de BitTorrent",
+	"library-opds-feed-all-entries": "Feed OPDS da biblioteca - Todas as entradas",
+	"filter-by-tag": "Filtrar por tag \"{{TAG}}\"",
+	"stop-filtering-by-tag": "Pare de filtrar pela tag \"{{TAG}}\"",
+	"library-opds-feed-parameterised": "Feed OPDS da biblioteca - entradas que correspondem a {{#LANG}}\nIdioma: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategoria: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nConsulta: {{Q}} {{/Q}}",
+	"welcome-to-kiwix-server": "Bem-vindo ao Kiwix Server",
+	"download-links-heading": "Links para download de <b><i>{{BOOK_TITLE}}</i></b>",
+	"download-links-title": "Descarregar livros",
+	"preview-book": "Pré-visualização",
+	"unknown-error": "Erro desconhecido",
+	"book-category.wikibooks": "Wikilivros",
+	"book-category.wikinews": "Wikinotícias",
+	"book-category.wikipedia": "Wikipédia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversidade",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wikcionário",
+	"book-category.other": "Outro"
+}
--- a/static/skin/i18n/qqq.json
+++ b/static/skin/i18n/qqq.json
@@ -24,9 +24,25 @@
 	"400-page-heading": "Heading of the 400 error page",
 	"404-page-title": "Title of the 404 error page",
 	"404-page-heading": "Heading of the 404 error page",
+	"new-404-page-title": "Title of the 404 error page",
+	"new-404-page-heading": "Heading of the 404 error page",
+	"404-img-text": "Fallback text for the image on the 404 error page",
+	"path-was-not-found": "Message telling that the URL path was not found (to be followed by the actual path)",
+	"404-advice.p1": "1st paragraph of the multiline advice on the 'Page not found' error page (see 404-advice.p1 through 404-advice.p5 for full text)",
+	"404-advice.p2": "2nd paragraph of the multiline advice on the 'Page not found' error page (see 404-advice.p1 through 404-advice.p5 for full text)",
+	"404-advice.p3": "3rd paragraph of the multiline advice on the 'Page not found' error page (see 404-advice.p1 through 404-advice.p5 for full text)",
+	"404-advice.p4": "4th paragraph of the multiline advice on the 'Page not found' error page (see 404-advice.p1 through 404-advice.p5 for full text)",
+	"404-advice.p5": "5th paragraph of the multiline advice on the 'Page not found' error page (see 404-advice.p1 through 404-advice.p5 for full text)",
 	"500-page-title": "Title of the 500 error page",
 	"500-page-heading": "Heading of the 500 error page",
 	"500-page-text": "Text of the 500 error page",
+	"500-img-text": "Fallback text for the image on the 500 error page",
+	"external-link-detected": "Title & heading of the external link blocker page",
+	"caution-warning": "Warning of action that shouldn't be carried out carelessly",
+	"external-link-intro": "Message introducing the external link (to be followed by the actual link)",
+	"external-link-advice.p1": "1st paragraph of the multiline advice on the external link blocker page (see external-link-advice.p1 through external-link-advice.p3 for full text)",
+	"external-link-advice.p2": "2nd paragraph of the multiline advice on the external link blocker page (see external-link-advice.p1 through external-link-advice.p3 for full text)",
+	"external-link-advice.p3": "3rd paragraph of the multiline advice on the external link blocker page (see external-link-advice.p1 through external-link-advice.p3 for full text)",
 	"fulltext-search-unavailable": "Title of the error page returned when search is attempted in a book without fulltext search database",
 	"no-search-results": "Text of the error page returned when search is attempted in a book without fulltext search database",
 	"search-results-page-title": "Title of the search results page",
@@ -62,5 +78,24 @@
 	"download-links-title": "Title for no-js download page",
 	"preview-book": "Tooltip of book-tile leading to the book",
 	"non-translated-text": "{{ignored}}\nUsed to display text that is generated at runtime and cannot be translated. Nothing to translate about this one.",
-	"unknown-error": "Unknown error"
+	"unknown-error": "Unknown error",
+	"book-category.gutenberg": "Name for the category of books from the Gutenberg project",
+	"book-category.iFixit": "Name for the category of iFixit books",
+	"book-category.mooc": "Name for the category of MOOC books",
+	"book-category.phet": "Name for the category of Phet books",
+	"book-category.stack_exchange": "Name for the category of books from the Stack Exchange network books",
+	"book-category.ted": "Name for the category of Ted books",
+	"book-category.vikidia": "Name for the category of Vikidia books",
+	"book-category.wikibooks": "Name for the category of Wikibooks books books",
+	"book-category.wikihow": "Name for the category of wikiHow books",
+	"book-category.wikinews": "Name for the category of Wikinews books",
+	"book-category.wikipedia": "Name for the category of Wikipedia books",
+	"book-category.wikiquote": "Name for the category of Wikiquote books",
+	"book-category.wikisource": "Name for the category of Wikisource books",
+	"book-category.wikispecies": "Name for the category of Wikispecies books",
+	"book-category.wikiversity": "Name for the category of Wikiversity books",
+	"book-category.wikivoyage": "Name for the category of Wikivoyage books",
+	"book-category.wiktionary": "Name for the category of Wiktionary books",
+	"book-category.other": "Books not belonging to any special category are listed under this one",
+	"text-loading-content": "Text displayed while content is being loaded"
 }
--- a/static/skin/i18n/ro.json
+++ b/static/skin/i18n/ro.json
@@ -0,0 +1,75 @@
+{
+	"@metadata": {
+		"authors": [
+			"MSClaudiu",
+			"Trotinel Iftode"
+		]
+	},
+	"name": "Engleză",
+	"suggest-full-text-search": "care conține '{{{SEARCH_TERMS}}}'...",
+	"no-such-book": "Nu există o astfel de carte: {{BOOK_NAME}}",
+	"too-many-books": "Prea multe cărți solicitate ({{NB_BOOKS}}) unde limita este {{LIMIT}}",
+	"no-book-found": "Nicio carte nu corespunde criteriilor de selecție",
+	"url-not-found": "Adresa URL solicitată \"{{url}}\" nu a fost găsită pe acest server.",
+	"suggest-search": "Efectuați o căutare text complet pentru <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
+	"random-article-failure": "Hopa! Nu s-a putut alege un articol aleatoriu :(",
+	"invalid-raw-data-type": "{{DATATYPE}} nu este o solicitare validă pentru conținut brut.",
+	"invalid-request": "Adresa URL solicitată \"{{{url}}}\" nu este o solicitare validă.",
+	"no-value-for-arg": "Nu este furnizată nicio valoare pentru argumentul {{ARGUMENT}}",
+	"no-query": "Nu a fost furnizată nicio interogare.",
+	"raw-entry-not-found": "Nu se poate găsi {{DATATYPE}} intrarea {{ENTRY}}",
+	"400-page-title": "Cerere invalidă",
+	"400-page-heading": "Cerere invalidă",
+	"404-page-title": "Conținut nu a fost găsit",
+	"404-page-heading": "Nu a fost găsit",
+	"500-page-title": "Eroare internă de server",
+	"500-page-heading": "Eroare internă de server",
+	"500-page-text": "A apărut o eroare internă de server. Ne pare rau pentru asta :/",
+	"external-link-intro": "Ești pe cale să părăsești cititorul ZIM al Kiwix pentru a te conecta la...",
+	"fulltext-search-unavailable": "Căutarea text integral indisponibilă",
+	"no-search-results": "Motorul de căutare textintegral nu este disponibil pentru acest conținut.",
+	"search-results-page-title": "Căutare: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Rezultatele <b>{{START}}-{{END}}</b> din <b>{{COUNT}}</b> pentru <b>„{{{SEARCH_PATTERN}}}”</b>",
+	"empty-search-results-page-header": "Nu au fost găsite rezultate pentru <b>„{{{SEARCH_PATTERN}}}”</b>",
+	"search-result-book-info": "din {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} cuvinte",
+	"library-button-text": "Mergi la pagina de pornire",
+	"home-button-text": "Accesați pagina principală a „{{BOOK_TITLE}}”",
+	"random-page-button-text": "Accesați o pagină selectată aleatoriu",
+	"searchbox-tooltip": "Căutați „{{BOOK_TITLE}}”",
+	"confusion-of-tongues": "Două sau mai multe cărți în limbi diferite ar participa la căutare, ceea ce poate duce la rezultate confuze.",
+	"welcome-page-overzealous-filter": "Nici un rezultat. Doriți să <a href=\"{{URL}}\">resetați filtrul</a>?",
+	"powered-by-kiwix-html": "Susținut de&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
+	"search": "Caută",
+	"book-filtering-all-categories": "Toate categoriile",
+	"book-filtering-all-languages": "Toate limbile",
+	"count-of-matching-books": "{{COUNT}} cărți",
+	"download": "Descărcare",
+	"direct-download-link-text": "Direct",
+	"direct-download-alt-text": "Descărcați direct prin HTTP(S)",
+	"hash-download-link-text": "Sumă de control SHA-256",
+	"hash-download-alt-text": "Afișează suma de verificare a fișierului SHA-256",
+	"magnet-link-text": "Legătură magnetică",
+	"magnet-alt-text": "Descărcați prin linkul Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Descărcați prin BitTorrent",
+	"library-opds-feed-all-entries": "Bibliotecă OPDS Feed - Toate intrările",
+	"filter-by-tag": "Filtrați după eticheta \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Opriți filtrarea după eticheta \"{{{TAG}}}\"",
+	"library-opds-feed-parameterised": "Bibliotecă OPDS Feed - intrări care se potrivesc cu {{#LANG}}\nLimba: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategorie: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nEtichetă: {{TAG}} {{/TAG}}{{#Q}}\nInterogare: {{Q}} {{/Q}}",
+	"welcome-to-kiwix-server": "Bun venit la Kiwix Server",
+	"download-links-heading": "Descărcați linkuri pentru <b><i>{{BOOK_TITLE}}</i></b>",
+	"download-links-title": "Descărcă cartea",
+	"preview-book": "Previzualizare",
+	"unknown-error": "Eroare necunoscută",
+	"book-category.wikibooks": "Wikimanuale",
+	"book-category.wikinews": "Wikiștiri",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikicitat",
+	"book-category.wikisource": "Wikisursă",
+	"book-category.wikispecies": "Wikispecii",
+	"book-category.wikiversity": "Wikiversitate",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wikționar",
+	"book-category.other": "Altul"
+}
--- a/static/skin/i18n/ru.json
+++ b/static/skin/i18n/ru.json
@@ -3,6 +3,7 @@
 		"authors": [
 			"Fenixs-ru",
 			"Kareyac",
+			"Lutece398",
 			"Okras",
 			"Pacha Tchernof",
 			"Razno0",
@@ -50,20 +51,30 @@
 	"count-of-matching-books": "{{COUNT}} книг(и)",
 	"download": "Скачать",
 	"direct-download-link-text": "Прямой",
-	"direct-download-alt-text": "прямая загрузка",
-	"hash-download-link-text": "Хэш Sha256",
-	"hash-download-alt-text": "скачать хэш",
+	"direct-download-alt-text": "Загрузка напрямую через HTTP(S)",
+	"hash-download-link-text": "Контрольная сумма SHA-256",
+	"hash-download-alt-text": "Показать контрольную сумму SHA-256 у файла",
 	"magnet-link-text": "Магнитная ссылка",
-	"magnet-alt-text": "скачать магнит",
-	"torrent-download-link-text": "Торрент-файл",
-	"torrent-download-alt-text": "скачать торрент",
+	"magnet-alt-text": "Скачать по Magnet-ссылке",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Скачать через BitTorrent",
 	"library-opds-feed-all-entries": "Канал библиотеки OPDS – все записи",
-	"filter-by-tag": "Фильтровать по тегу \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Прекратить фильтрацию по тегу \"{{TAG}}\"",
+	"filter-by-tag": "Фильтровать по тегу \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Прекратить фильтрацию по тегу \"{{{TAG}}}\"",
 	"library-opds-feed-parameterised": "Канал OPDS библиотеки – записи, соответствующие {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}} {{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nЗапрос: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Добро пожаловать на сервер Kiwix",
 	"download-links-heading": "Ссылки для скачивания <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Скачать книгу",
 	"preview-book": "Предпросмотр",
-	"unknown-error": "Неизвестная ошибка"
+	"unknown-error": "Неизвестная ошибка",
+	"book-category.wikibooks": "Викиучебник",
+	"book-category.wikinews": "Викиновости",
+	"book-category.wikipedia": "Википедия",
+	"book-category.wikiquote": "Викицитатник",
+	"book-category.wikisource": "Викитека",
+	"book-category.wikispecies": "Викивиды",
+	"book-category.wikiversity": "Викиверситет",
+	"book-category.wikivoyage": "Викигид",
+	"book-category.wiktionary": "Викисловарь",
+	"book-category.other": "Другое"
 }
--- a/static/skin/i18n/sc.json
+++ b/static/skin/i18n/sc.json
@@ -38,16 +38,16 @@
 	"count-of-matching-books": "{{COUNT}} libru/os",
 	"download": "Iscàrriga",
 	"direct-download-link-text": "Diretu",
-	"direct-download-alt-text": "iscarrigamentu diretu",
-	"hash-download-link-text": "Hash SHA256",
-	"hash-download-alt-text": "hash de s'iscarrigamentu",
+	"direct-download-alt-text": "Iscàrriga in manera direta tràmite HTTP(S)",
+	"hash-download-link-text": "Summa de controllu SHA-256",
+	"hash-download-alt-text": "Mustra sa summa de controllu SHA-256",
 	"magnet-link-text": "Ligàmene Magnet",
-	"magnet-alt-text": "ligàmene \"magnet\" de iscarrigamentu",
-	"torrent-download-link-text": "Documentu Torrent",
-	"torrent-download-alt-text": "iscàrriga su torrent",
+	"magnet-alt-text": "Iscàrriga impreende su ligàmene Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Iscàrriga impreende BitTorrent",
 	"library-opds-feed-all-entries": "Flussu OPDS de sa biblioteca – Totu sos elementos",
-	"filter-by-tag": "Filtra pro eticheta \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Non filtres prus pro eticheta \"{{TAG}}\"",
+	"filter-by-tag": "Filtra pro eticheta \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Non filtres prus pro eticheta \"{{{TAG}}}\"",
 	"library-opds-feed-parameterised": "Flussu OPDS de sa biblioteca - elementos chi currispondet cun {{#LANG}}\nLimba: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategoria: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nEticheta: {{TAG}} {{/TAG}}{{#Q}}\nChirca: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Bene bènnidu a su serbidore de Kiwix",
 	"download-links-heading": "Ligàmenes de iscarrigamentu pro <b><i>{{BOOK_TITLE}}</i></b>",
--- a/static/skin/i18n/skr-arab.json
+++ b/static/skin/i18n/skr-arab.json
@@ -9,6 +9,8 @@
 	"400-page-heading": "غلط ارداس",
 	"404-page-title": "مواد کائنی لبھیا",
 	"404-page-heading": "کائنی لبھا",
+	"new-404-page-title": "ورقہ کائنی لبھیا",
+	"404-img-text": "کائنی لبھا!",
 	"500-page-title": "اندرلا سرور نقص",
 	"500-page-heading": "اندرلا سرور نقص",
 	"search": "ڳولو",
@@ -22,5 +24,16 @@
 	"torrent-download-link-text": "ٹورنٹ فائل",
 	"torrent-download-alt-text": "ٹورںٹ ݙاؤن لوڈ کرو",
 	"download-links-title": "کتاب ڈاؤن لوڈ کرو",
-	"preview-book": "پیشگی ݙکھالا"
+	"preview-book": "پیشگی ݙکھالا",
+	"book-category.vikidia": "وکی ڈیا",
+	"book-category.wikibooks": "وکی کتاباں",
+	"book-category.wikinews": "وکی خبراں",
+	"book-category.wikipedia": "وکیپیڈیا",
+	"book-category.wikiquote": "وکی ٻول",
+	"book-category.wikisource": "وکی ماخذ",
+	"book-category.wikispecies": "وکی سپیشیز",
+	"book-category.wikiversity": "وکی ورسٹی",
+	"book-category.wikivoyage": "وکی سیرسپاٹا",
+	"book-category.wiktionary": "وکشنری",
+	"book-category.other": "ٻیا"
 }
--- a/static/skin/i18n/sl.json
+++ b/static/skin/i18n/sl.json
@@ -10,7 +10,7 @@
 	"suggest-full-text-search": "vsebuje »{{{SEARCH_TERMS}}}« ...",
 	"no-such-book": "Ni take knjige: {{BOOK_NAME}}",
 	"too-many-books": "Preveč zahtevanih knjig ({{NB_BOOKS}}), omejitev je {{LIMIT}}",
-	"no-book-found": "Izbirnim merilom ne ustreza nobena knjiga",
+	"no-book-found": "Izbranim merilom ne ustreza nobena knjiga",
 	"url-not-found": "Zahtevanega URL-ja »{{url}}« v tem strežniku ni bilo mogoče najti.",
 	"suggest-search": "Preiščite celotno besedilo za <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "Ups! Ni bilo mogoče izbrati naključnega članka :(",
@@ -23,9 +23,25 @@
 	"400-page-heading": "Neveljaven zahtevek",
 	"404-page-title": "Vsebine ni mogoče najti",
 	"404-page-heading": "Ni najdeno",
+	"new-404-page-title": "Stran ni bila najdena",
+	"new-404-page-heading": "Ups. Stran ni bila najdena.",
+	"404-img-text": "Ni najdeno!",
+	"path-was-not-found": "Zahtevana pot ni bila najdena:",
+	"404-advice.p1": "Vsebina, ki jo iščete, je mogoče še vedno na voljo, vendar se morda nahaja na drugem mestu v datoteki ZIM.",
+	"404-advice.p2": "Prosimo:",
+	"404-advice.p3": "Poskusite uporabiti funkcijo iskanja, da najdete želeno vsebino",
+	"404-advice.p4": "Poiščite ključne besede ali naslove, povezane z informacijami, ki jih iščete",
+	"404-advice.p5": "Ta pristop bi vam moral pomagati najti želeno vsebino, tudi če izvirna povezava ne deluje pravilno.",
 	"500-page-title": "Notranja napaka strežnika",
-	"500-page-heading": "Notranja napaka strežnika",
-	"500-page-text": "Prišlo je do notranje napake strežnika. Žal nam je za to. :/",
+	"500-page-heading": "Ups. Stran ne deluje.",
+	"500-page-text": "Zahtevane poti ni mogoče pravilno dostaviti:",
+	"500-img-text": "Stran ne deluje",
+	"external-link-detected": "Zaznana zunanja povezava",
+	"caution-warning": "Pozor!",
+	"external-link-intro": "Zapustili boste bralnik ZIM v Kiwixu in se v internetu povezali z",
+	"external-link-advice.p1": "Povezava, do katere poskušate dostopati, ni del vašega paketa za delo brez povezave in zahteva internetno povezavo.",
+	"external-link-advice.p2": "Če se lahko povežete z internetom, lahko poskusite odpreti povezavo.",
+	"external-link-advice.p3": "Na vsebino ZIM brez povezave se lahko vrnete tudi z gumbom za nazaj v brskalniku.",
 	"fulltext-search-unavailable": "Iskanje po celotnem besedilu ni na voljo",
 	"no-search-results": "Iskalnik po celotnem besedilu za to vsebino ni na voljo.",
 	"search-results-page-title": "Iskanje: {{SEARCH_PATTERN}}",
@@ -33,10 +49,10 @@
 	"empty-search-results-page-header": "Ni zadetkov za »<b>{{{SEARCH_PATTERN}}}</b>«",
 	"search-result-book-info": "iz {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} besed",
-	"library-button-text": "Pojdite na pozdravno stran",
-	"home-button-text": "Pojdite na glavno stran »{{BOOK_TITLE}}«",
-	"random-page-button-text": "Pojdite na naključno izbrano stran",
-	"searchbox-tooltip": "Poiščite »{{BOOK_TITLE}}«",
+	"library-button-text": "Pojdi na pozdravno stran",
+	"home-button-text": "Pojdi na glavno stran »{{{BOOK_TITLE}}}«",
+	"random-page-button-text": "Pojdi na naključno izbrano stran",
+	"searchbox-tooltip": "Poiščite »{{{BOOK_TITLE}}}«",
 	"confusion-of-tongues": "V iskanju bi bili uporabljeni dve ali več knjig v različnih jezikih, kar lahko pripelje do nejasnih zadetkov.",
 	"welcome-page-overzealous-filter": "Ni zadetkov. Želite <a href=\"{{URL}}\">ponastaviti filter</a>?",
 	"powered-by-kiwix-html": "Omogoča <a href=\"https://kiwix.org\">Kiwix</a>",
@@ -46,20 +62,31 @@
 	"count-of-matching-books": "{{COUNT}} knjiga(i/e)",
 	"download": "Prenesi",
 	"direct-download-link-text": "Neposredno",
-	"direct-download-alt-text": "neposredni prenos",
-	"hash-download-link-text": "Zgoščena vrednost SHA256",
-	"hash-download-alt-text": "prenesi zgoščeno vrednost",
+	"direct-download-alt-text": "Neposredni prenos prek HTTP(S)",
+	"hash-download-link-text": "Kontrolna vsota SHA-256",
+	"hash-download-alt-text": "Prikaz kontrolne vsote SHA-256 datoteke",
 	"magnet-link-text": "Magnetna povezava",
-	"magnet-alt-text": "prenesi magnet",
-	"torrent-download-link-text": "Torrent datoteka",
-	"torrent-download-alt-text": "prenesi torrent",
+	"magnet-alt-text": "Prenos prek magnetne povezave",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Prenos prek BitTorrenta",
 	"library-opds-feed-all-entries": "Knjižnični vir OPDS – Vsi vnosi",
-	"filter-by-tag": "Filtriraj po oznaki »{{TAG}}«",
-	"stop-filtering-by-tag": "Ustavi filtriranje po oznaki »{{TAG}}«",
+	"filter-by-tag": "Filtriraj po oznaki »{{{TAG}}}«",
+	"stop-filtering-by-tag": "Ustavi filtriranje po oznaki »{{{TAG}}}«",
 	"library-opds-feed-parameterised": "Knjižnični vir OPDS – vnosi, ki se ujemajo z {{#LANG}}\nJezik: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategorija: {{CATEGORY}} {{/CATEGORY}} {{#TAG}}\nOznaka: {{TAG}} {{/TAG}}{{#Q}}\nPoizvedba: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Pozdravljeni na strežniku Kiwix",
 	"download-links-heading": "Povezave za prenos za <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Prenesi knjigo",
 	"preview-book": "Predogled",
-	"unknown-error": "Neznana napaka"
+	"unknown-error": "Neznana napaka",
+	"book-category.wikibooks": "Wikiknjige",
+	"book-category.wikinews": "Wikinovice",
+	"book-category.wikipedia": "Wikipedija",
+	"book-category.wikiquote": "Wikinavedek",
+	"book-category.wikisource": "Wikivir",
+	"book-category.wikispecies": "Wikivrste",
+	"book-category.wikiversity": "Wikiverza",
+	"book-category.wikivoyage": "Wikipotovanje",
+	"book-category.wiktionary": "Wikislovar",
+	"book-category.other": "Drugo",
+	"text-loading-content": "Nalaganje vsebine"
 }
--- a/static/skin/i18n/sq.json
+++ b/static/skin/i18n/sq.json
@@ -13,6 +13,7 @@
 	"suggest-search": "Bëni një kërkim të plotë teksti për <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
 	"random-article-failure": "Oh! S’u arrit të merrej një artikull kuturu :(",
 	"invalid-raw-data-type": "{{DATATYPE}} s’është varg i vlefshëm kërkimi për lëndë të papërpunuar.",
+	"invalid-request": "URL-ja e kërkuar “{{{url}}}” s’është kërkesë e vlefshme.",
 	"no-value-for-arg": "S’u dha vlerë për argumentin {{ARGUMENT}}",
 	"no-query": "S’u dha varg kërkimi.",
 	"raw-entry-not-found": "S’gjendet dot zëri {{DATATYPE}} {{ENTRY}}",
@@ -22,8 +23,14 @@
 	"404-page-heading": "S’u Gjet",
 	"500-page-title": "Gabim i Brendshëm Shërbyesi",
 	"500-page-heading": "Gabim i Brendshëm Shërbyesi",
+	"500-page-text": "Ndodhi një gabim i brendshëm shërbyesi. Na ndjeni për këtë :/",
 	"fulltext-search-unavailable": "Kërkim teksti të plotë jo i mundshëm",
 	"no-search-results": "S’është i passhëm motori i kërkimit të tekstit të plotë për këtë lëndë.",
+	"search-results-page-title": "Kërkim: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Përfundime <b>{{START}}-{{END}}</b> nga <b>{{COUNT}}</b> gjithsej për <b>\"{{{SEARCH_PATTERN}}}\"</b>",
+	"empty-search-results-page-header": "S’u gjetën përfundime për <b>“{{{SEARCH_PATTERN}}}”</b>",
+	"search-result-book-info": "nga {{BOOK_TITLE}}",
+	"word-count": "{{COUNT}} fjalë",
 	"library-button-text": "Kalo te faqja e mirëseardhjes",
 	"home-button-text": "Kalo te faqja krye e '{{BOOK_TITLE}}'",
 	"random-page-button-text": "Kalo te një faqe e përzgjedhur kuturu",
@@ -37,19 +44,30 @@
 	"count-of-matching-books": "{{COUNT}} libër(a)",
 	"download": "Shkarkoje",
 	"direct-download-link-text": "Drejtpërsëdrejti",
-	"direct-download-alt-text": "shkarkim i drejtpërdrejt",
-	"hash-download-link-text": "Hash sha256",
-	"hash-download-alt-text": "shkarko hashin",
+	"direct-download-alt-text": "Shkarkoje drejtpërsëdrejti përmes HTTP(S)",
+	"hash-download-link-text": "“Checksum” SHA-256",
+	"hash-download-alt-text": "Shfaq “checksum” SHA-256 kartele",
 	"magnet-link-text": "Lidhje Magnet",
-	"magnet-alt-text": "shkarko magnetin",
-	"torrent-download-link-text": "Kartelë Torrent",
-	"torrent-download-alt-text": "shkarko torrent-in",
+	"magnet-alt-text": "Shkarkoje përmes lidhjeje Magnet",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Shkarkoje përmes BitTorrent-it",
 	"library-opds-feed-all-entries": "Prurje OPDS Biblioteke - Krejt zërat",
-	"filter-by-tag": "Filtroji sipas etiketës “{{TAG}}”",
-	"stop-filtering-by-tag": "Resht së filtruari sipas etiketë “{{TAG}}”",
+	"filter-by-tag": "Filtroji sipas etikete “{{{TAG}}}”",
+	"stop-filtering-by-tag": "Resht së filtruari sipas etikete “{{{TAG}}}”",
 	"library-opds-feed-parameterised": "Prurje OPDS Biblioteke - zëra që kanë përputhje me {{#LANG}}\nGjuhë: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nEtiketë: {{TAG}} {{/TAG}}{{#Q}}\nVarg Kërkimi: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Mirë se vini në Shërbyesin Kiwix",
 	"download-links-heading": "Lidhje shkarkimi për <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Shkarkoje librin",
-	"preview-book": "Paraparje"
+	"preview-book": "Paraparje",
+	"unknown-error": "Gabim i panjohur",
+	"book-category.wikibooks": "Wikibooks",
+	"book-category.wikinews": "Wikinews",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversity",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wiktionary",
+	"book-category.other": "Tjetër"
 }
--- a/static/skin/i18n/sv.json
+++ b/static/skin/i18n/sv.json
@@ -1,7 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
+			"Apq",
 			"Jopparn",
+			"Larsa",
 			"Rofiatmustapha12",
 			"Sabelöga",
 			"WikiPhoenix"
@@ -24,9 +26,25 @@
 	"400-page-heading": "Ogiltig begäran",
 	"404-page-title": "Innehållet hittades inte",
 	"404-page-heading": "Hittades inte",
+	"new-404-page-title": "Sidan kunde inte hittas",
+	"new-404-page-heading": "Hoppsan. Sidan hittades inte.",
+	"404-img-text": "Hittades ej!",
+	"path-was-not-found": "Den begärda sökvägen hittades ej:",
+	"404-advice.p1": "Innehållet du letar efter kan fortfarande vara tillgängligt, men det kan finnas på en annan plats i ZIM-filen.",
+	"404-advice.p2": "Vänligen:",
+	"404-advice.p3": "Försök att använda sökfunktionen för att hitta det innehåll du vill ha",
+	"404-advice.p4": "Leta efter nyckelord eller titlar relaterade till den information du söker",
+	"404-advice.p5": "Den här metoden bör hjälpa dig att hitta önskat innehåll, även om den ursprungliga länken inte fungerar korrekt.",
 	"500-page-title": "Internt serverfel",
-	"500-page-heading": "Internt serverfel",
-	"500-page-text": "Ett internt serverfel uppstod. Vi ber om ursäkt för det :/",
+	"500-page-heading": "Hoppsan. Sidan fungerar inte.",
+	"500-page-text": "Den begärda sökvägen kan inte levereras korrekt:",
+	"500-img-text": "Sidan fungerar ej",
+	"external-link-detected": "Extern länk upptäckt",
+	"caution-warning": "Varning!",
+	"external-link-intro": "Du är på väg att lämna Kiwix ZIM-läsare för att gå online till",
+	"external-link-advice.p1": "Länken du försöker komma åt är inte en del av ditt offlinepaket och kräver en internetanslutning.",
+	"external-link-advice.p2": "Om du kan gå online kan du försöka öppna länken.",
+	"external-link-advice.p3": "Du kan annars återgå till ditt ZIM-innehåll offline genom att använda webbläsarens bakåtknapp.",
 	"fulltext-search-unavailable": "Fulltextsökning är inte tillgänglig",
 	"no-search-results": "Sökmaskinen för fulltext är inte tillgänglig för detta innehåll.",
 	"search-results-page-title": "Sök: {{SEARCH_PATTERN}}",
@@ -35,9 +53,9 @@
 	"search-result-book-info": "från {{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} ord",
 	"library-button-text": "Gå till hemsidan",
-	"home-button-text": "Gå till huvudsidan för \"{{BOOK_TITLE}}\"",
+	"home-button-text": "Gå till huvudsidan för '{{{BOOK_TITLE}}}'",
 	"random-page-button-text": "Gå till en slumpmässigt utvald sida",
-	"searchbox-tooltip": "Sök efter \"{{BOOK_TITLE}}\"",
+	"searchbox-tooltip": "Sök '{{{BOOK_TITLE}}}'",
 	"confusion-of-tongues": "Två eller fler böcker på olika språk skulle delta i sökningen, vilket kan ge förvirrande resultat.",
 	"welcome-page-overzealous-filter": "Inga resultat. Vill du <a href=\"{{URL}}\">återställa filtret</a>?",
 	"powered-by-kiwix-html": "Drivs av&nbsp;<a href=\"https://kiwix.org\">Kiwix</a>",
@@ -47,20 +65,31 @@
 	"count-of-matching-books": "{{COUNT}} böcker",
 	"download": "Ladda ned",
 	"direct-download-link-text": "Direkt",
-	"direct-download-alt-text": "direktnedladdning",
-	"hash-download-link-text": "Sha256-hash",
-	"hash-download-alt-text": "ladda ned hash",
+	"direct-download-alt-text": "Ladda ner direkt via HTTP(S)",
+	"hash-download-link-text": "SHA-256-kontrollsiffra",
+	"hash-download-alt-text": "Visa SHA-256-filens kontrollsiffra",
 	"magnet-link-text": "Magnetlänk",
-	"magnet-alt-text": "ladda ned magnet",
-	"torrent-download-link-text": "Torrent-fil",
-	"torrent-download-alt-text": "ladda ned torrent",
+	"magnet-alt-text": "Ladda ner via Magnet-länk",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "Ladda ner via BitTorrent",
 	"library-opds-feed-all-entries": "Library OPDS Feed - Alla poster",
-	"filter-by-tag": "Filtrera efter taggen \"{{TAG}}\"",
-	"stop-filtering-by-tag": "Sluta filtrera efter taggen \"{{TAG}}\"",
+	"filter-by-tag": "Filtrera efter taggen \"{{{TAG}}}\"",
+	"stop-filtering-by-tag": "Sluta filtrera efter taggen \"{{{TAG}}}\"",
 	"library-opds-feed-parameterised": "Library OPDS Feed - poster som matchar {{#LANG}}\nSpråk: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKategori: {{CATEGORY}} {{/CATEGORY}}{{#TAG}}\nTagg: {{TAG}} {{/TAG}}{{#Q}}\nFråga: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Välkommen till Kiwix Server",
 	"download-links-heading": "Nedladdningslänkar för <b><i>{{BOOK_TITLE}}</i></b>",
 	"download-links-title": "Ladda ned bok",
 	"preview-book": "Förhandsgranska",
-	"unknown-error": "Okänt fel"
+	"unknown-error": "Okänt fel",
+	"book-category.wikibooks": "Wikibooks",
+	"book-category.wikinews": "Wikinews",
+	"book-category.wikipedia": "Wikipedia",
+	"book-category.wikiquote": "Wikiquote",
+	"book-category.wikisource": "Wikisource",
+	"book-category.wikispecies": "Wikispecies",
+	"book-category.wikiversity": "Wikiversity",
+	"book-category.wikivoyage": "Wikivoyage",
+	"book-category.wiktionary": "Wiktionary",
+	"book-category.other": "Övriga",
+	"text-loading-content": "Laddar innehåll"
 }
--- a/static/skin/i18n/sw.json
+++ b/static/skin/i18n/sw.json
@@ -0,0 +1,67 @@
+{
+	"@metadata": {
+		"authors": [
+			"Joeamj",
+			"Muddyb",
+			"Peggy",
+			"Wangombe"
+		]
+	},
+	"name": "Kiswahili",
+	"suggest-full-text-search": "ina '{{{SEARCH_TERMS}}}}'...",
+	"no-such-book": "Hakuna kitabu kama hiki: {{BOOK_NAME}}",
+	"too-many-books": "Vitabu vingi mno vimeombwa ({{NB_BOOKS}}) ambapo kikomo ni {{LIMIT}}",
+	"no-book-found": "Hakuna kitabu kinacholingana na vigezo vya uteuzi",
+	"url-not-found": "URL iliyoombwa \"{{url}}\" haikupatikana kwenye seva hii.",
+	"suggest-search": "Tafuta maandishi kamili ya <a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>",
+	"random-article-failure": "Lo! Imeshindwa kuchagua makala nasibu :(",
+	"invalid-raw-data-type": "{{DATATYPE}} si ombi halali la maudhui ghafi.",
+	"invalid-request": "URL iliyoombwa \"{{{url}}}\" si ombi halali.",
+	"no-value-for-arg": "Hakuna thamani iliyotolewa kwa hoja {{ARGUMENT}}",
+	"no-query": "Hakuna swali lililotolewa.",
+	"raw-entry-not-found": "Haiwezi kupata ingizo la {{DATATYPE}} {{ENTRY}}",
+	"400-page-title": "Ombi batili",
+	"400-page-heading": "Ombi batili",
+	"404-page-title": "Maudhui hayajapatikana",
+	"404-page-heading": "Haijapatikana",
+	"500-page-title": "Hitilafu ya Ndani ya Seva",
+	"500-page-heading": "Hitilafu ya Ndani ya Seva",
+	"500-page-text": "Hitilafu ya ndani ya seva imetokea. Tunasikitika kwa hilo:/",
+	"fulltext-search-unavailable": "Utafutaji wa maandishi kamili haupatikani",
+	"no-search-results": "Injini ya utafutaji ya maandishi kamili haipatikani kwa maudhui haya.",
+	"search-results-page-title": "Tafuta: {{SEARCH_PATTERN}}",
+	"search-results-page-header": "Matokeo <b>{{START}}-{{END}}</b> ya <b>{{COUNT}}</b> ya <b>\"{{{SEARCH_PATTERN}}}}\"</b>",
+	"empty-search-results-page-header": "Hakuna matokeo yaliyopatikana ya <b>\"{{{SEARCH_PATTERN}}}}\"</b>",
+	"search-result-book-info": "kutoka kwa {{BOOK_TITLE}}",
+	"word-count": "Maneno {{COUNT}}",
+	"library-button-text": "Nenda katika wiki ya mwanzo",
+	"home-button-text": "Nenda kwenye ukurasa mkuu wa '{{BOOK_TITLE}}'",
+	"random-page-button-text": "Nenda kwa ukurasa uliochaguliwa kwa nasibu",
+	"searchbox-tooltip": "Tafuta '{{BOOK_TITLE}}'",
+	"confusion-of-tongues": "Vitabu viwili au zaidi katika lugha tofauti vitashiriki katika utafutaji, jambo ambalo linaweza kusababisha matokeo ya kutatanisha.",
+	"welcome-page-overzealous-filter": "Hakuna matokeo. Je, ungependa <a href=\"{{URL}}\">kuweka upya kichujio</a> ?",
+	"powered-by-kiwix-html": "Inaendeshwa na <a href=\"https://kiwix.org\">Kiwix</a>",
+	"search": "Tafuta",
+	"book-filtering-all-categories": "Jamii Zote",
+	"book-filtering-all-languages": "Lugha zote",
+	"count-of-matching-books": "Vitabu {{COUNT}}",
+	"download": "Pakua",
+	"direct-download-link-text": "Moja kwa moja",
+	"direct-download-alt-text": "kupakua moja kwa moja",
+	"hash-download-link-text": "Sha256 heshi",
+	"hash-download-alt-text": "pakua heshi",
+	"magnet-link-text": "Kiungo cha sumaku",
+	"magnet-alt-text": "sumaku ya kupakua",
+	"torrent-download-link-text": "Faili ya Torrent",
+	"torrent-download-alt-text": "pakua torrent",
+	"library-opds-feed-all-entries": "Mlisho wa OPDS wa Maktaba - Maingizo yote",
+	"filter-by-tag": "Chuja kwa lebo \"{{TAG}}\"",
+	"stop-filtering-by-tag": "Acha kuchuja kwa lebo \"{{TAG}}\"",
+	"library-opds-feed-parameterised": "Mlisho wa OPDS wa Maktaba - maingizo yanayolingana {{#LANG}}\nLugha: {{LANG}} {{/LANG}}{{#CATEGORY}}\nKitengo: {{CATEGORY}} {{/CATEGORY}} {{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nSwali: {{Q}} {{/Q}}",
+	"welcome-to-kiwix-server": "Karibu kwenye Seva ya Kiwix",
+	"download-links-heading": "Pakua viungo vya <b><i>{{BOOK_TITLE}}</i></b>",
+	"download-links-title": "Pakua vitabu",
+	"preview-book": "Hakiki",
+	"unknown-error": "Hitilafu isiyojulikana",
+	"text-loading-content": "Inapakia Maudhui"
+}
--- a/static/skin/i18n/te.json
+++ b/static/skin/i18n/te.json
@@ -1,7 +1,6 @@
 {
 	"@metadata": {
 		"authors": [
-			"Amire80",
 			"Chaduvari",
 			"Rishitha 1238",
 			"V Bhavya"
--- a/static/skin/i18n/test.json
+++ b/static/skin/i18n/test.json
@@ -13,6 +13,25 @@
 	, "400-page-heading": "[I18N TESTING] -400 karma for an invalid request"
 	, "404-page-title": "[I18N TESTING] Not Found - Try Again"
 	, "404-page-heading": "[I18N TESTING] Content not found, but at least the server is alive"
+	, "new-404-page-title" : "Page [I18N] not [TESTING] found"
+	, "new-404-page-heading" : "[I18N TESTING] Oops. Larry Page could not be reached. He may be on paternity leave."
+	, "404-img-text": "[I18N] Not found! [TESTING]"
+	, "path-was-not-found": "[I18N TESTING] The requested path was not found (in fact, nothing was found instead, either):"
+	, "404-advice.p1": "Sh*t happens. [I18N TESTING] Take it easy!"
+	, "404-advice.p2": "[I18N TESTING] Try one of the following:"
+	, "404-advice.p3": "[I18N TESTING] Check the spelling of the URL path"
+	, "404-advice.p4": "[I18N TESTING] Press the dice button"
+	, "404-advice.p5": "Good luck! [I18N TESTING]"
+	, "500-page-title" : "[I18N] Internal Server Error [TESTING]"
+	, "500-page-heading" : "Oops. [I18N] Page isn't [TESTING] working."
+	, "500-page-text": "The requested path [I18N TESTING] cannot be properly delivered:"
+	, "500-img-text": "Page [I18N] isn't [TESTING] working"
+	, "external-link-detected" : "External [I18] Link [TESTING] Detected"
+	, "caution-warning" : "[I18N] C5n! [TESTING]"
+	, "external-link-intro" : "[I18N TESTING] The following link may lead you to a place from which you won't ever be able to return"
+	, "external-link-advice.p1": "[I18N TESTING] The link you're trying to access points past the end of the ZIM file."
+	, "external-link-advice.p2": "[I18N TESTING] If you are an optimist, you can attempt to open the link."
+	, "external-link-advice.p3": "[I18N TESTING] But we strongly recommend you to be reasonable and press your browser's back button."
 	, "library-button-text": "[I18N TESTING] Navigate to the welcome page"
 	, "home-button-text": "[I18N TESTING] Jump to the main page of '{{BOOK_TITLE}}'"
 	, "random-page-button-text": "[I18N TESTING] I am tired of determinism"
@@ -47,4 +66,23 @@
 	, "empty-search-results-page-header": "[I18N TESTING] No results were found for <b>\"{{{SEARCH_PATTERN}}}\"</b>"
 	, "search-result-book-info": "from [I18N TESTING] {{BOOK_TITLE}}"
 	, "word-count": "{{COUNT}} [I18N TESTING] words"
+	, "book-category.gutenberg": "[I18N] Gutenberg [TESTING]"
+	, "book-category.iFixit": "[I18N] iFixit [TESTING]"
+	, "book-category.mooc": "[I18N] MOOC [TESTING]"
+	, "book-category.phet": "[I18N] Phet [TESTING]"
+	, "book-category.stack_exchange": "[I18N] Stack Exchange [TESTING]"
+	, "book-category.ted": "[I18N] Ted [TESTING]"
+	, "book-category.vikidia": "[I18N] Vikidia [TESTING]"
+	, "book-category.wikibooks": "[I18N] Wikibooks [TESTING]"
+	, "book-category.wikihow": "[I18N] wikiHow [TESTING]"
+	, "book-category.wikinews": "[I18N] Wikinews [TESTING]"
+	, "book-category.wikipedia": "[I18N] Wikipedia [TESTING]"
+	, "book-category.wikiquote": "[I18N] Wikiquote [TESTING]"
+	, "book-category.wikisource": "[I18N] Wikisource [TESTING]"
+	, "book-category.wikispecies": "[I18N] Wikispecies [TESTING]"
+	, "book-category.wikiversity": "[I18N] Wikiversity [TESTING]"
+	, "book-category.wikivoyage": "[I18N] Wikivoyage [TESTING]"
+	, "book-category.wiktionary": "[I18N] Wiktionary [TESTING]"
+	, "book-category.other": "[I18N] Other [TESTING]"
+	, "text-loading-content": "[I18N TESTING] Loading content"
 }
--- a/static/skin/i18n/tr.json
+++ b/static/skin/i18n/tr.json
@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Hedda",
-			"Rofiatmustapha12"
+			"Rofiatmustapha12",
+			"SaldırganSincap"
 		]
 	},
 	"name": "Türkçe",
@@ -23,8 +24,8 @@
 	"404-page-title": "içerik bulunamadı",
 	"404-page-heading": "Bulunamadı",
 	"500-page-title": "İç Sunucu Hatası",
-	"500-page-heading": "İç Sunucu Hatası",
-	"500-page-text": "Dahili bir sunucu hatası oluştu. Bunun için üzgünüz :/",
+	"500-page-heading": "Üzgünüz. Sayfa çalışmıyor.",
+	"500-page-text": "İstenen yol düzgün bir şekilde teslim edilemiyor:",
 	"fulltext-search-unavailable": "Tam metin araması kullanılamıyor",
 	"no-search-results": "Tam metin arama motoru bu içerik için kullanılamaz.",
 	"search-results-page-title": "Arama: {{SEARCH_PATTERN}}",
@@ -33,9 +34,9 @@
 	"search-result-book-info": "{{BOOK_TITLE}} adlı kitaptan",
 	"word-count": "{{COUNT}} kelime",
 	"library-button-text": "Karşılama sayfasına git",
-	"home-button-text": "'{{BOOK_TITLE}}' anasayfasına gidin",
+	"home-button-text": "'{{{BOOK_TITLE}}}' ana sayfasına git",
 	"random-page-button-text": "Rastgele seçilen bir sayfaya git",
-	"searchbox-tooltip": "'{{BOOK_TITLE}}' ara",
+	"searchbox-tooltip": "'{{{BOOK_TITLE}}}' ara",
 	"confusion-of-tongues": "Aramaya farklı dillerde iki veya daha fazla kitap katılacak ve bu da kafa karıştırıcı sonuçlara yol açabilecektir.",
 	"welcome-page-overzealous-filter": "Sonuç yok. <a href=\"{{URL}}\">Filtreyi sıfırlamak</a> ister misiniz?",
 	"powered-by-kiwix-html": "<a href=\"https://kiwix.org\">Kiwix</a> tarafından desteklenmektedir",
@@ -45,16 +46,16 @@
 	"count-of-matching-books": "{{COUNT}} kitap",
 	"download": "İndir",
 	"direct-download-link-text": "Doğrudan",
-	"direct-download-alt-text": "direkt indirme",
-	"hash-download-link-text": "Sha256 haşesi",
-	"hash-download-alt-text": "csv indir",
+	"direct-download-alt-text": "Doğrudan HTTP(S) üzerinden indir",
+	"hash-download-link-text": "SHA-256 sağlama toplamı",
+	"hash-download-alt-text": "SHA-256 dosya toplam kontrolünü görüntüle",
 	"magnet-link-text": "Mıknatıs bağlantısı",
-	"magnet-alt-text": "mıknatısı indir",
-	"torrent-download-link-text": "Hedef dosya",
-	"torrent-download-alt-text": "torrenti indir",
+	"magnet-alt-text": "Mıknatıs bağlantısıyla indir",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "BitTorrent üzerinden indir",
 	"library-opds-feed-all-entries": "Kütüphane OPDS Akışı - Tüm girişler",
-	"filter-by-tag": "\"{{TAG}}\" etiketine göre filtrele",
-	"stop-filtering-by-tag": "\"{{TAG}}\" etiketine göre filtrelemeyi durdur",
+	"filter-by-tag": "\"{{{TAG}}}\" etiketine göre filtrele",
+	"stop-filtering-by-tag": "\"{{{TAG}}}\" etiketine göre filtrelemeyi durdur",
 	"library-opds-feed-parameterised": "Kütüphane OPDS Özet Akışı - {{#LANG}}\nLanguage: {{LANG}} {{/LANG}}{{#CATEGORY}}\nCategory: {{CATEGORY}} {{/CATEGORY}} ile eşleşen girişler {{#TAG}}\nTag: {{TAG}} {{/TAG}}{{#Q}}\nQuery: {{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "Kiwix Sunucusuna Hoş Geldiniz",
 	"download-links-heading": "<b><i>{{BOOK_TITLE}}</i></b> için indirme bağlantıları",
--- a/static/skin/i18n/zh-hans.json
+++ b/static/skin/i18n/zh-hans.json
@@ -1,21 +1,26 @@
 {
 	"@metadata": {
 		"authors": [
+			"Cyanjiang",
 			"GuoPC",
 			"IceButBin",
+			"Kichin",
+			"Peterxy12",
+			"Prmsh",
 			"StarrySky",
 			"Sunai",
-			"XtexChooser"
+			"XtexChooser",
+			"沈澄心"
 		]
 	},
-	"name": "英语",
+	"name": "简体中文",
 	"suggest-full-text-search": "正在查找「{{{SEARCH_TERMS}}}」…",
 	"no-such-book": "没有名为“{{BOOK_NAME}}”的图书",
 	"too-many-books": "请求的图书过多 ({{NB_BOOKS}})，上限为 {{LIMIT}}",
 	"no-book-found": "没有符合搜索要求的图书",
 	"url-not-found": "在此服务器上找不到请求的 URL：{{url}}",
 	"suggest-search": "对<a href=\"{{{SEARCH_URL}}}\">{{PATTERN}}</a>进行全文搜索",
-	"random-article-failure": "抱歉！随机条目失败了 (⁠〒⁠﹏⁠〒⁠)",
+	"random-article-failure": "抱歉！ 随机条目失败了 (⁠〒⁠﹏⁠〒⁠)",
 	"invalid-raw-data-type": "{{DATATYPE}} 对原请求无效。",
 	"invalid-request": "请求的URL无效：{{{url}}}",
 	"no-value-for-arg": "参数{{ARGUMENT}}无值",
@@ -25,9 +30,25 @@
 	"400-page-heading": "无效请求",
 	"404-page-title": "未找到内容",
 	"404-page-heading": "未找到",
+	"new-404-page-title": "找不到页面",
+	"new-404-page-heading": "哎呀。页面未找到。",
+	"404-img-text": "未找到！",
+	"path-was-not-found": "未找到请求的路径：",
+	"404-advice.p1": "您正在寻找的内容可能仍然可用，但它可能位于 ZIM 文件中的不同位置。",
+	"404-advice.p2": "请：",
+	"404-advice.p3": "尝试使用搜索功能来查找您想要的内容",
+	"404-advice.p4": "查找与你正在寻找的信息相关的关键字或标题",
+	"404-advice.p5": "即使原始链接无法正常工作，这种方法也应该可以帮助您找到所需的内容。",
 	"500-page-title": "内部服务器错误",
-	"500-page-heading": "内部服务器错误",
-	"500-page-text": "内部服务器出现错误。真的十分抱歉 (⁠;⁠ŏ⁠﹏⁠ŏ⁠)",
+	"500-page-heading": "哎呀。页面无法正常工作。",
+	"500-page-text": "请求的路径无法正确传递：",
+	"500-img-text": "页面无法正常工作",
+	"external-link-detected": "检测到外部链接",
+	"caution-warning": "警告！",
+	"external-link-intro": "你即将离开Kiwix的ZIM阅读器并打开网页",
+	"external-link-advice.p1": "你试图访问的链接不在你的离线包中，需要联网才能访问。",
+	"external-link-advice.p2": "如果您可以上网，您可以尝试打开该链接。",
+	"external-link-advice.p3": "您也可以使用浏览器的后退按钮返回 ZIM 的离线内容。",
 	"fulltext-search-unavailable": "全文搜索不可用",
 	"no-search-results": "全文搜索引擎不适用于该内容。",
 	"search-results-page-title": "搜索：{{SEARCH_PATTERN}}",
@@ -35,10 +56,10 @@
 	"empty-search-results-page-header": "未找到<b>“{{{SEARCH_PATTERN}}}”</b>的结果",
 	"search-result-book-info": "来自{{BOOK_TITLE}}",
 	"word-count": "{{COUNT}} 个字",
-	"library-button-text": "前往欢迎页面",
-	"home-button-text": "转到“{{BOOK_TITLE}}”的主页",
+	"library-button-text": "转到欢迎页面",
+	"home-button-text": "转到“{{{BOOK_TITLE}}}”的主页",
 	"random-page-button-text": "前往随机选择的页面",
-	"searchbox-tooltip": "搜索“{{BOOK_TITLE}}”",
+	"searchbox-tooltip": "搜索“{{{BOOK_TITLE}}}”",
 	"confusion-of-tongues": "两本或多本不同语言的图书将同时被搜索，这可能会导致搜索结果混乱。",
 	"welcome-page-overzealous-filter": "没有结果。您想<a href=\"{{URL}}\">重置过滤器</a>吗？",
 	"powered-by-kiwix-html": "由<a href=\"https://kiwix.org\">Kiwix</a>提供技术支持",
@@ -48,17 +69,31 @@
 	"count-of-matching-books": "{{COUNT}} 本书",
 	"download": "下载",
 	"direct-download-link-text": "直接",
-	"direct-download-alt-text": "直接下載",
-	"hash-download-link-text": "Sha256 哈希值",
-	"hash-download-alt-text": "下载哈希值",
+	"direct-download-alt-text": "通过 HTTP(S) 直接下載",
+	"hash-download-link-text": "SHA-256 校验和",
+	"hash-download-alt-text": "显示 SHA-256 文件校验和",
 	"magnet-link-text": "磁力链接",
-	"magnet-alt-text": "下载磁力链接",
-	"torrent-download-link-text": "种子文件",
-	"torrent-download-alt-text": "下载种子文件",
+	"magnet-alt-text": "通过磁力链接下载",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "通过 BitTorrent 下载",
 	"library-opds-feed-all-entries": "图书馆 OPDS Feed - 所有条目",
-	"filter-by-tag": "按标签“{{TAG}}”过滤",
-	"stop-filtering-by-tag": "停止按标签“{{TAG}}”过滤",
+	"filter-by-tag": "按标签“{{{TAG}}}”过滤",
+	"stop-filtering-by-tag": "停止按标签“{{{TAG}}}”过滤",
 	"library-opds-feed-parameterised": "图书馆 OPDS Feed - 匹配的项目 {{#LANG}}\n语言：{{LANG}} {{/LANG}}{{#CATEGORY}}\n分类：{{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n标签：{{TAG}} {{/TAG}}{{#Q}}\n查询：{{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "欢迎来到 Kiwix 服务器",
-	"preview-book": "预览"
+	"download-links-heading": "下载<b><i>{{BOOK_TITLE}}</i></b>的链接",
+	"download-links-title": "下载书籍",
+	"preview-book": "预览",
+	"unknown-error": "未知错误",
+	"book-category.wikibooks": "维基教科书",
+	"book-category.wikinews": "维基新闻",
+	"book-category.wikipedia": "维基百科",
+	"book-category.wikiquote": "维基语录",
+	"book-category.wikisource": "维基文库",
+	"book-category.wikispecies": "维基物种",
+	"book-category.wikiversity": "维基学院",
+	"book-category.wikivoyage": "维基导游",
+	"book-category.wiktionary": "维基词典",
+	"book-category.other": "其他",
+	"text-loading-content": "内容加载中"
 }
--- a/static/skin/i18n/zh-hant.json
+++ b/static/skin/i18n/zh-hant.json
@@ -23,9 +23,25 @@
 	"400-page-heading": "無效請求",
 	"404-page-title": "查無內容",
 	"404-page-heading": "查無頁面",
+	"new-404-page-title": "找不到頁面",
+	"new-404-page-heading": "哎呀，找不到頁面。",
+	"404-img-text": "找不到！",
+	"path-was-not-found": "找不到請求路徑。",
+	"404-advice.p1": "您正在尋找的內容可能仍然可用，只是可能位於 ZIM 檔案中的不同位置。",
+	"404-advice.p2": "請：",
+	"404-advice.p3": "嘗試使用搜尋功能來尋找您想要的內容",
+	"404-advice.p4": "查看與您正在尋找資訊相關的關鍵字或標題",
+	"404-advice.p5": "即使原始連結無法正常運作，這種方法應該可以幫助您發現到所需的內容。",
 	"500-page-title": "內部伺服器錯誤",
-	"500-page-heading": "內部伺服器錯誤",
-	"500-page-text": "內部伺服器發生錯誤。對此我們深感抱歉:/",
+	"500-page-heading": "哎呀，頁面無法正常運作。",
+	"500-page-text": "請求的路徑無法正確傳遞：",
+	"500-img-text": "頁面無法正常運作",
+	"external-link-detected": "偵測到外部連結",
+	"caution-warning": "注意！",
+	"external-link-intro": "您即將離開 Kiwix 的 ZIM 閱讀器，並上網到",
+	"external-link-advice.p1": "您嘗試存取的連結不在離線套件裡，需要網路連線。",
+	"external-link-advice.p2": "如果您可以連上網路，您可以嘗試開啟該連結。",
+	"external-link-advice.p3": "您也可以使用瀏覽器的返回按鈕跳回到 ZIM 離線內容。",
 	"fulltext-search-unavailable": "全文搜尋無效",
 	"no-search-results": "全文搜尋引擎不適用此內容。",
 	"search-results-page-title": "搜尋：{{SEARCH_PATTERN}}",
@@ -34,9 +50,9 @@
 	"search-result-book-info": "來自{{BOOK_TITLE}}",
 	"word-count": "{{COUNT}}個字",
 	"library-button-text": "前往歡迎首頁",
-	"home-button-text": "前往「{{BOOK_TITLE}}」的首頁",
+	"home-button-text": "前往「{{{BOOK_TITLE}}}」的首頁",
 	"random-page-button-text": "前往隨機選取頁面",
-	"searchbox-tooltip": "在{{BOOK_TITLE}}搜尋",
+	"searchbox-tooltip": "在「{{{BOOK_TITLE}}}」搜尋",
 	"confusion-of-tongues": "搜索裡有加入兩本或更多不同語言的書籍，這可能會導致混淆結果。",
 	"welcome-page-overzealous-filter": "沒有結果。您想要<a href=\"{{URL}}\">重新設定篩選</a>嗎？",
 	"powered-by-kiwix-html": "由 <a href=\"https://kiwix.org\">Kiwix</a> 提供技術支援",
@@ -46,20 +62,39 @@
 	"count-of-matching-books": "{{COUNT}} 本書籍",
 	"download": "下載",
 	"direct-download-link-text": "直接",
-	"direct-download-alt-text": "直接下載",
-	"hash-download-link-text": "Sha256 雜湊",
-	"hash-download-alt-text": "下載雜湊",
+	"direct-download-alt-text": "直接透過 HTTP（S）下載",
+	"hash-download-link-text": "SHA-256 核對和",
+	"hash-download-alt-text": "顯示 SHA-256 檔案核對和",
 	"magnet-link-text": "Magnet 連結",
-	"magnet-alt-text": "下載 magnet",
-	"torrent-download-link-text": "Torrent 檔案",
-	"torrent-download-alt-text": "下載 torrent",
-	"library-opds-feed-all-entries": "圖書館 OPDS 摘要 - 所有項目",
-	"filter-by-tag": "依標籤「{{TAG}}」篩選",
-	"stop-filtering-by-tag": "停止依標籤「{{TAG}}」篩選",
-	"library-opds-feed-parameterised": "圖書館 OPDS 摘要 - 項目符合 {{#LANG}}\n語言：{{LANG}} {{/LANG}}{{#CATEGORY}}\n分類：{{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n標籤：{{TAG}} {{/TAG}}{{#Q}}\n查詢：{{Q}} {{/Q}}",
+	"magnet-alt-text": "透過磁力連結下載",
+	"torrent-download-link-text": "BitTorrent",
+	"torrent-download-alt-text": "透過 BitTorrent 下載",
+	"library-opds-feed-all-entries": "文庫 OPDS 摘要 - 所有項目",
+	"filter-by-tag": "依標籤「{{{TAG}}}」篩選",
+	"stop-filtering-by-tag": "停止依標籤「{{{TAG}}}」篩選",
+	"library-opds-feed-parameterised": "文庫 OPDS 摘要 - 項目符合 {{#LANG}}\n語言：{{LANG}} {{/LANG}}{{#CATEGORY}}\n分類：{{CATEGORY}} {{/CATEGORY}}{{#TAG}}\n標籤：{{TAG}} {{/TAG}}{{#Q}}\n查詢：{{Q}} {{/Q}}",
 	"welcome-to-kiwix-server": "歡迎來到 Kiwix 伺服器",
 	"download-links-heading": "下載<b><i>{{BOOK_TITLE}}</i></b>的連結",
 	"download-links-title": "下載書籍",
 	"preview-book": "預覽",
-	"unknown-error": "不明錯誤"
+	"unknown-error": "不明錯誤",
+	"book-category.gutenberg": "古騰堡計劃",
+	"book-category.iFixit": "iFixit",
+	"book-category.mooc": "MOOC",
+	"book-category.phet": "PhET",
+	"book-category.stack_exchange": "Stack Exchange",
+	"book-category.ted": "Ted",
+	"book-category.vikidia": "Vikidia",
+	"book-category.wikibooks": "維基教科書",
+	"book-category.wikihow": "wikiHow",
+	"book-category.wikinews": "維基新聞",
+	"book-category.wikipedia": "維基百科",
+	"book-category.wikiquote": "維基語錄",
+	"book-category.wikisource": "維基文庫",
+	"book-category.wikispecies": "維基物種",
+	"book-category.wikiversity": "維基學院",
+	"book-category.wikivoyage": "維基導遊",
+	"book-category.wiktionary": "維基詞典",
+	"book-category.other": "其他",
+	"text-loading-content": "正在載入內容"
 }
--- a/static/skin/index.css
+++ b/static/skin/index.css
@@ -121,7 +121,7 @@

 .tagFilterLabel {
    width: max-content;
-    padding: 10px;
+    padding: 7px;
    font-family: roboto;
    font-size: 12px;
    margin: 0 0 0 17px;
@@ -152,23 +152,24 @@

 .book__link {
    text-decoration: none;
-    grid-column: 1 / 3;
-    grid-row: 1 / 3;
 }

 .book__wrapper {
+    --tile-width: 250px;
+    --tile-border-width:  1px;
+    --tile-border-radius: 3px;
    color: #444343;
-    height: 248px;
-    width: 250px;
+    height: 258px;
+    width: var(--tile-width);
    margin: 15px;
    background-color: #f7f7f7;
-    border: 1px solid #ececec;
-    border-radius: 3px;
-    display: grid;
-    grid-template-columns: 65px 1fr;
-    grid-template-rows: 70px 120px 1fr 1fr;
-    grid-gap: 5px;
+    border: var(--tile-border-width) solid #ececec;
+    border-radius: var(--tile-border-radius);
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
    transition: transform 0.25s;
+    gap: 4px;
 }

 .book__wrapper:hover {
@@ -177,8 +178,12 @@

 .book__link__wrapper {
    display: grid;
+    grid-template-areas:
+    "bookIcon bookHeader"
+    "bookDesc bookDesc"
+    ;
    grid-template-columns: 65px 1fr;
-    grid-template-rows: 70px 120px 1fr 1fr;
+    grid-template-rows: 70px 120px;
 }

 .book__icon {
@@ -189,7 +194,10 @@
    align-items: center;
    align-content: center;
    justify-content: center;
+    width:  48px;
+    height: 48px;
    margin: 10px 0 0 10px;
+    grid-area: bookIcon;
 }

 .book__header {
@@ -201,6 +209,7 @@
    height: 100%;
    align-items: center;
    align-content: center;
+    grid-area: bookHeader;
 }

 .book__title {
@@ -211,28 +220,36 @@
 }

 .book__download {
-    font-size: 1.1rem;
-    margin: 3px 0;
+    cursor: pointer;
+    font-size: 1.2rem;
+    background: #00b4e4;
+    padding: 8px;
+    border-radius: 0 0 var(--tile-border-radius) var(--tile-border-radius);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+    width: var(--tile-width);
+    left: calc(0px - var(--tile-border-width));
+    text-decoration: none;
+}
+
+.book__download > img {
+    height: 16px;
+    width: 16px;
 }

 .book__download > span {
-    cursor: pointer;
-    text-decoration: none;
    position: relative;
-    padding: 0 3px 1px;
    font-family: roboto;
-    background: #00b4e4;
    color: white;
-    box-shadow: 0 0 0 0;
-    border-radius: 2px;
 }

-.book__download > span:hover {
-    box-shadow: 0 5px 5px rgba(0, 0, 0, 0.1)
+.book__download:hover {
+    background: royalblue;
 }

 .book__description {
-    grid-column: 1 / 3;
    margin: 10px 10px 5px;
    overflow: hidden;
    display: -webkit-box;
@@ -243,6 +260,13 @@
    font-size: 1.2rem;
    color: #4d4d4d;
    line-height: 1.25;
+    grid-area: bookDesc;
+}
+
+.book__meta {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 10px 4px;
 }

 .book__languageTag {
@@ -255,7 +279,6 @@
    color: black;
    height: 25px;
    width: 25px;
-    margin: 10px auto 0 10px;
    border-radius: 5px;
    font-size: 0.85rem;
 }
@@ -266,8 +289,6 @@
    font-size: 1.1rem;
    justify-content: flex-end;
    font-family: roboto;
-    margin-right: 10px;
-    margin-top: 10px;
    overflow: hidden;
 }

--- a/static/skin/index.js
+++ b/static/skin/index.js
@@ -78,15 +78,21 @@
        return result;
    }

+    function humanFriendlyNumStr(num, precision) {
+        const n = Math.abs(num).toFixed().length;
+        return num.toFixed(Math.max(0, precision - n));
+    }
+
    const humanFriendlySize = (fileSize) => {
        if (fileSize === 0) {
            return '';
        }
-        const units = ['bytes', 'kB', 'MB', 'GB', 'TB'];
-        let quotient = Math.floor(Math.log10(fileSize) / 3);
-        quotient = quotient < units.length ? quotient : units.length - 1;
-        fileSize /= (1000 ** quotient);
-        return `${+fileSize.toFixed(2)} ${units[quotient]}`;
+        const units = ['bytes', 'KiB', 'MiB', 'GiB', 'TiB'];
+        let quotient = Math.floor(Math.log2(fileSize) / 10);
+        quotient = Math.min(quotient, units.length - 1);
+        fileSize /= (1024 ** quotient);
+        const fileSizeStr = humanFriendlyNumStr(fileSize, 3);
+        return `${fileSizeStr} ${units[quotient]}`;
    };

    const humanFriendlyTitle = (title) => {
@@ -99,6 +105,14 @@
        return '';
    }

+    // Borrowed from https://stackoverflow.com/a/1912522
+    function htmlDecode(input){
+      var e = document.createElement('textarea');
+      e.innerHTML = input;
+      // handle case of empty input
+      return e.childNodes.length === 0 ? "" : e.childNodes[0].nodeValue;
+    }
+
    function htmlEncode(str) {
        return str.replace(/[\u00A0-\u9999<>\&]/gim, (i) => `&#${i.charCodeAt(0)};`);
    }
@@ -115,13 +129,44 @@

    function generateTagLink(tagValue) {
        tagValue = tagValue.toLowerCase();
-        const humanFriendlyTagValue = humanFriendlyTitle(tagValue);
-        const tagMessage = $t("filter-by-tag", {TAG: humanFriendlyTagValue});
-        return `<span class='tag__link' aria-label='${tagMessage}' title='${tagMessage}' data-tag=${tagValue}>${humanFriendlyTagValue}</span>`
+        const tagMessage = $t("filter-by-tag", {TAG: tagValue});
+        const spanElement = document.createElement("span");
+        spanElement.className = 'tag__link';
+        spanElement.setAttribute('aria-label', tagMessage);
+        spanElement.setAttribute('title', tagMessage);
+        spanElement.setAttribute('data-tag', tagValue);
+        spanElement.innerHTML = htmlEncode(tagValue);
+        return spanElement.outerHTML;
+    }
+
+    function downloadButtonText(zimSize) {
+      return $t("download") + (zimSize ? ` - ${zimSize}`: '');
+    }
+
+    function downloadButtonHtml(url, zimSize) {
+        return url
+             ? `<div class="book__download" data-link="${url}" data-size="${zimSize}">
+                  <img src="${root}/skin/download-white.svg?KIWIXCACHEID">
+                  <span ">${downloadButtonText(zimSize)}</span>
+                </div>`
+             : '';
+    }
+
+    function addBookPreviewLink(html, bookXml) {
+        const bookContentLink = bookXml.querySelector('link[type="text/html"]');
+        if ( !bookContentLink )
+          return html;
+
+        const urlComponents = bookContentLink.getAttribute('href').split('/');
+        // bookContentLink URL = ROOT_URL/content/BOOK_NAME
+        const bookName = urlComponents.pop();
+        urlComponents.pop(); // drop 'content' component
+        const viewerLink = urlComponents.join('/') + `/viewer#${bookName}`;
+
+        return `<a class="book__link" href="${viewerLink}" data-hover="Preview">${html}</a>`;
    }

    function generateBookHtml(book, sort = false) {
-        const link = book.querySelector('link[type="text/html"]').getAttribute('href');
        let iconUrl;
        book.querySelectorAll('link[rel="http://opds-spec.org/image/thumbnail"]').forEach(link => {
            if (link.getAttribute('type').split(';')[1] == 'width=48' && !iconUrl) {
@@ -138,7 +183,7 @@
            const mulLangList = langCodesList.filter(x => languages.hasOwnProperty(x)).map(x => languages[x]);
            language = mulLangList.join(', ');
        }
-        const tags = getInnerHtml(book, 'tags');
+        const tags = htmlDecode(getInnerHtml(book, 'tags'));
        const tagList = tags.split(';').filter(tag => {return !(tag.startsWith('_'))});
        const tagFilterLinks = tagList.map((tagValue) => generateTagLink(tagValue));
        const tagHtml = tagFilterLinks.join(' | ');
@@ -151,9 +196,6 @@
        } catch {
            downloadLink = '';
        }
-        const bookName = link.split('/').pop();
-        const viewerLink = `${root}/viewer#${bookName}`;
-
        const humanFriendlyZimSize = humanFriendlySize(zimSize);

        const divTag = document.createElement('div');
@@ -164,20 +206,25 @@
        }
        const faviconAttr = iconUrl != undefined ? `style="background-image: url('${iconUrl}')"` : '';
        const languageAttr = langCode != '' ? `title="${language}" aria-label="${language}"` : 'style="background-color: transparent"';
-        divTag.innerHTML = `
-            <div class="book__wrapper">
-            <a class="book__link" href="${viewerLink}" data-hover="Preview">
+
+        let bookLinkWrapper = `
            <div class="book__link__wrapper">
            <div class="book__icon" ${faviconAttr}></div>
            <div class="book__header">
                <div id="book__title">${title}</div>
-                ${downloadLink ? `<div class="book__download"><span data-link="${downloadLink}">${$t("download")} ${humanFriendlyZimSize ? ` - ${humanFriendlyZimSize}</span></div>`: ''}` : ''}
            </div>
            <div class="book__description" title="${description}">${description}</div>
            </div>
-            </a>
+        `;
+
+        divTag.innerHTML = `
+            <div class="book__wrapper">
+            ${addBookPreviewLink(bookLinkWrapper, book)}
+            <div class="book__meta">
            <div class="book__languageTag" ${languageAttr}>${getLanguageCodeToDisplay(langCode)}</div>
            <div class="book__tags"><div class="book__tags--wrapper">${tagHtml}</div></div>
+            </div>
+            ${downloadButtonHtml(downloadLink, humanFriendlyZimSize)}
            </div></div>`;
        return divTag;
    }
@@ -203,7 +250,8 @@
            let finalValue = (keysToURIEncode.indexOf(key) >= 0) ? encodeURIComponent(value) : value;
            output += `&${key}=${finalValue}`;
        }
-        return output;
+        // exclude first char so the first params are not prefixed with &
+        return output.substring(1);
    }

    /* hack for library.kiwix.org magnet links (created by MirrorBrain)
@@ -263,6 +311,7 @@
    }

    function insertModal(button) {
+        const downloadSize = button.getAttribute('data-size');
        const downloadLink = button.getAttribute('data-link');
        button.addEventListener('click', async (event) => {
            event.preventDefault();
@@ -272,7 +321,7 @@
                    <div class="modal-heading">
                        <div class="modal-title">
                            <div>
-                                Download
+                                ${downloadButtonText(downloadSize)}
                            </div>
                        </div>
                        <div onclick="closeModal()" class="modal-close-button">
@@ -432,7 +481,7 @@
        booksToDelete.forEach(book => {iso.remove(book);});
        books.forEach((book) => {
            iso.insert(generateBookHtml(book, sort))
-            const downloadButton = document.querySelector(`[data-id="${getInnerHtml(book, 'id')}"] .book__download span`);
+            const downloadButton = document.querySelector(`[data-id="${getInnerHtml(book, 'id')}"] .book__download`);
            if (downloadButton) {
                insertModal(downloadButton);
            }
@@ -486,9 +535,8 @@
    function addTagElement(tagValue, resetFilter) {
        const tagElement = document.getElementsByClassName('tagFilterLabel')[0];
        tagElement.style.display = 'inline-block';
-        const humanFriendlyTagValue = humanFriendlyTitle(tagValue);
-        tagElement.innerHTML = `${humanFriendlyTagValue}`;
-        const tagMessage = $t("stop-filtering-by-tag", {TAG: humanFriendlyTagValue});
+        tagElement.innerHTML = htmlEncode(tagValue);
+        const tagMessage = $t("stop-filtering-by-tag", {TAG: tagValue});
        tagElement.setAttribute('aria-label', tagMessage);
        tagElement.setAttribute('title', tagMessage);
        if (resetFilter)
--- a/static/skin/kiwix.css
+++ b/static/skin/kiwix.css
@@ -13,6 +13,36 @@ html {
 body {
    position: relative;
    box-sizing: border-box;
+    background: #ffffff;
+}
+
+.loader {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  font-size: 24px;
+  background: rgba(255, 255, 255, 0.8);
+  padding: 10px 20px;
+  border-radius: 5px;
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  white-space: nowrap; /* Prevents text from wrapping */
+  min-width: fit-content; /* Ensures the container doesn’t shrink */
+}
+
+.spinner {
+  width: 20px;
+  height: 20px;
+  border: 3px solid #ccc;
+  border-top: 3px solid #007bff;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+.hidden {
+  visibility: hidden;
 }

 ::selection {
@@ -72,6 +102,10 @@ body {
    padding: 20px;
 }

+#content_iframe {
+    background: #ffffff;
+}
+
 #uiLanguageSelector {
  display: none;
 }
@@ -96,6 +130,11 @@ body {
  height: 30px;
 }

+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}
+
@font-face {
  font-family: "poppins";
  src: url("../skin/fonts/Poppins.ttf?KIWIXCACHEID") format("truetype");
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg viewBox="0 0 1742.79 1984.21" xmlns="http://www.w3.org/2000/svg"><ellipse cx="667.97" cy="1872.93" fill="#c7c8ca" rx="649.71" ry="111.28"/><path d="m933.76 1775.81c0-29.5-23.92-53.42-53.42-53.42h-163.28c-24.37 0-45.97-15.91-52.98-39.26l-105.96-347.65 18.1-9.63c251.03-105.38 519.58 82.75 706.54-97.93l1.17-1.17c23.21-21.02 46.27-42.47 114.72.29 73.56 46.12 236 166.53 309.71 372.32 0 0 44.66-15.91 32.25-70.49-12.41-54.73-102.89-212.36-287.96-352.18-33.86-25.69-64.36-47-89.76-64.07 36.93-158.21-155.14-349.11-342.69-259.21-134.57-126.54-284.6-178.2-422.67-176.16-365.6 5.11-647.58 386.04-344.3 749.45l.58.58c4.67 5.55 9.49 11.09 14.3 16.64 19.7 23.64 32.69 44.51 43.93 81.29l90.34 296.57h-31.96c-29.48 0-53.42 23.94-53.42 53.42h121.43l204.04 96.47c12.55-26.71 1.17-58.53-25.4-71.08l-53.56-25.25h153.83c0-29.48-23.94-53.42-53.42-53.42h-139.38c-24.37 0-45.97-15.91-52.98-39.26l-71.66-235.42c-17.81-61.88 23.21-102.31 61.74-107.13 35.17-4.38 52.83 18.39 69.47 73.27l63.63 208.85h-31.96c-29.48 0-53.42 23.94-53.42 53.42h121.43l204.04 96.47c12.55-26.71 1.17-58.53-25.4-71.08l-53.56-25.25h177.88z"/><path d="m545.68 2.53h52.19v1441.85h-52.19z" fill="#f89a16" transform="matrix(.9855856 -.16917749 .16917749 .9855856 -114.16 107.17)"/><path d="m581.21 624.21-55.8-17.21-93.34-544.54 53.51 3.6z" fill="#da7c2b"/><path d="m981.62 279.44c-30.85 1.91-83.72 3.58-83.72 3.58l79.01-31.06-43.25-251.96-933.66 160.24 56.63 330 68.11 13.66s-38.47 19-60.89 28.37l22.52 131.23 933.66-160.24z" fill="#f89a16"/><circle cx="1144.16" cy="1031.93" fill="#fff" r="82.26" transform="matrix(.70710678 -.70710678 .70710678 .70710678 -394.57 1111.29)"/><circle cx="1124.15" cy="1004.52" r="52.63" transform="matrix(.41786707 -.90850818 .90850818 .41786707 -258.21 1606.05)"/><g fill="#fff"><path d="m387.43 559.95-69.59-57.58 107.75-360.2 93.69-15.45 226.75 308.17-45.64 75.04-312.97 50.02zm-11.05-75.33 25.78 21.33 266.91-42.65 15.63-25.7-187.97-255.46-31.41 5.18-88.94 297.31z"/><path d="m526.16 300.48 5.44 89.61-20.72 3.32-28.24-85.96-9.08-47.73 43.52-6.98 9.08 47.73zm18.46 103.04 7.02 36.88-41.43 6.64-7.02-36.88z"/></g></svg>