diff --git a/.github/scripts/check_language_properties.py b/.github/scripts/check_language_properties.py
deleted file mode 100644
index a77c378a6..000000000
--- a/.github/scripts/check_language_properties.py
+++ /dev/null
@@ -1,403 +0,0 @@
-"""
-Author: Ludy87
-Description: This script processes .properties files for localization checks. It compares translation files in a branch with
-a reference file to ensure consistency. The script performs two main checks:
-1. Verifies that the number of lines (including comments and empty lines) in the translation files matches the reference file.
-2. Ensures that all keys in the translation files are present in the reference file and vice versa.
-
-The script also provides functionality to update the translation files to match the reference file by adding missing keys and
-adjusting the format.
-
-Usage:
-    python check_language_properties.py --reference-file <path_to_reference_file> --branch <branch_name> [--actor <actor_name>] [--files <list_of_changed_files>]
-"""
-# Sample for Windows:
-# python .github/scripts/check_language_properties.py --reference-file src\main\resources\messages_en_GB.properties --branch "" --files src\main\resources\messages_de_DE.properties src\main\resources\messages_uk_UA.properties
-
-import copy
-import glob
-import os
-import argparse
-import re
-
-
-def find_duplicate_keys(file_path):
-    """
-    Identifies duplicate keys in a .properties file.
-    :param file_path: Path to the .properties file.
-    :return: List of tuples (key, first_occurrence_line, duplicate_line).
-    """
-    keys = {}
-    duplicates = []
-
-    with open(file_path, "r", encoding="utf-8") as file:
-        for line_number, line in enumerate(file, start=1):
-            stripped_line = line.strip()
-
-            # Skip empty lines and comments
-            if not stripped_line or stripped_line.startswith("#"):
-                continue
-
-            # Split the line into key and value
-            if "=" in stripped_line:
-                key, _ = stripped_line.split("=", 1)
-                key = key.strip()
-
-                # Check if the key already exists
-                if key in keys:
-                    duplicates.append((key, keys[key], line_number))
-                else:
-                    keys[key] = line_number
-
-    return duplicates
-
-
-# Maximum size for properties files (e.g., 200 KB)
-MAX_FILE_SIZE = 200 * 1024
-
-
-def parse_properties_file(file_path):
-    """
-    Parses a .properties file and returns a structured list of its contents.
-    :param file_path: Path to the .properties file.
-    :return: List of dictionaries representing each line in the file.
-    """
-    properties_list = []
-    with open(file_path, "r", encoding="utf-8") as file:
-        for line_number, line in enumerate(file, start=1):
-            stripped_line = line.strip()
-
-            # Handle empty lines
-            if not stripped_line:
-                properties_list.append(
-                    {"line_number": line_number, "type": "empty", "content": ""}
-                )
-                continue
-
-            # Handle comments
-            if stripped_line.startswith("#"):
-                properties_list.append(
-                    {
-                        "line_number": line_number,
-                        "type": "comment",
-                        "content": stripped_line,
-                    }
-                )
-                continue
-
-            # Handle key-value pairs
-            match = re.match(r"^([^=]+)=(.*)$", line)
-            if match:
-                key, value = match.groups()
-                properties_list.append(
-                    {
-                        "line_number": line_number,
-                        "type": "entry",
-                        "key": key.strip(),
-                        "value": value.strip(),
-                    }
-                )
-
-    return properties_list
-
-
-def write_json_file(file_path, updated_properties):
-    """
-    Writes updated properties back to the file in their original format.
-    :param file_path: Path to the .properties file.
-    :param updated_properties: List of updated properties to write.
-    """
-    updated_lines = {entry["line_number"]: entry for entry in updated_properties}
-
-    # Sort lines by their numbers and retain comments and empty lines
-    all_lines = sorted(set(updated_lines.keys()))
-
-    original_format = []
-    for line in all_lines:
-        if line in updated_lines:
-            entry = updated_lines[line]
-        else:
-            entry = None
-        ref_entry = updated_lines[line]
-        if ref_entry["type"] in ["comment", "empty"]:
-            original_format.append(ref_entry)
-        elif entry is None:
-            # Add missing entries from the reference file
-            original_format.append(ref_entry)
-        elif entry["type"] == "entry":
-            # Replace entries with those from the current JSON
-            original_format.append(entry)
-
-    # Write the updated content back to the file
-    with open(file_path, "w", encoding="utf-8", newline="\n") as file:
-        for entry in original_format:
-            if entry["type"] == "comment":
-                file.write(f"{entry['content']}\n")
-            elif entry["type"] == "empty":
-                file.write(f"{entry['content']}\n")
-            elif entry["type"] == "entry":
-                file.write(f"{entry['key']}={entry['value']}\n")
-
-
-def update_missing_keys(reference_file, file_list, branch=""):
-    """
-    Updates missing keys in the translation files based on the reference file.
-    :param reference_file: Path to the reference .properties file.
-    :param file_list: List of translation files to update.
-    :param branch: Branch where the files are located.
-    """
-    reference_properties = parse_properties_file(reference_file)
-    for file_path in file_list:
-        basename_current_file = os.path.basename(os.path.join(branch, file_path))
-        if (
-            basename_current_file == os.path.basename(reference_file)
-            or not file_path.endswith(".properties")
-            or not basename_current_file.startswith("messages_")
-        ):
-            continue
-
-        current_properties = parse_properties_file(os.path.join(branch, file_path))
-        updated_properties = []
-        for ref_entry in reference_properties:
-            ref_entry_copy = copy.deepcopy(ref_entry)
-            for current_entry in current_properties:
-                if current_entry["type"] == "entry":
-                    if ref_entry_copy["type"] != "entry":
-                        continue
-                    if ref_entry_copy["key"].lower() == current_entry["key"].lower():
-                        ref_entry_copy["value"] = current_entry["value"]
-            updated_properties.append(ref_entry_copy)
-        write_json_file(os.path.join(branch, file_path), updated_properties)
-
-
-def check_for_missing_keys(reference_file, file_list, branch):
-    update_missing_keys(reference_file, file_list, branch)
-
-
-def read_properties(file_path):
-    if os.path.isfile(file_path) and os.path.exists(file_path):
-        with open(file_path, "r", encoding="utf-8") as file:
-            return file.read().splitlines()
-    return [""]
-
-
-def check_for_differences(reference_file, file_list, branch, actor):
-    reference_branch = reference_file.split("/")[0]
-    basename_reference_file = os.path.basename(reference_file)
-
-    report = []
-    report.append(f"#### 🔄 Reference Branch: `{reference_branch}`")
-    reference_lines = read_properties(reference_file)
-    has_differences = False
-
-    only_reference_file = True
-
-    file_arr = file_list
-
-    if len(file_list) == 1:
-        file_arr = file_list[0].split()
-    base_dir = os.path.abspath(
-        os.path.join(os.getcwd(), "app", "core", "src", "main", "resources")
-    )
-
-    for file_path in file_arr:
-        file_normpath = os.path.normpath(file_path)
-        absolute_path = os.path.abspath(file_normpath)
-        # Verify that file is within the expected directory
-        if not absolute_path.startswith(base_dir):
-            raise ValueError(f"Unsafe file found: {file_normpath}")
-        # Verify file size before processing
-        if os.path.getsize(os.path.join(branch, file_normpath)) > MAX_FILE_SIZE:
-            raise ValueError(
-                f"The file {file_normpath} is too large and could pose a security risk."
-            )
-
-        basename_current_file = os.path.basename(os.path.join(branch, file_normpath))
-        if (
-            basename_current_file == basename_reference_file
-            or (
-                # only local windows command
-                not file_normpath.startswith(
-                    os.path.join(
-                        "", "app", "core", "src", "main", "resources", "messages_"
-                    )
-                )
-                and not file_normpath.startswith(
-                    os.path.join(
-                        os.getcwd(),
-                        "app",
-                        "core",
-                        "src",
-                        "main",
-                        "resources",
-                        "messages_",
-                    )
-                )
-            )
-            or not file_normpath.endswith(".properties")
-            or not basename_current_file.startswith("messages_")
-        ):
-            continue
-        only_reference_file = False
-        report.append(f"#### 📃 **File Check:** `{basename_current_file}`")
-        current_lines = read_properties(os.path.join(branch, file_path))
-        reference_line_count = len(reference_lines)
-        current_line_count = len(current_lines)
-
-        if reference_line_count != current_line_count:
-            report.append("")
-            report.append("1. **Test Status:** ❌ **_Failed_**")
-            report.append("  - **Issue:**")
-            has_differences = True
-            if reference_line_count > current_line_count:
-                report.append(
-                    f"    - **_Mismatched line count_**: {reference_line_count} (reference) vs {current_line_count} (current). Comments, empty lines, or translation strings are missing."
-                )
-            elif reference_line_count < current_line_count:
-                report.append(
-                    f"    - **_Too many lines_**: {reference_line_count} (reference) vs {current_line_count} (current). Please verify if there is an additional line that needs to be removed."
-                )
-        else:
-            report.append("1. **Test Status:** ✅ **_Passed_**")
-
-        # Check for missing or extra keys
-        current_keys = []
-        reference_keys = []
-        for line in current_lines:
-            if not line.startswith("#") and line != "" and "=" in line:
-                key, _ = line.split("=", 1)
-                current_keys.append(key)
-        for line in reference_lines:
-            if not line.startswith("#") and line != "" and "=" in line:
-                key, _ = line.split("=", 1)
-                reference_keys.append(key)
-
-        current_keys_set = set(current_keys)
-        reference_keys_set = set(reference_keys)
-        missing_keys = current_keys_set.difference(reference_keys_set)
-        extra_keys = reference_keys_set.difference(current_keys_set)
-        missing_keys_list = list(missing_keys)
-        extra_keys_list = list(extra_keys)
-
-        if missing_keys_list or extra_keys_list:
-            has_differences = True
-            missing_keys_str = "`, `".join(missing_keys_list)
-            extra_keys_str = "`, `".join(extra_keys_list)
-            report.append("2. **Test Status:** ❌ **_Failed_**")
-            report.append("  - **Issue:**")
-            if missing_keys_list:
-                spaces_keys_list = []
-                for key in missing_keys_list:
-                    if " " in key:
-                        spaces_keys_list.append(key)
-                if spaces_keys_list:
-                    spaces_keys_str = "`, `".join(spaces_keys_list)
-                    report.append(
-                        f"    - **_Keys containing unnecessary spaces_**: `{spaces_keys_str}`!"
-                    )
-                report.append(
-                    f"    - **_Extra keys in `{basename_current_file}`_**: `{missing_keys_str}` that are not present in **_`{basename_reference_file}`_**."
-                )
-            if extra_keys_list:
-                report.append(
-                    f"    - **_Missing keys in `{basename_reference_file}`_**: `{extra_keys_str}` that are not present in **_`{basename_current_file}`_**."
-                )
-        else:
-            report.append("2. **Test Status:** ✅ **_Passed_**")
-
-        if find_duplicate_keys(os.path.join(branch, file_normpath)):
-            has_differences = True
-            output = "\n".join(
-                [
-                    f"      - `{key}`: first at line {first}, duplicate at `line {duplicate}`"
-                    for key, first, duplicate in find_duplicate_keys(
-                        os.path.join(branch, file_normpath)
-                    )
-                ]
-            )
-            report.append("3. **Test Status:** ❌ **_Failed_**")
-            report.append("  - **Issue:**")
-            report.append("    - duplicate entries were found:")
-            report.append(output)
-        else:
-            report.append("3. **Test Status:** ✅ **_Passed_**")
-
-        report.append("")
-        report.append("---")
-        report.append("")
-    if has_differences:
-        report.append("## ❌ Overall Check Status: **_Failed_**")
-        report.append("")
-        report.append(
-            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/app/core/src/main/resources/messages_en_GB.properties)"
-        )
-    else:
-        report.append("## ✅ Overall Check Status: **_Success_**")
-        report.append("")
-        report.append(
-            f"Thanks @{actor} for your help in keeping the translations up to date."
-        )
-
-    if not only_reference_file:
-        print("\n".join(report))
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Find missing keys")
-    parser.add_argument(
-        "--actor",
-        required=False,
-        help="Actor from PR.",
-    )
-    parser.add_argument(
-        "--reference-file",
-        required=True,
-        help="Path to the reference file.",
-    )
-    parser.add_argument(
-        "--branch",
-        type=str,
-        required=True,
-        help="Branch name.",
-    )
-    parser.add_argument(
-        "--check-file",
-        type=str,
-        required=False,
-        help="List of changed files, separated by spaces.",
-    )
-    parser.add_argument(
-        "--files",
-        nargs="+",
-        required=False,
-        help="List of changed files, separated by spaces.",
-    )
-    args = parser.parse_args()
-
-    # Sanitize --actor input to avoid injection attacks
-    if args.actor:
-        args.actor = re.sub(r"[^a-zA-Z0-9_\\-]", "", args.actor)
-
-    # Sanitize --branch input to avoid injection attacks
-    if args.branch:
-        args.branch = re.sub(r"[^a-zA-Z0-9\\-]", "", args.branch)
-
-    file_list = args.files
-    if file_list is None:
-        if args.check_file:
-            file_list = [args.check_file]
-        else:
-            file_list = glob.glob(
-                os.path.join(
-                    os.getcwd(),
-                    "app",
-                    "core",
-                    "src",
-                    "main",
-                    "resources",
-                    "messages_*.properties",
-                )
-            )
-        update_missing_keys(args.reference_file, file_list)
-    else:
-        check_for_differences(args.reference_file, file_list, args.branch, args.actor)
diff --git a/.github/scripts/check_language_json.py b/.github/scripts/check_language_toml.py
similarity index 84%
rename from .github/scripts/check_language_json.py
rename to .github/scripts/check_language_toml.py
index 3921bdaa5..494f90962 100644
--- a/.github/scripts/check_language_json.py
+++ b/.github/scripts/check_language_toml.py
@@ -1,6 +1,6 @@
 """
 Author: Ludy87
-Description: This script processes JSON translation files for localization checks. It compares translation files in a branch with
+Description: This script processes TOML translation files for localization checks. It compares translation files in a branch with
 a reference file to ensure consistency. The script performs two main checks:
 1. Verifies that the number of translation keys in the translation files matches the reference file.
 2. Ensures that all keys in the translation files are present in the reference file and vice versa.
@@ -9,10 +9,10 @@ The script also provides functionality to update the translation files to match
 adjusting the format.
 
 Usage:
-    python check_language_json.py --reference-file <path_to_reference_file> --branch <branch_name> [--actor <actor_name>] [--files <list_of_changed_files>]
+    python check_language_toml.py --reference-file <path_to_reference_file> --branch <branch_name> [--actor <actor_name>] [--files <list_of_changed_files>]
 """
 # Sample for Windows:
-# python .github/scripts/check_language_json.py --reference-file frontend/public/locales/en-GB/translation.json --branch "" --files frontend/public/locales/de-DE/translation.json frontend/public/locales/fr-FR/translation.json
+# python .github/scripts/check_language_toml.py --reference-file frontend/public/locales/en-GB/translation.toml --branch "" --files frontend/public/locales/de-DE/translation.toml frontend/public/locales/fr-FR/translation.toml
 
 import copy
 import glob
@@ -20,12 +20,14 @@ import os
 import argparse
 import re
 import json
+import tomllib  # Python 3.11+ (stdlib)
+import tomli_w  # For writing TOML files
 
 
 def find_duplicate_keys(file_path, keys=None, prefix=""):
     """
-    Identifies duplicate keys in a JSON file (including nested keys).
-    :param file_path: Path to the JSON file.
+    Identifies duplicate keys in a TOML file (including nested keys).
+    :param file_path: Path to the TOML file.
     :param keys: Dictionary to track keys (used for recursion).
     :param prefix: Prefix for nested keys.
     :return: List of tuples (key, first_occurrence_path, duplicate_path).
@@ -35,8 +37,9 @@ def find_duplicate_keys(file_path, keys=None, prefix=""):
 
     duplicates = []
 
-    with open(file_path, "r", encoding="utf-8") as file:
-        data = json.load(file)
+    # Load TOML file
+    with open(file_path, 'rb') as file:
+        data = tomllib.load(file)
 
     def process_dict(obj, current_prefix=""):
         for key, value in obj.items():
@@ -54,18 +57,18 @@ def find_duplicate_keys(file_path, keys=None, prefix=""):
     return duplicates
 
 
-# Maximum size for JSON files (e.g., 500 KB)
+# Maximum size for TOML files (e.g., 500 KB)
 MAX_FILE_SIZE = 500 * 1024
 
 
-def parse_json_file(file_path):
+def parse_toml_file(file_path):
     """
-    Parses a JSON translation file and returns a flat dictionary of all keys.
-    :param file_path: Path to the JSON file.
+    Parses a TOML translation file and returns a flat dictionary of all keys.
+    :param file_path: Path to the TOML file.
     :return: Dictionary with flattened keys.
     """
-    with open(file_path, "r", encoding="utf-8") as file:
-        data = json.load(file)
+    with open(file_path, 'rb') as file:
+        data = tomllib.load(file)
 
     def flatten_dict(d, parent_key="", sep="."):
         items = {}
@@ -99,38 +102,37 @@ def unflatten_dict(d, sep="."):
     return result
 
 
-def write_json_file(file_path, updated_properties):
+def write_toml_file(file_path, updated_properties):
     """
-    Writes updated properties back to the JSON file.
-    :param file_path: Path to the JSON file.
+    Writes updated properties back to the TOML file.
+    :param file_path: Path to the TOML file.
     :param updated_properties: Dictionary of updated properties to write.
     """
     nested_data = unflatten_dict(updated_properties)
 
-    with open(file_path, "w", encoding="utf-8", newline="\n") as file:
-        json.dump(nested_data, file, ensure_ascii=False, indent=2)
-        file.write("\n")  # Add trailing newline
+    with open(file_path, "wb") as file:
+        tomli_w.dump(nested_data, file)
 
 
 def update_missing_keys(reference_file, file_list, branch=""):
     """
     Updates missing keys in the translation files based on the reference file.
-    :param reference_file: Path to the reference JSON file.
+    :param reference_file: Path to the reference TOML file.
     :param file_list: List of translation files to update.
     :param branch: Branch where the files are located.
     """
-    reference_properties = parse_json_file(reference_file)
+    reference_properties = parse_toml_file(reference_file)
 
     for file_path in file_list:
         basename_current_file = os.path.basename(os.path.join(branch, file_path))
         if (
             basename_current_file == os.path.basename(reference_file)
-            or not file_path.endswith(".json")
+            or not file_path.endswith(".toml")
             or not os.path.dirname(file_path).endswith("locales")
         ):
             continue
 
-        current_properties = parse_json_file(os.path.join(branch, file_path))
+        current_properties = parse_toml_file(os.path.join(branch, file_path))
         updated_properties = {}
 
         for ref_key, ref_value in reference_properties.items():
@@ -141,16 +143,16 @@ def update_missing_keys(reference_file, file_list, branch=""):
                 # Add missing key with reference value
                 updated_properties[ref_key] = ref_value
 
-        write_json_file(os.path.join(branch, file_path), updated_properties)
+        write_toml_file(os.path.join(branch, file_path), updated_properties)
 
 
 def check_for_missing_keys(reference_file, file_list, branch):
     update_missing_keys(reference_file, file_list, branch)
 
 
-def read_json_keys(file_path):
+def read_toml_keys(file_path):
     if os.path.isfile(file_path) and os.path.exists(file_path):
-        return parse_json_file(file_path)
+        return parse_toml_file(file_path)
     return {}
 
 
@@ -160,7 +162,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
 
     report = []
     report.append(f"#### 🔄 Reference Branch: `{reference_branch}`")
-    reference_keys = read_json_keys(reference_file)
+    reference_keys = read_toml_keys(reference_file)
     has_differences = False
 
     only_reference_file = True
@@ -197,12 +199,12 @@ def check_for_differences(reference_file, file_list, branch, actor):
         ):
             continue
 
-        if not file_normpath.endswith(".json") or basename_current_file != "translation.json":
+        if not file_normpath.endswith(".toml") or basename_current_file != "translation.toml":
             continue
 
         only_reference_file = False
         report.append(f"#### 📃 **File Check:** `{locale_dir}/{basename_current_file}`")
-        current_keys = read_json_keys(os.path.join(branch, file_path))
+        current_keys = read_toml_keys(os.path.join(branch, file_path))
         reference_key_count = len(reference_keys)
         current_key_count = len(current_keys)
 
@@ -272,7 +274,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
         report.append("## ❌ Overall Check Status: **_Failed_**")
         report.append("")
         report.append(
-            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [en-GB/translation.json](https://github.com/Stirling-Tools/Stirling-PDF/blob/V2/frontend/public/locales/en-GB/translation.json)"
+            f"@{actor} please check your translation if it conforms to the standard. Follow the format of [en-GB/translation.toml](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/frontend/public/locales/en-GB/translation.toml)"
         )
     else:
         report.append("## ✅ Overall Check Status: **_Success_**")
@@ -286,7 +288,7 @@ def check_for_differences(reference_file, file_list, branch, actor):
 
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Find missing keys")
+    parser = argparse.ArgumentParser(description="Find missing keys in TOML translation files")
     parser.add_argument(
         "--actor",
         required=False,
@@ -337,9 +339,9 @@ if __name__ == "__main__":
                     "public",
                     "locales",
                     "*",
-                    "translation.json",
+                    "translation.toml",
                 )
             )
         update_missing_keys(args.reference_file, file_list)
     else:
-        check_for_differences(args.reference_file, file_list, args.branch, args.actor)
\ No newline at end of file
+        check_for_differences(args.reference_file, file_list, args.branch, args.actor)
diff --git a/.github/workflows/PR-Auto-Deploy-V2.yml b/.github/workflows/PR-Auto-Deploy-V2.yml
index ad6d6f3dc..c96d7d5b2 100644
--- a/.github/workflows/PR-Auto-Deploy-V2.yml
+++ b/.github/workflows/PR-Auto-Deploy-V2.yml
@@ -52,7 +52,6 @@ jobs:
             core.setOutput('repository', pr.head.repo.full_name);
             core.setOutput('ref', pr.head.ref);
             core.setOutput('is_fork', String(pr.head.repo.fork));
-            core.setOutput('base_ref', pr.base.ref);
             core.setOutput('author', pr.user.login);
             core.setOutput('state', pr.state);
 
@@ -65,10 +64,6 @@ jobs:
           IS_FORK: ${{ steps.resolve.outputs.is_fork }}
           # nur bei workflow_dispatch gesetzt:
           ALLOW_FORK_INPUT: ${{ inputs.allow_fork }}
-          # für Auto-PR-Logik:
-          PR_TITLE: ${{ github.event.pull_request.title }}
-          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
-          PR_BASE: ${{ steps.resolve.outputs.base_ref }}
           PR_AUTHOR: ${{ steps.resolve.outputs.author }}
         run: |
           set -e
@@ -89,14 +84,8 @@ jobs:
           else
             auth_users=("Frooodle" "sf298" "Ludy87" "LaserKaspar" "sbplat" "reecebrowne" "DarioGii" "ConnorYoh" "EthanHealy01" "jbrunton96" "balazs-szucs")
             is_auth=false; for u in "${auth_users[@]}"; do [ "$u" = "$PR_AUTHOR" ] && is_auth=true && break; done
-            if [ "$PR_BASE" = "V2" ] && [ "$is_auth" = true ]; then
+            if [ "$is_auth" = true ]; then
               should=true
-            else
-              title_has_v2=false; echo "$PR_TITLE" | grep -qiE 'v2|version.?2|version.?two' && title_has_v2=true
-              branch_has_kw=false; echo "$PR_BRANCH" | grep -qiE 'v2|react' && branch_has_kw=true
-              if [ "$is_auth" = true ] && { [ "$title_has_v2" = true ] || [ "$branch_has_kw" = true ]; }; then
-                should=true
-              fi
             fi
           fi
 
@@ -174,7 +163,7 @@ jobs:
               owner,
               repo,
               issue_number: prNumber,
-              body: `🚀 **Auto-deploying V2 version** for PR #${prNumber}...\n\n_This is an automated deployment triggered by V2/version2 keywords in the PR title or V2/React keywords in the branch name._\n\n⚠️ **Note:** If new commits are pushed during deployment, this build will be cancelled and replaced with the latest version.`
+              body: `🚀 **Auto-deploying V2 version** for PR #${prNumber}...\n\n_This is an automated deployment for approved V2 contributors._\n\n⚠️ **Note:** If new commits are pushed during deployment, this build will be cancelled and replaced with the latest version.`
             });
             return newComment.id;
 
@@ -394,7 +383,7 @@ jobs:
                               `🔗 **Direct Test URL (non-SSL)** [${deploymentUrl}](${deploymentUrl})\n\n` +
                               `🔐 **Secure HTTPS URL**: [${httpsUrl}](${httpsUrl})\n\n` +
                               `_This deployment will be automatically cleaned up when the PR is closed._\n\n` +
-                              `🔄 **Auto-deployed** because PR title or branch name contains V2/version2/React keywords.`;
+                              `🔄 **Auto-deployed** for approved V2 contributors.`;
 
             await github.rest.issues.createComment({
               owner,
diff --git a/.github/workflows/PR-Demo-Comment-with-react.yml b/.github/workflows/PR-Demo-Comment-with-react.yml
index bfde13275..c7aa66d4e 100644
--- a/.github/workflows/PR-Demo-Comment-with-react.yml
+++ b/.github/workflows/PR-Demo-Comment-with-react.yml
@@ -14,6 +14,7 @@ jobs:
     permissions:
       issues: write
     if: |
+      vars.CI_PROFILE != 'lite' &&
       github.event.issue.pull_request &&
       (
         contains(github.event.comment.body, 'prdeploy') ||
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a049bb90..a5df3e9ec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -262,7 +262,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        docker-rev: ["docker/embedded/Dockerfile", "docker/embedded/Dockerfile.ultra-lite", "docker/embedded/Dockerfile.fat"]
+        include:
+          - docker-rev: docker/embedded/Dockerfile
+            artifact-suffix: Dockerfile
+          - docker-rev: docker/embedded/Dockerfile.ultra-lite
+            artifact-suffix: Dockerfile.ultra-lite
+          - docker-rev: docker/embedded/Dockerfile.fat
+            artifact-suffix: Dockerfile.fat
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
@@ -272,6 +278,13 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
+      - name: Free disk space on runner
+        run: |
+          echo "Disk space before cleanup:" && df -h
+          sudo rm -rf /usr/share/dotnet /opt/ghc /usr/local/lib/android /usr/local/share/boost
+          docker system prune -af || true
+          echo "Disk space after cleanup:" && df -h
+
       - name: Set up JDK 17
         uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
@@ -313,7 +326,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
-          name: reports-docker-${{ matrix.docker-rev }}
+          name: reports-docker-${{ matrix.artifact-suffix }}
           path: |
             build/reports/tests/
             build/test-results/
diff --git a/.github/workflows/check_properties.yml b/.github/workflows/check_toml.yml
similarity index 77%
rename from .github/workflows/check_properties.yml
rename to .github/workflows/check_toml.yml
index 73232eee9..8fc1a75b8 100644
--- a/.github/workflows/check_properties.yml
+++ b/.github/workflows/check_toml.yml
@@ -1,19 +1,14 @@
-name: Check Properties Files on PR
+name: Check TOML Translation Files on PR
+
+# This workflow validates TOML translation files
 
 on:
   pull_request_target:
     types: [opened, synchronize, reopened]
     paths:
-      - "app/core/src/main/resources/messages_*.properties"
+      - "frontend/public/locales/*/translation.toml"
 
 # cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.ref_name || github.ref }}
   cancel-in-progress: true
@@ -73,22 +68,22 @@ jobs:
         run: |
           echo "Fetching PR changed files..."
           echo "Getting list of changed files from PR..."
-                   # Check if PR number exists
-            if [ -z "${{ steps.get-pr-data.outputs.pr_number }}" ]; then
-              echo "Error: PR number is empty"
-              exit 1
-            fi
-            # Get changed files and filter for properties files, handle case where no matches are found
-            gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^app/core/src/main/resources/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$' > changed_files.txt || echo "No matching properties files found in PR"
-            # Check if any files were found
-            if [ ! -s changed_files.txt ]; then
-              echo "No properties files changed in this PR"
-              echo "Workflow will exit early as no relevant files to check"
-              exit 0
-            fi
-            echo "Found $(wc -l < changed_files.txt) matching properties files"
+          # Check if PR number exists
+          if [ -z "${{ steps.get-pr-data.outputs.pr_number }}" ]; then
+            echo "Error: PR number is empty"
+            exit 1
+          fi
+          # Get changed files and filter for TOML translation files
+          gh pr view ${{ steps.get-pr-data.outputs.pr_number }} --json files -q ".files[].path" | grep -E '^frontend/public/locales/[a-zA-Z-]+/translation\.toml$' > changed_files.txt || echo "No matching TOML files found in PR"
+          # Check if any files were found
+          if [ ! -s changed_files.txt ]; then
+            echo "No TOML translation files changed in this PR"
+            echo "Workflow will exit early as no relevant files to check"
+            exit 0
+          fi
+          echo "Found $(wc -l < changed_files.txt) matching TOML files"
 
-      - name: Determine reference file test
+      - name: Determine reference file
         id: determine-file
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
@@ -125,11 +120,11 @@ jobs:
               pull_number: prNumber,
             });
 
-            // Filter for relevant files based on the PR changes
+            // Filter for relevant TOML files based on the PR changes
             const changedFiles = files
               .filter(file =>
                 file.status !== "removed" &&
-                /^app\/core\/src\/main\/resources\/messages_[a-zA-Z_]{2}_[a-zA-Z_]{2,7}\.properties$/.test(file.filename)
+                /^frontend\/public\/locales\/[a-zA-Z-]+\/translation\.toml$/.test(file.filename)
               )
               .map(file => file.filename);
 
@@ -169,16 +164,16 @@ jobs:
 
             // Determine reference file
             let referenceFilePath;
-            if (changedFiles.includes("app/core/src/main/resources/messages_en_GB.properties")) {
+            if (changedFiles.includes("frontend/public/locales/en-GB/translation.toml")) {
               console.log("Using PR branch reference file.");
               const { data: fileContent } = await github.rest.repos.getContent({
                 owner: prRepoOwner,
                 repo: prRepoName,
-                path: "app/core/src/main/resources/messages_en_GB.properties",
+                path: "frontend/public/locales/en-GB/translation.toml",
                 ref: branch,
               });
 
-              referenceFilePath = "pr-branch-messages_en_GB.properties";
+              referenceFilePath = "pr-branch-translation-en-GB.toml";
               const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
               fs.writeFileSync(referenceFilePath, content);
             } else {
@@ -186,11 +181,11 @@ jobs:
               const { data: fileContent } = await github.rest.repos.getContent({
                 owner: repoOwner,
                 repo: repoName,
-                path: "app/core/src/main/resources/messages_en_GB.properties",
+                path: "frontend/public/locales/en-GB/translation.toml",
                 ref: "main",
               });
 
-              referenceFilePath = "main-branch-messages_en_GB.properties";
+              referenceFilePath = "main-branch-translation-en-GB.toml";
               const content = Buffer.from(fileContent.content, "base64").toString("utf-8");
               fs.writeFileSync(referenceFilePath, content);
             }
@@ -198,11 +193,20 @@ jobs:
             console.log(`Reference file path: ${referenceFilePath}`);
             core.exportVariable("REFERENCE_FILE", referenceFilePath);
 
+      - name: Set up Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: "3.12"
+
+      - name: Install Python dependencies
+        run: |
+          pip install tomli-w
+
       - name: Run Python script to check files
         id: run-check
         run: |
-          echo "Running Python script to check files..."
-          python .github/scripts/check_language_properties.py \
+          echo "Running Python script to check TOML files..."
+          python .github/scripts/check_language_toml.py \
             --actor ${{ github.event.pull_request.user.login }} \
             --reference-file "${REFERENCE_FILE}" \
             --branch "pr-branch" \
@@ -213,7 +217,7 @@ jobs:
         id: capture-output
         run: |
           if [ -f result.txt ] && [ -s result.txt ]; then
-            echo "Test, capturing output..."
+            echo "Capturing output..."
             SCRIPT_OUTPUT=$(cat result.txt)
             echo "SCRIPT_OUTPUT<<EOF" >> $GITHUB_ENV
             echo "$SCRIPT_OUTPUT" >> $GITHUB_ENV
@@ -227,7 +231,7 @@ jobs:
               echo "FAIL_JOB=false" >> $GITHUB_ENV
             fi
           else
-            echo "No update found."
+            echo "No output found."
             echo "SCRIPT_OUTPUT=" >> $GITHUB_ENV
             echo "FAIL_JOB=false" >> $GITHUB_ENV
           fi
@@ -249,7 +253,7 @@ jobs:
               issue_number: issueNumber
             });
 
-            const comment = comments.data.find(c => c.body.includes("## 🚀 Translation Verification Summary"));
+            const comment = comments.data.find(c => c.body.includes("## 🌐 TOML Translation Verification Summary"));
 
             // Only update or create comments by the action user
             const expectedActor = "${{ steps.setup-bot.outputs.app-slug }}[bot]";
@@ -260,7 +264,7 @@ jobs:
                 owner: repoOwner,
                 repo: repoName,
                 comment_id: comment.id,
-                body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
+                body: `## 🌐 TOML Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
               });
               console.log("Updated existing comment.");
             } else if (!comment) {
@@ -269,7 +273,7 @@ jobs:
                 owner: repoOwner,
                 repo: repoName,
                 issue_number: issueNumber,
-                body: `## 🚀 Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
+                body: `## 🌐 TOML Translation Verification Summary\n\n\n${SCRIPT_OUTPUT}\n`
               });
               console.log("Created new comment.");
             } else {
@@ -287,6 +291,6 @@ jobs:
         run: |
           echo "Cleaning up temporary files..."
           rm -rf pr-branch
-          rm -f pr-branch-messages_en_GB.properties main-branch-messages_en_GB.properties changed_files.txt result.txt
+          rm -f pr-branch-translation-en-GB.toml main-branch-translation-en-GB.toml changed_files.txt result.txt
           echo "Cleanup complete."
         continue-on-error: true # Ensure cleanup runs even if previous steps fail
diff --git a/.github/workflows/multiOSReleases.yml b/.github/workflows/multiOSReleases.yml
index 636a34bc0..07c03b083 100644
--- a/.github/workflows/multiOSReleases.yml
+++ b/.github/workflows/multiOSReleases.yml
@@ -31,6 +31,7 @@ permissions:
 
 jobs:
   determine-matrix:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
diff --git a/.github/workflows/push-docker-v2.yml b/.github/workflows/push-docker-v2.yml
index 5f2b70f50..061cf40ed 100644
--- a/.github/workflows/push-docker-v2.yml
+++ b/.github/workflows/push-docker-v2.yml
@@ -24,6 +24,7 @@ permissions:
 
 jobs:
   push:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     runs-on: ubuntu-24.04-8core
     permissions:
       packages: write
diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml
index 3f2a0c8d0..ecf3fdc95 100644
--- a/.github/workflows/push-docker.yml
+++ b/.github/workflows/push-docker.yml
@@ -24,6 +24,7 @@ permissions:
 
 jobs:
   push:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     runs-on: ubuntu-latest
     permissions:
       packages: write
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index ca037b7c0..d83accd49 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -17,6 +17,7 @@ permissions: read-all
 
 jobs:
   analysis:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     name: Scorecard analysis
     runs-on: ubuntu-latest
     permissions:
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index 146eb4b39..dd419b310 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -27,6 +27,7 @@ permissions:
 
 jobs:
   sonarqube:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index c3c0b110a..c53bb4a4b 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -10,6 +10,7 @@ permissions:
 
 jobs:
   stale:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     runs-on: ubuntu-latest
     permissions:
       issues: write
diff --git a/.github/workflows/swagger.yml b/.github/workflows/swagger.yml
index 16f0a3088..6e9cdb435 100644
--- a/.github/workflows/swagger.yml
+++ b/.github/workflows/swagger.yml
@@ -23,6 +23,7 @@ permissions:
 
 jobs:
   push:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
diff --git a/.github/workflows/sync_files.yml b/.github/workflows/sync_files.yml
deleted file mode 100644
index 1233ac701..000000000
--- a/.github/workflows/sync_files.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-name: Sync Files
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - "build.gradle"
-      - "README.md"
-      - "app/core/src/main/resources/messages_*.properties"
-      - "app/core/src/main/resources/static/3rdPartyLicenses.json"
-      - "scripts/ignore_translation.toml"
-
-# cancel in-progress jobs if a new job is triggered
-# This is useful to avoid running multiple builds for the same branch if a new commit is pushed
-# or a pull request is updated.
-# It helps to save resources and time by ensuring that only the latest commit is built and tested
-# This is particularly useful for long-running jobs that may take a while to complete.
-# The `group` is set to a combination of the workflow name, event name, and branch name.
-# This ensures that jobs are grouped by the workflow and branch, allowing for cancellation of
-# in-progress jobs when a new commit is pushed to the same branch or a new pull request is opened.
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref_name || github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  sync-files:
-    runs-on: ubuntu-latest
-    env:
-      # Prevents sdist builds → no tar extraction
-      PIP_ONLY_BINARY: ":all:"
-      PIP_DISABLE_PIP_VERSION_CHECK: "1"
-    steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
-        with:
-          egress-policy: audit
-
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-
-      - name: Setup GitHub App Bot
-        id: setup-bot
-        uses: ./.github/actions/setup-bot
-        with:
-          app-id: ${{ secrets.GH_APP_ID }}
-          private-key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Set up Python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
-        with:
-          python-version: "3.12"
-          cache: "pip" # caching pip dependencies
-
-      - name: Sync translation property files
-        run: |
-          python .github/scripts/check_language_properties.py --reference-file "app/core/src/main/resources/messages_en_GB.properties" --branch main
-
-      - name: Commit translation files
-        run: |
-          git add app/core/src/main/resources/messages_*.properties
-          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"
-
-      - name: Install dependencies
-        # Wheels-only + Hash-Pinning
-        run: |
-          pip install --require-hashes --only-binary=:all: -r ./.github/scripts/requirements_sync_readme.txt
-
-      - name: Sync README.md
-        run: |
-          python scripts/counter_translation.py
-
-      - name: Run git add
-        run: |
-          git add README.md scripts/ignore_translation.toml
-          git diff --staged --quiet || git commit -m ":memo: Sync README.md & scripts/ignore_translation.toml" || echo "No changes detected"
-
-      - name: Create Pull Request
-        if: always()
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
-        with:
-          token: ${{ steps.setup-bot.outputs.token }}
-          commit-message: Update files
-          committer: ${{ steps.setup-bot.outputs.committer }}
-          author: ${{ steps.setup-bot.outputs.committer }}
-          signoff: true
-          branch: sync_readme
-          title: ":globe_with_meridians: Sync Translations + Update README Progress Table"
-          body: |
-            ### Description of Changes
-
-            This Pull Request was automatically generated to synchronize updates to translation files and documentation. Below are the details of the changes made:
-
-            #### **1. Synchronization of Translation Files**
-            - Updated translation files (`messages_*.properties`) to reflect changes in the reference file `messages_en_GB.properties`.
-            - Ensured consistency and synchronization across all supported language files.
-            - Highlighted any missing or incomplete translations.
-
-            #### **2. Update README.md**
-            - Generated the translation progress table in `README.md`.
-            - Added a summary of the current translation status for all supported languages.
-            - Included up-to-date statistics on translation coverage.
-
-            #### **Why these changes are necessary**
-            - Keeps translation files aligned with the latest reference updates.
-            - Ensures the documentation reflects the current translation progress.
-
-            ---
-
-            Auto-generated by [create-pull-request][1].
-
-            [1]: https://github.com/peter-evans/create-pull-request
-          draft: false
-          delete-branch: true
-          labels: github-actions
-          sign-commits: true
-          add-paths: |
-            README.md
-            app/core/src/main/resources/messages_*.properties
diff --git a/.github/workflows/sync_files_v2.yml b/.github/workflows/sync_files_v2.yml
index 84645c59e..935252be2 100644
--- a/.github/workflows/sync_files_v2.yml
+++ b/.github/workflows/sync_files_v2.yml
@@ -1,15 +1,15 @@
-name: Sync Files V2
+name: Sync Files (TOML)
 
 on:
   workflow_dispatch:
   push:
     branches:
-      - V2
+      - main
       - syncLangTest
     paths:
       - "build.gradle"
       - "README.md"
-      - "frontend/public/locales/*/translation.json"
+      - "frontend/public/locales/*/translation.toml"
       - "app/core/src/main/resources/static/3rdPartyLicenses.json"
       - "scripts/ignore_translation.toml"
 
@@ -52,21 +52,25 @@ jobs:
           python-version: "3.12"
           cache: "pip" # caching pip dependencies
 
-      - name: Sync translation JSON files
+      - name: Install Python dependencies
         run: |
-          python .github/scripts/check_language_json.py --reference-file "frontend/public/locales/en-GB/translation.json" --branch V2
+          pip install tomli-w
+
+      - name: Sync translation TOML files
+        run: |
+          python .github/scripts/check_language_toml.py --reference-file "frontend/public/locales/en-GB/translation.toml" --branch main
 
       - name: Commit translation files
         run: |
-          git add frontend/public/locales/*/translation.json
-          git diff --staged --quiet || git commit -m ":memo: Sync translation files" || echo "No changes detected"
+          git add frontend/public/locales/*/translation.toml
+          git diff --staged --quiet || git commit -m ":memo: Sync translation files (TOML)" || echo "No changes detected"
 
-      - name: Install dependencies
+      - name: Install README dependencies
         run: pip install --require-hashes -r ./.github/scripts/requirements_sync_readme.txt
 
       - name: Sync README.md
         run: |
-          python scripts/counter_translation_v2.py
+          python scripts/counter_translation_v3.py
 
       - name: Run git add
         run: |
@@ -82,21 +86,22 @@ jobs:
           committer: ${{ steps.setup-bot.outputs.committer }}
           author: ${{ steps.setup-bot.outputs.committer }}
           signoff: true
-          branch: sync_readme_v2
-          base: V2
-          title: ":globe_with_meridians: [V2] Sync Translations + Update README Progress Table"
+          branch: sync_readme_v3
+          base: main
+          title: ":globe_with_meridians: Sync Translations + Update README Progress Table"
           body: |
             ### Description of Changes
 
-            This Pull Request was automatically generated to synchronize updates to translation files and documentation for the **V2 branch**. Below are the details of the changes made:
+            This Pull Request was automatically generated to synchronize updates to translation files and documentation. Below are the details of the changes made:
 
             #### **1. Synchronization of Translation Files**
-            - Updated translation files (`frontend/public/locales/*/translation.json`) to reflect changes in the reference file `en-GB/translation.json`.
+            - Updated translation files (`frontend/public/locales/*/translation.toml`) to reflect changes in the reference file `en-GB/translation.toml`.
             - Ensured consistency and synchronization across all supported language files.
             - Highlighted any missing or incomplete translations.
+            - **Format**: TOML
 
             #### **2. Update README.md**
-            - Generated the translation progress table in `README.md`.
+            - Generated the translation progress table in `README.md` using `counter_translation_v3.py`.
             - Added a summary of the current translation status for all supported languages.
             - Included up-to-date statistics on translation coverage.
 
@@ -115,4 +120,5 @@ jobs:
           sign-commits: true
           add-paths: |
             README.md
-            frontend/public/locales/*/translation.json
\ No newline at end of file
+            frontend/public/locales/*/translation.toml
+            scripts/ignore_translation.toml
\ No newline at end of file
diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml
index 4e153d519..d28683950 100644
--- a/.github/workflows/tauri-build.yml
+++ b/.github/workflows/tauri-build.yml
@@ -28,6 +28,7 @@ permissions:
 
 jobs:
   determine-matrix:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -636,6 +637,8 @@ jobs:
           if [ "${{ needs.build.result }}" = "success" ]; then
             echo "✅ All Tauri builds completed successfully!"
             echo "Artifacts are ready for distribution."
+          elif [ "${{ needs.build.result }}" = "skipped" ]; then
+            echo "⏭️  Tauri builds skipped (CI lite mode enabled)"
           else
             echo "❌ Some Tauri builds failed."
             echo "Please check the logs and fix any issues."
diff --git a/.github/workflows/testdriver.yml b/.github/workflows/testdriver.yml
index 828c84d62..12d5bc48d 100644
--- a/.github/workflows/testdriver.yml
+++ b/.github/workflows/testdriver.yml
@@ -21,6 +21,7 @@ permissions:
 
 jobs:
   deploy:
+    if: ${{ vars.CI_PROFILE != 'lite' }}
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
diff --git a/ADDING_TOOLS.md b/ADDING_TOOLS.md
index ef1501bfc..d24641b00 100644
--- a/ADDING_TOOLS.md
+++ b/ADDING_TOOLS.md
@@ -202,10 +202,10 @@ const [ToolName] = (props: BaseToolProps) => {
 ## 5. Add Translations
 Update translation files. **Important: Only update `en-GB` files** - other languages are handled separately.
 
-**File to update:** `frontend/public/locales/en-GB/translation.json`
+**File to update:** `frontend/public/locales/en-GB/translation.toml`
 
 **Required Translation Keys**:
-```json
+```toml
 {
   "home": {
     "[toolName]": {
@@ -251,7 +251,7 @@ Update translation files. **Important: Only update `en-GB` files** - other langu
 ```
 
 **Translation Notes:**
-- **Only update `en-GB/translation.json`** - other locale files are managed separately
+- **Only update `en-GB/translation.toml`** - other locale files are managed separately
 - Use descriptive keys that match your component's `t()` calls
 - Include tooltip translations if you created tooltip hooks
 - Add `options.*` keys if your tool has settings with descriptions
diff --git a/app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
index 35f68939c..ff48b5b2e 100644
--- a/app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
+++ b/app/common/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java
@@ -491,6 +491,9 @@ public class EndpointConfiguration {
         addEndpointToGroup("Ghostscript", "repair");
         addEndpointToGroup("Ghostscript", "compress-pdf");
 
+        /* ImageMagick */
+        addEndpointToGroup("ImageMagick", "compress-pdf");
+
         /* tesseract */
         addEndpointToGroup("tesseract", "ocr-pdf");
 
@@ -574,6 +577,7 @@ public class EndpointConfiguration {
                 || "Javascript".equals(group)
                 || "Weasyprint".equals(group)
                 || "Pdftohtml".equals(group)
+                || "ImageMagick".equals(group)
                 || "rar".equals(group);
     }
 
diff --git a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
index 6a6ee8453..72cfef1a0 100644
--- a/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
+++ b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
@@ -68,6 +68,7 @@ public class ApplicationProperties {
 
     private AutoPipeline autoPipeline = new AutoPipeline();
     private ProcessExecutor processExecutor = new ProcessExecutor();
+    private PdfEditor pdfEditor = new PdfEditor();
 
     @Bean
     public PropertySource<?> dynamicYamlPropertySource(ConfigurableEnvironment environment)
@@ -100,6 +101,46 @@ public class ApplicationProperties {
         private String outputFolder;
     }
 
+    @Data
+    public static class PdfEditor {
+        private Cache cache = new Cache();
+        private FontNormalization fontNormalization = new FontNormalization();
+        private CffConverter cffConverter = new CffConverter();
+        private Type3 type3 = new Type3();
+        private String fallbackFont = "classpath:/static/fonts/NotoSans-Regular.ttf";
+
+        @Data
+        public static class Cache {
+            private long maxBytes = -1;
+            private int maxPercent = 20;
+        }
+
+        @Data
+        public static class FontNormalization {
+            private boolean enabled = false;
+        }
+
+        @Data
+        public static class CffConverter {
+            private boolean enabled = true;
+            private String method = "python";
+            private String pythonCommand = "/opt/venv/bin/python3";
+            private String pythonScript = "/scripts/convert_cff_to_ttf.py";
+            private String fontforgeCommand = "fontforge";
+        }
+
+        @Data
+        public static class Type3 {
+            private Library library = new Library();
+
+            @Data
+            public static class Library {
+                private boolean enabled = true;
+                private String index = "classpath:/type3/library/index.json";
+            }
+        }
+    }
+
     @Data
     public static class Legal {
         private String termsAndConditions;
@@ -112,7 +153,6 @@ public class ApplicationProperties {
     @Data
     public static class Security {
         private Boolean enableLogin;
-        private Boolean csrfDisabled;
         private InitialLogin initialLogin = new InitialLogin();
         private OAUTH2 oauth2 = new OAUTH2();
         private SAML2 saml2 = new SAML2();
@@ -358,6 +398,7 @@ public class ApplicationProperties {
         private Boolean enableAnalytics;
         private Boolean enablePosthog;
         private Boolean enableScarf;
+        private Boolean enableDesktopInstallSlide;
         private Datasource datasource;
         private Boolean disableSanitize;
         private int maxDPI;
@@ -368,10 +409,12 @@ public class ApplicationProperties {
         private TempFileManagement tempFileManagement = new TempFileManagement();
         private DatabaseBackup databaseBackup = new DatabaseBackup();
         private List<String> corsAllowedOrigins = new ArrayList<>();
-        private String
-                frontendUrl; // Base URL for frontend (used for invite links, etc.). If not set,
+        private String backendUrl; // Backend base URL for SAML/OAuth/API callbacks (e.g.
+        // 'http://localhost:8080', 'https://api.example.com'). Required for
+        // SSO.
+        private String frontendUrl; // Frontend URL for invite email links (e.g.
 
-        // falls back to backend URL.
+        // 'https://app.example.com'). If not set, falls back to backendUrl.
 
         public boolean isAnalyticsEnabled() {
             return this.getEnableAnalytics() != null && this.getEnableAnalytics();
@@ -536,6 +579,7 @@ public class ApplicationProperties {
         @ToString.Exclude private String key;
         private String UUID;
         private String appVersion;
+        private Boolean isNewServer;
     }
 
     // TODO: Remove post migration
@@ -575,6 +619,16 @@ public class ApplicationProperties {
         private String username;
         @ToString.Exclude private String password;
         private String from;
+        // STARTTLS upgrades a plain SMTP connection to TLS after connecting (RFC 3207)
+        private Boolean startTlsEnable = true;
+        private Boolean startTlsRequired;
+        // SSL/TLS wrapper for implicit TLS (typically port 465)
+        private Boolean sslEnable;
+        // Hostnames or patterns (e.g., "smtp.example.com" or "*") to trust for TLS certificates;
+        // defaults to "*" (trust all) when not set
+        private String sslTrust;
+        // Enables hostname verification for TLS connections
+        private Boolean sslCheckServerIdentity;
     }
 
     @Data
@@ -643,6 +697,7 @@ public class ApplicationProperties {
             private int weasyPrintSessionLimit;
             private int installAppSessionLimit;
             private int calibreSessionLimit;
+            private int imageMagickSessionLimit;
             private int qpdfSessionLimit;
             private int tesseractSessionLimit;
             private int ghostscriptSessionLimit;
@@ -680,6 +735,10 @@ public class ApplicationProperties {
                 return calibreSessionLimit > 0 ? calibreSessionLimit : 1;
             }
 
+            public int getImageMagickSessionLimit() {
+                return imageMagickSessionLimit > 0 ? imageMagickSessionLimit : 4;
+            }
+
             public int getGhostscriptSessionLimit() {
                 return ghostscriptSessionLimit > 0 ? ghostscriptSessionLimit : 8;
             }
@@ -709,6 +768,8 @@ public class ApplicationProperties {
             @JsonProperty("calibretimeoutMinutes")
             private long calibreTimeoutMinutes;
 
+            private long imageMagickTimeoutMinutes;
+
             private long tesseractTimeoutMinutes;
             private long qpdfTimeoutMinutes;
             private long ghostscriptTimeoutMinutes;
@@ -746,6 +807,10 @@ public class ApplicationProperties {
                 return calibreTimeoutMinutes > 0 ? calibreTimeoutMinutes : 30;
             }
 
+            public long getImageMagickTimeoutMinutes() {
+                return imageMagickTimeoutMinutes > 0 ? imageMagickTimeoutMinutes : 30;
+            }
+
             public long getGhostscriptTimeoutMinutes() {
                 return ghostscriptTimeoutMinutes > 0 ? ghostscriptTimeoutMinutes : 30;
             }
diff --git a/app/common/src/main/java/stirling/software/common/service/LineArtConversionService.java b/app/common/src/main/java/stirling/software/common/service/LineArtConversionService.java
new file mode 100644
index 000000000..ab4f55d2e
--- /dev/null
+++ b/app/common/src/main/java/stirling/software/common/service/LineArtConversionService.java
@@ -0,0 +1,12 @@
+package stirling.software.common.service;
+
+import java.io.IOException;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+
+public interface LineArtConversionService {
+    PDImageXObject convertImageToLineArt(
+            PDDocument doc, PDImageXObject originalImage, double threshold, int edgeLevel)
+            throws IOException;
+}
diff --git a/app/common/src/main/java/stirling/software/common/service/PostHogService.java b/app/common/src/main/java/stirling/software/common/service/PostHogService.java
index 310fc43ab..786c04a43 100644
--- a/app/common/src/main/java/stirling/software/common/service/PostHogService.java
+++ b/app/common/src/main/java/stirling/software/common/service/PostHogService.java
@@ -254,10 +254,7 @@ public class PostHogService {
                 properties,
                 "security_enableLogin",
                 applicationProperties.getSecurity().getEnableLogin());
-        addIfNotEmpty(
-                properties,
-                "security_csrfDisabled",
-                applicationProperties.getSecurity().getCsrfDisabled());
+        addIfNotEmpty(properties, "security_csrfDisabled", true);
         addIfNotEmpty(
                 properties,
                 "security_loginAttemptCount",
diff --git a/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java b/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
index 3b94fbfbc..269441813 100644
--- a/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
+++ b/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
@@ -86,6 +86,11 @@ public class ProcessExecutor {
                                                 .getProcessExecutor()
                                                 .getSessionLimit()
                                                 .getCalibreSessionLimit();
+                                case IMAGEMAGICK ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getSessionLimit()
+                                                .getImageMagickSessionLimit();
                                 case GHOSTSCRIPT ->
                                         applicationProperties
                                                 .getProcessExecutor()
@@ -141,6 +146,11 @@ public class ProcessExecutor {
                                                 .getProcessExecutor()
                                                 .getTimeoutMinutes()
                                                 .getCalibreTimeoutMinutes();
+                                case IMAGEMAGICK ->
+                                        applicationProperties
+                                                .getProcessExecutor()
+                                                .getTimeoutMinutes()
+                                                .getImageMagickTimeoutMinutes();
                                 case GHOSTSCRIPT ->
                                         applicationProperties
                                                 .getProcessExecutor()
@@ -301,6 +311,7 @@ public class ProcessExecutor {
         WEASYPRINT,
         INSTALL_APP,
         CALIBRE,
+        IMAGEMAGICK,
         TESSERACT,
         QPDF,
         GHOSTSCRIPT,
diff --git a/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java b/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java
index a0adec7de..acad6f4a9 100644
--- a/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java
+++ b/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java
@@ -26,6 +26,7 @@ public class RequestUriUtils {
                 || normalizedUri.startsWith("/public/")
                 || normalizedUri.startsWith("/pdfjs/")
                 || normalizedUri.startsWith("/pdfjs-legacy/")
+                || normalizedUri.startsWith("/pdfium/")
                 || normalizedUri.startsWith("/assets/")
                 || normalizedUri.startsWith("/locales/")
                 || normalizedUri.startsWith("/Login/")
@@ -61,7 +62,8 @@ public class RequestUriUtils {
                 || normalizedUri.endsWith(".css")
                 || normalizedUri.endsWith(".mjs")
                 || normalizedUri.endsWith(".html")
-                || normalizedUri.endsWith(".toml");
+                || normalizedUri.endsWith(".toml")
+                || normalizedUri.endsWith(".wasm");
     }
 
     public static boolean isFrontendRoute(String contextPath, String requestURI) {
@@ -125,11 +127,13 @@ public class RequestUriUtils {
                 || requestURI.endsWith("popularity.txt")
                 || requestURI.endsWith(".js")
                 || requestURI.endsWith(".toml")
+                || requestURI.endsWith(".wasm")
                 || requestURI.contains("swagger")
                 || requestURI.startsWith("/api/v1/info")
                 || requestURI.startsWith("/site.webmanifest")
                 || requestURI.startsWith("/fonts")
-                || requestURI.startsWith("/pdfjs"));
+                || requestURI.startsWith("/pdfjs")
+                || requestURI.startsWith("/pdfium"));
     }
 
     /**
@@ -162,10 +166,9 @@ public class RequestUriUtils {
                 // enableLogin)
                 || trimmedUri.startsWith(
                         "/api/v1/ui-data/footer-info") // Public footer configuration
-                || trimmedUri.startsWith("/v1/api-docs")
                 || trimmedUri.startsWith("/api/v1/invite/validate")
                 || trimmedUri.startsWith("/api/v1/invite/accept")
-                || trimmedUri.contains("/v1/api-docs");
+                || trimmedUri.startsWith("/v1/api-docs");
     }
 
     private static String stripContextPath(String contextPath, String requestURI) {
diff --git a/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java
index b7c121ab3..409615e68 100644
--- a/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java
+++ b/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java
@@ -24,6 +24,9 @@ public class RequestUriUtilsTest {
         assertTrue(
                 RequestUriUtils.isStaticResource("/pdfjs/pdf.worker.js"),
                 "PDF.js files should be static");
+        assertTrue(
+                RequestUriUtils.isStaticResource("/pdfium/pdfium.wasm"),
+                "PDFium wasm should be static");
         assertTrue(
                 RequestUriUtils.isStaticResource("/api/v1/info/status"),
                 "API status should be static");
@@ -110,7 +113,8 @@ public class RequestUriUtilsTest {
                 "/downloads/document.png",
                 "/assets/brand.ico",
                 "/any/path/with/image.svg",
-                "/deep/nested/folder/icon.png"
+                "/deep/nested/folder/icon.png",
+                "/pdfium/pdfium.wasm"
             })
     void testIsStaticResourceWithFileExtensions(String path) {
         assertTrue(
@@ -148,6 +152,9 @@ public class RequestUriUtilsTest {
         assertFalse(
                 RequestUriUtils.isTrackableResource("/script.js"),
                 "JS files should not be trackable");
+        assertFalse(
+                RequestUriUtils.isTrackableResource("/pdfium/pdfium.wasm"),
+                "PDFium wasm should not be trackable");
         assertFalse(
                 RequestUriUtils.isTrackableResource("/swagger/index.html"),
                 "Swagger files should not be trackable");
@@ -224,7 +231,8 @@ public class RequestUriUtilsTest {
                 "/api/v1/info/health",
                 "/site.webmanifest",
                 "/fonts/roboto.woff",
-                "/pdfjs/viewer.js"
+                "/pdfjs/viewer.js",
+                "/pdfium/pdfium.wasm"
             })
     void testNonTrackableResources(String path) {
         assertFalse(
diff --git a/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
index 59c8825fc..8606cc2a9 100644
--- a/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
+++ b/app/core/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java
@@ -46,6 +46,7 @@ public class ExternalAppDepConfig {
                         put("qpdf", List.of("qpdf"));
                         put("tesseract", List.of("tesseract"));
                         put("rar", List.of("rar")); // Required for real CBR output
+                        put("magick", List.of("ImageMagick"));
                     }
                 };
     }
@@ -128,6 +129,7 @@ public class ExternalAppDepConfig {
         checkDependencyAndDisableGroup("pdftohtml");
         checkDependencyAndDisableGroup(unoconvPath);
         checkDependencyAndDisableGroup("rar");
+        checkDependencyAndDisableGroup("magick");
         // Special handling for Python/OpenCV dependencies
         boolean pythonAvailable = isCommandAvailable("python3") || isCommandAvailable("python");
         if (!pythonAvailable) {
diff --git a/app/core/src/main/java/stirling/software/SPDF/config/InitialSetup.java b/app/core/src/main/java/stirling/software/SPDF/config/InitialSetup.java
index 0a63a6f48..2cded405f 100644
--- a/app/core/src/main/java/stirling/software/SPDF/config/InitialSetup.java
+++ b/app/core/src/main/java/stirling/software/SPDF/config/InitialSetup.java
@@ -34,7 +34,6 @@ public class InitialSetup {
     public void init() throws IOException {
         initUUIDKey();
         initSecretKey();
-        initEnableCSRFSecurity();
         initLegalUrls();
         initSetAppVersion();
         GeneralUtils.extractPipeline();
@@ -60,18 +59,6 @@ public class InitialSetup {
         }
     }
 
-    public void initEnableCSRFSecurity() throws IOException {
-        if (GeneralUtils.isVersionHigher(
-                "0.46.0", applicationProperties.getAutomaticallyGenerated().getAppVersion())) {
-            Boolean csrf = applicationProperties.getSecurity().getCsrfDisabled();
-            if (!csrf) {
-                GeneralUtils.saveKeyToSettings("security.csrfDisabled", false);
-                GeneralUtils.saveKeyToSettings("system.enableAnalytics", true);
-                applicationProperties.getSecurity().setCsrfDisabled(false);
-            }
-        }
-    }
-
     public void initLegalUrls() throws IOException {
         // Initialize Terms and Conditions
         String termsUrl = applicationProperties.getLegal().getTermsAndConditions();
@@ -95,7 +82,7 @@ public class InitialSetup {
         isNewServer =
                 existingVersion == null
                         || existingVersion.isEmpty()
-                        || existingVersion.equals("0.0.0");
+                        || "0.0.0".equals(existingVersion);
 
         String appVersion = "0.0.0";
         Resource resource = new ClassPathResource("version.properties");
@@ -107,6 +94,7 @@ public class InitialSetup {
         }
         GeneralUtils.saveKeyToSettings("AutomaticallyGenerated.appVersion", appVersion);
         applicationProperties.getAutomaticallyGenerated().setAppVersion(appVersion);
+        applicationProperties.getAutomaticallyGenerated().setIsNewServer(isNewServer);
     }
 
     public static boolean isNewServer() {
diff --git a/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
index a25287c4d..c85e78b73 100644
--- a/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
+++ b/app/core/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java
@@ -62,10 +62,15 @@ public class OpenApiConfig {
 
         // Add server configuration from environment variable
         String swaggerServerUrl = System.getenv("SWAGGER_SERVER_URL");
+        Server server;
         if (swaggerServerUrl != null && !swaggerServerUrl.trim().isEmpty()) {
-            Server server = new Server().url(swaggerServerUrl).description("API Server");
-            openAPI.addServersItem(server);
+            server = new Server().url(swaggerServerUrl).description("API Server");
+        } else {
+            // Use relative path so Swagger uses the current browser origin to avoid CORS issues
+            // when accessing via different ports
+            server = new Server().url("/").description("Current Server");
         }
+        openAPI.addServersItem(server);
 
         // Add ErrorResponse schema to components
         Schema<?> errorResponseSchema =
diff --git a/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
index 0703708f5..8eac8fa80 100644
--- a/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
+++ b/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java
@@ -1,10 +1,14 @@
 package stirling.software.SPDF.config;
 
+import java.util.concurrent.TimeUnit;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.CacheControl;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import lombok.RequiredArgsConstructor;
@@ -25,6 +29,20 @@ public class WebMvcConfig implements WebMvcConfigurer {
         registry.addInterceptor(endpointInterceptor);
     }
 
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        // Cache hashed assets (JS/CSS with content hashes) for 1 year
+        // These files have names like index-ChAS4tCC.js that change when content changes
+        registry.addResourceHandler("/assets/**")
+                .addResourceLocations("classpath:/static/assets/")
+                .setCacheControl(CacheControl.maxAge(365, TimeUnit.DAYS).cachePublic());
+
+        // Don't cache index.html - it needs to be fresh to reference latest hashed assets
+        registry.addResourceHandler("/index.html")
+                .addResourceLocations("classpath:/static/")
+                .setCacheControl(CacheControl.noCache().mustRevalidate());
+    }
+
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         // Check if running in Tauri mode
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
index 9657d8f15..1d9f63818 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java
@@ -124,7 +124,6 @@ public class SettingsController {
         ApplicationProperties.Security security = applicationProperties.getSecurity();
 
         settings.put("enableLogin", security.getEnableLogin());
-        settings.put("csrfDisabled", security.getCsrfDisabled());
         settings.put("loginMethod", security.getLoginMethod());
         settings.put("loginAttemptCount", security.getLoginAttemptCount());
         settings.put("loginResetTimeMinutes", security.getLoginResetTimeMinutes());
@@ -159,12 +158,6 @@ public class SettingsController {
                     .getSecurity()
                     .setEnableLogin((Boolean) settings.get("enableLogin"));
         }
-        if (settings.containsKey("csrfDisabled")) {
-            GeneralUtils.saveKeyToSettings("security.csrfDisabled", settings.get("csrfDisabled"));
-            applicationProperties
-                    .getSecurity()
-                    .setCsrfDisabled((Boolean) settings.get("csrfDisabled"));
-        }
         if (settings.containsKey("loginMethod")) {
             GeneralUtils.saveKeyToSettings("security.loginMethod", settings.get("loginMethod"));
             applicationProperties
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonController.java
similarity index 99%
rename from app/proprietary/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonController.java
rename to app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonController.java
index ef29c72e5..3b9f98c8c 100644
--- a/app/proprietary/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonController.java
@@ -31,12 +31,10 @@ import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.service.JobOwnershipService;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.WebResponseUtils;
-import stirling.software.proprietary.security.config.PremiumEndpoint;
 
 @Slf4j
 @ConvertApi
 @RequiredArgsConstructor
-@PremiumEndpoint
 public class ConvertPdfJsonController {
 
     private final PdfJsonConversionService pdfJsonConversionService;
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonExceptionHandler.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonExceptionHandler.java
new file mode 100644
index 000000000..c82fe19e1
--- /dev/null
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPdfJsonExceptionHandler.java
@@ -0,0 +1,60 @@
+package stirling.software.SPDF.controller.api.converters;
+
+import java.nio.charset.StandardCharsets;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.SPDF.exception.CacheUnavailableException;
+
+@ControllerAdvice(assignableTypes = ConvertPdfJsonController.class)
+@Slf4j
+@RequiredArgsConstructor
+public class ConvertPdfJsonExceptionHandler {
+
+    private final ObjectMapper objectMapper;
+
+    @ExceptionHandler(CacheUnavailableException.class)
+    @ResponseBody
+    public ResponseEntity<byte[]> handleCacheUnavailable(CacheUnavailableException ex) {
+        try {
+            byte[] body =
+                    objectMapper.writeValueAsBytes(
+                            java.util.Map.of(
+                                    "error", "cache_unavailable",
+                                    "action", "reupload",
+                                    "message", ex.getMessage()));
+            return ResponseEntity.status(HttpStatus.GONE)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .body(body);
+        } catch (Exception e) {
+            log.warn("Failed to serialize cache_unavailable response", e);
+            var fallbackBody =
+                    java.util.Map.of(
+                            "error", "cache_unavailable",
+                            "action", "reupload",
+                            "message", String.valueOf(ex.getMessage()));
+            try {
+                return ResponseEntity.status(HttpStatus.GONE)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .body(objectMapper.writeValueAsBytes(fallbackBody));
+            } catch (Exception ignored) {
+                // Truly last-ditch fallback
+                return ResponseEntity.status(HttpStatus.GONE)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .body(
+                                "{\"error\":\"cache_unavailable\",\"action\":\"reupload\",\"message\":\"Cache unavailable\"}"
+                                        .getBytes(StandardCharsets.UTF_8));
+            }
+        }
+    }
+}
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
index 865a95c5c..9b0483da9 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java
@@ -28,10 +28,13 @@ import org.apache.pdfbox.pdmodel.PDResources;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.server.ResponseStatusException;
 
 import io.swagger.v3.oas.annotations.Operation;
 
@@ -44,6 +47,7 @@ import stirling.software.SPDF.model.api.misc.OptimizePdfRequest;
 import stirling.software.common.annotations.AutoJobPostMapping;
 import stirling.software.common.annotations.api.MiscApi;
 import stirling.software.common.service.CustomPDFDocumentFactory;
+import stirling.software.common.service.LineArtConversionService;
 import stirling.software.common.util.ExceptionUtils;
 import stirling.software.common.util.GeneralUtils;
 import stirling.software.common.util.ProcessExecutor;
@@ -58,6 +62,9 @@ public class CompressController {
     private final CustomPDFDocumentFactory pdfDocumentFactory;
     private final EndpointConfiguration endpointConfiguration;
 
+    @Autowired(required = false)
+    private LineArtConversionService lineArtConversionService;
+
     private boolean isQpdfEnabled() {
         return endpointConfiguration.isGroupEnabled("qpdf");
     }
@@ -66,6 +73,10 @@ public class CompressController {
         return endpointConfiguration.isGroupEnabled("Ghostscript");
     }
 
+    private boolean isImageMagickEnabled() {
+        return endpointConfiguration.isGroupEnabled("ImageMagick");
+    }
+
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
@@ -660,6 +671,9 @@ public class CompressController {
         Integer optimizeLevel = request.getOptimizeLevel();
         String expectedOutputSizeString = request.getExpectedOutputSize();
         Boolean convertToGrayscale = request.getGrayscale();
+        Boolean convertToLineArt = request.getLineArt();
+        Double lineArtThreshold = request.getLineArtThreshold();
+        Integer lineArtEdgeLevel = request.getLineArtEdgeLevel();
         if (expectedOutputSizeString == null && optimizeLevel == null) {
             throw new Exception("Both expected output size and optimize level are not specified");
         }
@@ -689,6 +703,26 @@ public class CompressController {
                 optimizeLevel = determineOptimizeLevel(sizeReductionRatio);
             }
 
+            if (Boolean.TRUE.equals(convertToLineArt)) {
+                if (lineArtConversionService == null) {
+                    throw new ResponseStatusException(
+                            HttpStatus.FORBIDDEN,
+                            "Line art conversion is unavailable - ImageMagick service not found");
+                }
+                if (!isImageMagickEnabled()) {
+                    throw new IOException(
+                            "ImageMagick is not enabled but line art conversion was requested");
+                }
+                double thresholdValue =
+                        lineArtThreshold == null
+                                ? 55d
+                                : Math.min(100d, Math.max(0d, lineArtThreshold));
+                int edgeLevel =
+                        lineArtEdgeLevel == null ? 1 : Math.min(3, Math.max(1, lineArtEdgeLevel));
+                currentFile =
+                        applyLineArtConversion(currentFile, tempFiles, thresholdValue, edgeLevel);
+            }
+
             boolean sizeMet = false;
             boolean imageCompressionApplied = false;
             boolean externalCompressionApplied = false;
@@ -810,6 +844,75 @@ public class CompressController {
         }
     }
 
+    private Path applyLineArtConversion(
+            Path currentFile, List<Path> tempFiles, double threshold, int edgeLevel)
+            throws IOException {
+
+        Path lineArtFile = Files.createTempFile("lineart_output_", ".pdf");
+        tempFiles.add(lineArtFile);
+
+        try (PDDocument doc = pdfDocumentFactory.load(currentFile.toFile())) {
+            Map<String, List<ImageReference>> uniqueImages = findImages(doc);
+            CompressionStats stats = new CompressionStats();
+            stats.uniqueImagesCount = uniqueImages.size();
+            calculateImageStats(uniqueImages, stats);
+
+            Map<String, PDImageXObject> convertedImages =
+                    createLineArtImages(doc, uniqueImages, stats, threshold, edgeLevel);
+
+            replaceImages(doc, uniqueImages, convertedImages, stats);
+
+            log.info(
+                    "Applied line art conversion to {} unique images ({} total references)",
+                    stats.uniqueImagesCount,
+                    stats.totalImages);
+
+            doc.save(lineArtFile.toString());
+            return lineArtFile;
+        }
+    }
+
+    private Map<String, PDImageXObject> createLineArtImages(
+            PDDocument doc,
+            Map<String, List<ImageReference>> uniqueImages,
+            CompressionStats stats,
+            double threshold,
+            int edgeLevel)
+            throws IOException {
+
+        Map<String, PDImageXObject> convertedImages = new HashMap<>();
+
+        for (Entry<String, List<ImageReference>> entry : uniqueImages.entrySet()) {
+            String imageHash = entry.getKey();
+            List<ImageReference> references = entry.getValue();
+            if (references.isEmpty()) continue;
+
+            PDImageXObject originalImage = getOriginalImage(doc, references.get(0));
+
+            int originalSize = (int) originalImage.getCOSObject().getLength();
+            stats.totalOriginalBytes += originalSize;
+
+            PDImageXObject converted =
+                    lineArtConversionService.convertImageToLineArt(
+                            doc, originalImage, threshold, edgeLevel);
+            convertedImages.put(imageHash, converted);
+            stats.compressedImages++;
+
+            int convertedSize = (int) converted.getCOSObject().getLength();
+            stats.totalCompressedBytes += convertedSize * references.size();
+
+            double reductionPercentage = 100.0 - ((convertedSize * 100.0) / originalSize);
+            log.info(
+                    "Image hash {}: Line art conversion {} → {} (reduced by {}%)",
+                    imageHash,
+                    GeneralUtils.formatBytes(originalSize),
+                    GeneralUtils.formatBytes(convertedSize),
+                    String.format("%.1f", reductionPercentage));
+        }
+
+        return convertedImages;
+    }
+
     // Run Ghostscript compression
     private void applyGhostscriptCompression(
             OptimizePdfRequest request, int optimizeLevel, Path currentFile, List<Path> tempFiles)
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
index 4f31b83ef..95486ff9b 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/ConfigController.java
@@ -74,6 +74,7 @@ public class ConfigController {
             configData.put("appNameNavbar", applicationProperties.getUi().getAppNameNavbar());
             configData.put("languages", applicationProperties.getUi().getLanguages());
             configData.put("logoStyle", applicationProperties.getUi().getLogoStyle());
+            configData.put("defaultLocale", applicationProperties.getSystem().getDefaultLocale());
 
             // Security settings
             // enableLogin requires both the config flag AND proprietary features to be loaded
@@ -123,6 +124,9 @@ public class ConfigController {
                     "enableAnalytics", applicationProperties.getSystem().getEnableAnalytics());
             configData.put("enablePosthog", applicationProperties.getSystem().getEnablePosthog());
             configData.put("enableScarf", applicationProperties.getSystem().getEnableScarf());
+            configData.put(
+                    "enableDesktopInstallSlide",
+                    applicationProperties.getSystem().getEnableDesktopInstallSlide());
 
             // Premium/Enterprise settings
             configData.put("premiumEnabled", applicationProperties.getPremium().isEnabled());
@@ -226,4 +230,10 @@ public class ConfigController {
         }
         return ResponseEntity.ok(result);
     }
+
+    @GetMapping("/group-enabled")
+    public ResponseEntity<Boolean> isGroupEnabled(@RequestParam(name = "group") String group) {
+        boolean enabled = endpointConfiguration.isGroupEnabled(group);
+        return ResponseEntity.ok(enabled);
+    }
 }
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
index 3b27492a6..893c9c54c 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java
@@ -191,6 +191,12 @@ public class CertSignController {
 
         switch (certType) {
             case "PEM":
+                privateKeyFile =
+                        validateFilePresent(
+                                privateKeyFile, "PEM private key", "private key file is required");
+                certFile =
+                        validateFilePresent(
+                                certFile, "PEM certificate", "certificate file is required");
                 ks = KeyStore.getInstance("JKS");
                 ks.load(null);
                 PrivateKey privateKey = getPrivateKeyFromPEM(privateKeyFile.getBytes(), password);
@@ -200,10 +206,16 @@ public class CertSignController {
                 break;
             case "PKCS12":
             case "PFX":
+                p12File =
+                        validateFilePresent(
+                                p12File, "PKCS12 keystore", "PKCS12/PFX keystore file is required");
                 ks = KeyStore.getInstance("PKCS12");
                 ks.load(p12File.getInputStream(), password.toCharArray());
                 break;
             case "JKS":
+                jksfile =
+                        validateFilePresent(
+                                jksfile, "JKS keystore", "JKS keystore file is required");
                 ks = KeyStore.getInstance("JKS");
                 ks.load(jksfile.getInputStream(), password.toCharArray());
                 break;
@@ -251,6 +263,17 @@ public class CertSignController {
                 GeneralUtils.generateFilename(pdf.getOriginalFilename(), "_signed.pdf"));
     }
 
+    private MultipartFile validateFilePresent(
+            MultipartFile file, String argumentName, String errorDescription) {
+        if (file == null || file.isEmpty()) {
+            throw ExceptionUtils.createIllegalArgumentException(
+                    "error.invalidArgument",
+                    "Invalid argument: {0}",
+                    argumentName + " - " + errorDescription);
+        }
+        return file;
+    }
+
     private PrivateKey getPrivateKeyFromPEM(byte[] pemBytes, String password)
             throws IOException, OperatorCreationException, PKCSException {
         try (PEMParser pemParser =
diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java b/app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java
index adde1020a..ab8f3b75b 100644
--- a/app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java
+++ b/app/core/src/main/java/stirling/software/SPDF/controller/web/ReactRoutingController.java
@@ -11,6 +11,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import jakarta.annotation.PostConstruct;
 import jakarta.servlet.http.HttpServletRequest;
 
 @Controller
@@ -19,10 +20,25 @@ public class ReactRoutingController {
     @Value("${server.servlet.context-path:/}")
     private String contextPath;
 
-    @GetMapping(
-            value = {"/", "/index.html"},
-            produces = MediaType.TEXT_HTML_VALUE)
-    public ResponseEntity<String> serveIndexHtml(HttpServletRequest request) throws IOException {
+    private String cachedIndexHtml;
+    private boolean indexHtmlExists = false;
+
+    @PostConstruct
+    public void init() {
+        // Only cache if index.html exists (production builds)
+        ClassPathResource resource = new ClassPathResource("static/index.html");
+        if (resource.exists()) {
+            try {
+                this.cachedIndexHtml = processIndexHtml();
+                this.indexHtmlExists = true;
+            } catch (IOException e) {
+                // Failed to cache, will process on each request
+                this.indexHtmlExists = false;
+            }
+        }
+    }
+
+    private String processIndexHtml() throws IOException {
         ClassPathResource resource = new ClassPathResource("static/index.html");
 
         try (InputStream inputStream = resource.getInputStream()) {
@@ -42,18 +58,29 @@ public class ReactRoutingController {
                     "<script>window.STIRLING_PDF_API_BASE_URL = '" + baseUrl + "';</script>";
             html = html.replace("</head>", contextPathScript + "</head>");
 
-            return ResponseEntity.ok().contentType(MediaType.TEXT_HTML).body(html);
+            return html;
         }
     }
 
     @GetMapping(
-            "/{path:^(?!api|static|robots\\.txt|favicon\\.ico|manifest.*\\.json|pipeline|pdfjs|pdfjs-legacy|fonts|images|files|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*$}")
+            value = {"/", "/index.html"},
+            produces = MediaType.TEXT_HTML_VALUE)
+    public ResponseEntity<String> serveIndexHtml(HttpServletRequest request) throws IOException {
+        if (indexHtmlExists && cachedIndexHtml != null) {
+            return ResponseEntity.ok().contentType(MediaType.TEXT_HTML).body(cachedIndexHtml);
+        }
+        // Fallback: process on each request (dev mode or cache failed)
+        return ResponseEntity.ok().contentType(MediaType.TEXT_HTML).body(processIndexHtml());
+    }
+
+    @GetMapping(
+            "/{path:^(?!api|static|robots\\.txt|favicon\\.ico|manifest.*\\.json|pipeline|pdfjs|pdfjs-legacy|pdfium|fonts|images|files|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*$}")
     public ResponseEntity<String> forwardRootPaths(HttpServletRequest request) throws IOException {
         return serveIndexHtml(request);
     }
 
     @GetMapping(
-            "/{path:^(?!api|static|pipeline|pdfjs|pdfjs-legacy|fonts|images|files|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*}/{subpath:^(?!.*\\.).*$}")
+            "/{path:^(?!api|static|pipeline|pdfjs|pdfjs-legacy|pdfium|fonts|images|files|css|js|assets|locales|modern-logo|classic-logo|Login|og_images|samples)[^\\.]*}/{subpath:^(?!.*\\.).*$}")
     public ResponseEntity<String> forwardNestedPaths(HttpServletRequest request)
             throws IOException {
         return serveIndexHtml(request);
diff --git a/app/core/src/main/java/stirling/software/SPDF/exception/CacheUnavailableException.java b/app/core/src/main/java/stirling/software/SPDF/exception/CacheUnavailableException.java
new file mode 100644
index 000000000..fd5d77677
--- /dev/null
+++ b/app/core/src/main/java/stirling/software/SPDF/exception/CacheUnavailableException.java
@@ -0,0 +1,8 @@
+package stirling.software.SPDF.exception;
+
+public class CacheUnavailableException extends RuntimeException {
+
+    public CacheUnavailableException(String message) {
+        super(message);
+    }
+}
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/api/PdfJsonConversionProgress.java b/app/core/src/main/java/stirling/software/SPDF/model/api/PdfJsonConversionProgress.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/api/PdfJsonConversionProgress.java
rename to app/core/src/main/java/stirling/software/SPDF/model/api/PdfJsonConversionProgress.java
diff --git a/app/core/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java b/app/core/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
index bf96dd217..d6e5c7021 100644
--- a/app/core/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
+++ b/app/core/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java
@@ -45,4 +45,26 @@ public class OptimizePdfRequest extends PDFFile {
             requiredMode = Schema.RequiredMode.REQUIRED,
             defaultValue = "false")
     private Boolean grayscale = false;
+
+    @Schema(
+            description =
+                    "Whether to convert images to high-contrast line art using ImageMagick. Default is false.",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
+            defaultValue = "false")
+    private Boolean lineArt = false;
+
+    @Schema(
+            description = "Threshold to use for line art conversion (0-100).",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
+            defaultValue = "55")
+    private Double lineArtThreshold = 55d;
+
+    @Schema(
+            description =
+                    "Edge detection strength to use for line art conversion (1-3). This maps to"
+                            + " ImageMagick's -edge radius.",
+            requiredMode = Schema.RequiredMode.NOT_REQUIRED,
+            defaultValue = "1",
+            allowableValues = {"1", "2", "3"})
+    private Integer lineArtEdgeLevel = 1;
 }
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonAnnotation.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonAnnotation.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonAnnotation.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonAnnotation.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonCosValue.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonCosValue.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonCosValue.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonCosValue.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonDocument.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonDocument.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonDocument.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonDocument.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonDocumentMetadata.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonDocumentMetadata.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonDocumentMetadata.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonDocumentMetadata.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFont.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFont.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFont.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFont.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontCidSystemInfo.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontCidSystemInfo.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontCidSystemInfo.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontCidSystemInfo.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontConversionCandidate.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontConversionCandidate.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontConversionCandidate.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontConversionCandidate.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontConversionStatus.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontConversionStatus.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontConversionStatus.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontConversionStatus.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontType3Glyph.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontType3Glyph.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontType3Glyph.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFontType3Glyph.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFormField.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFormField.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonFormField.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonFormField.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonImageElement.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonImageElement.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonImageElement.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonImageElement.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonMetadata.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonMetadata.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonMetadata.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonMetadata.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonPage.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonPage.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonPage.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonPage.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonPageDimension.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonPageDimension.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonPageDimension.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonPageDimension.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonStream.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonStream.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonStream.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonStream.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonTextColor.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonTextColor.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonTextColor.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonTextColor.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonTextElement.java b/app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonTextElement.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/model/json/PdfJsonTextElement.java
rename to app/core/src/main/java/stirling/software/SPDF/model/json/PdfJsonTextElement.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/PdfJsonConversionService.java b/app/core/src/main/java/stirling/software/SPDF/service/PdfJsonConversionService.java
similarity index 95%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/PdfJsonConversionService.java
rename to app/core/src/main/java/stirling/software/SPDF/service/PdfJsonConversionService.java
index 623b99260..604e9ba38 100644
--- a/app/proprietary/src/main/java/stirling/software/SPDF/service/PdfJsonConversionService.java
+++ b/app/core/src/main/java/stirling/software/SPDF/service/PdfJsonConversionService.java
@@ -86,7 +86,6 @@ import org.apache.pdfbox.text.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 import org.apache.pdfbox.util.DateConverter;
 import org.apache.pdfbox.util.Matrix;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -144,15 +143,23 @@ public class PdfJsonConversionService {
     private final PdfJsonFontService fontService;
     private final Type3FontConversionService type3FontConversionService;
     private final Type3GlyphExtractor type3GlyphExtractor;
+    private final stirling.software.common.model.ApplicationProperties applicationProperties;
     private final Map<String, PDFont> type3NormalizedFontCache = new ConcurrentHashMap<>();
     private final Map<String, Set<Integer>> type3GlyphCoverageCache = new ConcurrentHashMap<>();
 
-    @Value("${stirling.pdf.json.font-normalization.enabled:true}")
     private boolean fontNormalizationEnabled;
+    private long cacheMaxBytes;
+    private int cacheMaxPercent;
 
     /** Cache for storing PDDocuments for lazy page loading. Key is jobId. */
     private final Map<String, CachedPdfDocument> documentCache = new ConcurrentHashMap<>();
 
+    private final java.util.LinkedHashMap<String, CachedPdfDocument> lruCache =
+            new java.util.LinkedHashMap<>(16, 0.75f, true);
+    private final Object cacheLock = new Object();
+    private volatile long currentCacheBytes = 0L;
+    private volatile long cacheBudgetBytes = -1L;
+
     private volatile boolean ghostscriptAvailable;
 
     private static final float FLOAT_EPSILON = 0.0001f;
@@ -161,7 +168,23 @@ public class PdfJsonConversionService {
 
     @PostConstruct
     private void initializeToolAvailability() {
+        loadConfigurationFromProperties();
         initializeGhostscriptAvailability();
+        initializeCacheBudget();
+    }
+
+    private void loadConfigurationFromProperties() {
+        stirling.software.common.model.ApplicationProperties.PdfEditor cfg =
+                applicationProperties.getPdfEditor();
+        if (cfg != null) {
+            fontNormalizationEnabled = cfg.getFontNormalization().isEnabled();
+            cacheMaxBytes = cfg.getCache().getMaxBytes();
+            cacheMaxPercent = cfg.getCache().getMaxPercent();
+        } else {
+            fontNormalizationEnabled = false;
+            cacheMaxBytes = -1;
+            cacheMaxPercent = 20;
+        }
     }
 
     private void initializeGhostscriptAvailability() {
@@ -202,6 +225,25 @@ public class PdfJsonConversionService {
         }
     }
 
+    private void initializeCacheBudget() {
+        long effective = -1L;
+        if (cacheMaxBytes > 0) {
+            effective = cacheMaxBytes;
+        } else if (cacheMaxPercent > 0) {
+            long maxMem = Runtime.getRuntime().maxMemory();
+            effective = Math.max(0L, (maxMem * cacheMaxPercent) / 100);
+        }
+        cacheBudgetBytes = effective;
+        if (cacheBudgetBytes > 0) {
+            log.info(
+                    "PDF JSON cache budget configured: {} bytes (source: {})",
+                    cacheBudgetBytes,
+                    cacheMaxBytes > 0 ? "max-bytes" : "max-percent");
+        } else {
+            log.info("PDF JSON cache budget: unlimited");
+        }
+    }
+
     public byte[] convertPdfToJson(MultipartFile file) throws IOException {
         return convertPdfToJson(file, null, false);
     }
@@ -236,7 +278,10 @@ public class PdfJsonConversionService {
             log.debug("Generated synthetic jobId for synchronous conversion: {}", jobId);
         } else {
             jobId = contextJobId;
-            log.debug("Starting PDF to JSON conversion, jobId from context: {}", jobId);
+            log.info(
+                    "Starting PDF to JSON conversion, jobId from context: {} (lightweight={})",
+                    jobId,
+                    lightweight);
         }
 
         Consumer<PdfJsonConversionProgress> progress =
@@ -318,9 +363,9 @@ public class PdfJsonConversionService {
 
             try (PDDocument document = pdfDocumentFactory.load(workingPath, true)) {
                 int totalPages = document.getNumberOfPages();
-                // Only use lazy images for real async jobs where client can access the cache
-                // Synchronous calls with synthetic jobId should do full extraction
-                boolean useLazyImages = totalPages > 5 && isRealJobId;
+                // Always enable lazy mode for real async jobs so cache is available regardless of
+                // page count. Synchronous calls with synthetic jobId still do full extraction.
+                boolean useLazyImages = isRealJobId;
                 Map<COSBase, FontModelCacheEntry> fontCache = new IdentityHashMap<>();
                 Map<COSBase, EncodedImage> imageCache = new IdentityHashMap<>();
                 log.debug(
@@ -403,6 +448,11 @@ public class PdfJsonConversionService {
 
                 // Only cache for real async jobIds, not synthetic synchronous ones
                 if (useLazyImages && isRealJobId) {
+                    log.info(
+                            "Creating cache for jobId: {} (useLazyImages={}, isRealJobId={})",
+                            jobId,
+                            useLazyImages,
+                            isRealJobId);
                     PdfJsonDocumentMetadata docMetadata = new PdfJsonDocumentMetadata();
                     docMetadata.setMetadata(pdfJson.getMetadata());
                     docMetadata.setXmpMetadata(pdfJson.getXmpMetadata());
@@ -435,16 +485,23 @@ public class PdfJsonConversionService {
                         cachedPdfBytes = Files.readAllBytes(workingPath);
                     }
                     CachedPdfDocument cached =
-                            new CachedPdfDocument(
-                                    cachedPdfBytes, docMetadata, fonts, pageFontResources);
-                    documentCache.put(jobId, cached);
-                    log.debug(
-                            "Cached PDF bytes ({} bytes, {} pages, {} fonts) for lazy images, jobId: {}",
-                            cachedPdfBytes.length,
+                            buildCachedDocument(
+                                    jobId, cachedPdfBytes, docMetadata, fonts, pageFontResources);
+                    putCachedDocument(jobId, cached);
+                    log.info(
+                            "Successfully cached PDF ({} bytes, {} pages, {} fonts) for jobId: {} (diskBacked={})",
+                            cached.getPdfSize(),
                             totalPages,
                             fonts.size(),
-                            jobId);
+                            jobId,
+                            cached.isDiskBacked());
                     scheduleDocumentCleanup(jobId);
+                } else {
+                    log.warn(
+                            "Skipping cache creation: useLazyImages={}, isRealJobId={}, jobId={}",
+                            useLazyImages,
+                            isRealJobId,
+                            jobId);
                 }
 
                 if (lightweight) {
@@ -2973,6 +3030,139 @@ public class PdfJsonConversionService {
         }
     }
 
+    // Cache helpers
+    private CachedPdfDocument buildCachedDocument(
+            String jobId,
+            byte[] pdfBytes,
+            PdfJsonDocumentMetadata metadata,
+            Map<String, PdfJsonFont> fonts,
+            Map<Integer, Map<PDFont, String>> pageFontResources)
+            throws IOException {
+        if (pdfBytes == null) {
+            throw new IllegalArgumentException("pdfBytes must not be null");
+        }
+        long budget = cacheBudgetBytes;
+        // If single document is larger than budget, spill straight to disk
+        if (budget > 0 && pdfBytes.length > budget) {
+            TempFile tempFile = new TempFile(tempFileManager, ".pdfjsoncache");
+            Files.write(tempFile.getPath(), pdfBytes);
+            log.debug(
+                    "Cached PDF spilled to disk ({} bytes exceeds budget {}) for jobId {}",
+                    pdfBytes.length,
+                    budget,
+                    jobId);
+            return new CachedPdfDocument(
+                    null, tempFile, pdfBytes.length, metadata, fonts, pageFontResources);
+        }
+        return new CachedPdfDocument(
+                pdfBytes, null, pdfBytes.length, metadata, fonts, pageFontResources);
+    }
+
+    private void putCachedDocument(String jobId, CachedPdfDocument cached) {
+        synchronized (cacheLock) {
+            CachedPdfDocument existing = documentCache.put(jobId, cached);
+            if (existing != null) {
+                lruCache.remove(jobId);
+                currentCacheBytes = Math.max(0L, currentCacheBytes - existing.getInMemorySize());
+                existing.close();
+            }
+            lruCache.put(jobId, cached);
+            currentCacheBytes += cached.getInMemorySize();
+            enforceCacheBudget();
+        }
+    }
+
+    private CachedPdfDocument getCachedDocument(String jobId) {
+        synchronized (cacheLock) {
+            CachedPdfDocument cached = documentCache.get(jobId);
+            if (cached != null) {
+                lruCache.remove(jobId);
+                lruCache.put(jobId, cached);
+            }
+            return cached;
+        }
+    }
+
+    private void enforceCacheBudget() {
+        if (cacheBudgetBytes <= 0) {
+            return;
+        }
+        // Must be called under cacheLock
+        java.util.Iterator<java.util.Map.Entry<String, CachedPdfDocument>> it =
+                lruCache.entrySet().iterator();
+        while (currentCacheBytes > cacheBudgetBytes && it.hasNext()) {
+            java.util.Map.Entry<String, CachedPdfDocument> entry = it.next();
+            it.remove();
+            CachedPdfDocument removed = entry.getValue();
+            documentCache.remove(entry.getKey(), removed);
+            currentCacheBytes = Math.max(0L, currentCacheBytes - removed.getInMemorySize());
+            removed.close();
+            log.warn(
+                    "Evicted cached PDF for jobId {} to enforce cache budget (budget={} bytes, current={} bytes)",
+                    entry.getKey(),
+                    cacheBudgetBytes,
+                    currentCacheBytes);
+        }
+        if (currentCacheBytes > cacheBudgetBytes && !lruCache.isEmpty()) {
+            // Spill the most recently used large entry to disk
+            String key =
+                    lruCache.entrySet().stream()
+                            .reduce((first, second) -> second)
+                            .map(java.util.Map.Entry::getKey)
+                            .orElse(null);
+            if (key != null) {
+                CachedPdfDocument doc = lruCache.get(key);
+                if (doc != null && doc.getInMemorySize() > 0) {
+                    try {
+                        CachedPdfDocument diskDoc =
+                                buildCachedDocument(
+                                        key,
+                                        doc.getPdfBytes(),
+                                        doc.getMetadata(),
+                                        doc.getFonts(),
+                                        doc.getPageFontResources());
+                        lruCache.put(key, diskDoc);
+                        documentCache.put(key, diskDoc);
+                        currentCacheBytes =
+                                Math.max(0L, currentCacheBytes - doc.getInMemorySize())
+                                        + diskDoc.getInMemorySize();
+                        doc.close();
+                        log.debug("Spilled cached PDF for jobId {} to disk to satisfy budget", key);
+                    } catch (IOException ex) {
+                        log.warn(
+                                "Failed to spill cached PDF for jobId {} to disk: {}",
+                                key,
+                                ex.getMessage());
+                    }
+                }
+            }
+        }
+    }
+
+    private void removeCachedDocument(String jobId) {
+        log.warn(
+                "removeCachedDocument called for jobId: {} [CALLER: {}]",
+                jobId,
+                Thread.currentThread().getStackTrace()[2].toString());
+        CachedPdfDocument removed = null;
+        synchronized (cacheLock) {
+            removed = documentCache.remove(jobId);
+            if (removed != null) {
+                lruCache.remove(jobId);
+                currentCacheBytes = Math.max(0L, currentCacheBytes - removed.getInMemorySize());
+                log.warn(
+                        "Removed cached document for jobId: {} (size={} bytes)",
+                        jobId,
+                        removed.getInMemorySize());
+            } else {
+                log.warn("Attempted to remove jobId: {} but it was not in cache", jobId);
+            }
+        }
+        if (removed != null) {
+            removed.close();
+        }
+    }
+
     private void applyTextState(PDPageContentStream contentStream, PdfJsonTextElement element)
             throws IOException {
         if (element.getCharacterSpacing() != null) {
@@ -5311,6 +5501,8 @@ public class PdfJsonConversionService {
      */
     private static class CachedPdfDocument {
         private final byte[] pdfBytes;
+        private final TempFile pdfTempFile;
+        private final long pdfSize;
         private final PdfJsonDocumentMetadata metadata;
         private final Map<String, PdfJsonFont> fonts; // Font map with UIDs for consistency
         private final Map<Integer, Map<PDFont, String>> pageFontResources; // Page font resources
@@ -5318,10 +5510,14 @@ public class PdfJsonConversionService {
 
         public CachedPdfDocument(
                 byte[] pdfBytes,
+                TempFile pdfTempFile,
+                long pdfSize,
                 PdfJsonDocumentMetadata metadata,
                 Map<String, PdfJsonFont> fonts,
                 Map<Integer, Map<PDFont, String>> pageFontResources) {
             this.pdfBytes = pdfBytes;
+            this.pdfTempFile = pdfTempFile;
+            this.pdfSize = pdfSize;
             this.metadata = metadata;
             // Create defensive copies to prevent mutation of shared maps
             this.fonts =
@@ -5336,8 +5532,14 @@ public class PdfJsonConversionService {
         }
 
         // Getters return defensive copies to prevent external mutation
-        public byte[] getPdfBytes() {
-            return pdfBytes;
+        public byte[] getPdfBytes() throws IOException {
+            if (pdfBytes != null) {
+                return pdfBytes;
+            }
+            if (pdfTempFile != null) {
+                return Files.readAllBytes(pdfTempFile.getPath());
+            }
+            throw new IOException("Cached PDF backing missing");
         }
 
         public PdfJsonDocumentMetadata getMetadata() {
@@ -5352,6 +5554,18 @@ public class PdfJsonConversionService {
             return new java.util.concurrent.ConcurrentHashMap<>(pageFontResources);
         }
 
+        public long getPdfSize() {
+            return pdfSize;
+        }
+
+        public long getInMemorySize() {
+            return pdfBytes != null ? pdfBytes.length : 0L;
+        }
+
+        public boolean isDiskBacked() {
+            return pdfBytes == null && pdfTempFile != null;
+        }
+
         public long getTimestamp() {
             return timestamp;
         }
@@ -5363,7 +5577,19 @@ public class PdfJsonConversionService {
         public CachedPdfDocument withUpdatedFonts(
                 byte[] nextBytes, Map<String, PdfJsonFont> nextFonts) {
             Map<String, PdfJsonFont> fontsToUse = nextFonts != null ? nextFonts : this.fonts;
-            return new CachedPdfDocument(nextBytes, metadata, fontsToUse, pageFontResources);
+            return new CachedPdfDocument(
+                    nextBytes,
+                    null,
+                    nextBytes != null ? nextBytes.length : 0,
+                    metadata,
+                    fontsToUse,
+                    pageFontResources);
+        }
+
+        public void close() {
+            if (pdfTempFile != null) {
+                pdfTempFile.close();
+            }
         }
     }
 
@@ -5444,14 +5670,15 @@ public class PdfJsonConversionService {
             // Cache PDF bytes, metadata, and fonts for lazy page loading
             if (jobId != null) {
                 CachedPdfDocument cached =
-                        new CachedPdfDocument(pdfBytes, docMetadata, fonts, pageFontResources);
-                documentCache.put(jobId, cached);
+                        buildCachedDocument(jobId, pdfBytes, docMetadata, fonts, pageFontResources);
+                putCachedDocument(jobId, cached);
                 log.debug(
-                        "Cached PDF bytes ({} bytes, {} pages, {} fonts) for lazy loading, jobId: {}",
-                        pdfBytes.length,
+                        "Cached PDF bytes ({} bytes, {} pages, {} fonts) for lazy loading, jobId: {} (diskBacked={})",
+                        cached.getPdfSize(),
                         totalPages,
                         fonts.size(),
-                        jobId);
+                        jobId,
+                        cached.isDiskBacked());
 
                 // Schedule cleanup after 30 minutes
                 scheduleDocumentCleanup(jobId);
@@ -5466,9 +5693,10 @@ public class PdfJsonConversionService {
 
     /** Extracts a single page from cached PDF bytes. Re-loads the PDF for each request. */
     public byte[] extractSinglePage(String jobId, int pageNumber) throws IOException {
-        CachedPdfDocument cached = documentCache.get(jobId);
+        CachedPdfDocument cached = getCachedDocument(jobId);
         if (cached == null) {
-            throw new IllegalArgumentException("No cached document found for jobId: " + jobId);
+            throw new stirling.software.SPDF.exception.CacheUnavailableException(
+                    "No cached document found for jobId: " + jobId);
         }
 
         int pageIndex = pageNumber - 1;
@@ -5480,8 +5708,8 @@ public class PdfJsonConversionService {
         }
 
         log.debug(
-                "Loading PDF from bytes ({} bytes) to extract page {} (jobId: {})",
-                cached.getPdfBytes().length,
+                "Loading PDF from {} to extract page {} (jobId: {})",
+                cached.isDiskBacked() ? "disk cache" : "memory cache",
                 pageNumber,
                 jobId);
 
@@ -5627,10 +5855,21 @@ public class PdfJsonConversionService {
         if (jobId == null || jobId.isBlank()) {
             throw new IllegalArgumentException("jobId is required for incremental export");
         }
-        CachedPdfDocument cached = documentCache.get(jobId);
+        log.info("Looking up cache for jobId: {}", jobId);
+        CachedPdfDocument cached = getCachedDocument(jobId);
         if (cached == null) {
-            throw new IllegalArgumentException("No cached document available for jobId: " + jobId);
+            log.error(
+                    "Cache not found for jobId: {}. Available cache keys: {}",
+                    jobId,
+                    documentCache.keySet());
+            throw new stirling.software.SPDF.exception.CacheUnavailableException(
+                    "No cached document available for jobId: " + jobId);
         }
+        log.info(
+                "Found cached document for jobId: {} (size={}, diskBacked={})",
+                jobId,
+                cached.getPdfSize(),
+                cached.isDiskBacked());
         if (updates == null || updates.getPages() == null || updates.getPages().isEmpty()) {
             log.debug(
                     "Incremental export requested with no page updates; returning cached PDF for jobId {}",
@@ -5709,7 +5948,14 @@ public class PdfJsonConversionService {
             document.save(baos);
             byte[] updatedBytes = baos.toByteArray();
 
-            documentCache.put(jobId, cached.withUpdatedFonts(updatedBytes, mergedFonts));
+            CachedPdfDocument updated =
+                    buildCachedDocument(
+                            jobId,
+                            updatedBytes,
+                            cached.getMetadata(),
+                            mergedFonts,
+                            cached.getPageFontResources());
+            putCachedDocument(jobId, updated);
 
             // Clear Type3 cache entries for this incremental update
             clearType3CacheEntriesForJob(updateJobId);
@@ -5724,11 +5970,13 @@ public class PdfJsonConversionService {
 
     /** Clears a cached document. */
     public void clearCachedDocument(String jobId) {
-        CachedPdfDocument cached = documentCache.remove(jobId);
+        CachedPdfDocument cached = getCachedDocument(jobId);
+        removeCachedDocument(jobId);
         if (cached != null) {
             log.debug(
-                    "Removed cached PDF bytes ({} bytes) for jobId: {}",
-                    cached.getPdfBytes().length,
+                    "Removed cached PDF ({} bytes, diskBacked={}) for jobId: {}",
+                    cached.getPdfSize(),
+                    cached.isDiskBacked(),
                     jobId);
         }
 
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/PdfJsonCosMapper.java b/app/core/src/main/java/stirling/software/SPDF/service/PdfJsonCosMapper.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/PdfJsonCosMapper.java
rename to app/core/src/main/java/stirling/software/SPDF/service/PdfJsonCosMapper.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/PdfJsonFallbackFontService.java b/app/core/src/main/java/stirling/software/SPDF/service/PdfJsonFallbackFontService.java
similarity index 86%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/PdfJsonFallbackFontService.java
rename to app/core/src/main/java/stirling/software/SPDF/service/PdfJsonFallbackFontService.java
index 4cf0fc8a1..e4baee055 100644
--- a/app/proprietary/src/main/java/stirling/software/SPDF/service/PdfJsonFallbackFontService.java
+++ b/app/core/src/main/java/stirling/software/SPDF/service/PdfJsonFallbackFontService.java
@@ -33,8 +33,12 @@ public class PdfJsonFallbackFontService {
     public static final String FALLBACK_FONT_CJK_ID = "fallback-noto-cjk";
     public static final String FALLBACK_FONT_JP_ID = "fallback-noto-jp";
     public static final String FALLBACK_FONT_KR_ID = "fallback-noto-korean";
+    public static final String FALLBACK_FONT_TC_ID = "fallback-noto-tc";
     public static final String FALLBACK_FONT_AR_ID = "fallback-noto-arabic";
     public static final String FALLBACK_FONT_TH_ID = "fallback-noto-thai";
+    public static final String FALLBACK_FONT_DEVANAGARI_ID = "fallback-noto-devanagari";
+    public static final String FALLBACK_FONT_MALAYALAM_ID = "fallback-noto-malayalam";
+    public static final String FALLBACK_FONT_TIBETAN_ID = "fallback-noto-tibetan";
 
     // Font name aliases map PDF font names to available fallback fonts
     // This provides better visual consistency when editing PDFs
@@ -59,6 +63,22 @@ public class PdfJsonFallbackFontService {
                     Map.entry("dejavuserif", "fallback-dejavu-serif"),
                     Map.entry("dejavumono", "fallback-dejavu-mono"),
                     Map.entry("dejavusansmono", "fallback-dejavu-mono"),
+                    // Traditional Chinese fonts (Taiwan, Hong Kong, Macau)
+                    Map.entry("mingliu", "fallback-noto-tc"),
+                    Map.entry("pmingliu", "fallback-noto-tc"),
+                    Map.entry("microsoftjhenghei", "fallback-noto-tc"),
+                    Map.entry("jhenghei", "fallback-noto-tc"),
+                    Map.entry("kaiti", "fallback-noto-tc"),
+                    Map.entry("kaiu", "fallback-noto-tc"),
+                    Map.entry("dfkaib5", "fallback-noto-tc"),
+                    Map.entry("dfkai", "fallback-noto-tc"),
+                    // Simplified Chinese fonts (Mainland China) - more common
+                    Map.entry("simsun", "fallback-noto-cjk"),
+                    Map.entry("simhei", "fallback-noto-cjk"),
+                    Map.entry("microsoftyahei", "fallback-noto-cjk"),
+                    Map.entry("yahei", "fallback-noto-cjk"),
+                    Map.entry("songti", "fallback-noto-cjk"),
+                    Map.entry("heiti", "fallback-noto-cjk"),
                     // Noto Sans - Google's universal font (use as last resort generic fallback)
                     Map.entry("noto", "fallback-noto-sans"),
                     Map.entry("notosans", "fallback-noto-sans"));
@@ -83,6 +103,12 @@ public class PdfJsonFallbackFontService {
                                     "classpath:/static/fonts/NotoSansKR-Regular.ttf",
                                     "NotoSansKR-Regular",
                                     "ttf")),
+                    Map.entry(
+                            FALLBACK_FONT_TC_ID,
+                            new FallbackFontSpec(
+                                    "classpath:/static/fonts/NotoSansTC-Regular.ttf",
+                                    "NotoSansTC-Regular",
+                                    "ttf")),
                     Map.entry(
                             FALLBACK_FONT_AR_ID,
                             new FallbackFontSpec(
@@ -95,6 +121,24 @@ public class PdfJsonFallbackFontService {
                                     "classpath:/static/fonts/NotoSansThai-Regular.ttf",
                                     "NotoSansThai-Regular",
                                     "ttf")),
+                    Map.entry(
+                            FALLBACK_FONT_DEVANAGARI_ID,
+                            new FallbackFontSpec(
+                                    "classpath:/static/fonts/NotoSansDevanagari-Regular.ttf",
+                                    "NotoSansDevanagari-Regular",
+                                    "ttf")),
+                    Map.entry(
+                            FALLBACK_FONT_MALAYALAM_ID,
+                            new FallbackFontSpec(
+                                    "classpath:/static/fonts/NotoSansMalayalam-Regular.ttf",
+                                    "NotoSansMalayalam-Regular",
+                                    "ttf")),
+                    Map.entry(
+                            FALLBACK_FONT_TIBETAN_ID,
+                            new FallbackFontSpec(
+                                    "classpath:/static/fonts/NotoSerifTibetan-Regular.ttf",
+                                    "NotoSerifTibetan-Regular",
+                                    "ttf")),
                     // Liberation Sans family
                     Map.entry(
                             "fallback-liberation-sans",
@@ -268,12 +312,29 @@ public class PdfJsonFallbackFontService {
                                     "ttf")));
 
     private final ResourceLoader resourceLoader;
+    private final stirling.software.common.model.ApplicationProperties applicationProperties;
 
     @Value("${stirling.pdf.fallback-font:" + DEFAULT_FALLBACK_FONT_LOCATION + "}")
+    private String legacyFallbackFontLocation;
+
     private String fallbackFontLocation;
 
     private final Map<String, byte[]> fallbackFontCache = new ConcurrentHashMap<>();
 
+    @jakarta.annotation.PostConstruct
+    private void loadConfig() {
+        String configured = null;
+        if (applicationProperties.getPdfEditor() != null) {
+            configured = applicationProperties.getPdfEditor().getFallbackFont();
+        }
+        if (configured != null && !configured.isBlank()) {
+            fallbackFontLocation = configured;
+        } else {
+            fallbackFontLocation = legacyFallbackFontLocation;
+        }
+        log.info("Using fallback font location: {}", fallbackFontLocation);
+    }
+
     public PdfJsonFont buildFallbackFontModel() throws IOException {
         return buildFallbackFontModel(FALLBACK_FONT_ID);
     }
@@ -484,6 +545,20 @@ public class PdfJsonFallbackFontService {
      */
     public String resolveFallbackFontId(int codePoint) {
         Character.UnicodeBlock block = Character.UnicodeBlock.of(codePoint);
+
+        // Bopomofo is primarily used in Taiwan for Traditional Chinese phonetic annotation
+        if (block == Character.UnicodeBlock.BOPOMOFO
+                || block == Character.UnicodeBlock.BOPOMOFO_EXTENDED) {
+            return FALLBACK_FONT_TC_ID;
+        }
+
+        // Compatibility ideographs are primarily used by Traditional Chinese encodings (e.g., Big5,
+        // HKSCS) so prefer the Traditional Chinese fallback here.
+        if (block == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
+                || block == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS_SUPPLEMENT) {
+            return FALLBACK_FONT_TC_ID;
+        }
+
         if (block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
                 || block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A
                 || block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B
@@ -492,19 +567,23 @@ public class PdfJsonFallbackFontService {
                 || block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E
                 || block == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_F
                 || block == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION
-                || block == Character.UnicodeBlock.BOPOMOFO
-                || block == Character.UnicodeBlock.BOPOMOFO_EXTENDED
                 || block == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS) {
             return FALLBACK_FONT_CJK_ID;
         }
 
         Character.UnicodeScript script = Character.UnicodeScript.of(codePoint);
         return switch (script) {
+            // HAN script is used by both Simplified and Traditional Chinese
+            // Default to Simplified (mainland China, 1.4B speakers) as it's more common
+            // Traditional Chinese PDFs are detected via font name aliases (MingLiU, PMingLiU, etc.)
             case HAN -> FALLBACK_FONT_CJK_ID;
             case HIRAGANA, KATAKANA -> FALLBACK_FONT_JP_ID;
             case HANGUL -> FALLBACK_FONT_KR_ID;
             case ARABIC -> FALLBACK_FONT_AR_ID;
             case THAI -> FALLBACK_FONT_TH_ID;
+            case DEVANAGARI -> FALLBACK_FONT_DEVANAGARI_ID;
+            case MALAYALAM -> FALLBACK_FONT_MALAYALAM_ID;
+            case TIBETAN -> FALLBACK_FONT_TIBETAN_ID;
             default -> FALLBACK_FONT_ID;
         };
     }
diff --git a/app/core/src/main/java/stirling/software/SPDF/service/SharedSignatureService.java b/app/core/src/main/java/stirling/software/SPDF/service/SharedSignatureService.java
index 6c349581d..7043118a4 100644
--- a/app/core/src/main/java/stirling/software/SPDF/service/SharedSignatureService.java
+++ b/app/core/src/main/java/stirling/software/SPDF/service/SharedSignatureService.java
@@ -179,7 +179,7 @@ public class SharedSignatureService {
                     StandardOpenOption.TRUNCATE_EXISTING);
 
             // Store reference to image file
-            response.setDataUrl("/api/v1/general/sign/" + imageFileName);
+            response.setDataUrl("/api/v1/general/signatures/" + imageFileName);
         }
 
         log.info("Saved signature {} for user {}", request.getId(), username);
@@ -207,7 +207,7 @@ public class SharedSignatureService {
                                         sig.setLabel(id); // Use ID as label
                                         sig.setType("image"); // Default type
                                         sig.setScope("personal");
-                                        sig.setDataUrl("/api/v1/general/sign/" + fileName);
+                                        sig.setDataUrl("/api/v1/general/signatures/" + fileName);
                                         sig.setCreatedAt(
                                                 Files.getLastModifiedTime(path).toMillis());
                                         sig.setUpdatedAt(
@@ -238,7 +238,7 @@ public class SharedSignatureService {
                                         sig.setLabel(id); // Use ID as label
                                         sig.setType("image"); // Default type
                                         sig.setScope("shared");
-                                        sig.setDataUrl("/api/v1/general/sign/" + fileName);
+                                        sig.setDataUrl("/api/v1/general/signatures/" + fileName);
                                         sig.setCreatedAt(
                                                 Files.getLastModifiedTime(path).toMillis());
                                         sig.setUpdatedAt(
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/JobOwnershipServiceImpl.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/JobOwnershipServiceImpl.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/JobOwnershipServiceImpl.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/JobOwnershipServiceImpl.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/NoOpJobOwnershipService.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/NoOpJobOwnershipService.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/NoOpJobOwnershipService.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/NoOpJobOwnershipService.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonFontService.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonFontService.java
similarity index 93%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonFontService.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonFontService.java
index 1a9f7f698..6a56bad09 100644
--- a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonFontService.java
+++ b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonFontService.java
@@ -5,7 +5,6 @@ import java.nio.file.Files;
 import java.util.Base64;
 import java.util.Locale;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import jakarta.annotation.PostConstruct;
@@ -25,22 +24,16 @@ import stirling.software.common.util.TempFileManager;
 public class PdfJsonFontService {
 
     private final TempFileManager tempFileManager;
+    private final stirling.software.common.model.ApplicationProperties applicationProperties;
 
-    @Getter
-    @Value("${stirling.pdf.json.cff-converter.enabled:true}")
-    private boolean cffConversionEnabled;
+    @Getter private boolean cffConversionEnabled;
 
-    @Getter
-    @Value("${stirling.pdf.json.cff-converter.method:python}")
-    private String cffConverterMethod;
+    @Getter private String cffConverterMethod;
 
-    @Value("${stirling.pdf.json.cff-converter.python-command:/opt/venv/bin/python3}")
     private String pythonCommand;
 
-    @Value("${stirling.pdf.json.cff-converter.python-script:/scripts/convert_cff_to_ttf.py}")
     private String pythonScript;
 
-    @Value("${stirling.pdf.json.cff-converter.fontforge-command:fontforge}")
     private String fontforgeCommand;
 
     private volatile boolean pythonCffConverterAvailable;
@@ -48,6 +41,7 @@ public class PdfJsonFontService {
 
     @PostConstruct
     private void initialiseCffConverterAvailability() {
+        loadConfiguration();
         if (!cffConversionEnabled) {
             log.warn("[FONT-DEBUG] CFF conversion is DISABLED in configuration");
             pythonCffConverterAvailable = false;
@@ -77,6 +71,22 @@ public class PdfJsonFontService {
         log.info("[FONT-DEBUG] Selected CFF converter method: {}", cffConverterMethod);
     }
 
+    private void loadConfiguration() {
+        if (applicationProperties.getPdfEditor() != null
+                && applicationProperties.getPdfEditor().getCffConverter() != null) {
+            var cfg = applicationProperties.getPdfEditor().getCffConverter();
+            this.cffConversionEnabled = cfg.isEnabled();
+            this.cffConverterMethod = cfg.getMethod();
+            this.pythonCommand = cfg.getPythonCommand();
+            this.pythonScript = cfg.getPythonScript();
+            this.fontforgeCommand = cfg.getFontforgeCommand();
+        } else {
+            // Use defaults when config is not available
+            this.cffConversionEnabled = false;
+            log.warn("[FONT-DEBUG] PdfEditor configuration not available, CFF conversion disabled");
+        }
+    }
+
     public byte[] convertCffProgramToTrueType(byte[] fontBytes, String toUnicode) {
         if (!cffConversionEnabled || fontBytes == null || fontBytes.length == 0) {
             log.warn(
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonImageService.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonImageService.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonImageService.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonImageService.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonMetadataService.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonMetadataService.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonMetadataService.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfJsonMetadataService.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfLazyLoadingService.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfLazyLoadingService.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/PdfLazyLoadingService.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/PdfLazyLoadingService.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3ConversionRequest.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3ConversionRequest.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3ConversionRequest.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3ConversionRequest.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3ConversionStrategy.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3ConversionStrategy.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3ConversionStrategy.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3ConversionStrategy.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3FontConversionService.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3FontConversionService.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3FontConversionService.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3FontConversionService.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3FontSignatureCalculator.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3FontSignatureCalculator.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3FontSignatureCalculator.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3FontSignatureCalculator.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GlyphContext.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GlyphContext.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GlyphContext.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GlyphContext.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GlyphExtractor.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GlyphExtractor.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GlyphExtractor.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GlyphExtractor.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GraphicsEngine.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GraphicsEngine.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GraphicsEngine.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3GraphicsEngine.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3LibraryStrategy.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3LibraryStrategy.java
similarity index 85%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3LibraryStrategy.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3LibraryStrategy.java
index 4385e5725..b4e8f9d95 100644
--- a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3LibraryStrategy.java
+++ b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/Type3LibraryStrategy.java
@@ -2,7 +2,6 @@ package stirling.software.SPDF.service.pdfjson.type3;
 
 import java.io.IOException;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
@@ -23,8 +22,8 @@ import stirling.software.SPDF.service.pdfjson.type3.library.Type3FontLibraryPayl
 public class Type3LibraryStrategy implements Type3ConversionStrategy {
 
     private final Type3FontLibrary fontLibrary;
+    private final stirling.software.common.model.ApplicationProperties applicationProperties;
 
-    @Value("${stirling.pdf.json.type3.library.enabled:true}")
     private boolean enabled;
 
     @Override
@@ -42,6 +41,19 @@ public class Type3LibraryStrategy implements Type3ConversionStrategy {
         return enabled && fontLibrary != null && fontLibrary.isLoaded();
     }
 
+    @jakarta.annotation.PostConstruct
+    private void loadConfiguration() {
+        if (applicationProperties.getPdfEditor() != null
+                && applicationProperties.getPdfEditor().getType3() != null
+                && applicationProperties.getPdfEditor().getType3().getLibrary() != null) {
+            var cfg = applicationProperties.getPdfEditor().getType3().getLibrary();
+            this.enabled = cfg.isEnabled();
+        } else {
+            this.enabled = false;
+            log.warn("PdfEditor Type3 library configuration not available, disabled");
+        }
+    }
+
     @Override
     public PdfJsonFontConversionCandidate convert(
             Type3ConversionRequest request, Type3GlyphContext context) throws IOException {
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibrary.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibrary.java
similarity index 94%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibrary.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibrary.java
index 32a6abec2..f00c729a2 100644
--- a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibrary.java
+++ b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibrary.java
@@ -14,7 +14,6 @@ import java.util.stream.Collectors;
 
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.font.PDType3Font;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.stereotype.Component;
@@ -34,8 +33,8 @@ public class Type3FontLibrary {
 
     private final ObjectMapper objectMapper;
     private final ResourceLoader resourceLoader;
+    private final stirling.software.common.model.ApplicationProperties applicationProperties;
 
-    @Value("${stirling.pdf.json.type3.library.index:classpath:/type3/library/index.json}")
     private String indexLocation;
 
     private final Map<String, Type3FontLibraryEntry> signatureIndex = new ConcurrentHashMap<>();
@@ -44,6 +43,17 @@ public class Type3FontLibrary {
 
     @jakarta.annotation.PostConstruct
     void initialise() {
+        if (applicationProperties.getPdfEditor() != null
+                && applicationProperties.getPdfEditor().getType3() != null
+                && applicationProperties.getPdfEditor().getType3().getLibrary() != null) {
+            this.indexLocation =
+                    applicationProperties.getPdfEditor().getType3().getLibrary().getIndex();
+        } else {
+            log.warn(
+                    "[TYPE3] PdfEditor Type3 library configuration not available; Type3 library disabled");
+            entries = List.of();
+            return;
+        }
         Resource resource = resourceLoader.getResource(indexLocation);
         if (!resource.exists()) {
             log.info("[TYPE3] Library index {} not found; Type3 library disabled", indexLocation);
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryEntry.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryEntry.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryEntry.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryEntry.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryMatch.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryMatch.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryMatch.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryMatch.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryPayload.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryPayload.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryPayload.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/library/Type3FontLibraryPayload.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/model/Type3GlyphOutline.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/model/Type3GlyphOutline.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/model/Type3GlyphOutline.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/model/Type3GlyphOutline.java
diff --git a/app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/tool/Type3SignatureTool.java b/app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/tool/Type3SignatureTool.java
similarity index 100%
rename from app/proprietary/src/main/java/stirling/software/SPDF/service/pdfjson/type3/tool/Type3SignatureTool.java
rename to app/core/src/main/java/stirling/software/SPDF/service/pdfjson/type3/tool/Type3SignatureTool.java
diff --git a/app/core/src/main/resources/settings.yml.template b/app/core/src/main/resources/settings.yml.template
index 5ea28f71e..dffebe1bb 100644
--- a/app/core/src/main/resources/settings.yml.template
+++ b/app/core/src/main/resources/settings.yml.template
@@ -12,7 +12,6 @@
 
 security:
   enableLogin: true # set to 'true' to enable login
-  csrfDisabled: false # set to 'true' to disable CSRF protection (not recommended for production)
   loginAttemptCount: 5 # lock user account after 5 tries; when using e.g. Fail2Ban you can deactivate the function with -1
   loginResetTimeMinutes: 120 # lock account for 2 hours after x attempts
   loginMethod: all # Accepts values like 'all' and 'normal'(only Login with Username/Password), 'oauth2'(only Login with OAuth2) or 'saml2'(only Login with SAML2)
@@ -59,6 +58,8 @@ security:
     idpCert: classpath:okta.cert # The certificate your Provider will use to authenticate your app's SAML authentication requests. Provided by your Provider
     privateKey: classpath:saml-private-key.key # Your private key. Generated from your keypair
     spCert: classpath:saml-public-cert.crt # Your signing certificate. Generated from your keypair
+    # IMPORTANT: For SAML setup, download your SP metadata from the BACKEND URL: http://localhost:8080/saml2/service-provider-metadata/{registrationId}
+    # Do NOT use the frontend dev server URL (localhost:5173) as it will generate incorrect ACS URLs. Always use the backend URL (localhost:8080) for SAML configuration.
   jwt: # This feature is currently under development and not yet fully supported. Do not use in production.
     persistence: true # Set to 'true' to enable JWT key store
     enableKeyRotation: true # Set to 'true' to enable key pair rotation
@@ -105,6 +106,11 @@ mail:
   username: '' # SMTP server username
   password: '' # SMTP server password
   from: '' # sender email address
+  startTlsEnable: true # enable STARTTLS (explicit TLS upgrade after connecting) when supported by the SMTP server
+  startTlsRequired: false # require STARTTLS; connection fails if the upgrade command is not supported
+  sslEnable: false # enable SSL/TLS wrapper for implicit TLS (typically used with port 465)
+  sslTrust: '' # optional trusted host override, e.g. "smtp.example.com" or "*"; defaults to "*" (trust all) when empty
+  sslCheckServerIdentity: false # enable hostname verification when using SSL/TLS
 
 legal:
   termsAndConditions: https://www.stirling.com/legal/terms-of-service # URL to the terms and conditions of your application (e.g. https://example.com/terms). Empty string to disable or filename to load from local file in static folder
@@ -122,13 +128,15 @@ system:
   customHTMLFiles: false # enable to have files placed in /customFiles/templates override the existing template HTML files
   tessdataDir: /usr/share/tessdata # path to the directory containing the Tessdata files. This setting is relevant for Windows systems. For Windows users, this path should be adjusted to point to the appropriate directory where the Tessdata files are stored.
   enableAnalytics: null # Master toggle for analytics: set to 'true' to enable all analytics, 'false' to disable all analytics, or leave as 'null' to prompt admin on first launch
+  enableDesktopInstallSlide: true # Set to 'false' to hide the desktop app installation slide in the onboarding flow
   enablePosthog: null # Enable PostHog analytics (open-source product analytics): set to 'true' to enable, 'false' to disable, or 'null' to enable by default when analytics is enabled
   enableScarf: null # Enable Scarf tracking pixel: set to 'true' to enable, 'false' to disable, or 'null' to enable by default when analytics is enabled
   enableUrlToPDF: false # Set to 'true' to enable URL to PDF, INTERNAL ONLY, known security issues, should not be used externally
   disableSanitize: false # set to true to disable Sanitize HTML; (can lead to injections in HTML)
   maxDPI: 500 # Maximum allowed DPI for PDF to image conversion
-  corsAllowedOrigins: [] # List of allowed origins for CORS (e.g. ['http://localhost:5173', 'https://app.example.com']). Leave empty to disable CORS.
-  frontendUrl: '' # Base URL for frontend (e.g. 'https://pdf.example.com'). Used for generating invite links in emails. If empty, falls back to backend URL.
+  corsAllowedOrigins: [] # List of allowed origins for CORS (e.g. ['http://localhost:5173', 'https://app.example.com']). Leave empty to disable CORS. For local development with frontend on port 5173, add 'http://localhost:5173'
+  backendUrl: '' # Backend base URL for SAML/OAuth/API callbacks (e.g. 'http://localhost:8080' for dev, 'https://api.example.com' for production). REQUIRED for SSO authentication to work correctly. This is where your IdP will send SAML responses and OAuth callbacks. Leave empty to default to 'http://localhost:8080' in development.
+  frontendUrl: '' # Frontend URL for invite email links (e.g. 'https://app.example.com'). Optional - if not set, will use backendUrl. This is the URL users click in invite emails.
   serverCertificate:
     enabled: true # Enable server-side certificate for "Sign with Stirling-PDF" option
     organizationName: Stirling-PDF # Organization name for generated certificates
@@ -174,23 +182,6 @@ system:
   databaseBackup:
     cron: '0 0 0 * * ?' # Cron expression for automatic database backups "0 0 0 * * ?" daily at midnight
 
-stirling:
-  pdf:
-    fallback-font: classpath:/static/fonts/NotoSans-Regular.ttf # Override to point at a custom fallback font
-    json:
-      font-normalization:
-        enabled: false # IMPORTANT: Disable to preserve ToUnicode CMaps for correct font rendering. Ghostscript strips Unicode mappings from CID fonts.
-      cff-converter:
-        enabled: true # Wrap CFF/Type1C fonts as OpenType-CFF for browser compatibility
-        method: python # Converter method: 'python' (fontTools, recommended - wraps as OTF), 'fontforge' (legacy - converts to TTF, may hang on CID fonts)
-        python-command: /opt/venv/bin/python3 # Python interpreter path
-        python-script: /scripts/convert_cff_to_ttf.py # Path to font wrapping script
-        fontforge-command: fontforge # Override if FontForge is installed under a different name/path
-      type3:
-        library:
-          enabled: true # Match common Type3 fonts against the built-in library of converted programs
-          index: classpath:/type3/library/index.json # Override to point at a custom index.json (supports http:, file:, classpath:)
-
 ui:
   appNameNavbar: '' # name displayed on the navigation bar
   logoStyle: classic # Options: 'classic' (default - classic S icon) or 'modern' (minimalist logo)
@@ -219,6 +210,7 @@ processExecutor:
     weasyPrintSessionLimit: 16
     installAppSessionLimit: 1
     calibreSessionLimit: 1
+    imageMagickSessionLimit: 4
     ghostscriptSessionLimit: 8
     ocrMyPdfSessionLimit: 2
   timeoutMinutes: # Process executor timeout in minutes
@@ -228,7 +220,26 @@ processExecutor:
     weasyPrinttimeoutMinutes: 30
     installApptimeoutMinutes: 60
     calibretimeoutMinutes: 30
+    imageMagickTimeoutMinutes: 30
     tesseractTimeoutMinutes: 30
     qpdfTimeoutMinutes: 30
     ghostscriptTimeoutMinutes: 30
     ocrMyPdfTimeoutMinutes: 30
+
+pdfEditor:
+  fallback-font: classpath:/static/fonts/NotoSans-Regular.ttf # Override to point at a custom fallback font
+  cache:
+    max-bytes: -1 # Max in-memory cache size in bytes; -1 disables byte cap
+    max-percent: 20 # Max in-memory cache as % of JVM max; used when max-bytes <= 0
+  font-normalization:
+    enabled: false # IMPORTANT: Disable to preserve ToUnicode CMaps for correct font rendering. Ghostscript strips Unicode mappings from CID fonts.
+  cff-converter:
+    enabled: true # Wrap CFF/Type1CFF fonts as OpenType-CFF for browser compatibility
+    method: python # Converter method: 'python' (fontTools, recommended - wraps as OTF), 'fontforge' (legacy - converts to TTF, may hang on CID fonts)
+    python-command: /opt/venv/bin/python3 # Python interpreter path
+    python-script: /scripts/convert_cff_to_ttf.py # Path to font wrapping script
+    fontforge-command: fontforge # Override if FontForge is installed under a different name/path
+  type3:
+    library:
+      enabled: true # Match common Type3 fonts against the built-in library of converted programs
+      index: classpath:/type3/library/index.json # Override to point at a custom index.json (supports http:, file:, classpath:)
diff --git a/app/core/src/main/resources/static/fonts/NotoSansDevanagari-Regular.ttf b/app/core/src/main/resources/static/fonts/NotoSansDevanagari-Regular.ttf
new file mode 100644
index 000000000..9a8c4b105
Binary files /dev/null and b/app/core/src/main/resources/static/fonts/NotoSansDevanagari-Regular.ttf differ
diff --git a/app/core/src/main/resources/static/fonts/NotoSansMalayalam-Regular.ttf b/app/core/src/main/resources/static/fonts/NotoSansMalayalam-Regular.ttf
new file mode 100644
index 000000000..a5a0fe65a
Binary files /dev/null and b/app/core/src/main/resources/static/fonts/NotoSansMalayalam-Regular.ttf differ
diff --git a/app/core/src/main/resources/static/fonts/NotoSansTC-Regular.ttf b/app/core/src/main/resources/static/fonts/NotoSansTC-Regular.ttf
new file mode 100644
index 000000000..75e2b0806
Binary files /dev/null and b/app/core/src/main/resources/static/fonts/NotoSansTC-Regular.ttf differ
diff --git a/app/core/src/main/resources/static/fonts/NotoSerifTibetan-Regular.ttf b/app/core/src/main/resources/static/fonts/NotoSerifTibetan-Regular.ttf
new file mode 100644
index 000000000..06b817d5c
Binary files /dev/null and b/app/core/src/main/resources/static/fonts/NotoSerifTibetan-Regular.ttf differ
diff --git a/app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java b/app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java
index c9f02cd28..5a5eff1f1 100644
--- a/app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java
+++ b/app/core/src/test/java/stirling/software/SPDF/controller/api/security/CertSignControllerTest.java
@@ -1,9 +1,10 @@
 package stirling.software.SPDF.controller.api.security;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.lenient;
 
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -107,7 +108,8 @@ class CertSignControllerTest {
             derCertBytes = baos.toByteArray();
         }
 
-        when(pdfDocumentFactory.load(any(MultipartFile.class)))
+        lenient()
+                .when(pdfDocumentFactory.load(any(MultipartFile.class)))
                 .thenAnswer(
                         invocation -> {
                             MultipartFile file = invocation.getArgument(0);
@@ -167,6 +169,31 @@ class CertSignControllerTest {
         assertTrue(response.getBody().length > 0);
     }
 
+    @Test
+    void testSignPdfWithMissingPkcs12FileThrowsError() {
+        MockMultipartFile pdfFile =
+                new MockMultipartFile(
+                        "fileInput", "test.pdf", MediaType.APPLICATION_PDF_VALUE, pdfBytes);
+
+        SignPDFWithCertRequest request = new SignPDFWithCertRequest();
+        request.setFileInput(pdfFile);
+        request.setCertType("PFX");
+        request.setPassword("password");
+        request.setShowSignature(false);
+        request.setReason("test");
+        request.setLocation("test");
+        request.setName("tester");
+        request.setPageNumber(1);
+        request.setShowLogo(false);
+
+        IllegalArgumentException exception =
+                assertThrows(
+                        IllegalArgumentException.class,
+                        () -> certSignController.signPDFWithCert(request));
+
+        assertTrue(exception.getMessage().contains("PKCS12 keystore"));
+    }
+
     @Test
     void testSignPdfWithJks() throws Exception {
         MockMultipartFile pdfFile =
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/ProprietaryUIDataController.java b/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/ProprietaryUIDataController.java
index d335eb9c2..e13d807da 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/ProprietaryUIDataController.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/ProprietaryUIDataController.java
@@ -94,6 +94,22 @@ public class ProprietaryUIDataController {
         this.auditRepository = auditRepository;
     }
 
+    /**
+     * Get the backend base URL for SAML/OAuth redirects. Uses system.backendUrl from config if set,
+     * otherwise defaults to http://localhost:8080
+     */
+    private String getBackendBaseUrl() {
+        String backendUrl = applicationProperties.getSystem().getBackendUrl();
+
+        // If backendUrl is configured, use it
+        if (backendUrl != null && !backendUrl.trim().isEmpty()) {
+            return backendUrl.trim();
+        }
+
+        // For development, default to localhost:8080 (backend port)
+        return "http://localhost:8080";
+    }
+
     @GetMapping("/audit-dashboard")
     @PreAuthorize("hasRole('ADMIN')")
     @EnterpriseEndpoint
@@ -185,14 +201,17 @@ public class ProprietaryUIDataController {
         }
 
         SAML2 saml2 = securityProps.getSaml2();
-        if (securityProps.isSaml2Active()
-                && applicationProperties.getSystem().getEnableAlphaFunctionality()
-                && applicationProperties.getPremium().isEnabled()) {
+        if (securityProps.isSaml2Active() && applicationProperties.getPremium().isEnabled()) {
             String samlIdp = saml2.getProvider();
             String saml2AuthenticationPath = "/saml2/authenticate/" + saml2.getRegistrationId();
 
+            // For SAML, we need to use the backend URL directly, not a relative path
+            // This ensures Spring Security generates the correct ACS URL
+            String backendUrl = getBackendBaseUrl();
+            String fullSamlPath = backendUrl + saml2AuthenticationPath;
+
             if (!applicationProperties.getPremium().getProFeatures().isSsoAutoLogin()) {
-                providerList.put(saml2AuthenticationPath, samlIdp + " (SAML 2)");
+                providerList.put(fullSamlPath, samlIdp + " (SAML 2)");
             }
         }
 
@@ -205,6 +224,10 @@ public class ProprietaryUIDataController {
         data.setLoginMethod(securityProps.getLoginMethod());
         data.setAltLogin(!providerList.isEmpty() && securityProps.isAltLogin());
 
+        // Add language configuration for login page
+        data.setLanguages(applicationProperties.getUi().getLanguages());
+        data.setDefaultLocale(applicationProperties.getSystem().getDefaultLocale());
+
         return ResponseEntity.ok(data);
     }
 
@@ -328,6 +351,7 @@ public class ProprietaryUIDataController {
         data.setGrandfatheredUserCount(grandfatheredCount);
         data.setLicenseMaxUsers(licenseMaxUsers);
         data.setPremiumEnabled(premiumEnabled);
+        data.setMailEnabled(applicationProperties.getMail().isEnabled());
 
         return ResponseEntity.ok(data);
     }
@@ -376,7 +400,7 @@ public class ProprietaryUIDataController {
         data.setUsername(username);
         data.setRole(user.get().getRolesAsString());
         data.setSettings(settingsJson);
-        data.setChangeCredsFlag(user.get().isFirstLogin());
+        data.setChangeCredsFlag(user.get().isFirstLogin() || user.get().isForcePasswordChange());
         data.setOAuth2Login(isOAuth2Login);
         data.setSaml2Login(isSaml2Login);
 
@@ -491,6 +515,8 @@ public class ProprietaryUIDataController {
         private boolean altLogin;
         private boolean firstTimeSetup;
         private boolean showDefaultCredentials;
+        private List<String> languages;
+        private String defaultLocale;
     }
 
     @Data
@@ -510,6 +536,7 @@ public class ProprietaryUIDataController {
         private int grandfatheredUserCount;
         private int licenseMaxUsers;
         private boolean premiumEnabled;
+        private boolean mailEnabled;
     }
 
     @Data
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/SignatureController.java b/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/SignatureController.java
index f42b23a97..53b3e1f38 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/SignatureController.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/controller/api/SignatureController.java
@@ -1,7 +1,12 @@
 package stirling.software.proprietary.controller.api;
 
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import stirling.software.common.annotations.api.UserApi;
+import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.proprietary.model.api.signature.SavedSignatureRequest;
 import stirling.software.proprietary.model.api.signature.SavedSignatureResponse;
 import stirling.software.proprietary.security.service.UserService;
@@ -28,7 +33,6 @@ import stirling.software.proprietary.service.SignatureService;
  * authentication and enforces per-user storage limits. All endpoints require authentication
  * via @PreAuthorize("isAuthenticated()").
  */
-@UserApi
 @Slf4j
 @RestController
 @RequestMapping("/api/v1/proprietary/signatures")
@@ -38,6 +42,7 @@ public class SignatureController {
 
     private final SignatureService signatureService;
     private final UserService userService;
+    private static final String ALL_USERS_FOLDER = "ALL_USERS";
 
     /**
      * Save a new signature for the authenticated user. Enforces storage limits and authentication
@@ -84,19 +89,105 @@ public class SignatureController {
     }
 
     /**
-     * Delete a signature owned by the authenticated user. Users can only delete their own personal
-     * signatures, not shared ones.
+     * Update a signature label. Users can update labels for their own personal signatures and for
+     * shared signatures.
+     */
+    @PostMapping("/{signatureId}/label")
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
+    public ResponseEntity<Void> updateSignatureLabel(
+            @PathVariable String signatureId, @RequestBody Map<String, String> body) {
+        try {
+            String username = userService.getCurrentUsername();
+            String newLabel = body.get("label");
+
+            if (newLabel == null || newLabel.trim().isEmpty()) {
+                log.warn("Invalid label update request");
+                return ResponseEntity.badRequest().build();
+            }
+
+            signatureService.updateSignatureLabel(username, signatureId, newLabel);
+            log.info("User {} updated label for signature {}", username, signatureId);
+            return ResponseEntity.noContent().build();
+        } catch (IOException e) {
+            log.warn("Failed to update signature label: {}", e.getMessage());
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+        }
+    }
+
+    /**
+     * Delete a signature owned by the authenticated user. Users can delete their own personal
+     * signatures. Admins can also delete shared signatures.
      */
     @DeleteMapping("/{signatureId}")
+    @PreAuthorize("!hasAuthority('ROLE_DEMO_USER')")
     public ResponseEntity<Void> deleteSignature(@PathVariable String signatureId) {
         try {
             String username = userService.getCurrentUsername();
-            signatureService.deleteSignature(username, signatureId);
-            log.info("User {} deleted signature {}", username, signatureId);
-            return ResponseEntity.noContent().build();
+            boolean isAdmin = userService.isCurrentUserAdmin();
+
+            // Validate filename to prevent path traversal
+            if (signatureId.contains("..")
+                    || signatureId.contains("/")
+                    || signatureId.contains("\\")) {
+                log.warn("Invalid signature ID: {}", signatureId);
+                return ResponseEntity.badRequest().build();
+            }
+
+            // Try to delete from personal folder first
+            try {
+                signatureService.deleteSignature(username, signatureId);
+                log.info("User {} deleted personal signature {}", username, signatureId);
+                return ResponseEntity.noContent().build();
+            } catch (IOException e) {
+                // If not found in personal folder, check if it's in shared folder
+                if (isAdmin) {
+                    // Admin can delete from shared folder
+                    if (deleteFromSharedFolder(signatureId)) {
+                        log.info("Admin {} deleted shared signature {}", username, signatureId);
+                        return ResponseEntity.noContent().build();
+                    }
+                }
+                // If not admin or not found in shared folder either, return 404
+                throw e;
+            }
         } catch (IOException e) {
             log.warn("Failed to delete signature {} for user: {}", signatureId, e.getMessage());
             return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
         }
     }
+
+    /**
+     * Delete a signature from the shared (ALL_USERS) folder. Only admins should call this method.
+     */
+    private boolean deleteFromSharedFolder(String signatureId) throws IOException {
+        String signatureBasePath = InstallationPathConfig.getSignaturesPath();
+        Path sharedFolder = Paths.get(signatureBasePath, ALL_USERS_FOLDER);
+        boolean deleted = false;
+
+        if (Files.exists(sharedFolder)) {
+            try (Stream<Path> stream = Files.list(sharedFolder)) {
+                List<Path> matchingFiles =
+                        stream.filter(
+                                        path ->
+                                                path.getFileName()
+                                                        .toString()
+                                                        .startsWith(signatureId + "."))
+                                .toList();
+                for (Path file : matchingFiles) {
+                    Files.delete(file);
+                    deleted = true;
+                    log.info("Deleted shared signature file: {}", file);
+                }
+            }
+
+            // Also delete metadata file if it exists
+            Path metadataPath = sharedFolder.resolve(signatureId + ".json");
+            if (Files.exists(metadataPath)) {
+                Files.delete(metadataPath);
+                log.info("Deleted shared signature metadata: {}", metadataPath);
+            }
+        }
+
+        return deleted;
+    }
 }
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java
index d035dbc58..17857fc85 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java
@@ -120,9 +120,7 @@ public class AccountWebController {
 
         SAML2 saml2 = securityProps.getSaml2();
 
-        if (securityProps.isSaml2Active()
-                && applicationProperties.getSystem().getEnableAlphaFunctionality()
-                && applicationProperties.getPremium().isEnabled()) {
+        if (securityProps.isSaml2Active() && applicationProperties.getPremium().isEnabled()) {
             String samlIdp = saml2.getProvider();
             String saml2AuthenticationPath = "/saml2/authenticate/" + saml2.getRegistrationId();
 
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java
index 6a565cade..6538b7ee9 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java
@@ -33,7 +33,8 @@ public class MailConfig {
 
         // Creates a new instance of JavaMailSenderImpl, which is a Spring implementation
         JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-        mailSender.setHost(mailProperties.getHost());
+        String host = mailProperties.getHost();
+        mailSender.setHost(host);
         mailSender.setPort(mailProperties.getPort());
         mailSender.setDefaultEncoding("UTF-8");
 
@@ -70,8 +71,32 @@ public class MailConfig {
             log.info("SMTP authentication disabled - no credentials provided");
         }
 
+        boolean startTlsEnabled =
+                mailProperties.getStartTlsEnable() == null || mailProperties.getStartTlsEnable();
         // Enables STARTTLS to encrypt the connection if supported by the SMTP server
-        props.put("mail.smtp.starttls.enable", "true");
+        props.put("mail.smtp.starttls.enable", Boolean.toString(startTlsEnabled));
+        if (mailProperties.getStartTlsRequired() != null) {
+            props.put(
+                    "mail.smtp.starttls.required", mailProperties.getStartTlsRequired().toString());
+        }
+
+        if (mailProperties.getSslEnable() != null) {
+            props.put("mail.smtp.ssl.enable", mailProperties.getSslEnable().toString());
+        }
+
+        // Trust the configured host to allow STARTTLS with self-signed certificates
+        String sslTrust = mailProperties.getSslTrust();
+        if (sslTrust == null || sslTrust.trim().isEmpty()) {
+            sslTrust = "*";
+        }
+        if (sslTrust != null && !sslTrust.trim().isEmpty()) {
+            props.put("mail.smtp.ssl.trust", sslTrust);
+        }
+        if (mailProperties.getSslCheckServerIdentity() != null) {
+            props.put(
+                    "mail.smtp.ssl.checkserveridentity",
+                    mailProperties.getSslCheckServerIdentity().toString());
+        }
 
         // Returns the configured mail sender, ready to send emails
         return mailSender;
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java
index ab1e4934d..1226237c8 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java
@@ -1,7 +1,6 @@
 package stirling.software.proprietary.security.configuration;
 
 import java.util.List;
-import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -25,8 +24,6 @@ import org.springframework.security.saml2.provider.service.web.authentication.Op
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
-import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
-import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.savedrequest.NullRequestCache;
 import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 import org.springframework.web.cors.CorsConfiguration;
@@ -47,7 +44,6 @@ import stirling.software.proprietary.security.database.repository.PersistentLogi
 import stirling.software.proprietary.security.filter.IPRateLimitingFilter;
 import stirling.software.proprietary.security.filter.JwtAuthenticationFilter;
 import stirling.software.proprietary.security.filter.UserAuthenticationFilter;
-import stirling.software.proprietary.security.model.User;
 import stirling.software.proprietary.security.oauth2.CustomOAuth2AuthenticationFailureHandler;
 import stirling.software.proprietary.security.oauth2.CustomOAuth2AuthenticationSuccessHandler;
 import stirling.software.proprietary.security.saml2.CustomSaml2AuthenticationFailureHandler;
@@ -198,74 +194,19 @@ public class SecurityConfiguration {
             http.cors(cors -> cors.disable());
         }
 
-        if (securityProperties.getCsrfDisabled() || !loginEnabledValue) {
-            http.csrf(CsrfConfigurer::disable);
-        }
+        http.csrf(CsrfConfigurer::disable);
 
         if (loginEnabledValue) {
-            boolean v2Enabled = appConfig.v2Enabled();
 
             http.addFilterBefore(
                             userAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
                     .addFilterBefore(rateLimitingFilter, UsernamePasswordAuthenticationFilter.class)
                     .addFilterBefore(jwtAuthenticationFilter, UserAuthenticationFilter.class);
 
-            if (!securityProperties.getCsrfDisabled()) {
-                CookieCsrfTokenRepository cookieRepo =
-                        CookieCsrfTokenRepository.withHttpOnlyFalse();
-                CsrfTokenRequestAttributeHandler requestHandler =
-                        new CsrfTokenRequestAttributeHandler();
-                requestHandler.setCsrfRequestAttributeName(null);
-                http.csrf(
-                        csrf ->
-                                csrf.ignoringRequestMatchers(
-                                                request -> {
-                                                    String uri = request.getRequestURI();
-
-                                                    // Ignore CSRF for auth endpoints
-                                                    if (uri.startsWith("/api/v1/auth/")) {
-                                                        return true;
-                                                    }
-
-                                                    String apiKey = request.getHeader("X-API-KEY");
-                                                    // If there's no API key, don't ignore CSRF
-                                                    // (return false)
-                                                    if (apiKey == null || apiKey.trim().isEmpty()) {
-                                                        return false;
-                                                    }
-                                                    // Validate API key using existing UserService
-                                                    try {
-                                                        Optional<User> user =
-                                                                userService.getUserByApiKey(apiKey);
-                                                        // If API key is valid, ignore CSRF (return
-                                                        // true)
-                                                        // If API key is invalid, don't ignore CSRF
-                                                        // (return false)
-                                                        return user.isPresent();
-                                                    } catch (Exception e) {
-                                                        // If there's any error validating the API
-                                                        // key, don't ignore CSRF
-                                                        return false;
-                                                    }
-                                                })
-                                        .csrfTokenRepository(cookieRepo)
-                                        .csrfTokenRequestHandler(requestHandler));
-            }
-
             http.sessionManagement(
-                    sessionManagement -> {
-                        if (v2Enabled) {
+                    sessionManagement ->
                             sessionManagement.sessionCreationPolicy(
-                                    SessionCreationPolicy.STATELESS);
-                        } else {
-                            sessionManagement
-                                    .sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
-                                    .maximumSessions(10)
-                                    .maxSessionsPreventsLogin(false)
-                                    .sessionRegistry(sessionRegistry)
-                                    .expiredUrl("/login?logout=true");
-                        }
-                    });
+                                    SessionCreationPolicy.STATELESS));
             http.authenticationProvider(daoAuthenticationProvider());
             http.requestCache(requestCache -> requestCache.requestCache(new NullRequestCache()));
 
@@ -348,18 +289,7 @@ public class SecurityConfiguration {
             if (securityProperties.isOauth2Active()) {
                 http.oauth2Login(
                         oauth2 -> {
-                            // v1: Use /oauth2 as login page for Thymeleaf templates
-                            if (!v2Enabled) {
-                                oauth2.loginPage("/oauth2");
-                            }
-
-                            // v2: Don't set loginPage, let default OAuth2 flow handle it
-                            oauth2
-                                    /*
-                                       This Custom handler is used to check if the OAUTH2 user trying to log in, already exists in the database.
-                                       If user exists, login proceeds as usual. If user does not exist, then it is auto-created but only if 'OAUTH2AutoCreateUser'
-                                       is set as true, else login fails with an error message advising the same.
-                                    */
+                            oauth2.loginPage("/login")
                                     .successHandler(
                                             new CustomOAuth2AuthenticationSuccessHandler(
                                                     loginAttemptService,
@@ -393,12 +323,8 @@ public class SecurityConfiguration {
                         .saml2Login(
                                 saml2 -> {
                                     try {
-                                        // Only set login page for v1/Thymeleaf mode
-                                        if (!v2Enabled) {
-                                            saml2.loginPage("/saml2");
-                                        }
-
-                                        saml2.relyingPartyRegistrationRepository(
+                                        saml2.loginPage("/login")
+                                                .relyingPartyRegistrationRepository(
                                                         saml2RelyingPartyRegistrations)
                                                 .authenticationManager(
                                                         new ProviderManager(authenticationProvider))
@@ -408,7 +334,8 @@ public class SecurityConfiguration {
                                                                 securityProperties.getSaml2(),
                                                                 userService,
                                                                 jwtService,
-                                                                licenseSettingsService))
+                                                                licenseSettingsService,
+                                                                applicationProperties))
                                                 .failureHandler(
                                                         new CustomSaml2AuthenticationFailureHandler())
                                                 .authenticationRequestResolver(
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/AuthController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/AuthController.java
index de6428554..c3e11c3ab 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/AuthController.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/AuthController.java
@@ -244,10 +244,13 @@ public class AuthController {
         userMap.put("username", user.getUsername());
         userMap.put("role", user.getRolesAsString());
         userMap.put("enabled", user.isEnabled());
+        userMap.put(
+                "authenticationType",
+                user.getAuthenticationType()); // Expose authentication type for SSO detection
 
         // Add metadata for OAuth compatibility
         Map<String, Object> appMetadata = new HashMap<>();
-        appMetadata.put("provider", user.getAuthenticationType()); // Default to email provider
+        appMetadata.put("provider", user.getAuthenticationType());
         userMap.put("app_metadata", appMetadata);
 
         return userMap;
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java
index f2b3fd510..6a18aeff0 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java
@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,6 +19,7 @@ import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.web.bind.annotation.*;
 
+import jakarta.mail.MessagingException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.transaction.Transactional;
@@ -236,6 +238,8 @@ public class UserController {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
                     .body(Map.of("error", "incorrectPassword", "message", "Incorrect password"));
         }
+        // Set flags before changing password so they're saved together
+        user.setForcePasswordChange(false);
         userService.changePassword(user, newPassword);
         userService.changeFirstUse(user, false);
         // Logout using Spring's utility
@@ -584,6 +588,79 @@ public class UserController {
         return ResponseEntity.ok(Map.of("message", "User role updated successfully"));
     }
 
+    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @PostMapping("/admin/changePasswordForUser")
+    public ResponseEntity<?> changePasswordForUser(
+            @RequestParam(name = "username") String username,
+            @RequestParam(name = "newPassword", required = false) String newPassword,
+            @RequestParam(name = "generateRandom", defaultValue = "false") boolean generateRandom,
+            @RequestParam(name = "sendEmail", defaultValue = "false") boolean sendEmail,
+            @RequestParam(name = "includePassword", defaultValue = "false") boolean includePassword,
+            @RequestParam(name = "forcePasswordChange", defaultValue = "false")
+                    boolean forcePasswordChange,
+            HttpServletRequest request,
+            Authentication authentication)
+            throws SQLException, UnsupportedProviderException, MessagingException {
+        Optional<User> userOpt = userService.findByUsernameIgnoreCase(username);
+        if (userOpt.isEmpty()) {
+            return ResponseEntity.status(HttpStatus.NOT_FOUND)
+                    .body(Map.of("error", "User not found."));
+        }
+
+        String currentUsername = authentication.getName();
+        if (currentUsername.equalsIgnoreCase(username)) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .body(Map.of("error", "Cannot change your own password."));
+        }
+
+        User user = userOpt.get();
+
+        String finalPassword = newPassword;
+        if (generateRandom) {
+            finalPassword = UUID.randomUUID().toString().replace("-", "").substring(0, 12);
+        }
+
+        if (finalPassword == null || finalPassword.trim().isEmpty()) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                    .body(Map.of("error", "New password is required."));
+        }
+
+        // Set force password change flag before changing password so both are saved together
+        user.setForcePasswordChange(forcePasswordChange);
+        userService.changePassword(user, finalPassword);
+
+        // Invalidate all active sessions to force reauthentication
+        userService.invalidateUserSessions(username);
+
+        if (sendEmail) {
+            if (emailService.isEmpty() || !applicationProperties.getMail().isEnabled()) {
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                        .body(Map.of("error", "Email is not configured."));
+            }
+
+            String userEmail = user.getUsername();
+            // Check if username is a valid email format
+            if (userEmail == null || userEmail.isBlank() || !userEmail.contains("@")) {
+                return ResponseEntity.status(HttpStatus.BAD_REQUEST)
+                        .body(
+                                Map.of(
+                                        "error",
+                                        "User's email is not a valid email address. Notifications are disabled."));
+            }
+
+            String loginUrl = buildLoginUrl(request);
+            emailService
+                    .get()
+                    .sendPasswordChangedNotification(
+                            userEmail,
+                            user.getUsername(),
+                            includePassword ? finalPassword : null,
+                            loginUrl);
+        }
+
+        return ResponseEntity.ok(Map.of("message", "User password updated successfully"));
+    }
+
     @PreAuthorize("hasRole('ROLE_ADMIN')")
     @PostMapping("/admin/changeUserEnabled/{username}")
     public ResponseEntity<?> changeUserEnabled(
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilter.java
index b481da51c..a2c3381f1 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilter.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/JwtAuthenticationFilter.java
@@ -26,6 +26,7 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.ApplicationProperties;
@@ -39,6 +40,7 @@ import stirling.software.proprietary.security.service.JwtServiceInterface;
 import stirling.software.proprietary.security.service.UserService;
 
 @Slf4j
+@RequiredArgsConstructor
 public class JwtAuthenticationFilter extends OncePerRequestFilter {
 
     private final JwtServiceInterface jwtService;
@@ -47,19 +49,6 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
     private final AuthenticationEntryPoint authenticationEntryPoint;
     private final ApplicationProperties.Security securityProperties;
 
-    public JwtAuthenticationFilter(
-            JwtServiceInterface jwtService,
-            UserService userService,
-            CustomUserDetailsService userDetailsService,
-            AuthenticationEntryPoint authenticationEntryPoint,
-            ApplicationProperties.Security securityProperties) {
-        this.jwtService = jwtService;
-        this.userService = userService;
-        this.userDetailsService = userDetailsService;
-        this.authenticationEntryPoint = authenticationEntryPoint;
-        this.securityProperties = securityProperties;
-    }
-
     @Override
     protected void doFilterInternal(
             HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
@@ -68,7 +57,11 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
             filterChain.doFilter(request, response);
             return;
         }
-        if (isStaticResource(request.getContextPath(), request.getRequestURI())) {
+
+        String requestURI = request.getRequestURI();
+        String contextPath = request.getContextPath();
+
+        if (isStaticResource(contextPath, requestURI)) {
             filterChain.doFilter(request, response);
             return;
         }
@@ -77,10 +70,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
             String jwtToken = jwtService.extractToken(request);
 
             if (jwtToken == null) {
-                // Allow specific auth endpoints to pass through without JWT
-                String requestURI = request.getRequestURI();
-                String contextPath = request.getContextPath();
-
+                // Allow auth endpoints to pass through without JWT
                 if (!isPublicAuthEndpoint(requestURI, contextPath)) {
                     // For API requests, return 401 JSON
                     String acceptHeader = request.getHeader("Accept");
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java
index fe57b3997..182b4cbfe 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java
@@ -241,24 +241,6 @@ public class UserAuthenticationFilter extends OncePerRequestFilter {
         filterChain.doFilter(request, response);
     }
 
-    private static boolean isPublicAuthEndpoint(String requestURI, String contextPath) {
-        // Remove context path from URI to normalize path matching
-        String trimmedUri =
-                requestURI.startsWith(contextPath)
-                        ? requestURI.substring(contextPath.length())
-                        : requestURI;
-
-        // Public auth endpoints that don't require authentication
-        return trimmedUri.startsWith("/login")
-                || trimmedUri.startsWith("/auth/")
-                || trimmedUri.startsWith("/oauth2")
-                || trimmedUri.startsWith("/saml2")
-                || trimmedUri.startsWith("/api/v1/auth/login")
-                || trimmedUri.startsWith("/api/v1/auth/refresh")
-                || trimmedUri.startsWith("/api/v1/auth/logout")
-                || trimmedUri.startsWith("/api/v1/proprietary/ui-data/login");
-    }
-
     private enum UserLoginType {
         USERDETAILS("UserDetails"),
         OAUTH2USER("OAuth2User"),
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
index 8207eae28..c53893a8b 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java
@@ -59,6 +59,9 @@ public class User implements UserDetails, Serializable {
     @Column(name = "hasCompletedInitialSetup")
     private Boolean hasCompletedInitialSetup = false;
 
+    @Column(name = "forcePasswordChange")
+    private Boolean forcePasswordChange = false;
+
     @Column(name = "roleName")
     private String roleName;
 
@@ -117,6 +120,14 @@ public class User implements UserDetails, Serializable {
         this.hasCompletedInitialSetup = hasCompletedInitialSetup;
     }
 
+    public boolean isForcePasswordChange() {
+        return forcePasswordChange != null && forcePasswordChange;
+    }
+
+    public void setForcePasswordChange(boolean forcePasswordChange) {
+        this.forcePasswordChange = forcePasswordChange;
+    }
+
     public void setAuthenticationType(AuthenticationType authenticationType) {
         this.authenticationType = authenticationType.toString().toLowerCase();
     }
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java
index e1e670394..793c6b62f 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java
@@ -27,6 +27,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.http.HttpSession;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.exception.UnsupportedProviderException;
@@ -39,6 +40,7 @@ import stirling.software.proprietary.security.service.JwtServiceInterface;
 import stirling.software.proprietary.security.service.LoginAttemptService;
 import stirling.software.proprietary.security.service.UserService;
 
+@Slf4j
 @RequiredArgsConstructor
 public class CustomOAuth2AuthenticationSuccessHandler
         extends SavedRequestAwareAuthenticationSuccessHandler {
@@ -77,12 +79,18 @@ public class CustomOAuth2AuthenticationSuccessHandler
 
             if (user != null && !licenseSettingsService.isOAuthEligible(user)) {
                 // User is not grandfathered and no paid license - block OAuth login
+                log.warn(
+                        "OAuth login blocked for existing user '{}' - not eligible (not grandfathered and no paid license)",
+                        username);
                 response.sendRedirect(
                         request.getContextPath() + "/logout?oAuth2RequiresLicense=true");
                 return;
             }
         } else if (!licenseSettingsService.isOAuthEligible(null)) {
             // No existing user and no paid license -> block auto creation
+            log.warn(
+                    "OAuth login blocked for new user '{}' - not eligible (no paid license for auto-creation)",
+                    username);
             response.sendRedirect(request.getContextPath() + "/logout?oAuth2RequiresLicense=true");
             return;
         }
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java
index a053c1ead..2d5f94620 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java
@@ -67,10 +67,15 @@ public class OAuth2Configuration {
         keycloakClientRegistration().ifPresent(registrations::add);
 
         if (registrations.isEmpty()) {
-            log.error("No OAuth2 provider registered");
+            log.error("No OAuth2 provider registered - check your OAuth2 configuration");
             throw new NoProviderFoundException("At least one OAuth2 provider must be configured.");
         }
 
+        log.info(
+                "OAuth2 ClientRegistrationRepository created with {} provider(s): {}",
+                registrations.size(),
+                registrations.stream().map(ClientRegistration::getRegistrationId).toList());
+
         return new InMemoryClientRegistrationRepository(registrations);
     }
 
@@ -165,7 +170,6 @@ public class OAuth2Configuration {
                         githubClient.getUseAsUsername());
 
         boolean isValid = validateProvider(github);
-        log.info("Initialised GitHub OAuth2 provider");
 
         return isValid
                 ? Optional.of(
@@ -208,7 +212,19 @@ public class OAuth2Configuration {
                         null,
                         null);
 
-        return !isStringEmpty(oidcProvider.getIssuer()) || validateProvider(oidcProvider)
+        boolean isValid =
+                !isStringEmpty(oidcProvider.getIssuer()) || validateProvider(oidcProvider);
+        if (isValid) {
+            log.info(
+                    "Initialised OIDC OAuth2 provider: registrationId='{}', issuer='{}', redirectUri='{}'",
+                    name,
+                    oauth.getIssuer(),
+                    REDIRECT_URI_PATH + name);
+        } else {
+            log.warn("OIDC OAuth2 provider validation failed - provider will not be registered");
+        }
+
+        return isValid
                 ? Optional.of(
                         ClientRegistrations.fromIssuerLocation(oauth.getIssuer())
                                 .registrationId(name)
@@ -217,7 +233,7 @@ public class OAuth2Configuration {
                                 .scope(oidcProvider.getScopes())
                                 .userNameAttributeName(oidcProvider.getUseAsUsername().getName())
                                 .clientName(clientName)
-                                .redirectUri(REDIRECT_URI_PATH + "oidc")
+                                .redirectUri(REDIRECT_URI_PATH + name)
                                 .authorizationGrantType(AUTHORIZATION_CODE)
                                 .build())
                 : Optional.empty();
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java
index 0f350d7b4..3c63f1bf4 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java
@@ -51,6 +51,7 @@ public class CustomSaml2AuthenticationSuccessHandler
     private final JwtServiceInterface jwtService;
     private final stirling.software.proprietary.service.UserLicenseSettingsService
             licenseSettingsService;
+    private final ApplicationProperties applicationProperties;
 
     @Override
     @Audited(type = AuditEventType.USER_LOGIN, level = AuditLevel.BASIC)
@@ -67,21 +68,27 @@ public class CustomSaml2AuthenticationSuccessHandler
 
             boolean userExists = userService.usernameExistsIgnoreCase(username);
 
-            // Check if user is eligible for SAML (grandfathered or system has paid license)
+            // Check if user is eligible for SAML (grandfathered or system has ENTERPRISE license)
             if (userExists) {
                 stirling.software.proprietary.security.model.User user =
                         userService.findByUsernameIgnoreCase(username).orElse(null);
 
-                if (user != null && !licenseSettingsService.isOAuthEligible(user)) {
-                    // User is not grandfathered and no paid license - block SAML login
-                    response.sendRedirect(
-                            request.getContextPath() + "/logout?saml2RequiresLicense=true");
+                if (user != null && !licenseSettingsService.isSamlEligible(user)) {
+                    // User is not grandfathered and no ENTERPRISE license - block SAML login
+                    log.warn(
+                            "SAML2 login blocked for existing user '{}' - not eligible (not grandfathered and no ENTERPRISE license)",
+                            username);
+                    String origin = resolveOrigin(request);
+                    response.sendRedirect(origin + "/logout?saml2RequiresLicense=true");
                     return;
                 }
-            } else if (!licenseSettingsService.isOAuthEligible(null)) {
-                // No existing user and no paid license -> block auto creation
-                response.sendRedirect(
-                        request.getContextPath() + "/logout?saml2RequiresLicense=true");
+            } else if (!licenseSettingsService.isSamlEligible(null)) {
+                // No existing user and no ENTERPRISE license -> block auto creation
+                log.warn(
+                        "SAML2 login blocked for new user '{}' - not eligible (no ENTERPRISE license for auto-creation)",
+                        username);
+                String origin = resolveOrigin(request);
+                response.sendRedirect(origin + "/logout?saml2RequiresLicense=true");
                 return;
             }
 
@@ -138,20 +145,28 @@ public class CustomSaml2AuthenticationSuccessHandler
                     log.debug(
                             "User {} exists with password but is not SSO user, redirecting to logout",
                             username);
-                    response.sendRedirect(
-                            contextPath + "/logout?oAuth2AuthenticationErrorWeb=true");
+                    String origin = resolveOrigin(request);
+                    response.sendRedirect(origin + "/logout?oAuth2AuthenticationErrorWeb=true");
                     return;
                 }
 
                 try {
-                    if (!userExists || saml2Properties.getBlockRegistration()) {
-                        log.debug("Registration blocked for new user: {}", username);
-                        response.sendRedirect(
-                                contextPath + "/login?errorOAuth=oAuth2AdminBlockedUser");
+                    // Block new users only if: blockRegistration is true OR autoCreateUser is false
+                    if (!userExists
+                            && (saml2Properties.getBlockRegistration()
+                                    || !saml2Properties.getAutoCreateUser())) {
+                        log.debug(
+                                "Registration blocked for new user '{}' (blockRegistration: {}, autoCreateUser: {})",
+                                username,
+                                saml2Properties.getBlockRegistration(),
+                                saml2Properties.getAutoCreateUser());
+                        String origin = resolveOrigin(request);
+                        response.sendRedirect(origin + "/login?errorOAuth=oAuth2AdminBlockedUser");
                         return;
                     }
                     if (!userExists && licenseSettingsService.wouldExceedLimit(1)) {
-                        response.sendRedirect(contextPath + "/logout?maxUsersReached=true");
+                        String origin = resolveOrigin(request);
+                        response.sendRedirect(origin + "/logout?maxUsersReached=true");
                         return;
                     }
 
@@ -216,16 +231,30 @@ public class CustomSaml2AuthenticationSuccessHandler
             String contextPath,
             String jwt) {
         String redirectPath = resolveRedirectPath(request, contextPath);
-        String origin =
-                resolveForwardedOrigin(request)
-                        .orElseGet(
-                                () ->
-                                        resolveOriginFromReferer(request)
-                                                .orElseGet(() -> buildOriginFromRequest(request)));
+        String origin = resolveOrigin(request);
         clearRedirectCookie(response);
         return origin + redirectPath + "#access_token=" + jwt;
     }
 
+    /**
+     * Resolve the origin (frontend URL) for redirects. First checks system.frontendUrl from config,
+     * then falls back to detecting from request headers.
+     */
+    private String resolveOrigin(HttpServletRequest request) {
+        // First check if frontendUrl is configured
+        String configuredFrontendUrl = applicationProperties.getSystem().getFrontendUrl();
+        if (configuredFrontendUrl != null && !configuredFrontendUrl.trim().isEmpty()) {
+            return configuredFrontendUrl.trim();
+        }
+
+        // Fall back to auto-detection from request headers
+        return resolveForwardedOrigin(request)
+                .orElseGet(
+                        () ->
+                                resolveOriginFromReferer(request)
+                                        .orElseGet(() -> buildOriginFromRequest(request)));
+    }
+
     private String resolveRedirectPath(HttpServletRequest request, String contextPath) {
         return extractRedirectPathFromCookie(request)
                 .filter(path -> path.startsWith("/"))
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/Saml2Configuration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/Saml2Configuration.java
index 9d21f88a3..99be4b5b0 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/Saml2Configuration.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/Saml2Configuration.java
@@ -41,22 +41,74 @@ public class Saml2Configuration {
     @ConditionalOnProperty(name = "security.saml2.enabled", havingValue = "true")
     public RelyingPartyRegistrationRepository relyingPartyRegistrations() throws Exception {
         SAML2 samlConf = applicationProperties.getSecurity().getSaml2();
-        X509Certificate idpCert = CertificateUtils.readCertificate(samlConf.getIdpCert());
+
+        log.info(
+                "Initializing SAML2 configuration with registration ID: {}",
+                samlConf.getRegistrationId());
+
+        // Load IdP certificate
+        X509Certificate idpCert;
+        try {
+            Resource idpCertResource = samlConf.getIdpCert();
+            log.info("Loading IdP certificate from: {}", idpCertResource.getDescription());
+            if (!idpCertResource.exists()) {
+                log.error(
+                        "SAML2 IdP certificate not found at: {}", idpCertResource.getDescription());
+                throw new IllegalStateException(
+                        "SAML2 IdP certificate file does not exist: "
+                                + idpCertResource.getDescription());
+            }
+            idpCert = CertificateUtils.readCertificate(idpCertResource);
+            log.info(
+                    "Successfully loaded IdP certificate. Subject: {}",
+                    idpCert.getSubjectX500Principal().getName());
+        } catch (Exception e) {
+            log.error("Failed to load SAML2 IdP certificate: {}", e.getMessage(), e);
+            throw new IllegalStateException("Failed to load SAML2 IdP certificate", e);
+        }
+
         Saml2X509Credential verificationCredential = Saml2X509Credential.verification(idpCert);
+
+        // Load SP private key and certificate
         Resource privateKeyResource = samlConf.getPrivateKey();
         Resource certificateResource = samlConf.getSpCert();
-        Saml2X509Credential signingCredential =
-                new Saml2X509Credential(
-                        CertificateUtils.readPrivateKey(privateKeyResource),
-                        CertificateUtils.readCertificate(certificateResource),
-                        Saml2X509CredentialType.SIGNING);
+
+        log.info("Loading SP private key from: {}", privateKeyResource.getDescription());
+        if (!privateKeyResource.exists()) {
+            log.error("SAML2 SP private key not found at: {}", privateKeyResource.getDescription());
+            throw new IllegalStateException(
+                    "SAML2 SP private key file does not exist: "
+                            + privateKeyResource.getDescription());
+        }
+
+        log.info("Loading SP certificate from: {}", certificateResource.getDescription());
+        if (!certificateResource.exists()) {
+            log.error(
+                    "SAML2 SP certificate not found at: {}", certificateResource.getDescription());
+            throw new IllegalStateException(
+                    "SAML2 SP certificate file does not exist: "
+                            + certificateResource.getDescription());
+        }
+
+        Saml2X509Credential signingCredential;
+        try {
+            signingCredential =
+                    new Saml2X509Credential(
+                            CertificateUtils.readPrivateKey(privateKeyResource),
+                            CertificateUtils.readCertificate(certificateResource),
+                            Saml2X509CredentialType.SIGNING);
+            log.info("Successfully loaded SP credentials");
+        } catch (Exception e) {
+            log.error("Failed to load SAML2 SP credentials: {}", e.getMessage(), e);
+            throw new IllegalStateException("Failed to load SAML2 SP credentials", e);
+        }
         RelyingPartyRegistration rp =
                 RelyingPartyRegistration.withRegistrationId(samlConf.getRegistrationId())
                         .signingX509Credentials(c -> c.add(signingCredential))
                         .entityId(samlConf.getIdpIssuer())
                         .singleLogoutServiceBinding(Saml2MessageBinding.POST)
                         .singleLogoutServiceLocation(samlConf.getIdpSingleLogoutUrl())
-                        .singleLogoutServiceResponseLocation("http://localhost:8080/login")
+                        .singleLogoutServiceResponseLocation("{baseUrl}/login")
                         .assertionConsumerServiceBinding(Saml2MessageBinding.POST)
                         .assertionConsumerServiceLocation(
                                 "{baseUrl}/login/saml2/sso/{registrationId}")
@@ -75,9 +127,14 @@ public class Saml2Configuration {
                                                 .singleLogoutServiceLocation(
                                                         samlConf.getIdpSingleLogoutUrl())
                                                 .singleLogoutServiceResponseLocation(
-                                                        "http://localhost:8080/login")
+                                                        "{baseUrl}/login")
                                                 .wantAuthnRequestsSigned(true))
                         .build();
+
+        log.info(
+                "SAML2 configuration initialized successfully. Registration ID: {}, IdP: {}",
+                samlConf.getRegistrationId(),
+                samlConf.getIdpIssuer());
         return new InMemoryRelyingPartyRegistrationRepository(rp);
     }
 
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java
index 8df76fca3..3ae079d0f 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java
@@ -223,4 +223,54 @@ public class EmailService {
 
         sendPlainEmail(to, subject, body, true);
     }
+
+    @Async
+    public void sendPasswordChangedNotification(
+            String to, String username, String newPassword, String loginUrl)
+            throws MessagingException {
+        String subject = "Your Stirling PDF password has been updated";
+
+        String passwordSection =
+                newPassword == null
+                        ? ""
+                        : """
+                          <div style=\"background-color: #f8f9fa; border-left: 4px solid #007bff; padding: 15px; margin: 20px 0; border-radius: 4px;\">
+                            <p style=\"margin: 0;\"><strong>Temporary Password:</strong> %s</p>
+                          </div>
+                        """
+                                .formatted(newPassword);
+
+        String body =
+                """
+                <html><body style=\"margin: 0; padding: 0;\">
+                <div style=\"font-family: Arial, sans-serif; background-color: #f8f9fa; padding: 20px;\">
+                  <div style=\"max-width: 600px; margin: auto; background-color: #ffffff; border-radius: 8px; overflow: hidden; border: 1px solid #e0e0e0;\">
+                    <div style=\"text-align: center; padding: 20px; background-color: #222;\">
+                      <img src=\"https://raw.githubusercontent.com/Stirling-Tools/Stirling-PDF/main/docs/stirling-transparent.svg\" alt=\"Stirling PDF\" style=\"max-height: 60px;\">
+                    </div>
+                    <div style=\"padding: 30px; color: #333;\">
+                      <h2 style=\"color: #222; margin-top: 0;\">Your password was changed</h2>
+                      <p>Hello %s,</p>
+                      <p>An administrator has updated the password for your Stirling PDF account.</p>
+                      %s
+                      <p>If you did not expect this change, please contact your administrator immediately.</p>
+                      <div style=\"text-align: center; margin: 30px 0;\">
+                        <a href=\"%s\" style=\"display: inline-block; background-color: #007bff; color: #ffffff; padding: 14px 28px; text-decoration: none; border-radius: 5px; font-weight: bold;\">Go to Stirling PDF</a>
+                      </div>
+                      <p style=\"font-size: 14px; color: #666;\">Or copy and paste this link in your browser:</p>
+                      <div style=\"background-color: #f8f9fa; padding: 12px; margin: 15px 0; border-radius: 4px; word-break: break-all; font-size: 13px; color: #555;\">
+                        %s
+                      </div>
+                    </div>
+                    <div style=\"text-align: center; padding: 15px; font-size: 12px; color: #777; background-color: #f0f0f0;\">
+                      &copy; 2025 Stirling PDF. All rights reserved.
+                    </div>
+                  </div>
+                </div>
+                </body></html>
+                """
+                        .formatted(username, passwordSection, loginUrl, loginUrl);
+
+        sendPlainEmail(to, subject, body, true);
+    }
 }
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/service/ImageMagickLineArtConversionService.java b/app/proprietary/src/main/java/stirling/software/proprietary/service/ImageMagickLineArtConversionService.java
new file mode 100644
index 000000000..8ca6a83e7
--- /dev/null
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/service/ImageMagickLineArtConversionService.java
@@ -0,0 +1,81 @@
+package stirling.software.proprietary.service;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.imageio.ImageIO;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.springframework.stereotype.Service;
+
+import lombok.extern.slf4j.Slf4j;
+
+import stirling.software.common.service.LineArtConversionService;
+import stirling.software.common.util.ProcessExecutor;
+import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;
+
+@Slf4j
+@Service
+public class ImageMagickLineArtConversionService implements LineArtConversionService {
+
+    @Override
+    public PDImageXObject convertImageToLineArt(
+            PDDocument doc, PDImageXObject originalImage, double threshold, int edgeLevel)
+            throws IOException {
+
+        Path inputImage = Files.createTempFile("lineart_image_input_", ".png");
+        Path outputImage = Files.createTempFile("lineart_image_output_", ".tiff");
+
+        try {
+            ImageIO.write(originalImage.getImage(), "png", inputImage.toFile());
+
+            List<String> command = new ArrayList<>();
+            command.add("magick");
+            command.add(inputImage.toString());
+            command.add("-colorspace");
+            command.add("Gray");
+
+            // Edge-aware line art conversion using ImageMagick's built-in operators.
+            // -edge/-negate/-normalize are standard convert options (IM v6+/v7) that
+            // accentuate outlines before thresholding to a bilevel image.
+            command.add("-edge");
+            command.add(String.valueOf(edgeLevel));
+            command.add("-negate");
+            command.add("-normalize");
+
+            command.add("-type");
+            command.add("Bilevel");
+            command.add("-threshold");
+            command.add(String.format(Locale.ROOT, "%.1f%%", threshold));
+            command.add("-compress");
+            command.add("Group4");
+            command.add(outputImage.toString());
+
+            ProcessExecutorResult result =
+                    ProcessExecutor.getInstance(ProcessExecutor.Processes.IMAGEMAGICK)
+                            .runCommandWithOutputHandling(command);
+
+            if (result.getRc() != 0) {
+                log.warn(
+                        "ImageMagick line art conversion failed with return code: {}",
+                        result.getRc());
+                throw new IOException("ImageMagick line art conversion failed");
+            }
+
+            byte[] convertedBytes = Files.readAllBytes(outputImage);
+            return PDImageXObject.createFromByteArray(
+                    doc, convertedBytes, originalImage.getCOSObject().toString());
+        } catch (Exception e) {
+            log.warn("ImageMagick line art conversion failed", e);
+            throw new IOException("ImageMagick line art conversion failed", e);
+        } finally {
+            Files.deleteIfExists(inputImage);
+            Files.deleteIfExists(outputImage);
+        }
+    }
+}
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/service/SignatureService.java b/app/proprietary/src/main/java/stirling/software/proprietary/service/SignatureService.java
index 6f849ebfe..63ee28512 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/service/SignatureService.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/service/SignatureService.java
@@ -2,6 +2,7 @@ package stirling.software.proprietary.service;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -13,6 +14,8 @@ import java.util.stream.Stream;
 
 import org.springframework.stereotype.Service;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import lombok.extern.slf4j.Slf4j;
 
 import stirling.software.common.configuration.InstallationPathConfig;
@@ -31,6 +34,7 @@ public class SignatureService implements PersonalSignatureServiceInterface {
 
     private final String SIGNATURE_BASE_PATH;
     private final String ALL_USERS_FOLDER = "ALL_USERS";
+    private final ObjectMapper objectMapper = new ObjectMapper();
 
     // Storage limits per user
     private static final int MAX_SIGNATURES_PER_USER = 20;
@@ -88,6 +92,14 @@ public class SignatureService implements PersonalSignatureServiceInterface {
         response.setCreatedAt(timestamp);
         response.setUpdatedAt(timestamp);
 
+        // Copy text signature properties if present
+        if ("text".equals(request.getType())) {
+            response.setSignerName(request.getSignerName());
+            response.setFontFamily(request.getFontFamily());
+            response.setFontSize(request.getFontSize());
+            response.setTextColor(request.getTextColor());
+        }
+
         // Extract and save image data
         String dataUrl = request.getDataUrl();
         if (dataUrl != null && dataUrl.startsWith("data:image/")) {
@@ -133,6 +145,19 @@ public class SignatureService implements PersonalSignatureServiceInterface {
             response.setDataUrl("/api/v1/general/signatures/" + imageFileName);
         }
 
+        // Save metadata JSON file
+        String metadataFileName = request.getId() + ".json";
+        Path metadataPath = targetFolder.resolve(metadataFileName);
+        verifyPathWithinDirectory(metadataPath, targetFolder);
+
+        String metadataJson = objectMapper.writeValueAsString(response);
+        Files.writeString(
+                metadataPath,
+                metadataJson,
+                StandardCharsets.UTF_8,
+                StandardOpenOption.CREATE,
+                StandardOpenOption.TRUNCATE_EXISTING);
+
         log.info("Saved signature {} for user {} (scope: {})", request.getId(), username, scope);
         return response;
     }
@@ -179,6 +204,13 @@ public class SignatureService implements PersonalSignatureServiceInterface {
                     log.info("Deleted signature file: {}", file);
                 }
             }
+
+            // Also delete metadata file if it exists
+            Path metadataPath = personalFolder.resolve(signatureId + ".json");
+            if (Files.exists(metadataPath)) {
+                Files.delete(metadataPath);
+                log.info("Deleted signature metadata: {}", metadataPath);
+            }
         }
 
         if (!deleted) {
@@ -186,6 +218,50 @@ public class SignatureService implements PersonalSignatureServiceInterface {
         }
     }
 
+    /** Update a signature label. */
+    public void updateSignatureLabel(String username, String signatureId, String newLabel)
+            throws IOException {
+        validateFileName(signatureId);
+
+        // Try personal folder first
+        Path personalFolder = Paths.get(SIGNATURE_BASE_PATH, username);
+        Path metadataPath = personalFolder.resolve(signatureId + ".json");
+
+        if (Files.exists(metadataPath)) {
+            updateMetadataLabel(metadataPath, newLabel);
+            log.info("Updated label for personal signature {} (user: {})", signatureId, username);
+            return;
+        }
+
+        // If not found in personal, try shared folder
+        Path sharedFolder = Paths.get(SIGNATURE_BASE_PATH, ALL_USERS_FOLDER);
+        Path sharedMetadataPath = sharedFolder.resolve(signatureId + ".json");
+
+        if (Files.exists(sharedMetadataPath)) {
+            updateMetadataLabel(sharedMetadataPath, newLabel);
+            log.info("Updated label for shared signature {}", signatureId);
+            return;
+        }
+
+        throw new FileNotFoundException("Signature metadata not found");
+    }
+
+    private void updateMetadataLabel(Path metadataPath, String newLabel) throws IOException {
+        String metadataJson = Files.readString(metadataPath, StandardCharsets.UTF_8);
+        SavedSignatureResponse sig =
+                objectMapper.readValue(metadataJson, SavedSignatureResponse.class);
+        sig.setLabel(newLabel);
+        sig.setUpdatedAt(System.currentTimeMillis());
+
+        String updatedJson = objectMapper.writeValueAsString(sig);
+        Files.writeString(
+                metadataPath,
+                updatedJson,
+                StandardCharsets.UTF_8,
+                StandardOpenOption.CREATE,
+                StandardOpenOption.TRUNCATE_EXISTING);
+    }
+
     // Private helper methods
 
     private void enforceStorageLimits(String username, String dataUrlToAdd) throws IOException {
@@ -245,16 +321,31 @@ public class SignatureService implements PersonalSignatureServiceInterface {
                                     String fileName = path.getFileName().toString();
                                     String id = fileName.substring(0, fileName.lastIndexOf('.'));
 
-                                    SavedSignatureResponse sig = new SavedSignatureResponse();
-                                    sig.setId(id);
-                                    sig.setLabel(id);
-                                    sig.setType("image");
-                                    sig.setScope(scope);
-                                    sig.setCreatedAt(Files.getLastModifiedTime(path).toMillis());
-                                    sig.setUpdatedAt(Files.getLastModifiedTime(path).toMillis());
+                                    // Try to load metadata from JSON file
+                                    Path metadataPath = folder.resolve(id + ".json");
+                                    SavedSignatureResponse sig;
 
-                                    // Set unified URL path (works for both personal and shared)
-                                    sig.setDataUrl("/api/v1/general/signatures/" + fileName);
+                                    if (Files.exists(metadataPath)) {
+                                        // Load from metadata file
+                                        String metadataJson =
+                                                Files.readString(
+                                                        metadataPath, StandardCharsets.UTF_8);
+                                        sig =
+                                                objectMapper.readValue(
+                                                        metadataJson, SavedSignatureResponse.class);
+                                    } else {
+                                        // Fallback for old signatures without metadata
+                                        sig = new SavedSignatureResponse();
+                                        sig.setId(id);
+                                        sig.setLabel(id);
+                                        sig.setType("image");
+                                        sig.setScope(scope);
+                                        sig.setCreatedAt(
+                                                Files.getLastModifiedTime(path).toMillis());
+                                        sig.setUpdatedAt(
+                                                Files.getLastModifiedTime(path).toMillis());
+                                        sig.setDataUrl("/api/v1/general/signatures/" + fileName);
+                                    }
 
                                     signatures.add(sig);
                                 } catch (IOException e) {
diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/service/UserLicenseSettingsService.java b/app/proprietary/src/main/java/stirling/software/proprietary/service/UserLicenseSettingsService.java
index 1cddefde3..54660a1cc 100644
--- a/app/proprietary/src/main/java/stirling/software/proprietary/service/UserLicenseSettingsService.java
+++ b/app/proprietary/src/main/java/stirling/software/proprietary/service/UserLicenseSettingsService.java
@@ -21,6 +21,7 @@ import stirling.software.common.model.ApplicationProperties;
 import stirling.software.proprietary.model.UserLicenseSettings;
 import stirling.software.proprietary.security.configuration.ee.KeygenLicenseVerifier.License;
 import stirling.software.proprietary.security.configuration.ee.LicenseKeyChecker;
+import stirling.software.proprietary.security.model.User;
 import stirling.software.proprietary.security.repository.UserLicenseSettingsRepository;
 import stirling.software.proprietary.security.service.UserService;
 
@@ -176,6 +177,13 @@ public class UserLicenseSettingsService {
      */
     @Transactional
     public void grandfatherExistingOAuthUsers() {
+        // Only grandfather users if this is a V1→V2 upgrade, not a fresh V2 install
+        Boolean isNewServer = applicationProperties.getAutomaticallyGenerated().getIsNewServer();
+        if (Boolean.TRUE.equals(isNewServer)) {
+            log.info("Fresh V2 installation detected - skipping OAuth user grandfathering");
+            return;
+        }
+
         UserLicenseSettings settings = getOrCreateSettings();
 
         // Check if we've already run this migration
@@ -343,17 +351,65 @@ public class UserLicenseSettingsService {
      * @param user The user to check
      * @return true if the user can use OAuth/SAML
      */
-    public boolean isOAuthEligible(stirling.software.proprietary.security.model.User user) {
-        // Grandfathered users always have OAuth access
-        if (user != null && user.isOauthGrandfathered()) {
-            log.debug("User {} is grandfathered for OAuth", user.getUsername());
+    public boolean isOAuthEligible(User user) {
+        String username = (user != null) ? user.getUsername() : "<new user>";
+        log.info("OAuth eligibility check for user: {}", username);
+
+        // Check license first - if paying, they're eligible (no need to check grandfathering)
+        boolean hasPaid = hasPaidLicense();
+        if (hasPaid) {
+            log.debug("User {} eligible for OAuth via paid license", username);
             return true;
         }
 
-        // Users can use OAuth/SAML only if system has ENTERPRISE license
-        boolean hasEnterpriseLicense = hasEnterpriseLicense();
-        log.debug("OAuth eligibility check: hasEnterpriseLicense={}", hasEnterpriseLicense);
-        return hasEnterpriseLicense;
+        // No license - check if grandfathered (fallback for V1 users)
+        if (user != null && user.isOauthGrandfathered()) {
+            log.info("User {} eligible for OAuth via grandfathering (no paid license)", username);
+            return true;
+        }
+
+        // Not grandfathered and no license
+        log.info("User {} NOT eligible for OAuth: no paid license and not grandfathered", username);
+        return false;
+    }
+
+    /**
+     * Checks if a user is eligible to use SAML authentication.
+     *
+     * <p>A user is eligible if:
+     *
+     * <ul>
+     *   <li>They are grandfathered for OAuth (existing user before policy change), OR
+     *   <li>The system has an ENTERPRISE license (SAML is enterprise-only)
+     * </ul>
+     *
+     * @param user The user to check
+     * @return true if the user can use SAML
+     */
+    public boolean isSamlEligible(User user) {
+        String username = (user != null) ? user.getUsername() : "<new user>";
+        log.info("SAML2 eligibility check for user: {}", username);
+
+        // Check license first - if paying, they're eligible (no need to check grandfathering)
+        boolean hasEnterprise = hasEnterpriseLicense();
+        if (hasEnterprise) {
+            log.debug("User {} eligible for SAML2 via ENTERPRISE license", username);
+            return true;
+        }
+
+        // No license - check if grandfathered (fallback for V1 users)
+        if (user != null && user.isOauthGrandfathered()) {
+            log.info(
+                    "User {} eligible for SAML2 via grandfathering (no ENTERPRISE license)",
+                    username);
+            return true;
+        }
+
+        // Not grandfathered and no license
+        log.info(
+                "User {} NOT eligible for SAML2: no ENTERPRISE license and not grandfathered",
+                username);
+        return false;
     }
 
     /**
@@ -495,8 +551,12 @@ public class UserLicenseSettingsService {
         if (checker == null) {
             return false;
         }
+
         License license = checker.getPremiumLicenseEnabledResult();
-        return license == License.SERVER || license == License.ENTERPRISE;
+        boolean hasPaid = (license == License.SERVER || license == License.ENTERPRISE);
+        log.info("License check result: type={}, requiresPaid=true, hasPaid={}", license, hasPaid);
+
+        return hasPaid;
     }
 
     /**
@@ -510,7 +570,19 @@ public class UserLicenseSettingsService {
         if (checker == null) {
             return false;
         }
+
         License license = checker.getPremiumLicenseEnabledResult();
+        log.info(
+                "License check result: type={}, requiresEnterprise=true, hasEnterprise={}",
+                license,
+                (license == License.ENTERPRISE));
+
+        if (license != License.ENTERPRISE) {
+            log.warn(
+                    "SAML2 requires ENTERPRISE license but found: {}. SAML2 login will be blocked.",
+                    license);
+        }
+
         return license == License.ENTERPRISE;
     }
 }
diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/oauth2/OAuth2ConfigurationTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/oauth2/OAuth2ConfigurationTest.java
new file mode 100644
index 000000000..750696b77
--- /dev/null
+++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/oauth2/OAuth2ConfigurationTest.java
@@ -0,0 +1,162 @@
+package stirling.software.proprietary.security.oauth2;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for OAuth2Configuration redirect URI logic.
+ *
+ * <p>These tests validate the critical fix for GitHub issue #5141: The redirect URI path segment
+ * MUST match the registration ID. Previously, the redirect URI was hardcoded to 'oidc', causing
+ * InvalidClientRegistrationIdException when custom provider names were used.
+ *
+ * <p>Note: These are conceptual tests documenting the expected behavior. Full integration testing
+ * with actual OIDC discovery would require: 1. Mock HTTP server for OIDC discovery endpoints 2.
+ * Valid OIDC configuration responses 3. Network mocking infrastructure
+ */
+class OAuth2ConfigurationTest {
+
+    /**
+     * Tests the redirect URI pattern for OIDC provider configurations.
+     *
+     * <p>Critical behavior (GitHub issue #5141 fix): The redirect URI path segment MUST match the
+     * registration ID. For example: - Provider name: "authentik" → Redirect URI:
+     * "/login/oauth2/code/authentik" - Provider name: "mycompany" → Redirect URI:
+     * "/login/oauth2/code/mycompany" - Provider name: "oidc" → Redirect URI:
+     * "/login/oauth2/code/oidc"
+     *
+     * <p>Previously, the redirect URI was hardcoded to 'oidc', causing Spring Security to look for
+     * a registration with ID 'oidc' when the provider redirected back. This caused
+     * InvalidClientRegistrationIdException when custom provider names were used.
+     */
+    @Test
+    void testRedirectUriPattern_usesProviderNameNotHardcodedOidc() {
+        // Verify the redirect URI pattern constant
+        String redirectUriBase = "{baseUrl}/login/oauth2/code/";
+
+        // Test cases: provider name → expected redirect URI
+        String[][] testCases = {
+            {"authentik", redirectUriBase + "authentik"},
+            {"mycompany", redirectUriBase + "mycompany"},
+            {"oidc", redirectUriBase + "oidc"},
+            {"okta", redirectUriBase + "okta"},
+            {"auth0", redirectUriBase + "auth0"}
+        };
+
+        for (String[] testCase : testCases) {
+            String providerName = testCase[0];
+            String expectedRedirectUri = testCase[1];
+
+            // The fix ensures: .redirectUri(REDIRECT_URI_PATH + name)
+            // instead of: .redirectUri(REDIRECT_URI_PATH + "oidc")
+            String actualRedirectUri = redirectUriBase + providerName;
+
+            assertEquals(
+                    expectedRedirectUri,
+                    actualRedirectUri,
+                    String.format(
+                            "Redirect URI for provider '%s' must use provider name, not hardcoded 'oidc'",
+                            providerName));
+        }
+    }
+
+    /**
+     * Documents the critical fix for OAuth2 redirect URI mismatch.
+     *
+     * <p>This test validates the logic that was changed in OAuth2Configuration.java line 220:
+     *
+     * <pre>
+     * // BEFORE (bug):
+     * .redirectUri(REDIRECT_URI_PATH + "oidc")  // Always "oidc"
+     *
+     * // AFTER (fix):
+     * .redirectUri(REDIRECT_URI_PATH + name)  // Dynamic provider name
+     * </pre>
+     */
+    @Test
+    void testCriticalFix_redirectUriMatchesRegistrationId() {
+        // The redirect URI path segment extraction by Spring Security
+        String callbackUrl = "http://localhost:8080/login/oauth2/code/authentik?code=abc123";
+
+        // Spring extracts the path segment between "code/" and "?"
+        String extractedRegistrationId = extractRegistrationIdFromCallback(callbackUrl);
+
+        // The extracted ID MUST match an actual registration ID
+        assertEquals("authentik", extractedRegistrationId);
+
+        // If we had used hardcoded "oidc", the callback would be:
+        String buggyCallbackUrl = "http://localhost:8080/login/oauth2/code/oidc?code=abc123";
+        String buggyExtractedId = extractRegistrationIdFromCallback(buggyCallbackUrl);
+
+        // This would look for registration with ID "oidc" but we registered "authentik"
+        assertEquals("oidc", buggyExtractedId);
+
+        // The mismatch: registrationId="authentik", but Spring looks for "oidc"
+        // Result: InvalidClientRegistrationIdException
+        assertNotNull(buggyExtractedId, "This demonstrates the bug that was fixed");
+    }
+
+    /** Helper method simulating Spring's extraction of registration ID from callback URL */
+    private String extractRegistrationIdFromCallback(String callbackUrl) {
+        // Simplified version of what Spring Security does
+        // Actual: OAuth2AuthorizationRequestRedirectFilter extracts from path
+        String path = callbackUrl.split("\\?")[0];
+        String[] parts = path.split("/");
+        return parts[parts.length - 1]; // Last path segment
+    }
+
+    /**
+     * Validates the frontend-backend flow for custom provider names.
+     *
+     * <p>Complete flow: 1. Backend: Provider configured as "authentik" in settings.yml 2. Backend:
+     * ClientRegistration created with registrationId="authentik" 3. Backend: Redirect URI set to
+     * "{baseUrl}/login/oauth2/code/authentik" 4. Backend: Login endpoint returns providerList with
+     * "/oauth2/authorization/authentik" 5. Frontend: Extracts "authentik" from path and uses it for
+     * OAuth login 6. Frontend: Redirects to "/oauth2/authorization/authentik" 7. Backend: Spring
+     * Security redirects to provider with redirect_uri containing "authentik" 8. Provider:
+     * Redirects back to "/login/oauth2/code/authentik?code=..." 9. Backend: Spring Security
+     * extracts "authentik" from callback URL 10. Backend: Looks up ClientRegistration with ID
+     * "authentik" ✅ SUCCESS
+     *
+     * <p>If redirect URI was hardcoded to "oidc" (the bug): Step 7: Provider redirects to
+     * "/login/oauth2/code/oidc?code=..." Step 9: Spring Security looks for registration ID "oidc"
+     * Step 10: FAIL - No registration found with ID "oidc" (we registered "authentik") Result:
+     * InvalidClientRegistrationIdException
+     */
+    @Test
+    void testEndToEndFlow_registrationIdConsistency() {
+        String providerName = "authentik";
+
+        // Step 2: Registration ID
+        String registrationId = providerName;
+        assertEquals("authentik", registrationId);
+
+        // Step 3: Redirect URI (MUST use same name)
+        String redirectUri = "{baseUrl}/login/oauth2/code/" + providerName;
+        assertEquals("{baseUrl}/login/oauth2/code/authentik", redirectUri);
+
+        // Step 4: Provider list endpoint
+        String authorizationPath = "/oauth2/authorization/" + providerName;
+        assertEquals("/oauth2/authorization/authentik", authorizationPath);
+
+        // Step 5: Frontend extracts provider ID
+        String frontendProviderId =
+                authorizationPath.substring(authorizationPath.lastIndexOf('/') + 1);
+        assertEquals("authentik", frontendProviderId);
+
+        // Step 6-8: OAuth flow (external)
+
+        // Step 9: Callback URL from provider
+        String callbackUrl =
+                "http://localhost:8080/login/oauth2/code/" + providerName + "?code=abc123";
+        String extractedId = extractRegistrationIdFromCallback(callbackUrl);
+
+        // Step 10: Registration lookup
+        assertEquals(
+                registrationId,
+                extractedId,
+                "Registration ID from callback MUST match original registration ID");
+    }
+}
diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/security/service/MailConfigTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/MailConfigTest.java
index 3db3493f4..5df56f8ef 100644
--- a/app/proprietary/src/test/java/stirling/software/proprietary/security/service/MailConfigTest.java
+++ b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/MailConfigTest.java
@@ -27,6 +27,11 @@ class MailConfigTest {
         when(mailProps.getPort()).thenReturn(587);
         when(mailProps.getUsername()).thenReturn("user@example.com");
         when(mailProps.getPassword()).thenReturn("password");
+        when(mailProps.getStartTlsEnable()).thenReturn(null);
+        when(mailProps.getStartTlsRequired()).thenReturn(null);
+        when(mailProps.getSslEnable()).thenReturn(null);
+        when(mailProps.getSslTrust()).thenReturn(null);
+        when(mailProps.getSslCheckServerIdentity()).thenReturn(null);
     }
 
     @Test
@@ -50,6 +55,32 @@ class MailConfigTest {
                 () -> assertEquals("password", impl.getPassword()),
                 () -> assertEquals("UTF-8", impl.getDefaultEncoding()),
                 () -> assertEquals("true", props.getProperty("mail.smtp.auth")),
-                () -> assertEquals("true", props.getProperty("mail.smtp.starttls.enable")));
+                () -> assertEquals("true", props.getProperty("mail.smtp.starttls.enable")),
+                () -> assertEquals(null, props.getProperty("mail.smtp.starttls.required")),
+                () -> assertEquals(null, props.getProperty("mail.smtp.ssl.enable")),
+                () -> assertEquals("*", props.getProperty("mail.smtp.ssl.trust")));
+    }
+
+    @Test
+    void shouldRespectExplicitTlsOverrides() {
+        ApplicationProperties appProps = mock(ApplicationProperties.class);
+        when(mailProps.getStartTlsEnable()).thenReturn(false);
+        when(mailProps.getStartTlsRequired()).thenReturn(true);
+        when(mailProps.getSslEnable()).thenReturn(true);
+        when(mailProps.getSslTrust()).thenReturn("*");
+        when(mailProps.getSslCheckServerIdentity()).thenReturn(true);
+        when(appProps.getMail()).thenReturn(mailProps);
+
+        MailConfig config = new MailConfig(appProps);
+        JavaMailSenderImpl impl = (JavaMailSenderImpl) config.javaMailSender();
+
+        Properties props = impl.getJavaMailProperties();
+
+        assertAll(
+                () -> assertEquals("false", props.getProperty("mail.smtp.starttls.enable")),
+                () -> assertEquals("true", props.getProperty("mail.smtp.starttls.required")),
+                () -> assertEquals("true", props.getProperty("mail.smtp.ssl.enable")),
+                () -> assertEquals("*", props.getProperty("mail.smtp.ssl.trust")),
+                () -> assertEquals("true", props.getProperty("mail.smtp.ssl.checkserveridentity")));
     }
 }
diff --git a/app/proprietary/src/test/java/stirling/software/proprietary/service/UserLicenseSettingsServiceTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/service/UserLicenseSettingsServiceTest.java
index 139146d70..a7f8042f6 100644
--- a/app/proprietary/src/test/java/stirling/software/proprietary/service/UserLicenseSettingsServiceTest.java
+++ b/app/proprietary/src/test/java/stirling/software/proprietary/service/UserLicenseSettingsServiceTest.java
@@ -33,6 +33,7 @@ class UserLicenseSettingsServiceTest {
     @Mock private UserService userService;
     @Mock private ApplicationProperties applicationProperties;
     @Mock private ApplicationProperties.Premium premium;
+    @Mock private ApplicationProperties.AutomaticallyGenerated automaticallyGenerated;
     @Mock private LicenseKeyChecker licenseKeyChecker;
     @Mock private ObjectProvider<LicenseKeyChecker> licenseKeyCheckerProvider;
 
@@ -49,6 +50,8 @@ class UserLicenseSettingsServiceTest {
         mockSettings.setGrandfatheredUserSignature("80:test-signature");
 
         when(applicationProperties.getPremium()).thenReturn(premium);
+        when(applicationProperties.getAutomaticallyGenerated()).thenReturn(automaticallyGenerated);
+        when(automaticallyGenerated.getIsNewServer()).thenReturn(false); // Default: not a new server
         when(settingsRepository.findSettings()).thenReturn(Optional.of(mockSettings));
         when(userService.getTotalUsersCount()).thenReturn(80L);
         when(settingsRepository.save(any(UserLicenseSettings.class)))
@@ -267,4 +270,222 @@ class UserLicenseSettingsServiceTest {
         verify(userService, times(1)).grandfatherAllOAuthUsers();
         verify(userService, times(1)).grandfatherPendingSsoUsersWithoutSession();
     }
+
+    // ===== OAuth Eligibility Tests =====
+
+    @Test
+    void isOAuthEligible_grandfatheredUser_returnsTrue() {
+        // Grandfathered user should be eligible regardless of license
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("grandfathered-user");
+        user.setOauthGrandfathered(true);
+
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.NORMAL);
+
+        boolean result = service.isOAuthEligible(user);
+
+        assertEquals(true, result, "Grandfathered user should be eligible for OAuth");
+    }
+
+    @Test
+    void isOAuthEligible_nonGrandfatheredUserWithServerLicense_returnsTrue() {
+        // Non-grandfathered user with SERVER license should be eligible
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("test-user");
+        user.setOauthGrandfathered(false);
+
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.SERVER);
+
+        boolean result = service.isOAuthEligible(user);
+
+        assertEquals(true, result, "Non-grandfathered user with SERVER license should be eligible");
+    }
+
+    @Test
+    void isOAuthEligible_nonGrandfatheredUserWithEnterpriseLicense_returnsTrue() {
+        // Non-grandfathered user with ENTERPRISE license should be eligible
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("test-user");
+        user.setOauthGrandfathered(false);
+
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.ENTERPRISE);
+
+        boolean result = service.isOAuthEligible(user);
+
+        assertEquals(
+                true, result, "Non-grandfathered user with ENTERPRISE license should be eligible");
+    }
+
+    @Test
+    void isOAuthEligible_nonGrandfatheredUserWithNoLicense_returnsFalse() {
+        // Non-grandfathered user without license should NOT be eligible
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("test-user");
+        user.setOauthGrandfathered(false);
+
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.NORMAL);
+
+        boolean result = service.isOAuthEligible(user);
+
+        assertEquals(
+                false,
+                result,
+                "Non-grandfathered user without paid license should NOT be eligible");
+    }
+
+    @Test
+    void isOAuthEligible_newUserWithServerLicense_returnsTrue() {
+        // New user (null) with SERVER license should be eligible for auto-creation
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.SERVER);
+
+        boolean result = service.isOAuthEligible(null);
+
+        assertEquals(
+                true, result, "New user with SERVER license should be eligible for auto-creation");
+    }
+
+    @Test
+    void isOAuthEligible_newUserWithNoLicense_returnsFalse() {
+        // New user (null) without license should NOT be eligible
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.NORMAL);
+
+        boolean result = service.isOAuthEligible(null);
+
+        assertEquals(
+                false,
+                result,
+                "New user without paid license should NOT be eligible for auto-creation");
+    }
+
+    @Test
+    void isOAuthEligible_licenseCheckerUnavailable_returnsFalse() {
+        // If LicenseKeyChecker is unavailable, OAuth should be blocked
+        when(licenseKeyCheckerProvider.getIfAvailable()).thenReturn(null);
+
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("test-user");
+        user.setOauthGrandfathered(false);
+
+        boolean result = service.isOAuthEligible(user);
+
+        assertEquals(
+                false, result, "OAuth should be blocked when LicenseKeyChecker is unavailable");
+    }
+
+    // ===== SAML Eligibility Tests =====
+
+    @Test
+    void isSamlEligible_grandfatheredUser_returnsTrue() {
+        // Grandfathered user should be eligible for SAML regardless of license
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("grandfathered-user");
+        user.setOauthGrandfathered(true);
+
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.NORMAL);
+
+        boolean result = service.isSamlEligible(user);
+
+        assertEquals(true, result, "Grandfathered user should be eligible for SAML");
+    }
+
+    @Test
+    void isSamlEligible_nonGrandfatheredUserWithEnterpriseLicense_returnsTrue() {
+        // Non-grandfathered user with ENTERPRISE license should be eligible
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("test-user");
+        user.setOauthGrandfathered(false);
+
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.ENTERPRISE);
+
+        boolean result = service.isSamlEligible(user);
+
+        assertEquals(
+                true,
+                result,
+                "Non-grandfathered user with ENTERPRISE license should be eligible for SAML");
+    }
+
+    @Test
+    void isSamlEligible_nonGrandfatheredUserWithServerLicense_returnsFalse() {
+        // Non-grandfathered user with SERVER license should NOT be eligible for SAML
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("test-user");
+        user.setOauthGrandfathered(false);
+
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.SERVER);
+
+        boolean result = service.isSamlEligible(user);
+
+        assertEquals(
+                false,
+                result,
+                "Non-grandfathered user with SERVER license should NOT be eligible for SAML");
+    }
+
+    @Test
+    void isSamlEligible_nonGrandfatheredUserWithNoLicense_returnsFalse() {
+        // Non-grandfathered user without license should NOT be eligible
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("test-user");
+        user.setOauthGrandfathered(false);
+
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.NORMAL);
+
+        boolean result = service.isSamlEligible(user);
+
+        assertEquals(
+                false,
+                result,
+                "Non-grandfathered user without ENTERPRISE license should NOT be eligible for SAML");
+    }
+
+    @Test
+    void isSamlEligible_newUserWithEnterpriseLicense_returnsTrue() {
+        // New user (null) with ENTERPRISE license should be eligible for auto-creation
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.ENTERPRISE);
+
+        boolean result = service.isSamlEligible(null);
+
+        assertEquals(
+                true,
+                result,
+                "New user with ENTERPRISE license should be eligible for SAML auto-creation");
+    }
+
+    @Test
+    void isSamlEligible_newUserWithServerLicense_returnsFalse() {
+        // New user (null) with SERVER license should NOT be eligible for SAML
+        when(licenseKeyChecker.getPremiumLicenseEnabledResult()).thenReturn(License.SERVER);
+
+        boolean result = service.isSamlEligible(null);
+
+        assertEquals(
+                false,
+                result,
+                "New user with SERVER license should NOT be eligible for SAML (requires ENTERPRISE)");
+    }
+
+    @Test
+    void isSamlEligible_licenseCheckerUnavailable_returnsFalse() {
+        // If LicenseKeyChecker is unavailable, SAML should be blocked
+        when(licenseKeyCheckerProvider.getIfAvailable()).thenReturn(null);
+
+        stirling.software.proprietary.security.model.User user =
+                new stirling.software.proprietary.security.model.User();
+        user.setUsername("test-user");
+        user.setOauthGrandfathered(false);
+
+        boolean result = service.isSamlEligible(user);
+
+        assertEquals(false, result, "SAML should be blocked when LicenseKeyChecker is unavailable");
+    }
 }
diff --git a/build.gradle b/build.gradle
index b85c2d413..17bcdb878 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,6 +12,8 @@ plugins {
 }
 
 import com.github.jk1.license.render.*
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
 
 ext {
     springBootVersion = "3.5.6"
@@ -57,7 +59,7 @@ repositories {
 
 allprojects {
     group = 'stirling.software'
-    version = '2.0.2'
+    version = '2.1.4'
 
     configurations.configureEach {
         exclude group: 'commons-logging', module: 'commons-logging'
@@ -65,6 +67,51 @@ allprojects {
     }
 }
 
+def writeIfChanged(File targetFile, String newContent) {
+    if (targetFile.getText('UTF-8') != newContent) {
+        targetFile.write(newContent, 'UTF-8')
+    }
+}
+
+def updateTauriConfigVersion(String version) {
+    File tauriConfig = file('frontend/src-tauri/tauri.conf.json')
+    def parsed = new JsonSlurper().parse(tauriConfig)
+    parsed.version = version
+
+    def formatted = JsonOutput.prettyPrint(JsonOutput.toJson(parsed)) + System.lineSeparator()
+    writeIfChanged(tauriConfig, formatted)
+}
+
+def updateSimulationVersion(File fileToUpdate, String version) {
+    def content = fileToUpdate.getText('UTF-8')
+    def matcher = content =~ /(appVersion:\s*')([^']*)(')/
+
+    if (!matcher.find()) {
+        throw new GradleException("Could not locate appVersion in ${fileToUpdate} for synchronization")
+    }
+
+    def updatedContent = matcher.replaceFirst("${matcher.group(1)}${version}${matcher.group(3)}")
+    writeIfChanged(fileToUpdate, updatedContent)
+}
+
+tasks.register('syncAppVersion') {
+    group = 'versioning'
+    description = 'Synchronizes app version across desktop and simulation configs.'
+
+    doLast {
+        def appVersion = project.version.toString()
+        println "Synchronizing application version to ${appVersion}"
+        updateTauriConfigVersion(appVersion)
+
+        [
+            'frontend/src/core/testing/serverExperienceSimulations.ts',
+            'frontend/src/proprietary/testing/serverExperienceSimulations.ts'
+        ].each { path ->
+            updateSimulationVersion(file(path), appVersion)
+        }
+    }
+}
+
 tasks.register('writeVersion', WriteProperties) {
     destinationFile = layout.projectDirectory.file('app/common/src/main/resources/version.properties')
     println "Writing version.properties to ${destinationFile.get().asFile.path}"
@@ -314,7 +361,7 @@ tasks.named('bootRun') {
 tasks.named('build') {
     group = 'build'
     description = 'Delegates to :stirling-pdf:bootJar'
-    dependsOn ':stirling-pdf:bootJar', 'buildRestartHelper'
+    dependsOn ':stirling-pdf:bootJar', 'buildRestartHelper', 'syncAppVersion'
 
     doFirst {
         println "Delegating to :stirling-pdf:bootJar"
diff --git a/devGuide/HowToAddNewLanguage.md b/devGuide/HowToAddNewLanguage.md
index 6a9ed17f2..861772576 100644
--- a/devGuide/HowToAddNewLanguage.md
+++ b/devGuide/HowToAddNewLanguage.md
@@ -8,36 +8,33 @@
 
 Fork Stirling-PDF and create a new branch out of `main`.
 
-Then add a reference to the language in the navbar by adding a new language entry to the dropdown:
+## Frontend Translation Files (TOML Format)
 
-- Edit the file: [languages.html](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/app/core/src/main/resources/templates/fragments/languages.html)
+### Add Language Directory and Translation File
 
+1. Create a new language directory in `frontend/public/locales/`
+   - Use hyphenated format: `pl-PL` (not underscore)
 
-For example, to add Polish, you would add:
+2. Copy the reference translation file:
+   - Source: `frontend/public/locales/en-GB/translation.toml`
+   - Destination: `frontend/public/locales/pl-PL/translation.toml`
 
-```html
-<div th:replace="~{fragments/languageEntry :: languageEntry ('pl_PL', 'Polski')}" ></div>
-```
+3. Translate all entries in the TOML file
+   - Keep the TOML structure intact
+   - Preserve all placeholders like `{n}`, `{total}`, `{filename}`, `{{variable}}`
+   - See `scripts/translations/README.md` for translation tools and workflows
 
-The `data-bs-language-code` is the code used to reference the file in the next step.
+4. Update the language selector in the frontend to include your new language
 
-### Add Language Property File
-
-Start by copying the existing English property file:
-
-- [messages_en_GB.properties](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/app/core/src/main/resources/messages_en_GB.properties)
-
-Copy and rename it to `messages_{your data-bs-language-code here}.properties`. In the Polish example, you would set the name to `messages_pl_PL.properties`.
-
-Then simply translate all property entries within that file and make a Pull Request (PR) into `main` for others to use!
-
-If you do not have a Java IDE, I am happy to verify that the changes work once you raise the PR (but I won't be able to verify the translations themselves).
+Then make a Pull Request (PR) into `main` for others to use!
 
 ## Handling Untranslatable Strings
 
-Sometimes, certain strings in the properties file may not require translation because they are the same in the target language or are universal (like names of protocols, certain terminologies, etc.). To ensure accurate statistics for language progress, these strings should be added to the `ignore_translation.toml` file located in the `scripts` directory. This will exclude them from the translation progress calculations.
+Sometimes, certain strings may not require translation because they are the same in the target language or are universal (like names of protocols, certain terminologies, etc.). To ensure accurate statistics for language progress, these strings should be added to the `ignore_translation.toml` file located in the `scripts` directory. This will exclude them from the translation progress calculations.
 
-For example, if the English string `error=Error` does not need translation in Polish, add it to the `ignore_translation.toml` under the Polish section:
+For example, if the English string `error` does not need translation in Polish, add it to the `ignore_translation.toml` under the Polish section:
+
+**Note**: Use underscores in `ignore_translation.toml` even though frontend uses hyphens (e.g., `pl_PL` not `pl-PL`)
 
 ```toml
 [pl_PL]
@@ -50,27 +47,27 @@ ignore = [
 ## Add New Translation Tags
 
 > [!IMPORTANT]
-> If you add any new translation tags, they must first be added to the `messages_en_GB.properties` file. This ensures consistency across all language files.
+> If you add any new translation tags, they must first be added to the `en-GB/translation.toml` file. This ensures consistency across all language files.
 
-- New translation tags **must be added** to the `messages_en_GB.properties` file to maintain a reference for other languages.
-- After adding the new tags to `messages_en_GB.properties`, add and translate them in the respective language file (e.g., `messages_pl_PL.properties`).
+- New translation tags **must be added** to `frontend/public/locales/en-GB/translation.toml` to maintain a reference for other languages.
+- After adding the new tags to `en-GB/translation.toml`, add and translate them in the respective language file (e.g., `pl-PL/translation.toml`).
+- Use the scripts in `scripts/translations/` to validate and manage translations (see `scripts/translations/README.md`)
 
 Make sure to place the entry under the correct language section. This helps maintain the accuracy of translation progress statistics and ensures that the translation tool or scripts do not misinterpret the completion rate.
 
-### Use this code to perform a local check
+### Validation Commands
 
-#### Windows command
-
-```powershell
-python .github/scripts/check_language_properties.py --reference-file app\core\src\main\resources\messages_en_GB.properties --branch "" --files app\core\src\main\resources\messages_pl_PL.properties
-
-python .github/scripts/check_language_properties.py --reference-file app\core\src\main\resources\messages_en_GB.properties --branch "" --check-file app\core\src\main\resources\messages_pl_PL.properties
-```
-
-#### Linux command
+Use the translation scripts in `scripts/translations/` directory:
 
 ```bash
-python3 .github/scripts/check_language_properties.py --reference-file app/core/src/main/resources/messages_en_GB.properties --branch "" --files app/core/src/main/resources/messages_pl_PL.properties
+# Analyze translation progress
+python3 scripts/translations/translation_analyzer.py --language pl-PL
 
-python3 .github/scripts/check_language_properties.py --reference-file app/core/src/main/resources/messages_en_GB.properties --branch "" --check-file app/core/src/main/resources/messages_pl_PL.properties
+# Validate TOML structure
+python3 scripts/translations/validate_json_structure.py --language pl-PL
+
+# Validate placeholders
+python3 scripts/translations/validate_placeholders.py --language pl-PL
 ```
+
+See `scripts/translations/README.md` for complete documentation.
diff --git a/docker/Dockerfile.unified b/docker/Dockerfile.unified
index 0ba7cfb3c..2968f569c 100644
--- a/docker/Dockerfile.unified
+++ b/docker/Dockerfile.unified
@@ -105,6 +105,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     gcompat \
     libc6-compat \
     libreoffice \
+    imagemagick \
     # pdftohtml
     poppler-utils \
     # OCR MY PDF
diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index f2421fa94..b946e1e61 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -81,6 +81,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     libc6-compat \
     libreoffice \
     ghostscript \
+    imagemagick \
     fontforge \
     # pdftohtml
     poppler-utils \
diff --git a/docker/backend/Dockerfile.fat b/docker/backend/Dockerfile.fat
index c54a162da..78d395d9d 100644
--- a/docker/backend/Dockerfile.fat
+++ b/docker/backend/Dockerfile.fat
@@ -74,6 +74,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     libc6-compat \
     libreoffice \
     ghostscript \
+    imagemagick \
     fontforge \
     # pdftohtml
     poppler-utils \
diff --git a/docker/embedded/Dockerfile b/docker/embedded/Dockerfile
index a38aee9b4..6b189f310 100644
--- a/docker/embedded/Dockerfile
+++ b/docker/embedded/Dockerfile
@@ -99,6 +99,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     libc6-compat \
     libreoffice \
     ghostscript \
+    imagemagick \
     fontforge \
     # pdftohtml
     poppler-utils \
diff --git a/docker/embedded/Dockerfile.fat b/docker/embedded/Dockerfile.fat
index 67e648aee..462daa901 100644
--- a/docker/embedded/Dockerfile.fat
+++ b/docker/embedded/Dockerfile.fat
@@ -101,6 +101,7 @@ RUN echo "@main https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/a
     libc6-compat \
     libreoffice \
     ghostscript \
+    imagemagick \
     fontforge \
     # pdftohtml
     poppler-utils \
diff --git a/docker/frontend/nginx.conf b/docker/frontend/nginx.conf
index 3be5ec900..ef74321ef 100644
--- a/docker/frontend/nginx.conf
+++ b/docker/frontend/nginx.conf
@@ -103,8 +103,8 @@ http {
             add_header Cache-Control "public, immutable";
         }
 
-        # Cache static assets
-        location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+        # Cache static assets (but not API endpoints)
+        location ~* ^(?!/api/).*\.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
             expires 1y;
             add_header Cache-Control "public, immutable";
         }
diff --git a/docker/unified/nginx.conf b/docker/unified/nginx.conf
index 1e47b8619..cbd5fee81 100644
--- a/docker/unified/nginx.conf
+++ b/docker/unified/nginx.conf
@@ -106,8 +106,8 @@ http {
             add_header Cache-Control "public, immutable";
         }
 
-        # Cache static assets
-        location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
+        # Cache static assets (but not API endpoints)
+        location ~* ^(?!/api/).*\.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
             expires 1y;
             add_header Cache-Control "public, immutable";
         }
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 6e1f885e6..f788474bb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -105,6 +105,7 @@
         "typescript": "^5.9.2",
         "typescript-eslint": "^8.44.1",
         "vite": "^7.1.7",
+        "vite-plugin-static-copy": "^3.1.4",
         "vite-tsconfig-paths": "^5.1.4",
         "vitest": "^3.2.4"
       }
@@ -456,6 +457,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -499,6 +501,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       }
@@ -579,6 +582,7 @@
       "resolved": "https://registry.npmjs.org/@embedpdf/core/-/core-1.5.0.tgz",
       "integrity": "sha512-Yrh9XoVaT8cUgzgqpJ7hx5wg6BqQrCFirqqlSwVb+Ly9oNn4fZbR9GycIWmzJOU5XBnaOJjXfQSaDyoNP0woNA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@embedpdf/engines": "1.5.0",
         "@embedpdf/models": "1.5.0"
@@ -678,6 +682,7 @@
       "resolved": "https://registry.npmjs.org/@embedpdf/plugin-history/-/plugin-history-1.5.0.tgz",
       "integrity": "sha512-p7PTNNaIr4gH3jLwX+eLJe1DeUXgi21kVGN6SRx/pocH8esg4jqoOeD/YiRRZoZnPOiy0jBXVhkPkwSmY7a2hQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@embedpdf/models": "1.5.0"
       },
@@ -694,6 +699,7 @@
       "resolved": "https://registry.npmjs.org/@embedpdf/plugin-interaction-manager/-/plugin-interaction-manager-1.5.0.tgz",
       "integrity": "sha512-ckHgTfvkW6c5Ta7Mc+Dl9C2foVnvEpqEJ84wyBnqrU0OWbe/jsiPhyKBVeartMGqNI/kVfaQTXupyrKhekAVmg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@embedpdf/models": "1.5.0"
       },
@@ -711,6 +717,7 @@
       "resolved": "https://registry.npmjs.org/@embedpdf/plugin-loader/-/plugin-loader-1.5.0.tgz",
       "integrity": "sha512-P4YpIZfaW69etYIjphyaL4cGl2pB14h3OdTE0tRQ2pZYZHFLTvlt4q9B3PVSdhlSrHK5nob7jfLGon2U7xCslg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@embedpdf/models": "1.5.0"
       },
@@ -764,6 +771,7 @@
       "resolved": "https://registry.npmjs.org/@embedpdf/plugin-render/-/plugin-render-1.5.0.tgz",
       "integrity": "sha512-ywwSj0ByrlkvrJIHKRzqxARkOZriki8VJUC+T4MV8fGyF4CzvCRJyKlPktahFz+VxhoodqTh7lBCib68dH+GvA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@embedpdf/models": "1.5.0"
       },
@@ -798,6 +806,7 @@
       "resolved": "https://registry.npmjs.org/@embedpdf/plugin-scroll/-/plugin-scroll-1.5.0.tgz",
       "integrity": "sha512-RNmTZCZ8X1mA8cw9M7TMDuhO9GtkOalGha2bBL3En3D1IlDRS7PzNNMSMV7eqT7OQICSTltlpJ8p8Qi5esvL/Q==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@embedpdf/models": "1.5.0"
       },
@@ -834,6 +843,7 @@
       "resolved": "https://registry.npmjs.org/@embedpdf/plugin-selection/-/plugin-selection-1.5.0.tgz",
       "integrity": "sha512-zrxLBAZQoPswDuf9q9DrYaQc6B0Ysc2U1hueTjNH/4+ydfl0BFXZkKR63C2e3YmWtXvKjkoIj0GyPzsiBORLUw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@embedpdf/models": "1.5.0"
       },
@@ -909,6 +919,7 @@
       "resolved": "https://registry.npmjs.org/@embedpdf/plugin-viewport/-/plugin-viewport-1.5.0.tgz",
       "integrity": "sha512-G8GDyYRhfehw72+r4qKkydnA5+AU8qH67g01Y12b0DzI0VIzymh/05Z4dK8DsY3jyWPXJfw2hlg5+KDHaMBHgQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@embedpdf/models": "1.5.0"
       },
@@ -1064,6 +1075,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
       "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -1107,6 +1119,7 @@
       "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
       "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -2137,6 +2150,7 @@
       "resolved": "https://registry.npmjs.org/@mantine/core/-/core-8.3.6.tgz",
       "integrity": "sha512-paTl+0x+O/QtgMtqVJaG8maD8sfiOdgPmLOyG485FmeGZ1L3KMdEkhxZtmdGlDFsLXhmMGQ57ducT90bvhXX5A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@floating-ui/react": "^0.27.16",
         "clsx": "^2.1.1",
@@ -2187,6 +2201,7 @@
       "resolved": "https://registry.npmjs.org/@mantine/hooks/-/hooks-8.3.6.tgz",
       "integrity": "sha512-liHfaWXHAkLjJy+Bkr29UsCwAoDQ/a64WrM67lksx8F0qqyjR5RQH8zVlhuOjdpQnwtlUkE/YiTvbJiPcoI0bw==",
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "react": "^18.x || ^19.x"
       }
@@ -2254,6 +2269,7 @@
       "resolved": "https://registry.npmjs.org/@mui/material/-/material-7.3.5.tgz",
       "integrity": "sha512-8VVxFmp1GIm9PpmnQoCoYo0UWHoOrdA57tDL62vkpzEgvb/d71Wsbv4FRg7r1Gyx7PuSo0tflH34cdl/NvfHNQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.4",
         "@mui/core-downloads-tracker": "^7.3.5",
@@ -3186,6 +3202,7 @@
       "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-7.9.0.tgz",
       "integrity": "sha512-ggs5k+/0FUJcIgNY08aZTqpBTtbExkJMYMLSMwyucrhtWexVOEY1KJmhBsxf+E/Q15f5rbwBpj+t0t2AW2oCsQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12.16"
       }
@@ -3304,7 +3321,6 @@
       "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.6.tgz",
       "integrity": "sha512-4awhxtMh4cx9blePWl10HRHj8Iivtqj+2QdDCSMDzxG+XKa9+VCNupQuCuvzEhYPzZSrX+0gC+0lHA/0fFKKQQ==",
       "license": "MIT",
-      "peer": true,
       "peerDependencies": {
         "acorn": "^8.9.0"
       }
@@ -4081,6 +4097,7 @@
       "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.10.4",
         "@babel/runtime": "^7.12.5",
@@ -4409,6 +4426,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
       "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -4419,6 +4437,7 @@
       "integrity": "sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "peerDependencies": {
         "@types/react": "^19.2.0"
       }
@@ -4488,6 +4507,7 @@
       "integrity": "sha512-6m1I5RmHBGTnUGS113G04DMu3CpSdxCAU/UvtjNWL4Nuf3MW9tQhiJqRlHzChIkhy6kZSAQmc+I1bcGjE3yNKg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.46.3",
         "@typescript-eslint/types": "8.46.3",
@@ -5201,7 +5221,6 @@
       "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz",
       "integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/shared": "3.5.24"
       }
@@ -5211,7 +5230,6 @@
       "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz",
       "integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/reactivity": "3.5.24",
         "@vue/shared": "3.5.24"
@@ -5222,7 +5240,6 @@
       "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz",
       "integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/reactivity": "3.5.24",
         "@vue/runtime-core": "3.5.24",
@@ -5235,7 +5252,6 @@
       "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz",
       "integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-ssr": "3.5.24",
         "@vue/shared": "3.5.24"
@@ -5262,6 +5278,7 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5669,7 +5686,6 @@
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
       "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -5946,6 +5962,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.19",
         "caniuse-lite": "^1.0.30001751",
@@ -6993,7 +7010,8 @@
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1521046.tgz",
       "integrity": "sha512-vhE6eymDQSKWUXwwA37NtTTVEzjtGVfDr3pRbsWEQ5onH/Snp2c+2xZHWJJawG/0hCCJLRGt4xVtEVUVILol4w==",
       "dev": true,
-      "license": "BSD-3-Clause"
+      "license": "BSD-3-Clause",
+      "peer": true
     },
     "node_modules/dezalgo": {
       "version": "1.0.4",
@@ -7388,6 +7406,7 @@
       "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -7558,6 +7577,7 @@
       "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@rtsao/scc": "^1.1.0",
         "array-includes": "^3.1.9",
@@ -7724,8 +7744,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
       "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/espree": {
       "version": "10.4.0",
@@ -7790,7 +7809,6 @@
       "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.1.2.tgz",
       "integrity": "sha512-DgvlIQeowRNyvLPWW4PT7Gu13WznY288Du086E751mwwbsgr29ytBiYeLzAGIo0qk3Ujob0SDk8TiSaM5WQzNg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
       }
@@ -8881,6 +8899,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.27.6"
       },
@@ -9357,7 +9376,6 @@
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-3.0.3.tgz",
       "integrity": "sha512-ixkJoqQvAP88E6wLydLGGqCJsrFUnqoH6HnaczB8XmDH1oaWU+xxdptvikTgaEhtZ53Ky6YXiBuUI2WXLMCwjw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/estree": "^1.0.6"
       }
@@ -9678,6 +9696,7 @@
       "integrity": "sha512-Pcfm3eZ+eO4JdZCXthW9tCDT3nF4K+9dmeZ+5X39n+Kqz0DDIABRP5CAEOHRFZk8RGuC2efksTJxrjp8EXCunQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@acemir/cssom": "^0.9.19",
         "@asamuzakjp/dom-selector": "^6.7.3",
@@ -10264,8 +10283,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-character/-/locate-character-3.0.0.tgz",
       "integrity": "sha512-SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
@@ -11076,6 +11094,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-map": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
+      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/pac-proxy-agent": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
@@ -11411,6 +11442,7 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -11690,6 +11722,7 @@
       "resolved": "https://registry.npmjs.org/preact/-/preact-10.27.2.tgz",
       "integrity": "sha512-5SYSgFKSyhCbk6SrXyMpqjb5+MQBgfvEKE/OC+PujcY34sOpqtr+0AZQtPYx5IA6VxynQ7rUPCtKzyovpj9Bpg==",
       "license": "MIT",
+      "peer": true,
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/preact"
@@ -12072,6 +12105,7 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
       "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -12081,6 +12115,7 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
       "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -13592,7 +13627,6 @@
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
       "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
       "license": "Apache-2.0",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -13801,6 +13835,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -14102,6 +14137,7 @@
       "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "devOptional": true,
       "license": "Apache-2.0",
+      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -14183,6 +14219,7 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "napi-postinstall": "^0.3.0"
       },
@@ -14387,6 +14424,7 @@
       "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.5.0",
@@ -14479,6 +14517,25 @@
         "url": "https://opencollective.com/vitest"
       }
     },
+    "node_modules/vite-plugin-static-copy": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-3.1.4.tgz",
+      "integrity": "sha512-iCmr4GSw4eSnaB+G8zc2f4dxSuDjbkjwpuBLLGvQYR9IW7rnDzftnUjOH5p4RYR+d4GsiBqXRvzuFhs5bnzVyw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chokidar": "^3.6.0",
+        "p-map": "^7.0.3",
+        "picocolors": "^1.1.1",
+        "tinyglobby": "^0.2.15"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
+      }
+    },
     "node_modules/vite-tsconfig-paths": {
       "version": "5.1.4",
       "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz",
@@ -14538,6 +14595,7 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -14551,6 +14609,7 @@
       "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/chai": "^5.2.2",
         "@vitest/expect": "3.2.4",
@@ -15162,8 +15221,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.4.tgz",
       "integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/zod": {
       "version": "3.25.76",
diff --git a/frontend/package.json b/frontend/package.json
index 5489f6b46..914b7bb1f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -152,6 +152,7 @@
     "typescript": "^5.9.2",
     "typescript-eslint": "^8.44.1",
     "vite": "^7.1.7",
+    "vite-plugin-static-copy": "^3.1.4",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4"
   },
diff --git a/frontend/public/Login/authentik.svg b/frontend/public/Login/authentik.svg
new file mode 100644
index 000000000..26dc0189e
--- /dev/null
+++ b/frontend/public/Login/authentik.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="300" height="230">
+<path d="M0 0 C1.31903824 -0.0071553 2.63807648 -0.01431061 3.99708557 -0.02168274 C5.457443 -0.02452288 6.91780069 -0.02723462 8.37815857 -0.02983093 C9.91753288 -0.03609819 11.45690569 -0.04274523 12.99627686 -0.04974365 C18.05121309 -0.07076093 23.10614953 -0.08114609 28.16111755 -0.09111023 C29.9042964 -0.09515911 31.64747509 -0.09927607 33.39065361 -0.10346031 C41.5839072 -0.12250942 49.77715181 -0.13673921 57.97042328 -0.14507228 C67.41159376 -0.1548342 76.85252914 -0.18112751 86.29361683 -0.22157317 C93.60081727 -0.25179687 100.90795058 -0.2665472 108.21521229 -0.26985329 C112.57457636 -0.27219728 116.9336892 -0.28107194 121.29298592 -0.30631447 C125.39953639 -0.32970901 129.50567225 -0.33378312 133.61227226 -0.32355309 C135.11218526 -0.32306031 136.61211945 -0.32930375 138.11196899 -0.34310913 C152.84247827 -0.47101164 163.97724403 3.01349139 174.8212738 13.24873352 C182.88515893 21.79584771 187.82015779 31.98003153 187.86886597 43.86180115 C187.87884109 45.17365891 187.88881622 46.48551666 187.89909363 47.83712769 C187.89998926 49.27397144 187.90065292 50.71081534 187.90110779 52.1476593 C187.90873693 53.67438153 187.91716572 55.20109994 187.92633057 56.72781372 C187.94821238 60.86244525 187.95706633 64.99700285 187.96215701 69.13168573 C187.96580911 71.7203613 187.97205369 74.30901776 187.9791584 76.897686 C188.00363429 85.94472345 188.01670005 94.99170374 188.02024841 104.03877258 C188.0238787 112.4452023 188.05374235 120.85126581 188.095653 129.25758374 C188.13046003 136.49524804 188.14579867 143.73279163 188.14649445 150.97053897 C188.14728394 155.28413849 188.1558702 159.59736489 188.18449211 163.91087723 C188.21085103 167.97406106 188.21278 172.0365672 188.19683647 176.0997982 C188.19503583 177.58113661 188.20158585 179.06251559 188.21765518 180.54376793 C188.36450998 194.97434252 184.85316963 206.66730712 174.5947113 217.14717102 C165.79646466 225.14557706 156.08057815 230.43905796 144.0087738 230.34248352 C142.72438416 230.3374884 141.43999451 230.33249329 140.11668396 230.3273468 C138.50068298 230.30913879 136.88468201 230.29093079 135.2197113 230.27217102 C130.0634613 230.23092102 124.9072113 230.18967102 119.5947113 230.14717102 C119.5947113 215.29717102 119.5947113 200.44717102 119.5947113 185.14717102 C88.5747113 185.14717102 57.5547113 185.14717102 25.5947113 185.14717102 C25.5947113 199.99717102 25.5947113 214.84717102 25.5947113 230.14717102 C20.7065863 230.22967102 15.8184613 230.31217102 10.7822113 230.39717102 C9.26393738 230.43358704 7.74566345 230.47000305 6.18138123 230.50752258 C-5.50898103 230.60237339 -14.889398 228.09279021 -24.4052887 221.14717102 C-25.06142151 220.6908429 -25.71755432 220.23451477 -26.39356995 219.76435852 C-35.6417653 212.61720949 -41.52201418 200.44681809 -43.4052887 189.14717102 C-43.0752887 172.64717102 -42.7452887 156.14717102 -42.4052887 139.14717102 C7.4247113 139.14717102 57.2547113 139.14717102 108.5947113 139.14717102 C108.2647113 113.07717102 107.9347113 87.00717102 107.5947113 60.14717102 C102.3147113 60.14717102 97.0347113 60.14717102 91.5947113 60.14717102 C91.4090863 62.59123352 91.4090863 62.59123352 91.2197113 65.08467102 C91.0087738 67.86201477 91.0087738 67.86201477 90.5947113 70.14717102 C87.97156099 71.45874618 86.36437695 71.0436709 83.4697113 70.70967102 C82.55963318 70.60783508 81.64955505 70.50599915 80.7118988 70.40107727 C79.66389099 70.27539368 79.66389099 70.27539368 78.5947113 70.14717102 C77.92804464 66.81383769 77.26137797 63.48050435 76.5947113 60.14717102 C72.3047113 60.14717102 68.0147113 60.14717102 63.5947113 60.14717102 C63.2647113 66.08717102 62.9347113 72.02717102 62.5947113 78.14717102 C58.6347113 78.14717102 54.6747113 78.14717102 50.5947113 78.14717102 C50.5947113 71.87717102 50.5947113 65.60717102 50.5947113 59.14717102 C47.6247113 59.64217102 47.6247113 59.64217102 44.5947113 60.14717102 C39.02328273 60.36145673 39.02328273 60.36145673 36.5947113 59.14717102 C36.5947113 74.32717102 36.5947113 89.50717102 36.5947113 105.14717102 C11.8447113 105.47717102 -12.9052887 105.80717102 -38.4052887 106.14717102 C-36.7552887 109.44717102 -35.1052887 112.74717102 -33.4052887 116.14717102 C-32.23385964 123.93483139 -37.28666971 130.77501339 -41.6552887 136.89961243 C-50.19263554 148.19063476 -59.91392466 156.85995926 -74.4052887 159.14717102 C-80.88854532 158.9467374 -86.88378649 157.62811807 -92.4052887 154.14717102 C-93.17485901 153.69728821 -93.94442932 153.2474054 -94.73731995 152.78388977 C-103.86805755 147.04808909 -109.56723535 138.52333432 -112.4052887 128.14717102 C-112.8723603 124.88590617 -112.97726751 121.68916403 -112.9677887 118.39717102 C-112.9653717 117.51972229 -112.96295471 116.64227356 -112.96046448 115.73823547 C-112.65422767 104.8768365 -108.0027269 96.74460922 -100.4052887 89.14717102 C-99.7452887 89.14717102 -99.0852887 89.14717102 -98.4052887 89.14717102 C-98.4052887 88.48717102 -98.4052887 87.82717102 -98.4052887 87.14717102 C-96.32399765 86.16367077 -94.2401751 85.18552644 -92.1552887 84.20967102 C-90.99513245 83.66439758 -89.8349762 83.11912415 -88.6396637 82.55732727 C-81.50461728 79.44651597 -73.41946171 78.81361437 -65.8349762 80.83076477 C-57.72956403 84.23390821 -47.43007285 91.09760271 -43.4052887 99.14717102 C-43.40972992 98.49730225 -43.41417114 97.84743347 -43.41874695 97.1778717 C-43.46327723 90.36362424 -43.49327744 83.54941867 -43.51515198 76.73506165 C-43.52515846 74.19793517 -43.53876781 71.66082007 -43.5561676 69.12373352 C-43.58065249 65.4596423 -43.5918257 61.79570464 -43.6006012 58.13154602 C-43.61608505 56.45267303 -43.61608505 56.45267303 -43.63188171 54.73988342 C-43.63410813 38.81921683 -40.45768984 24.97343548 -29.44044495 13.01435852 C-21.16029185 5.13848053 -11.47412704 0.04274377 0 0 Z M-91.67481995 103.06123352 C-95.82753716 108.06699197 -98.20306218 114.54098751 -97.7802887 121.08076477 C-96.40229746 128.67407064 -93.51648925 134.04027941 -87.4052887 138.80342102 C-82.34135894 142.20574882 -77.91601901 142.59060055 -71.98731995 141.79951477 C-63.04973823 139.54145706 -57.43450233 132.43487412 -52.4052887 125.14717102 C-51.9515387 124.5258429 -51.4977887 123.90451477 -51.0302887 123.26435852 C-49.79068763 121.40487039 -49.79068763 121.40487039 -49.4052887 118.14717102 C-50.947176 114.76439926 -53.06912635 112.02038218 -55.4052887 109.14717102 C-56.1477887 108.13654602 -56.8902887 107.12592102 -57.6552887 106.08467102 C-58.2327887 105.44529602 -58.8102887 104.80592102 -59.4052887 104.14717102 C-60.0652887 104.14717102 -60.7252887 104.14717102 -61.4052887 104.14717102 C-61.6115387 103.56967102 -61.8177887 102.99217102 -62.0302887 102.39717102 C-64.57009959 98.24111683 -68.12585168 96.50927584 -72.7177887 95.20967102 C-80.35763288 95.08018214 -86.15491527 97.83880873 -91.67481995 103.06123352 Z " fill="#FD4A2C" transform="translate(112.40528869628906,-0.1471710205078125)"/>
+<path d="" fill="#FD4A2C" transform="translate(0,0)"/>
+</svg>
diff --git a/frontend/public/Login/cloudron.svg b/frontend/public/Login/cloudron.svg
new file mode 100644
index 000000000..a4b50c421
--- /dev/null
+++ b/frontend/public/Login/cloudron.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="512" height="512">
+<path d="M0 0 C3.49744921 0.00008059 6.99476555 -0.00676629 10.4921875 -0.02050781 C122.34246478 -0.45274246 122.34246478 -0.45274246 141.09765625 16.76342773 C174.54897241 50.48398084 198.17485368 98.50734979 220.2890625 140.18530273 C221.1324829 141.76100004 221.97621598 143.33653003 222.8203125 144.91186523 C225.34858406 149.64988997 227.82847564 154.41181605 230.2890625 159.18530273 C230.8267627 160.2267041 231.36446289 161.26810547 231.91845703 162.34106445 C263.97869273 224.6988045 263.97869273 224.6988045 257.2890625 246.62280273 C256.33837624 249.49549183 255.32151367 252.34111978 254.2890625 255.18530273 C254.04752441 255.87043945 253.80598633 256.55557617 253.55712891 257.26147461 C244.38398084 282.94389568 231.16369144 307.84651325 217.77392578 331.5480957 C216.15713726 334.41960994 214.56384348 337.30343438 212.97265625 340.18920898 C194.28299041 373.98591599 174.45724145 407.95539812 150.2890625 438.18530273 C149.44778687 439.26853527 148.60664286 440.35187005 147.765625 441.43530273 C135.2777998 457.28458828 120.48484397 460.1921792 101.2734375 462.52905273 C90.97014135 463.69879989 80.63803833 464.54507968 70.2890625 465.18530273 C69.63779388 465.2287381 68.98652527 465.27217346 68.31552124 465.31692505 C50.87151776 466.45187962 33.4023821 466.37275817 15.92993164 466.37060547 C12.48782015 466.37052485 9.04584358 466.37737916 5.60375977 466.39111328 C-105.75918075 466.82808362 -105.75918075 466.82808362 -124.51953125 449.60717773 C-157.96261218 415.89492615 -181.62027539 367.86551471 -203.7109375 326.18530273 C-204.17081055 325.32195312 -204.63068359 324.45860352 -205.10449219 323.5690918 C-210.43022193 313.56936897 -215.66249875 303.52575099 -220.6484375 293.35180664 C-221.3952219 291.82906657 -222.1455397 290.30805675 -222.8984375 288.78833008 C-247.25894415 239.50588323 -247.25894415 239.50588323 -240.02416992 217.67553711 C-239.27144018 215.50512905 -238.49479043 213.34465053 -237.7109375 211.18530273 C-237.46939941 210.50016602 -237.22786133 209.8150293 -236.97900391 209.10913086 C-227.80402405 183.42158124 -214.58045959 158.51494941 -201.18701172 134.80932617 C-199.59454635 131.9783937 -198.02842516 129.13384607 -196.46484375 126.28686523 C-187.65613486 110.30892324 -178.30355216 94.70052176 -168.7109375 79.18530273 C-168.13537109 78.25363281 -167.55980469 77.32196289 -166.96679688 76.36206055 C-156.65880245 59.72842263 -145.68617783 43.66588911 -133.7109375 28.18530273 C-133.26331055 27.60167969 -132.81568359 27.01805664 -132.35449219 26.41674805 C-120.11889277 10.58083036 -106.8466946 6.70895536 -87.58569336 4.19287109 C-76.32773901 2.82264388 -65.02778011 1.90231075 -53.7109375 1.18530273 C-52.43895508 1.09627686 -51.16697266 1.00725098 -49.85644531 0.91552734 C-33.25990706 -0.14473851 -16.62256341 -0.00201494 0 0 Z " fill="#03A9F4" transform="translate(247.7109375,22.814697265625)"/>
+<path d="M0 0 C1.94015739 -0.00006042 1.94015739 -0.00006042 3.91950989 -0.00012207 C6.6350783 0.00151661 9.34980657 0.01994719 12.06518555 0.05175781 C15.52142771 0.09155158 18.97658108 0.09578014 22.43300915 0.08829498 C25.76796881 0.08446601 29.10259375 0.10532619 32.4375 0.125 C33.66583054 0.12520142 34.89416107 0.12540283 36.15971375 0.12561035 C47.09695747 0.27540119 56.50795369 2.57843586 64.7109375 10.15625 C72.91383281 19.03758026 73.6173168 28.09554397 73.515625 39.8125 C73.51578032 41.28023348 73.51727475 42.74796735 73.52003479 44.21569824 C73.52141245 47.27858816 73.50896828 50.34100621 73.48608398 53.40380859 C73.45770082 57.30735778 73.460445 61.21012427 73.4731741 65.11373138 C73.48016705 68.14058992 73.47230105 71.16727118 73.45991707 74.19410706 C73.45543758 75.63244443 73.45503473 77.07080108 73.45898247 78.50914001 C73.47463451 89.22704255 72.73697579 98.16811946 65.89453125 106.73828125 C59.56650261 113.00039293 51.33744879 116.85517881 42.48510742 116.82080078 C41.1841362 116.82064972 39.88316498 116.82049866 38.54277039 116.82034302 C37.13267868 116.81013124 35.72258856 116.79969927 34.3125 116.7890625 C32.86233211 116.78532959 31.41216168 116.78248393 29.96199036 116.78048706 C26.15614791 116.77287249 22.35045955 116.75324289 18.54467773 116.7310791 C13.97247756 116.70696463 9.40022569 116.69782931 4.82798004 116.68617249 C-2.10827653 116.66681704 -9.0441954 116.6284796 -15.98046875 116.59375 C-15.98046875 133.75375 -15.98046875 150.91375 -15.98046875 168.59375 C-11.39269531 168.54734375 -6.80492187 168.5009375 -2.078125 168.453125 C0.84312184 168.43266627 3.7642793 168.41340924 6.68554688 168.3984375 C11.31374653 168.37460446 15.9416271 168.34653118 20.56958008 168.29199219 C24.30435729 168.2482587 28.03879193 168.22455557 31.77380562 168.21424103 C33.19266712 168.20689857 34.61151168 168.19256131 36.03022575 168.17082977 C44.27281605 168.04969077 50.83849035 168.3352293 58.01953125 172.59375 C58.66119736 172.95160583 59.30286346 173.30946167 59.963974 173.67816162 C65.70350455 177.01858226 69.07169835 182.79801075 72.01953125 188.59375 C72.99960463 192.46008043 73.17298409 196.14122422 73.22827148 200.12133789 C73.2475621 201.42361832 73.26685272 202.72589874 73.28672791 204.06764221 C73.30154165 205.48388664 73.31531404 206.90014229 73.328125 208.31640625 C73.33469683 209.03602476 73.34126865 209.75564327 73.34803963 210.49706841 C73.38056493 214.31044424 73.40502597 218.12379305 73.42456055 221.93725586 C73.44231787 225.07113991 73.47705549 228.20411465 73.52709961 231.33764648 C73.58777934 235.14313026 73.6181004 238.94777684 73.62773323 242.75372124 C73.63621165 244.19247644 73.65483803 245.63121392 73.68447685 247.0696888 C73.89092106 257.66405546 72.34689436 266.684995 65.00950623 274.82313538 C57.79090516 281.6765038 50.00657402 284.66198025 40.13452148 284.78662109 C38.39131874 284.81071548 38.39131874 284.81071548 36.61289978 284.83529663 C31.29751293 284.88008458 25.98226986 284.92125017 20.66674805 284.94384766 C17.87246601 284.9571364 15.07892301 284.98490259 12.28491211 285.02587891 C8.23669479 285.08522035 4.18925534 285.10257348 0.140625 285.1171875 C-1.09418106 285.13985687 -2.32898712 285.16252625 -3.60121155 285.18588257 C-14.04047933 285.16075819 -23.76576747 282.61833853 -31.51953125 275.26171875 C-37.13294046 268.85282641 -40.24381233 262.00617759 -40.20751953 253.40478516 C-40.20736847 252.20399323 -40.20721741 251.00320129 -40.20706177 249.76602173 C-40.1967392 248.48456268 -40.18641663 247.20310364 -40.17578125 245.8828125 C-40.17204665 244.54617526 -40.16920179 243.20953526 -40.16720581 241.87289429 C-40.15960452 238.37119868 -40.13998663 234.8696715 -40.11779785 231.36804199 C-40.09726349 227.78835325 -40.08818793 224.20863704 -40.078125 220.62890625 C-40.05673704 213.61711873 -40.02264391 206.60544247 -39.98046875 199.59375 C-40.52234329 199.75542664 -41.06421783 199.91710327 -41.62251282 200.0836792 C-44.37168919 200.67837844 -46.89396671 200.7358999 -49.70776367 200.75488281 C-50.85963669 200.76449036 -52.0115097 200.7740979 -53.19828796 200.78399658 C-54.43996231 200.78824646 -55.68163666 200.79249634 -56.9609375 200.796875 C-58.2434993 200.80257507 -59.5260611 200.80827515 -60.8474884 200.81414795 C-63.56345005 200.82464026 -66.27938228 200.83049378 -68.99536133 200.83398438 C-72.45394824 200.83945074 -75.91213783 200.86344575 -79.3706007 200.89195633 C-82.69237098 200.91521378 -86.01409013 200.9170415 -89.3359375 200.921875 C-90.56749069 200.9342218 -91.79904388 200.9465686 -93.06791687 200.95928955 C-103.65184563 200.93208632 -112.25095602 199.24643018 -120.01953125 191.58203125 C-127.14949164 183.94649185 -130.05794562 177.10919245 -130.1574707 166.60107422 C-130.17672356 164.82299881 -130.17672356 164.82299881 -130.19636536 163.00900269 C-130.20375229 161.73501617 -130.21113922 160.46102966 -130.21875 159.1484375 C-130.22282553 158.49376621 -130.22690105 157.83909492 -130.23110008 157.16458511 C-130.25190891 153.69598972 -130.26623019 150.22743322 -130.27563477 146.75878906 C-130.28665966 143.20503139 -130.32102786 139.65190666 -130.36080647 136.09837151 C-130.38715858 133.34084033 -130.3953431 130.58345544 -130.39891624 127.82580948 C-130.40605871 125.88784044 -130.43241783 123.94997219 -130.45930481 122.01217651 C-130.43034057 110.08918086 -127.76147935 101.40358223 -119.421875 92.76171875 C-112.61145264 86.71406369 -106.09578246 84.47136897 -97.06030273 84.46435547 C-95.89236679 84.46120331 -94.72443085 84.45805115 -93.52110291 84.45480347 C-92.26890457 84.4568277 -91.01670624 84.45885193 -89.7265625 84.4609375 C-88.43355728 84.45998077 -87.14055206 84.45902405 -85.80836487 84.45803833 C-83.07739054 84.45656746 -80.34644902 84.45869659 -77.61547852 84.46337891 C-74.11958175 84.46908151 -70.62376167 84.46578998 -67.1278677 84.45980644 C-63.78575985 84.45531996 -60.44367253 84.45846276 -57.1015625 84.4609375 C-55.84733994 84.45891327 -54.59311737 84.45688904 -53.30088806 84.45480347 C-52.13610428 84.45795563 -50.9713205 84.46110779 -49.77124023 84.46435547 C-48.74707504 84.46515106 -47.72290985 84.46594666 -46.66770935 84.46676636 C-44.2753053 84.57981771 -42.26539621 84.90758854 -39.98046875 85.59375 C-39.99379242 84.85618469 -40.00711609 84.11861938 -40.02084351 83.35870361 C-40.14180142 76.35768374 -40.23278436 69.35703462 -40.29134178 62.35525894 C-40.32246122 58.75672551 -40.36456763 55.15906585 -40.43310547 51.56103516 C-40.49900628 48.0790645 -40.53431995 44.59792618 -40.54973221 41.11537933 C-40.56597536 39.1612142 -40.6126984 37.20737723 -40.6602478 35.25372314 C-40.66381698 25.6424848 -38.42861053 17.99523792 -32.24203491 10.48272705 C-23.21024427 1.73860842 -12.11330374 -0.16248684 0 0 Z " fill="#FEFEFE" transform="translate(258.98046875,113.40625)"/>
+</svg>
diff --git a/frontend/public/Login/keycloak.svg b/frontend/public/Login/keycloak.svg
new file mode 100644
index 000000000..30628c7b2
--- /dev/null
+++ b/frontend/public/Login/keycloak.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 44.39828 40.248" xmlns="http://www.w3.org/2000/svg" style="max-height: 500px" width="300" height="300"><path d="M5.795 9.869 11.511.003 34.53 0l5.685 9.964.007 19.932-5.691 9.958-23.012.008-5.782-9.965z" fill="#4d4d4d"/><path d="M5.738 29.894h10.374l-5.698-10.041 4.634-9.982-9.252-.002L0 19.934" fill="#ededed"/><path d="M19.258 29.894h7.583l6.705-9.773-6.588-10.156h-8.92l-5.373 9.814z" fill="#e0e0e0"/><path d="m0 19.933 5.738 9.964h10.375l-5.636-9.93z" fill="#acacac"/><path d="m12.774 19.935 6.485 9.962h7.582l6.6-9.958z" fill="#9e9e9e"/><path d="m15.342 19.94-1.957.57-1.878-.571 7.667-13.29 1.918 3.318" fill="#00b8e3"/><path d="m21.084 29.894-1.908 3.332-5.093-5.487-2.58-7.797v-.004h3.838" fill="#33c6e9"/><path d="M11.508 19.939h-.004v.003l-1.917 3.322-1.925-3.307 1.952-3.386 5.728-9.92h3.834" fill="#008aaa"/><path d="M32.604 29.894h11.612l-.007-19.93H32.604Z" fill="#d4d4d4"/><path d="M32.604 19.966v9.93h11.591v-9.93z" fill="#919191"/><path d="M19.178 33.23h-3.837l-5.754-9.967 1.917-3.32z" fill="#00b8e3"/><path d="M34.519 19.939 26.85 33.227c-.705-1.036-1.913-3.33-1.913-3.33l5.753-9.96z" fill="#008aaa"/><path d="m30.68 33.227-3.83-.001 7.67-13.288 1.916-3.318 1.922 3.34m-3.839-.021h-3.828l-5.755-9.973 1.905-3.314 4.658 5.922z" fill="#00b8e3"/><path d="M36.436 16.618v.003l-1.917 3.318-7.677-13.286 3.841.002z" fill="#33c6e9"/><path d="M175.972 9.98a.193.193 0 0 0-.195.196v19.503c0 .106.086.195.195.195h4.049c.106 0 .195-.09.195-.195V24.31c0-.046.016-.093.05-.13l.181-.204 1.6-1.782a.196.196 0 0 1 .302.016l1.528 2.06 2.735 3.68 1.002 1.347.367.497c.04.05.096.08.159.08h4.7a.2.2 0 0 0 .162-.312l-.973-1.356-1.389-1.954c-.413-.576-.856-1.198-1.333-1.866l-.215-.304-1.76-2.48a1565.7 1565.7 0 0 0-1.934-2.706.19.19 0 0 1 .016-.241l1.551-1.724 3.725-4.14 2.239-2.487a.218.218 0 0 0 .05-.123.195.195 0 0 0-.196-.201h-4.97a.195.195 0 0 0-.143.062l-1.558 1.694-3.324 3.614-2.235 2.428a.194.194 0 0 1-.338-.132v-7.471a.195.195 0 0 0-.195-.195Z" fill="#626262"/><path d="M161.562 9.98a.198.198 0 0 0-.178.12l-5.213 12.065-.003.003-.007.013-.003.01-.674 1.565-.04.096-.087.195h.001l-.073.166v.003l-2.027 4.693-.298.69a.196.196 0 0 0 .178.275h4.3a.196.196 0 0 0 .175-.112c0-.004.004-.004.004-.007l1.498-3.485.248-.576a.199.199 0 0 1 .182-.12h8.08a.19.19 0 0 1 .178.12l1.664 3.866 1.865-6.618-1.499-3.47-1.339-3.098-2.712-6.273a.191.191 0 0 0-.179-.12h-2.526zm7.905 19.58v.003l.086.192c.03.073.099.12.178.12h4.3a.197.197 0 0 0 .179-.276l-.04-.09-2.838-6.567zm-5.87-13.362c.074 0 .147.04.181.117l.943 2.2.952 2.225.285.664a.194.194 0 0 1-.179.272h-4.389a.194.194 0 0 1-.178-.272l.516-1.19 1.69-3.9a.195.195 0 0 1 .18-.116z" fill="#6f6f6f"/><path d="M143.452 9.524c-.826 0-1.617.076-2.368.235v.004-.004h-.003a9.78 9.78 0 0 0-3.556 1.488 10.59 10.59 0 0 0-1.497 1.224c-1.486 1.453-2.428 3.197-2.815 5.176l-.002.003-.014.076-.005.023-.042.225v-.001l-.003.012v.006l-.01.085v.009a11.29 11.29 0 0 0-.126 1.715c0 2.63.816 4.872 2.45 6.727.175.206.367.404.565.599.506.496 1.043.93 1.608 1.3 1.68 1.098 3.619 1.647 5.818 1.647.245 0 .486-.006.724-.023 2.13-.12 4.001-.784 5.615-1.991a10.44 10.44 0 0 0 1.089-.933l.01-.01a9.983 9.983 0 0 0 1.922-2.583c.148-.288.28-.582.396-.887.46-1.174.688-2.457.688-3.845 0-.374-.016-.742-.05-1.1v-.006a9.841 9.841 0 0 0-.783-3.1c-.5-1.15-1.227-2.191-2.183-3.124-.397-.39-.814-.74-1.25-1.052-1.76-1.263-3.817-1.895-6.178-1.895zm.017 3.873c1.66 0 3.059.625 4.197 1.875.062.067.122.136.175.205 1.022 1.214 1.531 2.66 1.531 4.336 0 1.17-.248 2.223-.744 3.162a6.456 6.456 0 0 1-1.138 1.545 5.658 5.658 0 0 1-1.382 1.048c-.79.423-1.67.635-2.64.635a5.57 5.57 0 0 1-2.56-.592 5.46 5.46 0 0 1-1.12-.77 5.668 5.668 0 0 1-.516-.503c-1.14-1.243-1.71-2.751-1.71-4.524 0-.053 0-.103.003-.156.03-1.707.599-3.168 1.707-4.386.83-.912 1.802-1.495 2.913-1.74a6.03 6.03 0 0 1 1.284-.135z" fill="#7d7d7d"/><path d="M120.252 9.98a.193.193 0 0 0-.195.196v19.503c0 .106.086.195.195.195h12.528c.11 0 .196-.09.196-.195v-3.57a.195.195 0 0 0-.196-.194h-8.09a.192.192 0 0 1-.194-.191V10.176a.19.19 0 0 0-.113-.176.174.174 0 0 0-.083-.02h-2.242z" fill="#888"/><path d="M109.792 9.525c-2.923 0-5.394.989-7.415 2.96-.367.36-.7.738-1.002 1.13v.004c-1.352 1.756-2.027 3.84-2.027 6.25 0 1.377.215 2.64.649 3.794l.006-.002-.005.003c.254.695.592 1.336.999 1.948v.003c.003 0 .003.003.003.003a9.828 9.828 0 0 0 1.323 1.58 10.01 10.01 0 0 0 1.984 1.512h.003a9.831 9.831 0 0 0 .953.484h.007l.003.003h.003c1.37.602 2.907.903 4.617.903.503 0 .996-.037 1.475-.106h.01c.308-.043.612-.102.913-.175 1.683-.404 3.225-1.257 4.63-2.557v-.002l.001.002c.281-.258.559-.54.83-.837a.199.199 0 0 0-.007-.27l-2.566-2.643a.19.19 0 0 0-.172-.057.212.212 0 0 0-.116.07c-.685.81-1.465 1.419-2.338 1.822-.867.4-1.826.6-2.874.6-.718 0-1.39-.113-2.011-.341a5.641 5.641 0 0 1-2.057-1.34 5.433 5.433 0 0 1-1.3-2.066h-.007l.007-.001c-.255-.715-.38-1.508-.38-2.385 0-1.723.512-3.118 1.544-4.183.076-.076.152-.153.235-.23 1.184-1.09 2.612-1.636 4.283-1.636.611 0 1.197.076 1.75.229v-.001c1.27.344 2.384 1.085 3.343 2.216.076.09.215.096.29.007l2.498-2.832a.201.201 0 0 0-.003-.264c-1.955-2.147-4.323-3.334-7.1-3.556-.322-.025-.646-.04-.977-.04z" fill="#949494"/><path d="M82.588 9.98a.195.195 0 0 0-.17.29l1.892 3.309 3.423 5.983 1.38 2.41a.2.2 0 0 1 .026.097v7.61c0 .106.086.195.195.195h4.049c.109 0 .194-.09.194-.195v-7.61c0-.033.01-.066.027-.096l.976-1.706 3.704-6.476.757-1.32.503-.88h-.007l.007-.003.754-1.316a.194.194 0 0 0-.168-.29h-4.363a.196.196 0 0 0-.168.095l-3.953 6.803-.003.003v.003l-.212.156-.159.122a.203.203 0 0 1-.082-.076l-.067-.112-.099-.17-3.905-6.73a.196.196 0 0 0-.169-.095zm15.537 2.04v.002l-.004.002z" fill="#aaa"/><path d="M66.598 9.98a.193.193 0 0 0-.196.196v19.503c0 .106.086.195.195.195h14.264c.11 0 .196-.09.196-.195v-3.54a.196.196 0 0 0-.196-.194h-9.825a.195.195 0 0 1-.196-.195v-3.737c0-.106.09-.196.196-.196h8.519a.195.195 0 0 0 .195-.194v-3.394c0-.11-.09-.195-.195-.195h-8.52a.196.196 0 0 1-.195-.195V14.13c0-.11.09-.195.196-.195h9.515a.195.195 0 0 0 .195-.195v-3.565a.195.195 0 0 0-.195-.195h-7.829z" fill="#bcbcbc"/><path d="M47.256 9.98a.193.193 0 0 0-.195.196v19.503c0 .106.086.195.195.195h4.048c.11 0 .196-.09.196-.195V24.31c0-.046.016-.093.05-.13l.842-.942.94-1.044a.196.196 0 0 1 .3.016l2.808 3.777.002.002 2.016 2.713.81 1.09a.19.19 0 0 0 .156.08h4.703a.197.197 0 0 0 .158-.31l-.171-.241a693.927 693.927 0 0 1-1.846-2.587c-.566-.79-1.194-1.673-1.888-2.652l-.07-.1v.002-.002a1569.226 1569.226 0 0 0-3.628-5.086.195.195 0 0 1 .017-.241l1.772-1.968h-.006l.006-.001v-.003l1.459-1.62 1.402-1.558 2.88-3.202a.194.194 0 0 0-.145-.324H59.1a.196.196 0 0 0-.146.063l-3.079 3.345-4.038 4.39a.194.194 0 0 1-.338-.132V10.17a.193.193 0 0 0-.195-.192h-2.11zm.091 9.823v.01h-.001zm12.27 8.34v.002h-.001z" fill="#b8b8b8"/><path d="M89.222 29.806c-.024-.025-.045-1.79-.045-3.92V22.01l-3.38-5.904c-1.996-3.487-3.364-5.945-3.342-6.003.032-.084.357-.098 2.278-.098 2.052 0 2.25.01 2.342.115.055.064.986 1.649 2.069 3.523 1.082 1.873 2.003 3.443 2.045 3.488.194.21.46-.181 2.48-3.662l2.01-3.465h2.275c1.894 0 2.28.016 2.31.094.02.05-1.477 2.737-3.326 5.969l-3.362 5.876-.066 7.872-2.121.018c-1.167.01-2.142-.003-2.167-.028z" fill="#a0a0a0"/><path d="M66.456 29.767c-.017-.045-.023-4.503-.014-9.905l.017-9.823h14.22v3.837l-4.855.017c-3.453.012-4.88.038-4.944.09-.13.109-.13 3.91 0 4.018.063.052 1.362.079 4.448.09l4.36.018v3.638l-4.36.017c-3.086.012-4.385.039-4.448.09-.07.06-.089.465-.089 1.98 0 1.047.018 1.95.04 2.009.036.094.538.104 4.999.104 3.29 0 5 .023 5.086.069.122.065.128.156.128 1.872 0 1.314-.022 1.825-.08 1.883-.118.118-14.463.115-14.508-.003z" fill="#acacac"/></svg>
diff --git a/frontend/public/Login/oidc.svg b/frontend/public/Login/oidc.svg
new file mode 100644
index 000000000..440b54487
--- /dev/null
+++ b/frontend/public/Login/oidc.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="660" height="600">
+<path d="M0 0 C0 57.09 0 114.18 0 173 C8.415 173.495 8.415 173.495 17 174 C22.13212507 174.61353778 27.20920013 175.27424487 32.3125 176.0625 C33.35173111 176.22247467 33.35173111 176.22247467 34.41195679 176.38568115 C87.28212498 184.61044341 143.75115649 199.67402182 188.89135742 229.19360352 C192.39340352 231.47487198 192.39340352 231.47487198 196.44140625 231.74584961 C199.00353686 230.99896898 200.92235962 230.0848876 203.1953125 228.69921875 C203.98349365 228.22299072 204.7716748 227.7467627 205.58374023 227.25610352 C206.42235596 226.73846436 207.26097168 226.2208252 208.125 225.6875 C209.44963257 224.88107056 209.44963257 224.88107056 210.80102539 224.05834961 C218.2788882 219.48880349 225.68697393 214.80908891 233.0859375 210.11328125 C238.56516867 206.63801776 244.05794024 203.18499956 249.5625 199.75 C250.47378662 199.17644775 251.38507324 198.60289551 252.32397461 198.01196289 C253.16710205 197.48723389 254.01022949 196.96250488 254.87890625 196.421875 C255.6272876 195.95362305 256.37566895 195.48537109 257.14672852 195.00292969 C259 194 259 194 261 194 C261 234.92 261 275.84 261 318 C195 318 129 318 61 318 C66.62046022 312.37953978 66.62046022 312.37953978 70.1953125 310.30859375 C70.98373535 309.84509521 71.7721582 309.38159668 72.58447266 308.90405273 C73.42284668 308.42009033 74.2612207 307.93612793 75.125 307.4375 C76.92821049 306.37691406 78.73026666 305.31436348 80.53125 304.25 C81.44390625 303.71117187 82.3565625 303.17234375 83.296875 302.6171875 C87.45315513 300.13062684 91.54077364 297.5401891 95.625 294.9375 C104.68061691 289.17639009 113.82499619 283.56858057 123 278 C95.41546967 253.17980426 47.87307254 244.92506981 12.4230957 238.65087891 C9.69549527 238.13224381 6.99469148 237.56557616 4.28605652 236.95932007 C3.48163211 236.77956823 2.6772077 236.5998164 1.84840679 236.41461754 C1.23843255 236.27779375 0.62845831 236.14096996 0 236 C0.00968287 236.95226887 0.00968287 236.95226887 0.01956135 237.92377549 C0.40016641 275.5678774 0.69175834 313.21169428 0.8681106 350.857327 C0.88937207 355.37957866 0.9113756 359.90182642 0.93383789 364.42407227 C0.94052681 365.77449264 0.94052681 365.77449264 0.94735085 367.15219422 C1.02128165 381.72092042 1.15529296 396.28850378 1.31159753 410.85655246 C1.47069632 425.80998832 1.56502392 440.76282661 1.59950441 455.7170741 C1.6228081 464.94203832 1.69633253 474.16377254 1.83457994 483.38774201 C1.92459849 489.71710549 1.95157012 496.04480499 1.92952342 502.3747618 C1.91865239 506.0258425 1.93502576 509.67129285 2.02649307 513.32136536 C2.53404806 534.611025 2.53404806 534.611025 -1.66046834 540.22067046 C-5.61382003 543.84486231 -9.99337264 546.11440877 -14.93325436 548.1178354 C-17.9472021 549.4043014 -20.51710879 551.11902775 -23.2421875 552.93359375 C-25.11898742 554.10285441 -26.99659067 555.27082661 -28.875 556.4375 C-30.94554208 557.72749617 -33.01585201 559.01786502 -35.0859375 560.30859375 C-36.08850586 560.93362793 -37.09107422 561.55866211 -38.12402344 562.20263672 C-42.25887824 564.78674547 -46.38050299 567.39150173 -50.5 570 C-55.66368756 573.26924126 -60.83510492 576.52543937 -66.01953125 579.76171875 C-67.57365723 580.73226196 -67.57365723 580.73226196 -69.15917969 581.72241211 C-71.24494276 583.02221909 -73.33280531 584.31866375 -75.42285156 585.61157227 C-79.75754504 588.30094736 -84.06005599 590.99141777 -88.21484375 593.953125 C-88.82610107 594.38020752 -89.4373584 594.80729004 -90.06713867 595.24731445 C-91.59690593 596.32922587 -93.10452179 597.4422887 -94.609375 598.55859375 C-104.17888449 602.62673776 -116.13257118 599.41829489 -126.125 597.9375 C-126.8782254 597.82773834 -127.63145081 597.71797668 -128.40750122 597.60488892 C-155.10921512 593.68788246 -181.21892048 588.0366224 -207 580 C-208.55702637 579.51877686 -208.55702637 579.51877686 -210.14550781 579.02783203 C-252.4892261 565.81471296 -293.49031089 546.13359294 -328 518 C-328.55075195 517.55221191 -329.10150391 517.10442383 -329.66894531 516.64306641 C-344.0262393 504.87499381 -357.05375247 492.02119149 -368 477 C-368.39912598 476.45633789 -368.79825195 475.91267578 -369.20947266 475.35253906 C-392.91190201 442.83128247 -403.85540073 404.17862698 -398.31640625 364.015625 C-397.49292051 359.26188702 -396.34256653 354.631548 -395 350 C-394.78569336 349.2373584 -394.57138672 348.4747168 -394.35058594 347.68896484 C-391.13292385 336.49740216 -386.62671929 326.17910618 -381 316 C-380.65066406 315.36465332 -380.30132812 314.72930664 -379.94140625 314.07470703 C-371.83738068 299.52530948 -361.49162018 286.98857593 -350 275 C-349.49742676 274.47019531 -348.99485352 273.94039063 -348.47705078 273.39453125 C-341.05202995 265.6016144 -333.26048878 258.6983199 -324.64941406 252.24365234 C-323.12444203 251.09382885 -321.619807 249.91716565 -320.1171875 248.73828125 C-266.81422583 207.38765499 -198.78193787 186.43202299 -133 176.25 C-132.31911316 176.1429071 -131.63822632 176.03581421 -130.93670654 175.92547607 C-129.93815643 175.76973114 -129.93815643 175.76973114 -128.91943359 175.61083984 C-128.34196381 175.52039398 -127.76449402 175.42994812 -127.16952515 175.33676147 C-120.94349948 174.44098127 -114.78189332 173.78966702 -108.50390625 173.43652344 C-107.77659302 173.39341034 -107.04927979 173.35029724 -106.29992676 173.30587769 C-104.53342535 173.20150671 -102.76673142 173.10040225 -101 173 C-101.02074034 172.17119166 -101.02074034 172.17119166 -101.04189968 171.32563972 C-101.37399305 157.84546534 -101.62081125 144.36601235 -101.77718258 130.88261604 C-101.85535887 124.36159622 -101.96130923 117.8435353 -102.1315918 111.32421875 C-102.29500975 105.02805601 -102.38434565 98.73473139 -102.42315865 92.43661118 C-102.45080164 90.03850484 -102.50479107 87.64054815 -102.58595085 85.24365616 C-103.18130054 66.92673567 -103.18130054 66.92673567 -99.52549744 62.02160263 C-95.51009029 58.30398314 -90.97637623 56.16816603 -86 54 C-84.54249937 53.09533774 -83.09809025 52.16707622 -81.6953125 51.1796875 C-80.5060068 50.4102228 -79.31590351 49.64198945 -78.125 48.875 C-77.4441333 48.43526855 -76.7632666 47.99553711 -76.06176758 47.54248047 C-68.5391438 42.69050798 -60.992142 37.87650432 -53.44970703 33.05541992 C-44.38499907 27.25678412 -35.3589696 21.4002907 -26.34326172 15.52587891 C-22.4194515 12.97078265 -18.49180794 10.42163155 -14.5625 7.875 C-13.87027344 7.42535889 -13.17804688 6.97571777 -12.46484375 6.51245117 C-2.41141154 0 -2.41141154 0 0 0 Z M-202 265 C-203.40740081 265.66438305 -204.8149486 266.32845483 -206.22265625 266.9921875 C-226.15067623 276.52952704 -243.53669409 289.35049348 -260 304 C-260.72832031 304.64195312 -261.45664062 305.28390625 -262.20703125 305.9453125 C-283.6307223 326.06103084 -297.78356798 354.67970444 -299.03125 384.125 C-298.92387323 397.4397192 -296.55043235 409.51957444 -292 422 C-291.64164062 423.02351562 -291.28328125 424.04703125 -290.9140625 425.1015625 C-285.07813826 440.45707947 -275.06824297 453.08794049 -264 465 C-263.22914063 465.84175781 -262.45828125 466.68351563 -261.6640625 467.55078125 C-255.39484224 474.11132215 -248.25461404 479.58481164 -241 485 C-239.99324219 485.75152344 -238.98648438 486.50304687 -237.94921875 487.27734375 C-198.06145792 515.88685314 -149.30111356 530.9623608 -101 537 C-101 437.67 -101 338.34 -101 236 C-134.31853884 236 -172.60102557 250.75734058 -202 265 Z " fill="#FE6200" transform="translate(399,0)"/>
+<path d="M0 0 C0 20.79 0 41.58 0 63 C-5.24841939 64.16631542 -10.39838479 65.29253106 -15.67578125 66.2265625 C-40.87427673 70.80660183 -65.31370876 77.09720394 -89 87 C-89.8343457 87.34643555 -90.66869141 87.69287109 -91.52832031 88.04980469 C-122.35826708 100.99530289 -153.08258507 120.19644793 -173.5 147.1875 C-174.34800171 148.30777588 -174.34800171 148.30777588 -175.21313477 149.45068359 C-192.44810623 172.52486636 -200.77216074 199.73105012 -196.79296875 228.50390625 C-195.64830139 235.59656473 -193.45505231 242.26655244 -191 249 C-190.64164062 250.02351562 -190.28328125 251.04703125 -189.9140625 252.1015625 C-184.07517346 267.46488046 -174.05844002 280.07060885 -163 292 C-162.30261719 292.76828125 -161.60523438 293.5365625 -160.88671875 294.328125 C-123.17922705 334.05421904 -64.42812654 352.62435588 -12.08764648 361.42504883 C-8.03764151 362.17920094 -4.02152172 363.10632851 0 364 C0 384.79 0 405.58 0 427 C-6.20846882 427 -11.44016669 426.97826822 -17.4375 426.15234375 C-18.44259865 426.01478668 -18.44259865 426.01478668 -19.46800232 425.87445068 C-21.64682203 425.57172093 -23.82347704 425.25630365 -26 424.9375 C-26.75822052 424.82773834 -27.51644104 424.71797668 -28.29763794 424.60488892 C-55.0409923 420.70221143 -81.18121046 415.04837758 -107 407 C-108.55702637 406.51877686 -108.55702637 406.51877686 -110.14550781 406.02783203 C-152.4892261 392.81471296 -193.49031089 373.13359294 -228 345 C-228.55075195 344.55221191 -229.10150391 344.10442383 -229.66894531 343.64306641 C-244.0262393 331.87499381 -257.05375247 319.02119149 -268 304 C-268.39912598 303.45633789 -268.79825195 302.91267578 -269.20947266 302.35253906 C-292.91190201 269.83128247 -303.85540073 231.17862698 -298.31640625 191.015625 C-297.49292051 186.26188702 -296.34256653 181.631548 -295 177 C-294.78569336 176.2373584 -294.57138672 175.4747168 -294.35058594 174.68896484 C-291.13292385 163.49740216 -286.62671929 153.17910618 -281 143 C-280.65066406 142.36465332 -280.30132812 141.72930664 -279.94140625 141.07470703 C-271.83738068 126.52530948 -261.49162018 113.98857593 -250 102 C-249.49742676 101.47019531 -248.99485352 100.94039063 -248.47705078 100.39453125 C-241.05202995 92.6016144 -233.26048878 85.6983199 -224.64941406 79.24365234 C-223.12444203 78.09382885 -221.619807 76.91716565 -220.1171875 75.73828125 C-161.40086551 30.18815403 -74.50051823 0 0 0 Z " fill="#CCCBCB" transform="translate(299,173)"/>
+<path d="M0 0 C10.97163436 0.64539026 21.50993823 1.39393751 32.3125 3.0625 C33.00532074 3.16914978 33.69814148 3.27579956 34.41195679 3.38568115 C87.28212498 11.61044341 143.75115649 26.67402182 188.89135742 56.19360352 C192.39340352 58.47487198 192.39340352 58.47487198 196.44140625 58.74584961 C199.00353686 57.99896898 200.92235962 57.0848876 203.1953125 55.69921875 C204.37758423 54.98487671 204.37758423 54.98487671 205.58374023 54.25610352 C206.42235596 53.73846436 207.26097168 53.2208252 208.125 52.6875 C209.44963257 51.88107056 209.44963257 51.88107056 210.80102539 51.05834961 C218.2788882 46.48880349 225.68697393 41.80908891 233.0859375 37.11328125 C238.56516867 33.63801776 244.05794024 30.18499956 249.5625 26.75 C250.47378662 26.17644775 251.38507324 25.60289551 252.32397461 25.01196289 C253.16710205 24.48723389 254.01022949 23.96250488 254.87890625 23.421875 C255.6272876 22.95362305 256.37566895 22.48537109 257.14672852 22.00292969 C259 21 259 21 261 21 C261 61.92 261 102.84 261 145 C195 145 129 145 61 145 C66.62046022 139.37953978 66.62046022 139.37953978 70.1953125 137.30859375 C71.37794678 136.61334595 71.37794678 136.61334595 72.58447266 135.90405273 C73.42284668 135.42009033 74.2612207 134.93612793 75.125 134.4375 C76.92821049 133.37691406 78.73026666 132.31436348 80.53125 131.25 C81.44390625 130.71117187 82.3565625 130.17234375 83.296875 129.6171875 C87.45315513 127.13062684 91.54077364 124.5401891 95.625 121.9375 C104.68061691 116.17639009 113.82499619 110.56858057 123 105 C95.41546967 80.17980426 47.87307254 71.92506981 12.4230957 65.65087891 C8.26336652 64.85993404 4.13342785 63.91853952 0 63 C0 42.21 0 21.42 0 0 Z " fill="#CCCCCC" transform="translate(399,173)"/>
+</svg>
diff --git a/frontend/public/locales/ar-AR/translation.toml b/frontend/public/locales/ar-AR/translation.toml
index 0942b37b5..55a20edc2 100644
--- a/frontend/public/locales/ar-AR/translation.toml
+++ b/frontend/public/locales/ar-AR/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "إزالة من المفضلة"
 fullscreen = "التبديل إلى وضع ملء الشاشة"
 sidebar = "التبديل إلى وضع الشريط الجانبي"
 
+[backendStartup]
+notFoundTitle = "لم يتم العثور على الخادم الخلفي"
+retry = "إعادة المحاولة"
+unreachable = "لا يمكن للتطبيق حالياً الاتصال بالخادم الخلفي. تحقق من حالة الخادم والاتصال بالشبكة، ثم حاول مرة أخرى."
+
 [zipWarning]
 title = "ملف ZIP كبير"
 message = "هذا الملف ZIP يحتوي على {{count}} ملفات. هل تريد الاستخراج على أي حال؟"
@@ -912,6 +917,9 @@ desc = "ابنِ تدفّقات عمل متعددة الخطوات بسلسلة
 desc = "تراكب ملف PDF فوق آخر"
 title = "تراكب ملفات PDF"
 
+[home.pdfTextEditor]
+title = "محرر نص PDF"
+desc = "حرّر النصوص والصور الموجودة داخل ملفات PDF"
 
 [home.addText]
 tags = "نص,تعليق,تسمية"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "توقيع مرسوم"
 defaultImageLabel = "توقيع مرفوع"
 defaultTextLabel = "توقيع مكتوب"
 saveButton = "حفظ التوقيع"
+savePersonal = "حفظ شخصي"
+saveShared = "حفظ مشترك"
 saveUnavailable = "أنشئ توقيعاً أولاً لحفظه."
 noChanges = "التوقيع الحالي محفوظ بالفعل."
+tempStorageTitle = "تخزين مؤقت في المتصفح"
+tempStorageDescription = "يتم تخزين التواقيع في متصفحك فقط. ستُفقد إذا حذفت بيانات المتصفح أو بدّلت المتصفح."
+personalHeading = "تواقيع شخصية"
+sharedHeading = "تواقيع مشتركة"
+personalDescription = "أنت فقط من يمكنه رؤية هذه التواقيع."
+sharedDescription = "يمكن لجميع المستخدمين رؤية هذه التواقيع واستخدامها."
 
 [sign.saved.type]
 canvas = "رسم"
@@ -3020,6 +3036,91 @@ title = "الحصول على معلومات عن PDF"
 header = "الحصول على معلومات عن PDF"
 submit = "الحصول على المعلومات"
 downloadJson = "تحميل JSON"
+processing = "جارٍ استخراج المعلومات..."
+results = "النتائج"
+noResults = "شغّل الأداة لإنشاء تقرير."
+downloads = "التنزيلات"
+noneDetected = "لم يتم اكتشاف أي شيء"
+indexTitle = "الفهرس"
+
+[getPdfInfo.report]
+entryLabel = "ملخص المعلومات الكامل"
+shortTitle = "معلومات PDF"
+
+[getPdfInfo.sections]
+metadata = "البيانات الوصفية"
+formFields = "حقول النماذج"
+basicInfo = "معلومات أساسية"
+documentInfo = "معلومات المستند"
+compliance = "الامتثال"
+encryption = "التشفير"
+permissions = "الأذونات"
+other = "أخرى"
+perPageInfo = "معلومات لكل صفحة"
+tableOfContents = "جدول المحتويات"
+
+[getPdfInfo.other]
+attachments = "المرفقات"
+embeddedFiles = "ملفات مضمنة"
+javaScript = "JavaScript"
+layers = "الطبقات"
+structureTree = "شجرة البنية"
+xmp = "بيانات XMP الوصفية"
+
+[getPdfInfo.perPage]
+size = "الحجم"
+annotations = "التعليقات التوضيحية"
+images = "الصور"
+links = "الروابط"
+fonts = "الخطوط"
+xobjects = "عدد كائنات XObject"
+multimedia = "وسائط متعددة"
+
+[getPdfInfo.summary]
+pages = "الصفحات"
+fileSize = "حجم الملف"
+pdfVersion = "إصدار PDF"
+language = "اللغة"
+title = "ملخص PDF"
+author = "المؤلف"
+created = "تم الإنشاء"
+modified = "تم التعديل"
+permsAll = "جميع الأذونات مسموح بها"
+permsRestricted = "{{count}} قيود"
+permsMixed = "بعض الأذونات مقيّدة"
+hasCompliance = "يتضمن معايير امتثال"
+noCompliance = "لا توجد معايير امتثال"
+basic = "معلومات أساسية"
+documentInfo = "معلومات المستند"
+securityTitle = "حالة الأمان"
+technical = "تقني"
+overviewTitle = "نظرة عامة على PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF مشفّر - توجد حماية بكلمة مرور"
+unencrypted = "PDF غير مُشفّر - لا توجد حماية بكلمة مرور"
+
+[getPdfInfo.summary.tech]
+images = "الصور"
+fonts = "الخطوط"
+formFields = "حقول النماذج"
+embeddedFiles = "ملفات مضمنة"
+javaScript = "JavaScript"
+layers = "الطبقات"
+bookmarks = "الإشارات المرجعية"
+multimedia = "وسائط متعددة"
+
+[getPdfInfo.summary.overview]
+untitled = "مستند بلا عنوان"
+unknown = "مؤلف غير معروف"
+text = "هذا ملف PDF يحتوي على {{pages}} صفحة بعنوان {{title}} وتم إنشاؤه بواسطة {{author}} (إصدار PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "تعذّر معالجة بعض الملفات."
+unexpected = "حدث خطأ غير متوقع أثناء الاستخراج."
+
+[getPdfInfo.status]
+complete = "اكتمل الاستخراج"
 
 [extractPage]
 tags = "استخراج"
@@ -3438,6 +3539,9 @@ signinTitle = "الرجاء تسجيل الدخول"
 ssoSignIn = "تسجيل الدخول عبر تسجيل الدخول الأحادي"
 oAuth2AutoCreateDisabled = "تم تعطيل الإنشاء التلقائي لمستخدم OAuth2"
 oAuth2AdminBlockedUser = "تم حظر تسجيل أو تسجيل دخول المستخدمين غير المسجلين حاليًا. يرجى الاتصال بالمسؤول."
+oAuth2RequiresLicense = "يتطلب تسجيل الدخول عبر OAuth/SSO ترخيصاً مدفوعاً (Server أو Enterprise). يرجى الاتصال بالمسؤول لترقية باقتك."
+saml2RequiresLicense = "يتطلب تسجيل الدخول عبر SAML ترخيصاً مدفوعاً (Server أو Enterprise). يرجى الاتصال بالمسؤول لترقية باقتك."
+maxUsersReached = "تم الوصول إلى الحد الأقصى لعدد المستخدمين ضمن ترخيصك الحالي. يرجى الاتصال بالمسؤول لترقية باقتك أو إضافة مقاعد إضافية."
 oauth2RequestNotFound = "لم يتم العثور على طلب التفويض"
 oauth2InvalidUserInfoResponse = "استجابة معلومات المستخدم غير صالحة"
 oauth2invalidRequest = "طلب غير صالح"
@@ -3771,7 +3875,7 @@ version = "الإصدار الحالي"
 title = "توثيق API"
 header = "توثيق API"
 desc = "عرض واختبار نقاط نهاية Stirling PDF API"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,توثيق,swagger,نقاط النهاية,تطوير"
 
 [cookieBanner.popUp]
 title = "كيف نستخدم ملفات تعريف الارتباط"
@@ -3809,8 +3913,8 @@ title = "التحليلات"
 description = "تساعدنا هذه الملفات على فهم كيفية استخدام أدواتنا، كي نركّز على بناء الميزات الأكثر قيمة لمجتمعنا. كن مطمئنًا—‏Stirling PDF لا يمكنه ولن يتتبع محتوى المستندات التي تعمل عليها."
 
 [cookieBanner.services]
-posthog = "PostHog Analytics"
-scarf = "Scarf Pixel"
+posthog = "تحليلات PostHog"
+scarf = "Scarf بكسل"
 
 [removeMetadata]
 submit = "إزالة البيانات الوصفية"
@@ -3846,14 +3950,17 @@ fitToWidth = "ملاءمة للعرض"
 actualSize = "الحجم الفعلي"
 
 [viewer]
+cannotPreviewFile = "لا يمكن معاينة الملف"
+dualPageView = "عرض صفحتين"
 firstPage = "الصفحة الأولى"
 lastPage = "الصفحة الأخيرة"
-previousPage = "الصفحة السابقة"
 nextPage = "الصفحة التالية"
+onlyPdfSupported = "عارض الملفات يدعم ملفات PDF فقط. يبدو أن هذا الملف بتنسيق مختلف."
+previousPage = "الصفحة السابقة"
+singlePageView = "عرض صفحة واحدة"
+unknownFile = "ملف غير معروف"
 zoomIn = "تكبير"
 zoomOut = "تصغير"
-singlePageView = "عرض صفحة واحدة"
-dualPageView = "عرض صفحتين"
 
 [rightRail]
 closeSelected = "إغلاق الصفحات المحددة"
@@ -3877,6 +3984,7 @@ toggleSidebar = "تبديل الشريط الجانبي"
 exportSelected = "تصدير الصفحات المحددة"
 toggleAnnotations = "تبديل ظهور التعليقات التوضيحية"
 annotationMode = "تبديل وضع التعليقات"
+print = "طباعة PDF"
 draw = "رسم"
 save = "حفظ"
 saveChanges = "حفظ التغييرات"
@@ -4494,6 +4602,7 @@ description = "عنوان URL أو اسم الملف الخاص بـ Impressum (
 title = "الممتاز والمؤسسي"
 description = "تهيئة مفتاح الترخيص للمزايا الممتازة أو المؤسسية."
 license = "تهيئة الترخيص"
+noInput = "يرجى تقديم مفتاح ترخيص أو ملف"
 
 [admin.settings.premium.licenseKey]
 toggle = "هل لديك مفتاح ترخيص أو ملف شهادة؟"
@@ -4511,6 +4620,25 @@ line1 = "لا يمكن التراجع عن استبدال مفتاح الترخ
 line2 = "سيُفقد ترخيصك السابق نهائياً ما لم تكن قد احتفظت بنسخة احتياطية منه في مكان آخر."
 line3 = "مهم: احتفظ بمفاتيح الترخيص خاصة وآمنة. لا تشاركها علناً أبداً."
 
+[admin.settings.premium.inputMethod]
+text = "مفتاح الترخيص"
+file = "ملف الشهادة"
+
+[admin.settings.premium.file]
+label = "ملف شهادة الترخيص"
+description = "قم بتحميل ملف الترخيص .lic أو .cert من عمليات الشراء دون اتصال"
+choose = "اختر ملف الترخيص"
+selected = "المحدد: {{filename}} ({{size}})"
+successMessage = "تم تحميل ملف الترخيص وتفعيله بنجاح. لا يلزم إعادة التشغيل."
+
+[admin.settings.premium.currentLicense]
+title = "الترخيص النشط"
+file = "المصدر: ملف الترخيص ({{path}})"
+key = "المصدر: مفتاح الترخيص"
+type = "النوع: {{type}}"
+noInput = "يرجى تقديم مفتاح ترخيص أو تحميل ملف شهادة"
+success = "نجاح"
+
 [admin.settings.premium.enabled]
 label = "تمكين الميزات الممتازة"
 description = "تمكين التحقق من مفتاح الترخيص لميزات Pro/المؤسسة"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} محدد"
 download = "تنزيل"
 delete = "حذف"
 unsupported = "غير مدعوم"
+active = "نشط"
 addToUpload = "إضافة إلى الرفع"
+closeFile = "إغلاق الملف"
 deleteAll = "حذف الكل"
 loadingFiles = "جارٍ تحميل الملفات..."
 noFiles = "لا توجد ملفات متاحة"
@@ -5132,7 +5262,7 @@ upgrade = "الترقية الآن →"
 freeTitle = "ترخيص الخادم"
 overLimitTitle = "مطلوب ترخيص خادم"
 overLimitBody = "ترخيصنا يسمح حتى <strong>{{freeTierLimit}}</strong> مستخدمين مجاناً لكل خادم. لديك <strong>{{overLimitUserCopy}}</strong> مستخدمي Stirling. للمتابعة دون انقطاع، ارقَ إلى خطة خادم Stirling - <strong>مقاعد غير محدودة</strong>، تحرير نصوص PDF، وتحكم إداري كامل مقابل $99/خادم/شهرياً."
-freeBody = "ترخيص <strong>Open-Core</strong> لدينا يسمح حتى <strong>{{freeTierLimit}}</strong> مستخدمين مجاناً لكل خادم. للتوسع بسلاسة والحصول على وصول مبكر إلى <strong>أداة تحرير نصوص PDF</strong> الجديدة، نوصي بخطة خادم Stirling - تحرير كامل و<strong>مقاعد غير محدودة</strong> مقابل $99/خادم/شهرياً."
+freeBody = "يتيح ترخيصنا <strong>Open-Core</strong> ما يصل إلى <strong>{{freeTierLimit}}</strong> مستخدمًا مجانًا لكل خادم. للتوسع دون انقطاع، نوصي بخطة Stirling Server - <strong>مقاعد غير محدودة</strong> و<strong>دعم SSO</strong> مقابل $99/server/mo."
 
 [onboarding.desktopInstall]
 title = "تنزيل"
@@ -5237,6 +5367,31 @@ error = "فشل تحديث حالة المستخدم"
 success = "تم حذف المستخدم بنجاح"
 error = "فشل حذف المستخدم"
 
+[workspace.people.changePassword]
+action = "تغيير كلمة المرور"
+title = "تغيير كلمة المرور"
+subtitle = "تحديث كلمة المرور لـ"
+newPassword = "كلمة مرور جديدة"
+confirmPassword = "تأكيد كلمة المرور"
+placeholder = "أدخل كلمة مرور جديدة"
+confirmPlaceholder = "أعد إدخال كلمة المرور الجديدة"
+passwordRequired = "يرجى إدخال كلمة مرور جديدة"
+passwordMismatch = "كلمتا المرور غير متطابقتين"
+generateRandom = "إنشاء كلمة مرور آمنة"
+generatedPreview = "كلمة المرور المُنشأة:"
+copyTooltip = "نسخ إلى الحافظة"
+copiedToClipboard = "تم نسخ كلمة المرور إلى الحافظة"
+copyFailed = "فشل نسخ كلمة المرور"
+sendEmail = "إرسال بريد إلكتروني للمستخدم حول هذا التغيير"
+includePassword = "تضمين كلمة المرور الجديدة في البريد الإلكتروني"
+forcePasswordChange = "إلزام المستخدم بتغيير كلمة المرور عند تسجيل الدخول التالي"
+emailUnavailable = "بريد هذا المستخدم الإلكتروني غير صالح. تم تعطيل الإشعارات."
+smtpDisabled = "تتطلب إشعارات البريد الإلكتروني تفعيل SMTP في الإعدادات."
+notifyOnly = "سيتم إرسال بريد إلكتروني بدون كلمة المرور لإبلاغ المستخدم بأن المشرف قد غيّرها."
+submit = "تحديث كلمة المرور"
+success = "تم تحديث كلمة المرور بنجاح"
+error = "فشل تحديث كلمة المرور"
+
 [workspace.people.emailInvite]
 tab = "دعوة عبر البريد الإلكتروني"
 description = "اكتب أو الصق عناوين البريد الإلكتروني أدناه مفصولة بفواصل. سيتلقى المستخدمون بيانات اعتماد تسجيل الدخول عبر البريد الإلكتروني."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "مطلوب عنوان بريد إلكتروني واحد على الأقل"
 submit = "إرسال الدعوات"
 success = "تمت دعوة المستخدم/المستخدمين بنجاح"
-partialSuccess = "فشلت بعض الدعوات"
+partialFailure = "فشل بعض الدعوات"
 allFailed = "فشلت دعوة المستخدمين"
 error = "فشل إرسال الدعوات"
 
@@ -5770,6 +5925,7 @@ subtitle = "سجّل الدخول بحساب Stirling الخاص بك"
 [setup.selfhosted]
 title = "سجّل الدخول إلى الخادم"
 subtitle = "أدخل بيانات اعتماد الخادم"
+link = "أو الاتصال بحساب مُستضاف ذاتيًا"
 
 [setup.server]
 title = "الاتصال بالخادم"
@@ -5788,6 +5944,14 @@ description = "أدخل عنوان URL الكامل لخادم Stirling PDF ال
 emptyUrl = "يرجى إدخال عنوان URL للخادم"
 unreachable = "تعذّر الاتصال بالخادم"
 testFailed = "فشل اختبار الاتصال"
+configFetch = "فشل في جلب إعدادات الخادم. يرجى التحقق من عنوان URL والمحاولة مرة أخرى."
+
+[setup.server.error.securityDisabled]
+title = "تسجيل الدخول غير مفعّل"
+body = "لا يحتوي هذا الخادم على تسجيل دخول مفعّل. للاتصال بهذا الخادم، يجب تمكين المصادقة:"
+step1 = "عيّن DOCKER_ENABLE_SECURITY=true في بيئتك"
+step2 = "أو عيّن security.enableLogin=true في settings.yml"
+step3 = "أعد تشغيل الخادم"
 
 [setup.login]
 title = "تسجيل الدخول"
@@ -5797,6 +5961,13 @@ submit = "تسجيل الدخول"
 signInWith = "تسجيل الدخول باستخدام"
 oauthPending = "جارٍ فتح المتصفح للمصادقة..."
 orContinueWith = "أو المتابعة بالبريد الإلكتروني"
+serverRequirement = "ملاحظة: يجب أن يكون تسجيل الدخول مفعّلاً على الخادم."
+showInstructions = "كيفية التمكين؟"
+hideInstructions = "إخفاء الإرشادات"
+instructions = "لتمكين تسجيل الدخول على خادم Stirling PDF الخاص بك:"
+instructionsEnvVar = "عيّن متغيّر البيئة:"
+instructionsOrYml = "أو في settings.yml:"
+instructionsRestart = "ثم أعد تشغيل الخادم لتصبح التغييرات نافذة."
 
 [setup.login.username]
 label = "اسم المستخدم"
@@ -5853,6 +6024,7 @@ earlyAccess = "وصول مبكر"
 reset = "إعادة تعيين التغييرات"
 downloadJson = "تنزيل JSON"
 generatePdf = "توليد PDF"
+saveChanges = "حفظ التغييرات"
 
 [pdfTextEditor.options.autoScaleText]
 title = "ضبط النص تلقائياً ليتناسب مع الصناديق"
@@ -5890,6 +6062,8 @@ alpha = "هذا العارض بنسخة ألفا ولا يزال يتطور—ق
 [pdfTextEditor.empty]
 title = "لم يتم تحميل مستند"
 subtitle = "حمّل ملف PDF أو JSON لبدء تحرير محتوى النص."
+dropzone = "اسحب وأفلت ملف PDF أو JSON هنا، أو انقر للاستعراض"
+dropzoneWithFiles = "حدد ملفًا من علامة تبويب الملفات، أو اسحب وأفلت ملف PDF أو JSON هنا، أو انقر للاستعراض"
 
 [pdfTextEditor.welcomeBanner]
 title = "مرحباً بك في محرر نصوص PDF (وصول مبكر)"
diff --git a/frontend/public/locales/az-AZ/translation.toml b/frontend/public/locales/az-AZ/translation.toml
index d4c20aea6..5512e9e55 100644
--- a/frontend/public/locales/az-AZ/translation.toml
+++ b/frontend/public/locales/az-AZ/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Seçilmişlərdən çıxar"
 fullscreen = "Tam ekran rejiminə keç"
 sidebar = "Yan panel rejiminə keç"
 
+[backendStartup]
+notFoundTitle = "Backend tapılmadı"
+retry = "Yenidən cəhd et"
+unreachable = "Tətbiq hazırda backend-ə qoşula bilmir. Backend-in vəziyyətini və şəbəkə bağlantısını yoxlayın, sonra yenidən cəhd edin."
+
 [zipWarning]
 title = "Böyük ZIP faylı"
 message = "Bu ZIP {{count}} fayl ehtiva edir. Yenə də çıxarılsın?"
@@ -912,6 +917,9 @@ desc = "PDF əməliyyatlarını zəncirləyərək çoxaddımlı iş axınları q
 desc = "Bir PDF-i digərinin üstünə qoyur"
 title = "Üst-Üstə Qoy"
 
+[home.pdfTextEditor]
+title = "PDF Mətn Redaktoru"
+desc = "PDF-lərin içindəki mövcud mətn və şəkilləri redaktə edin"
 
 [home.addText]
 tags = "mətn,şərh,etiket"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Çəkilmiş imza"
 defaultImageLabel = "Yüklənmiş imza"
 defaultTextLabel = "Yazılmış imza"
 saveButton = "İmzanı saxla"
+savePersonal = "Şəxsi yadda saxla"
+saveShared = "Paylaşılanı yadda saxla"
 saveUnavailable = "Saxlamaq üçün əvvəlcə imza yaradın."
 noChanges = "Cari imza artıq saxlanıb."
+tempStorageTitle = "Müvəqqəti brauzer yaddaşı"
+tempStorageDescription = "İmzalar yalnız brauzerinizdə saxlanılır. Brauzer məlumatlarını təmizləsəniz və ya brauzer dəyişsəniz, itəcək."
+personalHeading = "Şəxsi imzalar"
+sharedHeading = "Paylaşılan imzalar"
+personalDescription = "Bu imzaları yalnız siz görə bilirsiniz."
+sharedDescription = "Bütün istifadəçilər bu imzaları görə və istifadə edə bilərlər."
 
 [sign.saved.type]
 canvas = "Rəsm"
@@ -3020,6 +3036,91 @@ title = "PDF Barəsində Məlumat Əldə Et"
 header = "PDF Barəsində Məlumat Əldə Et"
 submit = "Məlumat Əldə Et"
 downloadJson = "JSON yüklə"
+processing = "Məlumat çıxarılır..."
+results = "Nəticələr"
+noResults = "Hesabat yaratmaq üçün aləti işə salın."
+downloads = "Yükləmələr"
+noneDetected = "Heç nə aşkar edilmədi"
+indexTitle = "İndeks"
+
+[getPdfInfo.report]
+entryLabel = "Tam məlumat xülasəsi"
+shortTitle = "PDF Məlumatı"
+
+[getPdfInfo.sections]
+metadata = "Metaməlumat"
+formFields = "Forma sahələri"
+basicInfo = "Əsas Məlumat"
+documentInfo = "Sənəd Məlumatı"
+compliance = "Uyğunluq"
+encryption = "Şifrələmə"
+permissions = "İcazələr"
+other = "Digər"
+perPageInfo = "Hər səhifə üzrə məlumat"
+tableOfContents = "Mündəricat"
+
+[getPdfInfo.other]
+attachments = "Əlavələr"
+embeddedFiles = "Gömülü fayllar"
+javaScript = "JavaScript"
+layers = "Qatlar"
+structureTree = "Struktur ağacı"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Ölçü"
+annotations = "Annotasiyalar"
+images = "Şəkillər"
+links = "Keçidlər"
+fonts = "Şriftlər"
+xobjects = "XObject sayları"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Səhifələr"
+fileSize = "Fayl Ölçüsü"
+pdfVersion = "PDF Versiyası"
+language = "Dil"
+title = "PDF Xülasəsi"
+author = "Müəllif"
+created = "Yaradılıb"
+modified = "Dəyişdirilib"
+permsAll = "Bütün icazələr verilib"
+permsRestricted = "{{count}} məhdudiyyət"
+permsMixed = "Bəzi icazələr məhdudlaşdırılıb"
+hasCompliance = "Uyğunluq standartları mövcuddur"
+noCompliance = "Uyğunluq standartları yoxdur"
+basic = "Əsas Məlumat"
+documentInfo = "Sənəd Məlumatı"
+securityTitle = "Təhlükəsizlik Vəziyyəti"
+technical = "Texniki"
+overviewTitle = "PDF İcmalı"
+
+[getPdfInfo.summary.security]
+encrypted = "Şifrələnmiş PDF - Parol ilə qorunur"
+unencrypted = "Şifrələnməmiş PDF - Parol qorunması yoxdur"
+
+[getPdfInfo.summary.tech]
+images = "Şəkillər"
+fonts = "Şriftlər"
+formFields = "Forma sahələri"
+embeddedFiles = "Gömülü fayllar"
+javaScript = "JavaScript"
+layers = "Qatlar"
+bookmarks = "Əlfəcinlər"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "adsız sənəd"
+unknown = "Naməlum müəllif"
+text = "Bu, {{author}} tərəfindən yaradılmış, {{title}} adlı, {{pages}} səhifəlik PDF-dir (PDF versiyası {{version}})."
+
+[getPdfInfo.error]
+partial = "Bəzi faylları emal etmək mümkün olmadı."
+unexpected = "Çıxarılma zamanı gözlənilməz xəta baş verdi."
+
+[getPdfInfo.status]
+complete = "Çıxarılma tamamlandı"
 
 [extractPage]
 tags = "çıxar"
@@ -3438,6 +3539,9 @@ signinTitle = "Zəhmət olmasa, daxil olun"
 ssoSignIn = "Single Sign-on vasitəsilə daxil olun"
 oAuth2AutoCreateDisabled = "OAUTH2 Auto-Create İstifadəçisi Deaktivləşdirilmişdir"
 oAuth2AdminBlockedUser = "Qeydiyyatdan keçməmiş istifadəçilərin qeydiyyatı və daxil olması hal-hazırda bloklanmışdır. Zəhmət olmasa, administratorla əlaqə saxlayın."
+oAuth2RequiresLicense = "OAuth/SSO ilə giriş üçün ödənişli lisenziya (Server və ya Enterprise) tələb olunur. Planınızı yüksəltmək üçün administratorla əlaqə saxlayın."
+saml2RequiresLicense = "SAML ilə giriş üçün ödənişli lisenziya (Server və ya Enterprise) tələb olunur. Planınızı yüksəltmək üçün administratorla əlaqə saxlayın."
+maxUsersReached = "Mövcud lisenziyanız üçün maksimum istifadəçi sayına çatılıb. Planınızı yüksəltmək və ya əlavə yerlər əlavə etmək üçün administratorla əlaqə saxlayın."
 oauth2RequestNotFound = "Təsdiqlənmə sorğusu tapılmadı"
 oauth2InvalidUserInfoResponse = "Yanlış İstifadəçi Məlumatı Cavabı"
 oauth2invalidRequest = "Etibarsız Sorğu"
@@ -3846,14 +3950,17 @@ fitToWidth = "Eninə sığdır"
 actualSize = "Həqiqi ölçü"
 
 [viewer]
+cannotPreviewFile = "Faylın önizlənməsi mümkün deyil"
+dualPageView = "İki Səhifə Görünüşü"
 firstPage = "Birinci səhifə"
 lastPage = "Son səhifə"
-previousPage = "Əvvəlki səhifə"
 nextPage = "Növbəti səhifə"
+onlyPdfSupported = "Görüntüləyici yalnız PDF fayllarını dəstəkləyir. Bu fayl fərqli formatda görünür."
+previousPage = "Əvvəlki səhifə"
+singlePageView = "Tək Səhifə Görünüşü"
+unknownFile = "Naməlum fayl"
 zoomIn = "Böyüt"
 zoomOut = "Kiçilt"
-singlePageView = "Tək Səhifə Görünüşü"
-dualPageView = "İki Səhifə Görünüşü"
 
 [rightRail]
 closeSelected = "Seçilmiş faylları bağla"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Yan paneli aç/bağla"
 exportSelected = "Seçilmiş səhifələri ixrac et"
 toggleAnnotations = "Annotasiyaların görünməsini dəyiş"
 annotationMode = "Annotasiya rejimini dəyiş"
+print = "PDF-i çap et"
 draw = "Rəsm çək"
 save = "Yadda saxla"
 saveChanges = "Dəyişiklikləri yadda saxla"
@@ -4407,7 +4515,7 @@ description = "Daha geniş sistem müvəqqəti qovluğunu təmizləyib-təmizlə
 label = "Proses İcraedicisi Limitləri"
 description = "Hər icraedici üçün sessiya limitlərini və taym-outları konfiqurasiya edin"
 libreOffice = "LibreOffice"
-pdfToHtml = "PDF to HTML"
+pdfToHtml = "PDF-dən HTML-ə"
 qpdf = "QPDF"
 tesseract = "Tesseract OCR"
 pythonOpenCv = "Python OpenCV"
@@ -4494,6 +4602,7 @@ description = "Impressum üçün URL və ya fayl adı (bəzi yurisdiksiyalarda t
 title = "Premium və Enterprise"
 description = "Premium və ya enterprise lisenziya açarınızı konfiqurasiya edin."
 license = "Lisenziya Konfiqurasiyası"
+noInput = "Zəhmət olmasa lisenziya açarı və ya fayl təqdim edin"
 
 [admin.settings.premium.licenseKey]
 toggle = "Lisenziya açarınız və ya sertifikat faylınız var?"
@@ -4511,6 +4620,25 @@ line1 = "Cari lisenziya açarının üzərinə yazmaq geri alına bilməz."
 line2 = "Ehtiyat nüsxəsi yoxdursa, əvvəlki lisenziyanız birdəfəlik itəcək."
 line3 = "Vacibdir: Lisenziya açarlarını məxfi və təhlükəsiz saxlayın. Heç vaxt onları ictimai paylaşmayın."
 
+[admin.settings.premium.inputMethod]
+text = "Lisenziya açarı"
+file = "Sertifikat faylı"
+
+[admin.settings.premium.file]
+label = "Lisenziya sertifikat faylı"
+description = "Oflayn alışdan əldə etdiyiniz .lic və ya .cert lisenziya faylını yükləyin"
+choose = "Lisenziya faylını seçin"
+selected = "Seçildi: {{filename}} ({{size}})"
+successMessage = "Lisenziya faylı uğurla yüklənib və aktivləşdirilib. Yenidən başlatmağa ehtiyac yoxdur."
+
+[admin.settings.premium.currentLicense]
+title = "Aktiv lisenziya"
+file = "Mənbə: Lisenziya faylı ({{path}})"
+key = "Mənbə: Lisenziya açarı"
+type = "Növ: {{type}}"
+noInput = "Zəhmət olmasa lisenziya açarı verin və ya sertifikat faylı yükləyin"
+success = "Uğurlu"
+
 [admin.settings.premium.enabled]
 label = "Premium Xüsusiyyətlərini aktiv et"
 description = "Pro/enterprise xüsusiyyətləri üçün lisenziya açarı yoxlamalarını aktiv et"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} seçildi"
 download = "Endir"
 delete = "Sil"
 unsupported = "Dəstəklənmir"
+active = "Aktiv"
 addToUpload = "Yükləməyə əlavə et"
+closeFile = "Faylı bağla"
 deleteAll = "Hamısını sil"
 loadingFiles = "Fayllar yüklənir..."
 noFiles = "Fayl mövcud deyil"
@@ -5132,7 +5262,7 @@ upgrade = "İndi yüksəlt →"
 freeTitle = "Server lisenziyası"
 overLimitTitle = "Server lisenziyası tələb olunur"
 overLimitBody = "Lisenziyalaşmamız hər server üçün pulsuz olaraq maksimum <strong>{{freeTierLimit}}</strong> istifadəçiyə icazə verir. Sizdə <strong>{{overLimitUserCopy}}</strong> Stirling istifadəçisi var. Fasiləsiz davam etmək üçün Stirling Server planına yüksəldin - <strong>limitsiz yerlər</strong>, PDF mətn redaktəsi və tam admin nəzarəti cəmi $99/server/ay."
-freeBody = "Bizim <strong>Open-Core</strong> lisenziyası hər server üçün pulsuz olaraq maksimum <strong>{{freeTierLimit}}</strong> istifadəçiyə icazə verir. Fasiləsiz miqyaslanmaq və yeni <strong>PDF mətn redaktəsi alətimizə</strong> erkən çıxış əldə etmək üçün Stirling Server planını tövsiyə edirik — tam redaktə və <strong>limitsiz yerlər</strong> $99/server/ay."
+freeBody = "Bizim <strong>Open-Core</strong> lisenziyalaşdırmamız hər server üçün pulsuz olaraq ən çox <strong>{{freeTierLimit}}</strong> istifadəçiyə icazə verir. Fasiləsiz miqyaslama üçün Stirling Server planını tövsiyə edirik - <strong>limitsiz yerlər</strong> və <strong>SSO dəstəyi</strong> $99/server/ay."
 
 [onboarding.desktopInstall]
 title = "Yüklə"
@@ -5237,6 +5367,31 @@ error = "İstifadəçi statusunu yeniləmək alınmadı"
 success = "İstifadəçi uğurla silindi"
 error = "İstifadəçini silmək alınmadı"
 
+[workspace.people.changePassword]
+action = "Parolu dəyiş"
+title = "Parolu dəyiş"
+subtitle = "Aşağıdakı istifadəçi üçün parolu yeniləyin"
+newPassword = "Yeni parol"
+confirmPassword = "Parolu təsdiq edin"
+placeholder = "Yeni parolu daxil edin"
+confirmPlaceholder = "Yeni parolu yenidən daxil edin"
+passwordRequired = "Zəhmət olmasa yeni parolu daxil edin"
+passwordMismatch = "Parollar uyğun gəlmir"
+generateRandom = "Təhlükəsiz parol yaradın"
+generatedPreview = "Yaradılmış parol:"
+copyTooltip = "Buferə kopyala"
+copiedToClipboard = "Parol buferə kopyalandı"
+copyFailed = "Parolu kopyalamaq alınmadı"
+sendEmail = "Bu dəyişiklik barədə istifadəçiyə e-poçt göndərin"
+includePassword = "E-poçta yeni parolu daxil edin"
+forcePasswordChange = "Növbəti girişdə istifadəçini parolu dəyişməyə məcbur et"
+emailUnavailable = "Bu istifadəçinin e-poçtu etibarlı e-poçt ünvanı deyil. Bildirişlər söndürülüb."
+smtpDisabled = "E-poçt bildirişləri üçün parametrlərdə SMTP aktiv olmalıdır."
+notifyOnly = "Parol olmadan e-poçt göndəriləcək; istifadəçiyə adminin onu dəyişdiyi bildiriləcək."
+submit = "Parolu yenilə"
+success = "Parol uğurla yeniləndi"
+error = "Parolu yeniləmək alınmadı"
+
 [workspace.people.emailInvite]
 tab = "E-poçt Dəvəti"
 description = "Aşağıya vergüllə ayrılmış e-poçtları yazın və ya yapışdırın. İstifadəçilərə giriş məlumatları e-poçtla göndəriləcək."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Ən azı bir e-poçt ünvanı tələb olunur"
 submit = "Dəvətnamələri göndər"
 success = "istifadəçi(lər) uğurla dəvət olundu"
-partialSuccess = "Bəzi dəvətnamələr alınmadı"
+partialFailure = "Bəzi dəvətlər uğursuz oldu"
 allFailed = "İstifadəçiləri dəvət etmək alınmadı"
 error = "Dəvətnamələri göndərmək alınmadı"
 
@@ -5288,8 +5443,8 @@ emailDisabled = "E-poçt dəvətləri üçün ayarlarda SMTP konfiqurasiyası v
 [workspace.people.license]
 users = "istifadəçi"
 availableSlots = "Mövcud yerlər"
-grandfathered = "Grandfathered"
-grandfatheredShort = "{{count}} grandfathered"
+grandfathered = "Əvvəlki şərtlərlə"
+grandfatheredShort = "{{count}} əvvəlki şərtlərlə"
 fromLicense = "lisenziyadan"
 slotsAvailable = "{{count}} istifadəçi yeri mövcuddur"
 noSlotsAvailable = "Mövcud yer yoxdur"
@@ -5770,6 +5925,7 @@ subtitle = "Stirling hesabınızla daxil olun"
 [setup.selfhosted]
 title = "Serverə daxil olun"
 subtitle = "Server məlumatlarınızı daxil edin"
+link = "və ya self-hosted hesaba qoşulun"
 
 [setup.server]
 title = "Serverə qoşulun"
@@ -5788,6 +5944,14 @@ description = "Öz Stirling PDF serverinizin tam URL ünvanını daxil edin"
 emptyUrl = "Zəhmət olmasa server URL-i daxil edin"
 unreachable = "Serverə qoşulmaq mümkün olmadı"
 testFailed = "Bağlantı testi uğursuz oldu"
+configFetch = "Server konfiqurasiyasını əldə etmək mümkün olmadı. URL-i yoxlayın və yenidən cəhd edin."
+
+[setup.server.error.securityDisabled]
+title = "Giriş aktiv deyil"
+body = "Bu serverdə giriş aktiv deyil. Bu serverə qoşulmaq üçün autentifikasiya aktiv edilməlidir:"
+step1 = "Mühitinizdə DOCKER_ENABLE_SECURITY=true təyin edin"
+step2 = "Yaxud settings.yml faylında security.enableLogin=true təyin edin"
+step3 = "Serveri yenidən başladın"
 
 [setup.login]
 title = "Daxil ol"
@@ -5797,6 +5961,13 @@ submit = "Daxil ol"
 signInWith = "Bununla daxil ol"
 oauthPending = "Təsdiqləmə üçün brauzer açılır..."
 orContinueWith = "Və ya e-poçt ilə davam edin"
+serverRequirement = "Qeyd: Serverdə giriş funksiyası aktiv olmalıdır."
+showInstructions = "Necə aktivləşdirmək olar?"
+hideInstructions = "Təlimatları gizlət"
+instructions = "Stirling PDF serverinizdə girişi aktivləşdirmək üçün:"
+instructionsEnvVar = "Mühit dəyişənini təyin edin:"
+instructionsOrYml = "Və ya settings.yml faylında:"
+instructionsRestart = "Dəyişikliklərin qüvvəyə minməsi üçün serveri yenidən başladın."
 
 [setup.login.username]
 label = "İstifadəçi adı"
@@ -5853,6 +6024,7 @@ earlyAccess = "Erkən Giriş"
 reset = "Dəyişiklikləri sıfırla"
 downloadJson = "JSON-u endir"
 generatePdf = "PDF yarat"
+saveChanges = "Dəyişiklikləri yadda saxla"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Mətni avtomatik miqyasla"
@@ -5890,6 +6062,8 @@ alpha = "Bu alfa görüntüləyici hələ inkişaf edir—bəzi şriftlər, rən
 [pdfTextEditor.empty]
 title = "Sənəd yüklənməyib"
 subtitle = "Mətn məzmununu redaktə etməyə başlamaq üçün PDF və ya JSON faylı yükləyin."
+dropzone = "Buraya PDF və ya JSON faylını sürükləyib buraxın və ya baxmaq üçün klikləyin"
+dropzoneWithFiles = "Fayllar vərəqindən bir fayl seçin və ya buraya PDF və ya JSON faylını sürükləyib buraxın, yaxud baxmaq üçün klikləyin"
 
 [pdfTextEditor.welcomeBanner]
 title = "PDF Text Editor-ə xoş gəldiniz (Erkən Giriş)"
diff --git a/frontend/public/locales/bg-BG/translation.toml b/frontend/public/locales/bg-BG/translation.toml
index 2d33576bf..b25a7f246 100644
--- a/frontend/public/locales/bg-BG/translation.toml
+++ b/frontend/public/locales/bg-BG/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Премахване от любими"
 fullscreen = "Превключване към режим на цял екран"
 sidebar = "Превключване към режим със странична лента"
 
+[backendStartup]
+notFoundTitle = "Бекендът не е намерен"
+retry = "Опитай отново"
+unreachable = "Приложението в момента не може да се свърже с бекенда. Проверете състоянието на бекенда и мрежовата свързаност, след което опитайте отново."
+
 [zipWarning]
 title = "Голям ZIP файл"
 message = "Този ZIP съдържа {{count}} файла. Да се извлече въпреки това?"
@@ -912,6 +917,9 @@ desc = "Създавайте многостъпкови работни проц
 desc = "Наслагва PDF файлове върху друг PDF"
 title = "Наслагване PDF-и"
 
+[home.pdfTextEditor]
+title = "Редактор на текст в PDF"
+desc = "Редактирайте съществуващ текст и изображения в PDF файлове"
 
 [home.addText]
 tags = "текст,анотация,етикет"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Нарисуван подпис"
 defaultImageLabel = "Качен подпис"
 defaultTextLabel = "Въведен подпис"
 saveButton = "Запази подписа"
+savePersonal = "Запази като личен"
+saveShared = "Запази като споделен"
 saveUnavailable = "Първо създайте подпис, за да го запазите."
 noChanges = "Текущият подпис вече е запазен."
+tempStorageTitle = "Временно съхранение в браузъра"
+tempStorageDescription = "Подписите се съхраняват само във вашия браузър. Ще бъдат загубени, ако изчистите данните на браузъра или смените браузър."
+personalHeading = "Лични подписи"
+sharedHeading = "Споделени подписи"
+personalDescription = "Само вие можете да виждате тези подписи."
+sharedDescription = "Всички потребители могат да виждат и използват тези подписи."
 
 [sign.saved.type]
 canvas = "Рисунка"
@@ -3020,6 +3036,91 @@ title = "Вземете информация за PDF"
 header = "Вземете информация за PDF"
 submit = "Вземете информация"
 downloadJson = "Изтеглете JSON"
+processing = "Извличане на информация..."
+results = "Резултати"
+noResults = "Стартирайте инструмента, за да генерирате отчет."
+downloads = "Изтегляния"
+noneDetected = "Нищо не е открито"
+indexTitle = "Индекс"
+
+[getPdfInfo.report]
+entryLabel = "Пълно резюме на информацията"
+shortTitle = "Информация за PDF"
+
+[getPdfInfo.sections]
+metadata = "Метаданни"
+formFields = "Полета на формуляра"
+basicInfo = "Основна информация"
+documentInfo = "Информация за документа"
+compliance = "Съответствие"
+encryption = "Шифриране"
+permissions = "Разрешения"
+other = "Друго"
+perPageInfo = "Информация по страници"
+tableOfContents = "Съдържание"
+
+[getPdfInfo.other]
+attachments = "Прикачени файлове"
+embeddedFiles = "Вградени файлове"
+javaScript = "JavaScript"
+layers = "Слоеве"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Размер"
+annotations = "Анотации"
+images = "Изображения"
+links = "Връзки"
+fonts = "Шрифтове"
+xobjects = "Брой XObject"
+multimedia = "Мултимедия"
+
+[getPdfInfo.summary]
+pages = "Страници"
+fileSize = "Размер на файла"
+pdfVersion = "Версия на PDF"
+language = "Език"
+title = "Обобщение на PDF"
+author = "Автор"
+created = "Създаден"
+modified = "Променен"
+permsAll = "Всички разрешения са позволени"
+permsRestricted = "{{count}} ограничения"
+permsMixed = "Някои разрешения са ограничени"
+hasCompliance = "Има стандарти за съответствие"
+noCompliance = "Няма стандарти за съответствие"
+basic = "Основна информация"
+documentInfo = "Информация за документа"
+securityTitle = "Състояние на сигурността"
+technical = "Технически"
+overviewTitle = "Преглед на PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "Шифриран PDF - налична защита с парола"
+unencrypted = "Нешифриран PDF - няма защита с парола"
+
+[getPdfInfo.summary.tech]
+images = "Изображения"
+fonts = "Шрифтове"
+formFields = "Полета на формуляра"
+embeddedFiles = "Вградени файлове"
+javaScript = "JavaScript"
+layers = "Слоеве"
+bookmarks = "Отметки"
+multimedia = "Мултимедия"
+
+[getPdfInfo.summary.overview]
+untitled = "неозаглавен документ"
+unknown = "Неизвестен автор"
+text = "Това е {{pages}}-страничен PDF със заглавие {{title}}, създаден от {{author}} (версия на PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Някои файлове не можаха да бъдат обработени."
+unexpected = "Неочаквана грешка по време на извличане."
+
+[getPdfInfo.status]
+complete = "Извличането е завършено"
 
 [extractPage]
 tags = "извличане"
@@ -3438,6 +3539,9 @@ signinTitle = "Моля впишете се"
 ssoSignIn = "Влизане чрез еднократно влизане"
 oAuth2AutoCreateDisabled = "OAUTH2 Автоматично създаване на потребител е деактивирано"
 oAuth2AdminBlockedUser = "Регистрацията или влизането на нерегистрирани потребители в момента е блокирано. Моля, свържете се с администратора."
+oAuth2RequiresLicense = "Вход с OAuth/SSO изисква платен лиценз (Server или Enterprise). Моля, свържете се с администратора, за да надстроите плана си."
+saml2RequiresLicense = "Вход със SAML изисква платен лиценз (Server или Enterprise). Моля, свържете се с администратора, за да надстроите плана си."
+maxUsersReached = "Достигнат е максималният брой потребители за текущия ви лиценз. Моля, свържете се с администратора, за да надстроите плана си или да добавите още места."
 oauth2RequestNotFound = "Заявката за оторизация не е намерена"
 oauth2InvalidUserInfoResponse = "Невалидна информация за потребителя"
 oauth2invalidRequest = "Невалидна заявка"
@@ -3846,14 +3950,17 @@ fitToWidth = "Побиране по ширина"
 actualSize = "Действителен размер"
 
 [viewer]
+cannotPreviewFile = "Не може да се визуализира файлът"
+dualPageView = "Изглед: две страници"
 firstPage = "Първа страница"
 lastPage = "Последна страница"
-previousPage = "Предишна страница"
 nextPage = "Следваща страница"
+onlyPdfSupported = "Прегледачът поддържа само PDF файлове. Този файл изглежда е в друг формат."
+previousPage = "Предишна страница"
+singlePageView = "Изглед: една страница"
+unknownFile = "Непознат файл"
 zoomIn = "Увеличи"
 zoomOut = "Намали"
-singlePageView = "Изглед: една страница"
-dualPageView = "Изглед: две страници"
 
 [rightRail]
 closeSelected = "Затвори избраните файлове"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Показване/скриване на страничната
 exportSelected = "Експорт на избраните страници"
 toggleAnnotations = "Показване/скриване на анотациите"
 annotationMode = "Превключи режим на анотации"
+print = "Печат на PDF"
 draw = "Рисуване"
 save = "Запази"
 saveChanges = "Запази промените"
@@ -4494,6 +4602,7 @@ description = "URL или име на файл към импресум (задъ
 title = "Премиум и Enterprise"
 description = "Конфигурирайте вашия премиум или enterprise лицензионен ключ."
 license = "Конфигурация на лиценз"
+noInput = "Моля, предоставете лицензен ключ или файл"
 
 [admin.settings.premium.licenseKey]
 toggle = "Имате лицензен ключ или сертификат?"
@@ -4511,6 +4620,25 @@ line1 = "Презаписването на текущия лицензен кл
 line2 = "Предишният лиценз ще бъде окончателно загубен, освен ако не сте го архивирали другаде."
 line3 = "Важно: Пазете лицензните ключове поверителни и сигурни. Никога не ги споделяйте публично."
 
+[admin.settings.premium.inputMethod]
+text = "Лицензен ключ"
+file = "Файл със сертификат"
+
+[admin.settings.premium.file]
+label = "Файл с лицензен сертификат"
+description = "Качете вашия .lic или .cert лицензен файл от офлайн покупки"
+choose = "Изберете лицензен файл"
+selected = "Избрано: {{filename}} ({{size}})"
+successMessage = "Лицензният файл беше качен и активиран успешно. Не е необходимо рестартиране."
+
+[admin.settings.premium.currentLicense]
+title = "Активен лиценз"
+file = "Източник: Лицензен файл ({{path}})"
+key = "Източник: Лицензен ключ"
+type = "Тип: {{type}}"
+noInput = "Моля, предоставете лицензен ключ или качете файл със сертификат"
+success = "Успешно"
+
 [admin.settings.premium.enabled]
 label = "Активирай премиум функции"
 description = "Активира проверки на лицензионния ключ за pro/enterprise функции"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} избрани"
 download = "Изтегли"
 delete = "Изтрий"
 unsupported = "Неподдържано"
+active = "Активен"
 addToUpload = "Добави към качването"
+closeFile = "Затвори файла"
 deleteAll = "Изтрий всички"
 loadingFiles = "Зареждане на файлове..."
 noFiles = "Няма налични файлове"
@@ -5132,7 +5262,7 @@ upgrade = "Надградете сега →"
 freeTitle = "Лиценз за сървър"
 overLimitTitle = "Необходим е лиценз за сървър"
 overLimitBody = "Нашият лиценз позволява до <strong>{{freeTierLimit}}</strong> безплатни потребители на сървър. Имате <strong>{{overLimitUserCopy}}</strong> потребители на Stirling. За да продължите без прекъсвания, надградете до плана Stirling Server – <strong>неограничени места</strong>, редакция на PDF текст и пълен админ контрол за $99/сървър/месец."
-freeBody = "Нашият <strong>Open-Core</strong> лиценз позволява до <strong>{{freeTierLimit}}</strong> безплатни потребители на сървър. За да мащабирате без прекъсвания и да получите ранен достъп до нашия нов <strong>инструмент за редакция на PDF текст</strong>, препоръчваме плана Stirling Server – пълно редактиране и <strong>неограничени места</strong> за $99/сървър/месец."
+freeBody = "Нашият лицензен модел <strong>Open-Core</strong> позволява до <strong>{{freeTierLimit}}</strong> потребители безплатно на сървър. За безпрепятствено мащабиране препоръчваме плана Stirling Server - <strong>неограничени места</strong> и <strong>поддръжка на SSO</strong> за $99/server/mo."
 
 [onboarding.desktopInstall]
 title = "Изтегляне"
@@ -5237,6 +5367,31 @@ error = "Неуспешно обновяване на статус на потр
 success = "Потребителят е изтрит успешно"
 error = "Неуспешно изтриване на потребител"
 
+[workspace.people.changePassword]
+action = "Промяна на парола"
+title = "Промяна на парола"
+subtitle = "Актуализирайте паролата за"
+newPassword = "Нова парола"
+confirmPassword = "Потвърдете паролата"
+placeholder = "Въведете нова парола"
+confirmPlaceholder = "Въведете отново новата парола"
+passwordRequired = "Моля, въведете нова парола"
+passwordMismatch = "Паролите не съвпадат"
+generateRandom = "Генерирайте сигурна парола"
+generatedPreview = "Генерирана парола:"
+copyTooltip = "Копиране в клипборда"
+copiedToClipboard = "Паролата е копирана в клипборда"
+copyFailed = "Неуспешно копиране на паролата"
+sendEmail = "Изпратете имейл на потребителя за тази промяна"
+includePassword = "Включете новата парола в имейла"
+forcePasswordChange = "Принудете потребителя да смени паролата при следващо влизане"
+emailUnavailable = "Имейлът на този потребител не е валиден адрес. Известията са изключени."
+smtpDisabled = "Имейл известията изискват SMTP да е активиран в настройките."
+notifyOnly = "Ще бъде изпратен имейл без паролата, за да уведоми потребителя, че администратор я е променил."
+submit = "Актуализиране на паролата"
+success = "Паролата е актуализирана успешно"
+error = "Неуспешно актуализиране на паролата"
+
 [workspace.people.emailInvite]
 tab = "Покана по имейл"
 description = "Въведете или поставете имейли по-долу, разделени със запетаи. Потребителите ще получат данни за вход по имейл."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Изисква се поне един имейл адрес"
 submit = "Изпрати покани"
 success = "Потребител(и) поканени успешно"
-partialSuccess = "Някои покани не успяха"
+partialFailure = "Някои покани бяха неуспешни"
 allFailed = "Неуспешно канене на потребители"
 error = "Неуспешно изпращане на покани"
 
@@ -5770,6 +5925,7 @@ subtitle = "Впишете се с вашия Stirling акаунт"
 [setup.selfhosted]
 title = "Впишете се в сървъра"
 subtitle = "Въведете своите данни за сървъра"
+link = "или се свържете със самостоятелно хостван акаунт"
 
 [setup.server]
 title = "Свързване към сървър"
@@ -5788,6 +5944,14 @@ description = "Въведете пълния URL на вашия самосто
 emptyUrl = "Моля, въведете URL на сървър"
 unreachable = "Неуспешна връзка със сървъра"
 testFailed = "Тестът на връзката е неуспешен"
+configFetch = "Неуспешно извличане на конфигурацията на сървъра. Моля, проверете URL адреса и опитайте отново."
+
+[setup.server.error.securityDisabled]
+title = "Входът не е активиран"
+body = "На този сървър не е активиран вход. За да се свържете, трябва да активирате удостоверяване:"
+step1 = "Задайте DOCKER_ENABLE_SECURITY=true във вашата среда"
+step2 = "Или задайте security.enableLogin=true в settings.yml"
+step3 = "Рестартирайте сървъра"
 
 [setup.login]
 title = "Вписване"
@@ -5797,6 +5961,13 @@ submit = "Вход"
 signInWith = "Вписване с"
 oauthPending = "Отваряне на браузър за удостоверяване..."
 orContinueWith = "Или продължете с имейл"
+serverRequirement = "Забележка: Сървърът трябва да има активиран вход."
+showInstructions = "Как да се активира?"
+hideInstructions = "Скрий инструкциите"
+instructions = "За да активирате вход на вашия Stirling PDF сървър:"
+instructionsEnvVar = "Задайте променливата на средата:"
+instructionsOrYml = "Или в settings.yml:"
+instructionsRestart = "След това рестартирайте сървъра, за да влязат промените в сила."
 
 [setup.login.username]
 label = "Потребителско име"
@@ -5853,6 +6024,7 @@ earlyAccess = "Ранен достъп"
 reset = "Отмени промените"
 downloadJson = "Изтегли JSON"
 generatePdf = "Генерирай PDF"
+saveChanges = "Запази промените"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Авто-мащабиране на текст за напасване в полетата"
@@ -5890,6 +6062,8 @@ alpha = "Този алфа визуализатор все още се разв
 [pdfTextEditor.empty]
 title = "Няма зареден документ"
 subtitle = "Заредете PDF или JSON файл, за да започнете да редактирате текстовото съдържание."
+dropzone = "Плъзнете и пуснете тук PDF или JSON файл или щракнете, за да прегледате"
+dropzoneWithFiles = "Изберете файл от раздела Файлове или плъзнете и пуснете тук PDF или JSON файл, или щракнете, за да прегледате"
 
 [pdfTextEditor.welcomeBanner]
 title = "Добре дошли в PDF Text Editor (ранен достъп)"
diff --git a/frontend/public/locales/ca-CA/translation.toml b/frontend/public/locales/ca-CA/translation.toml
index 2d8bc23e3..00370a7d7 100644
--- a/frontend/public/locales/ca-CA/translation.toml
+++ b/frontend/public/locales/ca-CA/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Elimina dels preferits"
 fullscreen = "Canvia al mode de pantalla completa"
 sidebar = "Canvia al mode de barra lateral"
 
+[backendStartup]
+notFoundTitle = "Backend no trobat"
+retry = "Torneu-ho a intentar"
+unreachable = "L'aplicació no pot connectar-se al backend ara mateix. Verifiqueu l'estat del backend i la connectivitat de xarxa i torneu-ho a intentar."
+
 [zipWarning]
 title = "Fitxer ZIP gran"
 message = "Aquest ZIP conté {{count}} fitxers. Vols extreure'l igualment?"
@@ -347,7 +352,7 @@ teams = "Equips"
 title = "Configuració"
 systemSettings = "Configuració del sistema"
 features = "Funcions"
-endpoints = "Endpoints"
+endpoints = "Punts finals"
 database = "Base de dades"
 advanced = "Avançat"
 
@@ -556,7 +561,7 @@ totalEndpoints = "Total d'endpoints"
 totalVisits = "Total de visites"
 showing = "Mostrant"
 selectedVisits = "Visites seleccionades"
-endpoint = "Endpoint"
+endpoint = "Punt final"
 visits = "Visites"
 percentage = "Percentatge"
 loading = "Carregant..."
@@ -912,6 +917,9 @@ desc = "Construeix fluxos de treball multietapa enllaçant accions PDF. Ideal pe
 desc = "Superposa PDFs sobre un altre PDF"
 title = "Superposar PDFs"
 
+[home.pdfTextEditor]
+title = "Editor de text PDF"
+desc = "Edita el text i les imatges existents dins dels PDF"
 
 [home.addText]
 tags = "text,anotació,etiqueta"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Signatura dibuixada"
 defaultImageLabel = "Signatura pujada"
 defaultTextLabel = "Signatura teclejada"
 saveButton = "Desa la signatura"
+savePersonal = "Desa com a personal"
+saveShared = "Desa com a compartida"
 saveUnavailable = "Crea una signatura primer per poder-la desar."
 noChanges = "La signatura actual ja està desada."
+tempStorageTitle = "Emmagatzematge temporal del navegador"
+tempStorageDescription = "Les signatures només s'emmagatzemen al vostre navegador. Es perdran si netegeu les dades del navegador o canvieu de navegador."
+personalHeading = "Signatures personals"
+sharedHeading = "Signatures compartides"
+personalDescription = "Només vosaltres podeu veure aquestes signatures."
+sharedDescription = "Tots els usuaris poden veure i utilitzar aquestes signatures."
 
 [sign.saved.type]
 canvas = "Dibuix"
@@ -3020,6 +3036,91 @@ title = "Obteniu Informació del PDF"
 header = "Obteniu Informació del PDF"
 submit = "Obteniu Informació"
 downloadJson = "Descarrega JSON"
+processing = "Extraient informació..."
+results = "Resultats"
+noResults = "Executeu l'eina per generar un informe."
+downloads = "Descàrregues"
+noneDetected = "No se n'ha detectat cap"
+indexTitle = "Índex"
+
+[getPdfInfo.report]
+entryLabel = "Resum d'informació complet"
+shortTitle = "Informació del PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadades"
+formFields = "Camps de formulari"
+basicInfo = "Informació bàsica"
+documentInfo = "Informació del document"
+compliance = "Conformitat"
+encryption = "Xifratge"
+permissions = "Permisos"
+other = "Altres"
+perPageInfo = "Informació per pàgina"
+tableOfContents = "Taula de continguts"
+
+[getPdfInfo.other]
+attachments = "Fitxers adjunts"
+embeddedFiles = "Fitxers incrustats"
+javaScript = "JavaScript"
+layers = "Capes"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Mida"
+annotations = "Anotacions"
+images = "Imatges"
+links = "Enllaços"
+fonts = "Tipus de lletra"
+xobjects = "Recompte d'XObject"
+multimedia = "Multimèdia"
+
+[getPdfInfo.summary]
+pages = "Pàgines"
+fileSize = "Mida del fitxer"
+pdfVersion = "Versió del PDF"
+language = "Idioma"
+title = "Resum del PDF"
+author = "Autor"
+created = "Creat"
+modified = "Modificat"
+permsAll = "Tots els permisos permesos"
+permsRestricted = "{{count}} restriccions"
+permsMixed = "Alguns permisos restringits"
+hasCompliance = "Té estàndards de conformitat"
+noCompliance = "Sense estàndards de conformitat"
+basic = "Informació bàsica"
+documentInfo = "Informació del document"
+securityTitle = "Estat de seguretat"
+technical = "Tècnic"
+overviewTitle = "Visió general del PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF xifrat - Protecció amb contrasenya present"
+unencrypted = "PDF no xifrat - Sense protecció amb contrasenya"
+
+[getPdfInfo.summary.tech]
+images = "Imatges"
+fonts = "Tipus de lletra"
+formFields = "Camps de formulari"
+embeddedFiles = "Fitxers incrustats"
+javaScript = "JavaScript"
+layers = "Capes"
+bookmarks = "Marcadors"
+multimedia = "Multimèdia"
+
+[getPdfInfo.summary.overview]
+untitled = "un document sense títol"
+unknown = "Autor desconegut"
+text = "Aquest és un PDF de {{pages}} pàgines titulat {{title}} creat per {{author}} (versió del PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Alguns fitxers no s'han pogut processar."
+unexpected = "Error inesperat durant l'extracció."
+
+[getPdfInfo.status]
+complete = "Extracció completada"
 
 [extractPage]
 tags = "extreure"
@@ -3438,6 +3539,9 @@ signinTitle = "Autenticat"
 ssoSignIn = "Inicia sessió mitjançant inici de sessió únic"
 oAuth2AutoCreateDisabled = "La creació automàtica d'usuaris OAUTH2 està desactivada"
 oAuth2AdminBlockedUser = "El registre o inici de sessió d'usuaris no registrats està actualment bloquejat. Si us plau, contacta amb l'administrador."
+oAuth2RequiresLicense = "L'inici de sessió OAuth/SSO requereix una llicència de pagament (Server o Enterprise). Poseu-vos en contacte amb l'administrador per actualitzar el vostre pla."
+saml2RequiresLicense = "L'inici de sessió SAML requereix una llicència de pagament (Server o Enterprise). Poseu-vos en contacte amb l'administrador per actualitzar el vostre pla."
+maxUsersReached = "S'ha assolit el nombre màxim d'usuaris de la vostra llicència actual. Poseu-vos en contacte amb l'administrador per actualitzar el vostre pla o afegir més places."
 oauth2RequestNotFound = "Sol·licitud d'autorització no trobada"
 oauth2InvalidUserInfoResponse = "Resposta d'informació d'usuari no vàlida"
 oauth2invalidRequest = "Sol·licitud no vàlida"
@@ -3846,14 +3950,17 @@ fitToWidth = "Ajusta a l'amplada"
 actualSize = "Mida real"
 
 [viewer]
+cannotPreviewFile = "No es pot previsualitzar el fitxer"
+dualPageView = "Vista de dues pàgines"
 firstPage = "Primera pàgina"
 lastPage = "Última pàgina"
-previousPage = "Pàgina anterior"
 nextPage = "Pàgina següent"
+onlyPdfSupported = "El visualitzador només admet fitxers PDF. Aquest fitxer sembla ser d'un format diferent."
+previousPage = "Pàgina anterior"
+singlePageView = "Vista d'una sola pàgina"
+unknownFile = "Fitxer desconegut"
 zoomIn = "Amplia"
 zoomOut = "Redueix"
-singlePageView = "Vista d'una sola pàgina"
-dualPageView = "Vista de dues pàgines"
 
 [rightRail]
 closeSelected = "Tanca els fitxers seleccionats"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Mostra/oculta la barra lateral"
 exportSelected = "Exporta les pàgines seleccionades"
 toggleAnnotations = "Mostra/oculta les anotacions"
 annotationMode = "Activa/desactiva el mode d'anotació"
+print = "Imprimeix el PDF"
 draw = "Dibuixa"
 save = "Desa"
 saveChanges = "Desa els canvis"
@@ -3925,7 +4033,7 @@ files = "Fitxers"
 activity = "Registre"
 help = "Ajuda"
 account = "Compte"
-config = "Config"
+config = "Configuració"
 settings = "Ajustos"
 adminSettings = "Ajustos admin"
 allTools = "All Tools"
@@ -4343,7 +4451,7 @@ features = "Banderes de funcions"
 processing = "Processament"
 
 [admin.settings.advanced.endpoints]
-label = "Endpoints"
+label = "Punts finals"
 manage = "Gestiona els endpoints de l'API"
 description = "La gestió d'endpoints es configura via YAML. Consulteu la documentació per a detalls sobre com habilitar/deshabilitar endpoints específics."
 
@@ -4494,6 +4602,7 @@ description = "URL o nom de fitxer de l'impressum (requerit en algunes jurisdicc
 title = "Premium i Enterprise"
 description = "Configureu la clau de llicència Premium o Enterprise."
 license = "Configuració de llicència"
+noInput = "Proporcioneu una clau de llicència o un fitxer"
 
 [admin.settings.premium.licenseKey]
 toggle = "Tens una clau de llicència o un fitxer de certificat?"
@@ -4511,6 +4620,25 @@ line1 = "Sobreescriure la clau de llicència actual no es pot desfer."
 line2 = "La llicència anterior es perdrà permanentment si no en tens una còpia de seguretat."
 line3 = "Important: mantén les claus de llicència privades i segures. No les comparteixis mai públicament."
 
+[admin.settings.premium.inputMethod]
+text = "Clau de llicència"
+file = "Fitxer de certificat"
+
+[admin.settings.premium.file]
+label = "Fitxer de certificat de llicència"
+description = "Pugeu el vostre fitxer de llicència .lic o .cert de compres fora de línia"
+choose = "Trieu el fitxer de llicència"
+selected = "Seleccionat: {{filename}} ({{size}})"
+successMessage = "Fitxer de llicència pujat i activat correctament. No cal reiniciar."
+
+[admin.settings.premium.currentLicense]
+title = "Llicència activa"
+file = "Origen: Fitxer de llicència ({{path}})"
+key = "Origen: Clau de llicència"
+type = "Tipus: {{type}}"
+noInput = "Proporcioneu una clau de llicència o pugeu un fitxer de certificat"
+success = "Èxit"
+
 [admin.settings.premium.enabled]
 label = "Habilita les funcions Premium"
 description = "Habilita les comprovacions de clau per a funcions pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} seleccionats"
 download = "Descarrega"
 delete = "Esborra"
 unsupported = "No compatible"
+active = "Actiu"
 addToUpload = "Afegeix a la pujada"
+closeFile = "Tanca el fitxer"
 deleteAll = "Suprimeix-ho tot"
 loadingFiles = "Carregant fitxers..."
 noFiles = "No hi ha fitxers disponibles"
@@ -5132,7 +5262,7 @@ upgrade = "Actualitza ara →"
 freeTitle = "Llicència del servidor"
 overLimitTitle = "Cal una llicència de servidor"
 overLimitBody = "La nostra llicència permet fins a <strong>{{freeTierLimit}}</strong> usuaris gratuïts per servidor. Tens <strong>{{overLimitUserCopy}}</strong> usuaris de Stirling. Per continuar sense interrupcions, actualitza al pla Stirling Server: <strong>seients il·limitats</strong>, edició de text de PDF i control d'administració complet per 99 $/servidor/mes."
-freeBody = "La nostra llicència <strong>Open-Core</strong> permet fins a <strong>{{freeTierLimit}}</strong> usuaris gratuïts per servidor. Per escalar sense interrupcions i obtenir accés anticipat a la nova <strong>eina d'edició de text PDF</strong>, recomanem el pla Stirling Server: edició completa i <strong>seients il·limitats</strong> per 99 $/servidor/mes."
+freeBody = "La nostra llicència <strong>Open-Core</strong> permet fins a <strong>{{freeTierLimit}}</strong> usuaris gratuïts per servidor. Per escalar sense interrupcions, recomanem el pla Stirling Server - <strong>places il·limitades</strong> i <strong>suport SSO</strong> per $99/servidor/mes."
 
 [onboarding.desktopInstall]
 title = "Baixa"
@@ -5237,6 +5367,31 @@ error = "No s’ha pogut actualitzar l’estat de l’usuari"
 success = "Usuari suprimit correctament"
 error = "No s’ha pogut suprimir l’usuari"
 
+[workspace.people.changePassword]
+action = "Canvieu la contrasenya"
+title = "Canvi de contrasenya"
+subtitle = "Actualitza la contrasenya de"
+newPassword = "Contrasenya nova"
+confirmPassword = "Confirma la contrasenya"
+placeholder = "Introduïu una contrasenya nova"
+confirmPlaceholder = "Torneu a introduir la contrasenya nova"
+passwordRequired = "Introduïu una contrasenya nova"
+passwordMismatch = "Les contrasenyes no coincideixen"
+generateRandom = "Genereu una contrasenya segura"
+generatedPreview = "Contrasenya generada:"
+copyTooltip = "Copieu al portapapers"
+copiedToClipboard = "Contrasenya copiada al portapapers"
+copyFailed = "No s'ha pogut copiar la contrasenya"
+sendEmail = "Envieu un correu a l'usuari sobre aquest canvi"
+includePassword = "Incloeu la contrasenya nova al correu"
+forcePasswordChange = "Obligueu l'usuari a canviar la contrasenya en el pròxim inici de sessió"
+emailUnavailable = "El correu d'aquest usuari no és una adreça de correu vàlida. Les notificacions estan desactivades."
+smtpDisabled = "Les notificacions per correu electrònic requereixen habilitar SMTP als paràmetres."
+notifyOnly = "S'enviarà un correu sense la contrasenya, informant l'usuari que un administrador l'ha canviada."
+submit = "Actualitzeu la contrasenya"
+success = "La contrasenya s'ha actualitzat correctament"
+error = "No s'ha pogut actualitzar la contrasenya"
+
 [workspace.people.emailInvite]
 tab = "Invitació per correu"
 description = "Escriviu o enganxeu correus a continuació, separats per comes. Els usuaris rebran credencials d’inici de sessió per correu electrònic."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Cal almenys una adreça de correu"
 submit = "Envia invitacions"
 success = "usuari(s) convidat(s) correctament"
-partialSuccess = "Algunes invitacions han fallat"
+partialFailure = "Algunes invitacions han fallat"
 allFailed = "No s’ha pogut convidar els usuaris"
 error = "No s’han pogut enviar les invitacions"
 
@@ -5709,7 +5864,7 @@ title = "Gràfic d'ús dels endpoints"
 
 [usage.table]
 title = "Estadístiques detallades"
-endpoint = "Endpoint"
+endpoint = "Punt final"
 visits = "Visites"
 percentage = "Percentatge"
 noData = "No hi ha dades disponibles"
@@ -5770,6 +5925,7 @@ subtitle = "Inicia sessió amb el teu compte de Stirling"
 [setup.selfhosted]
 title = "Inicia sessió al servidor"
 subtitle = "Introdueix les credencials del servidor"
+link = "o connecteu-vos a un compte autoallotjat"
 
 [setup.server]
 title = "Connecta't al servidor"
@@ -5788,6 +5944,14 @@ description = "Introdueix la URL completa del teu servidor autoallotjat de Stirl
 emptyUrl = "Introdueix una URL de servidor"
 unreachable = "No s'ha pogut connectar amb el servidor"
 testFailed = "Ha fallat la prova de connexió"
+configFetch = "No s'ha pogut obtenir la configuració del servidor. Comproveu l'URL i torneu-ho a provar."
+
+[setup.server.error.securityDisabled]
+title = "Inici de sessió no habilitat"
+body = "Aquest servidor no té l'inici de sessió habilitat. Per connectar-hi, heu d'habilitar l'autenticació:"
+step1 = "Establiu DOCKER_ENABLE_SECURITY=true al vostre entorn"
+step2 = "O establiu security.enableLogin=true a settings.yml"
+step3 = "Reinicieu el servidor"
 
 [setup.login]
 title = "Inicia sessió"
@@ -5797,6 +5961,13 @@ submit = "Inicia sessió"
 signInWith = "Inicia sessió amb"
 oauthPending = "Obrint el navegador per autenticar-te..."
 orContinueWith = "O continua amb el correu electrònic"
+serverRequirement = "Nota: el servidor ha de tenir l'inici de sessió habilitat."
+showInstructions = "Com s'habilita?"
+hideInstructions = "Amagueu les instruccions"
+instructions = "Per habilitar l'inici de sessió al vostre servidor de Stirling PDF:"
+instructionsEnvVar = "Establiu la variable d'entorn:"
+instructionsOrYml = "O a settings.yml:"
+instructionsRestart = "A continuació, reinicieu el servidor perquè els canvis tinguin efecte."
 
 [setup.login.username]
 label = "Nom d'usuari"
@@ -5853,6 +6024,7 @@ earlyAccess = "Accés anticipat"
 reset = "Restableix els canvis"
 downloadJson = "Descarrega JSON"
 generatePdf = "Genera PDF"
+saveChanges = "Deseu els canvis"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Autoajusta el text a les caixes"
@@ -5890,6 +6062,8 @@ alpha = "Aquest visor alfa encara evoluciona—certs tipus de lletra, colors, ef
 [pdfTextEditor.empty]
 title = "No s'ha carregat cap document"
 subtitle = "Carrega un fitxer PDF o JSON per començar a editar el contingut de text."
+dropzone = "Arrossegueu i deixeu anar un fitxer PDF o JSON aquí, o feu clic per explorar"
+dropzoneWithFiles = "Seleccioneu un fitxer de la pestanya Fitxers o arrossegueu i deixeu anar aquí un fitxer PDF o JSON, o feu clic per explorar"
 
 [pdfTextEditor.welcomeBanner]
 title = "Benvingut a l'Editor de text PDF (accés anticipat)"
diff --git a/frontend/public/locales/cs-CZ/translation.toml b/frontend/public/locales/cs-CZ/translation.toml
index 0f80dd14b..54d1d8728 100644
--- a/frontend/public/locales/cs-CZ/translation.toml
+++ b/frontend/public/locales/cs-CZ/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Odebrat z oblíbených"
 fullscreen = "Přepnout na režim na celou obrazovku"
 sidebar = "Přepnout na režim postranního panelu"
 
+[backendStartup]
+notFoundTitle = "Backend nebyl nalezen"
+retry = "Zkusit znovu"
+unreachable = "Aplikace se nyní nemůže připojit k backendu. Ověřte stav backendu a síťové připojení a poté to zkuste znovu."
+
 [zipWarning]
 title = "Velký soubor ZIP"
 message = "Tento ZIP obsahuje {{count}} souborů. Přesto rozbalit?"
@@ -347,7 +352,7 @@ teams = "Týmy"
 title = "Konfigurace"
 systemSettings = "Systémová nastavení"
 features = "Funkce"
-endpoints = "Endpoints"
+endpoints = "Koncové body"
 database = "Databáze"
 advanced = "Pokročilé"
 
@@ -912,6 +917,9 @@ desc = "Vytvářejte vícekrokové workflow řetězením akcí PDF. Ideální pr
 desc = "Překryje PDF nad jiným PDF"
 title = "Překrýt PDF"
 
+[home.pdfTextEditor]
+title = "Editor textu PDF"
+desc = "Upravujte existující text a obrázky v PDF"
 
 [home.addText]
 tags = "text,anotace,štítek"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Nakreslený podpis"
 defaultImageLabel = "Nahraný podpis"
 defaultTextLabel = "Napsaný podpis"
 saveButton = "Uložit podpis"
+savePersonal = "Uložit osobní"
+saveShared = "Uložit sdílené"
 saveUnavailable = "Nejprve vytvořte podpis, abyste jej mohli uložit."
 noChanges = "Aktuální podpis je již uložen."
+tempStorageTitle = "Dočasné úložiště prohlížeče"
+tempStorageDescription = "Podpisy jsou uloženy pouze ve vašem prohlížeči. Při vymazání dat prohlížeče nebo při přepnutí na jiný prohlížeč budou ztraceny."
+personalHeading = "Osobní podpisy"
+sharedHeading = "Sdílené podpisy"
+personalDescription = "Tyto podpisy vidíte pouze vy."
+sharedDescription = "Všichni uživatelé mohou tyto podpisy vidět a používat."
 
 [sign.saved.type]
 canvas = "Kresba"
@@ -3020,6 +3036,91 @@ title = "Získat informace o PDF"
 header = "Získat informace o PDF"
 submit = "Získat informace"
 downloadJson = "Stáhnout JSON"
+processing = "Probíhá extrahování informací..."
+results = "Výsledky"
+noResults = "Spusťte nástroj pro vygenerování zprávy."
+downloads = "Stažení"
+noneDetected = "Nic nebylo zjištěno"
+indexTitle = "Rejstřík"
+
+[getPdfInfo.report]
+entryLabel = "Úplné shrnutí informací"
+shortTitle = "Informace o PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadata"
+formFields = "Formulářová pole"
+basicInfo = "Základní informace"
+documentInfo = "Informace o dokumentu"
+compliance = "Shoda"
+encryption = "Šifrování"
+permissions = "Oprávnění"
+other = "Ostatní"
+perPageInfo = "Informace po stránkách"
+tableOfContents = "Obsah"
+
+[getPdfInfo.other]
+attachments = "Přílohy"
+embeddedFiles = "Vložené soubory"
+javaScript = "JavaScript"
+layers = "Vrstvy"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Velikost"
+annotations = "Anotace"
+images = "Obrázky"
+links = "Odkazy"
+fonts = "Písma"
+xobjects = "Počty XObjectů"
+multimedia = "Multimédia"
+
+[getPdfInfo.summary]
+pages = "Stránky"
+fileSize = "Velikost souboru"
+pdfVersion = "Verze PDF"
+language = "Jazyk"
+title = "Souhrn PDF"
+author = "Autor"
+created = "Vytvořeno"
+modified = "Upraveno"
+permsAll = "Všechna oprávnění povolena"
+permsRestricted = "{{count}} omezení"
+permsMixed = "Některá oprávnění jsou omezena"
+hasCompliance = "Obsahuje standardy shody"
+noCompliance = "Žádné standardy shody"
+basic = "Základní informace"
+documentInfo = "Informace o dokumentu"
+securityTitle = "Stav zabezpečení"
+technical = "Technické"
+overviewTitle = "Přehled PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "Šifrované PDF – chráněno heslem"
+unencrypted = "Nešifrované PDF – bez ochrany heslem"
+
+[getPdfInfo.summary.tech]
+images = "Obrázky"
+fonts = "Písma"
+formFields = "Formulářová pole"
+embeddedFiles = "Vložené soubory"
+javaScript = "JavaScript"
+layers = "Vrstvy"
+bookmarks = "Záložky"
+multimedia = "Multimédia"
+
+[getPdfInfo.summary.overview]
+untitled = "nepojmenovaný dokument"
+unknown = "Neznámý autor"
+text = "Toto je PDF o {{pages}} stránkách s názvem {{title}} od autora {{author}} (verze PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Některé soubory se nepodařilo zpracovat."
+unexpected = "Během extrahování došlo k neočekávané chybě."
+
+[getPdfInfo.status]
+complete = "Extrahování dokončeno"
 
 [extractPage]
 tags = "extrahovat"
@@ -3438,6 +3539,9 @@ signinTitle = "Prosím přihlaste se"
 ssoSignIn = "Přihlásit se přes Single Sign-on"
 oAuth2AutoCreateDisabled = "Automatické vytváření OAUTH2 uživatelů je zakázáno"
 oAuth2AdminBlockedUser = "Registrace nebo přihlášení neregistrovaných uživatelů je momentálně blokováno. Kontaktujte prosím správce."
+oAuth2RequiresLicense = "Přihlášení pomocí OAuth/SSO vyžaduje placenou licenci (Server nebo Enterprise). Kontaktujte prosím administrátora kvůli upgradu vašeho plánu."
+saml2RequiresLicense = "Přihlášení pomocí SAML vyžaduje placenou licenci (Server nebo Enterprise). Kontaktujte prosím administrátora kvůli upgradu vašeho plánu."
+maxUsersReached = "Byl dosažen maximální počet uživatelů pro vaši aktuální licenci. Kontaktujte prosím administrátora kvůli upgradu vašeho plánu nebo přidání dalších míst."
 oauth2RequestNotFound = "Požadavek na autorizaci nebyl nalezen"
 oauth2InvalidUserInfoResponse = "Neplatná odpověď s informacemi o uživateli"
 oauth2invalidRequest = "Neplatný požadavek"
@@ -3846,14 +3950,17 @@ fitToWidth = "Přizpůsobit šířce"
 actualSize = "Skutečná velikost"
 
 [viewer]
+cannotPreviewFile = "Nelze zobrazit náhled souboru"
+dualPageView = "Zobrazení dvou stránek"
 firstPage = "První stránka"
 lastPage = "Poslední stránka"
-previousPage = "Předchozí stránka"
 nextPage = "Další stránka"
+onlyPdfSupported = "Prohlížeč podporuje pouze soubory PDF. Tento soubor má zřejmě jiný formát."
+previousPage = "Předchozí stránka"
+singlePageView = "Zobrazení jedné stránky"
+unknownFile = "Neznámý soubor"
 zoomIn = "Přiblížit"
 zoomOut = "Oddálit"
-singlePageView = "Zobrazení jedné stránky"
-dualPageView = "Zobrazení dvou stránek"
 
 [rightRail]
 closeSelected = "Zavřít vybrané soubory"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Přepnout postranní panel"
 exportSelected = "Exportovat vybrané stránky"
 toggleAnnotations = "Přepnout viditelnost anotací"
 annotationMode = "Přepnout režim anotací"
+print = "Tisk PDF"
 draw = "Kreslit"
 save = "Uložit"
 saveChanges = "Uložit změny"
@@ -4153,7 +4261,7 @@ description = "Sledovat akce uživatelů a systémové události pro compliance
 
 [admin.settings.security.audit.level]
 label = "Úroveň auditu"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=VYPNUTO, 1=ZÁKLADNÍ, 2=STANDARDNÍ, 3=PODROBNÝ"
 
 [admin.settings.security.audit.retentionDays]
 label = "Doba uchování auditů (dny)"
@@ -4494,6 +4602,7 @@ description = "URL nebo název souboru k Impressu (vyžadováno v některých ju
 title = "Premium a Enterprise"
 description = "Nakonfigurujte svůj prémiový nebo enterprise licenční klíč."
 license = "Konfigurace licence"
+noInput = "Zadejte licenční klíč nebo soubor"
 
 [admin.settings.premium.licenseKey]
 toggle = "Máte licenční klíč nebo certifikační soubor?"
@@ -4511,6 +4620,25 @@ line1 = "Přepsání aktuálního licenčního klíče nelze vrátit zpět."
 line2 = "Předchozí licence bude trvale ztracena, pokud ji nemáte zálohovanou jinde."
 line3 = "Důležité: Uchovávejte licenční klíče v soukromí a v bezpečí. Nikdy je nesdílejte veřejně."
 
+[admin.settings.premium.inputMethod]
+text = "Licenční klíč"
+file = "Soubor certifikátu"
+
+[admin.settings.premium.file]
+label = "Soubor licenčního certifikátu"
+description = "Nahrajte svůj licenční soubor .lic nebo .cert z offline nákupu"
+choose = "Vybrat licenční soubor"
+selected = "Vybráno: {{filename}} ({{size}})"
+successMessage = "Licenční soubor byl úspěšně nahrán a aktivován. Restart není vyžadován."
+
+[admin.settings.premium.currentLicense]
+title = "Aktivní licence"
+file = "Zdroj: Licenční soubor ({{path}})"
+key = "Zdroj: Licenční klíč"
+type = "Typ: {{type}}"
+noInput = "Zadejte licenční klíč nebo nahrajte soubor certifikátu"
+success = "Úspěch"
+
 [admin.settings.premium.enabled]
 label = "Povolit prémiové funkce"
 description = "Povolit kontrolu licenčního klíče pro pro/enterprise funkce"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} vybráno"
 download = "Stáhnout"
 delete = "Smazat"
 unsupported = "Nepodporováno"
+active = "Aktivní"
 addToUpload = "Přidat k nahrání"
+closeFile = "Zavřít soubor"
 deleteAll = "Smazat vše"
 loadingFiles = "Načítání souborů..."
 noFiles = "Nejsou k dispozici žádné soubory"
@@ -5132,7 +5262,7 @@ upgrade = "Upgradovat nyní →"
 freeTitle = "Serverová licence"
 overLimitTitle = "Vyžadována serverová licence"
 overLimitBody = "Naše licencování umožňuje až <strong>{{freeTierLimit}}</strong> uživatelů zdarma na server. Máte <strong>{{overLimitUserCopy}}</strong> uživatelů Stirling. Pro nepřerušené používání přejděte na plán Stirling Server – <strong>neomezený počet míst</strong>, úpravy textu PDF a plná správa za 99 $/server/měsíc."
-freeBody = "Naše licencování <strong>Open-Core</strong> umožňuje až <strong>{{freeTierLimit}}</strong> uživatelů zdarma na server. Pro nepřerušený růst a přednostní přístup k našemu novému <strong>nástroji pro úpravu textu PDF</strong> doporučujeme plán Stirling Server – plné úpravy a <strong>neomezený počet míst</strong> za 99 $/server/měsíc."
+freeBody = "Naše licencování <strong>Open-Core</strong> umožňuje až <strong>{{freeTierLimit}}</strong> uživatelů zdarma na server. Pro nepřerušované škálování doporučujeme plán Stirling Server - <strong>neomezený počet míst</strong> a <strong>podpora SSO</strong> za $99/server/měs."
 
 [onboarding.desktopInstall]
 title = "Stáhnout"
@@ -5237,6 +5367,31 @@ error = "Nepodařilo se aktualizovat stav uživatele"
 success = "Uživatel úspěšně smazán"
 error = "Nepodařilo se smazat uživatele"
 
+[workspace.people.changePassword]
+action = "Změnit heslo"
+title = "Změna hesla"
+subtitle = "Aktualizovat heslo pro"
+newPassword = "Nové heslo"
+confirmPassword = "Potvrzení hesla"
+placeholder = "Zadejte nové heslo"
+confirmPlaceholder = "Zadejte nové heslo znovu"
+passwordRequired = "Zadejte prosím nové heslo"
+passwordMismatch = "Hesla se neshodují"
+generateRandom = "Vygenerovat bezpečné heslo"
+generatedPreview = "Vygenerované heslo:"
+copyTooltip = "Zkopírovat do schránky"
+copiedToClipboard = "Heslo zkopírováno do schránky"
+copyFailed = "Heslo se nepodařilo zkopírovat"
+sendEmail = "Odeslat uživateli e-mail o této změně"
+includePassword = "Zahrnout nové heslo do e-mailu"
+forcePasswordChange = "Vynutit změnu hesla při příštím přihlášení"
+emailUnavailable = "E-mailová adresa tohoto uživatele není platná. Oznámení jsou deaktivována."
+smtpDisabled = "E-mailová oznámení vyžadují, aby bylo v nastavení povoleno SMTP."
+notifyOnly = "Bude odeslán e-mail bez hesla, který uživateli oznámí, že ho změnil administrátor."
+submit = "Aktualizovat heslo"
+success = "Heslo bylo úspěšně aktualizováno"
+error = "Heslo se nepodařilo aktualizovat"
+
 [workspace.people.emailInvite]
 tab = "Pozvánka e‑mailem"
 description = "Níže napište nebo vložte e‑maily oddělené čárkami. Uživatelé obdrží přihlašovací údaje e‑mailem."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "uzivatel1@priklad.cz, uzivatel2@priklad.cz"
 emailsRequired = "Je vyžadována alespoň jedna e‑mailová adresa"
 submit = "Odeslat pozvánky"
 success = "uživatel(é) úspěšně pozváni"
-partialSuccess = "Některé pozvánky se nepodařilo odeslat"
+partialFailure = "Některá pozvání selhala"
 allFailed = "Nepodařilo se pozvat uživatele"
 error = "Nepodařilo se odeslat pozvánky"
 
@@ -5709,7 +5864,7 @@ title = "Graf využití endpointů"
 
 [usage.table]
 title = "Podrobné statistiky"
-endpoint = "Endpoint"
+endpoint = "Koncový bod"
 visits = "Návštěvy"
 percentage = "Procenta"
 noData = "Žádná data nejsou k dispozici"
@@ -5770,6 +5925,7 @@ subtitle = "Přihlaste se svým účtem Stirling"
 [setup.selfhosted]
 title = "Přihlásit se k serveru"
 subtitle = "Zadejte přihlašovací údaje k vašemu serveru"
+link = "nebo se připojte k účtu s vlastním hostováním"
 
 [setup.server]
 title = "Připojit k serveru"
@@ -5788,6 +5944,14 @@ description = "Zadejte úplnou URL vašeho samohostovaného serveru Stirling PDF
 emptyUrl = "Zadejte URL serveru"
 unreachable = "Nelze se připojit k serveru"
 testFailed = "Test připojení selhal"
+configFetch = "Nepodařilo se načíst konfiguraci serveru. Zkontrolujte prosím URL a zkuste to znovu."
+
+[setup.server.error.securityDisabled]
+title = "Přihlášení není povoleno"
+body = "Na tomto serveru není povoleno přihlašování. Pokud se chcete připojit, musíte povolit ověřování:"
+step1 = "Nastavte DOCKER_ENABLE_SECURITY=true ve svém prostředí"
+step2 = "Nebo nastavte security.enableLogin=true v souboru settings.yml"
+step3 = "Restartujte server"
 
 [setup.login]
 title = "Přihlášení"
@@ -5797,6 +5961,13 @@ submit = "Přihlásit se"
 signInWith = "Přihlásit se pomocí"
 oauthPending = "Otevírám prohlížeč pro ověření..."
 orContinueWith = "Nebo pokračovat e-mailem"
+serverRequirement = "Poznámka: Na serveru musí být povoleno přihlášení."
+showInstructions = "Jak povolit?"
+hideInstructions = "Skrýt pokyny"
+instructions = "Chcete-li povolit přihlášení na vašem serveru Stirling PDF:"
+instructionsEnvVar = "Nastavte proměnnou prostředí:"
+instructionsOrYml = "Nebo v settings.yml:"
+instructionsRestart = "Poté restartujte server, aby se změny projevily."
 
 [setup.login.username]
 label = "Uživatelské jméno"
@@ -5840,7 +6011,7 @@ paragraph = "Odstavcová stránka"
 sparse = "Řídký text"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automaticky"
 paragraph = "Odstavec"
 singleLine = "Jeden řádek"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Předběžný přístup"
 reset = "Obnovit změny"
 downloadJson = "Stáhnout JSON"
 generatePdf = "Vytvořit PDF"
+saveChanges = "Uložit změny"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Automaticky přizpůsobit text rámečkům"
@@ -5890,6 +6062,8 @@ alpha = "Tento alfa prohlížeč se stále vyvíjí — některé fonty, barvy,
 [pdfTextEditor.empty]
 title = "Není načten žádný dokument"
 subtitle = "Načtěte soubor PDF nebo JSON a začněte upravovat text."
+dropzone = "Sem přetáhněte soubor PDF nebo JSON, případně kliknutím vyberte"
+dropzoneWithFiles = "Vyberte soubor na kartě Soubory, nebo sem přetáhněte soubor PDF či JSON, případně kliknutím vyberte"
 
 [pdfTextEditor.welcomeBanner]
 title = "Vítejte v editoru textu PDF (předběžný přístup)"
@@ -5932,13 +6106,13 @@ warnings = "Varování"
 suggestions = "Poznámky"
 currentPageFonts = "Fonty na této stránce"
 allFonts = "Všechny fonty"
-fallback = "fallback"
+fallback = "náhradní"
 missing = "chybí"
 perfectMessage = "Všechny fonty lze reprodukovat dokonale."
 warningMessage = "Některé fonty se nemusí vykreslit správně."
 infoMessage = "K dispozici jsou informace o reprodukci fontů."
-perfect = "perfect"
-subset = "subset"
+perfect = "dokonalé"
+subset = "podmnožina"
 
 [pdfTextEditor.errors]
 invalidJson = "Nelze přečíst soubor JSON. Ujistěte se, že byl vytvořen nástrojem PDF to JSON."
diff --git a/frontend/public/locales/da-DK/translation.toml b/frontend/public/locales/da-DK/translation.toml
index bc44aa479..88e688291 100644
--- a/frontend/public/locales/da-DK/translation.toml
+++ b/frontend/public/locales/da-DK/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Fjern fra favoritter"
 fullscreen = "Skift til fuldskærmstilstand"
 sidebar = "Skift til sidepanel-tilstand"
 
+[backendStartup]
+notFoundTitle = "Backend ikke fundet"
+retry = "Prøv igen"
+unreachable = "Programmet kan i øjeblikket ikke forbinde til backend. Kontroller backend-status og netværksforbindelse, og prøv igen."
+
 [zipWarning]
 title = "Stor ZIP-fil"
 message = "Denne ZIP indeholder {{count}} filer. Udpak alligevel?"
@@ -347,7 +352,7 @@ teams = "Teams"
 title = "Konfiguration"
 systemSettings = "Systemindstillinger"
 features = "Funktioner"
-endpoints = "Endpoints"
+endpoints = "Slutpunkter"
 database = "Database"
 advanced = "Avanceret"
 
@@ -359,7 +364,7 @@ connections = "Forbindelser"
 [settings.licensingAnalytics]
 title = "Licensering & Analytics"
 plan = "Plan"
-audit = "Audit"
+audit = "Revision"
 usageAnalytics = "Brugsanalyse"
 
 [settings.policiesPrivacy]
@@ -556,13 +561,13 @@ totalEndpoints = "Endpoints i alt"
 totalVisits = "Besøg i alt"
 showing = "Viser"
 selectedVisits = "Valgte besøg"
-endpoint = "Endpoint"
+endpoint = "Slutpunkt"
 visits = "Besøg"
 percentage = "Procent"
 loading = "Laster..."
 failedToLoad = "Kunne ikke indlæse endpoint-data. Prøv at opdatere."
 home = "Hjem"
-login = "Login"
+login = "Log ind"
 top = "Top"
 numberOfVisits = "Antal besøg"
 visitsTooltip = "Besøg: {0} ({1}% af totalen)"
@@ -912,6 +917,9 @@ desc = "Byg flertrins-workflows ved at kæde PDF-handlinger sammen. Ideelt til t
 desc = "Overlejrer PDF'er oven på en anden PDF"
 title = "Overlejr PDF'er"
 
+[home.pdfTextEditor]
+title = "PDF-teksteditor"
+desc = "Rediger eksisterende tekst og billeder i PDF'er"
 
 [home.addText]
 tags = "tekst,annotering,etiket"
@@ -1173,7 +1181,7 @@ selectFilesPlaceholder = "Vælg filer i hovedvisningen for at komme i gang"
 settings = "Indstillinger"
 conversionCompleted = "Konvertering fuldført"
 results = "Resultater"
-defaultFilename = "converted_file"
+defaultFilename = "konverteret_fil"
 conversionResults = "Konverteringsresultater"
 convertFrom = "Konvertér fra"
 convertTo = "Konvertér til"
@@ -1213,9 +1221,9 @@ pdfaDigitalSignatureWarning = "PDF'en indeholder en digital signatur. Dette vil
 fileFormat = "Filformat"
 wordDoc = "Word-dokument"
 wordDocExt = "Word-dokument (.docx)"
-odtExt = "OpenDocument Text (.odt)"
+odtExt = "OpenDocument-tekst (.odt)"
 pptExt = "PowerPoint (.pptx)"
-odpExt = "OpenDocument Presentation (.odp)"
+odpExt = "OpenDocument-præsentation (.odp)"
 txtExt = "Almindelig tekst (.txt)"
 rtfExt = "Rich Text Format (.rtf)"
 selectedFiles = "Valgte filer"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Tegnet signatur"
 defaultImageLabel = "Uploadet signatur"
 defaultTextLabel = "Indtastet signatur"
 saveButton = "Gem signatur"
+savePersonal = "Gem personlig"
+saveShared = "Gem delt"
 saveUnavailable = "Opret først en signatur for at gemme den."
 noChanges = "Nuværende signatur er allerede gemt."
+tempStorageTitle = "Midlertidig browserlagring"
+tempStorageDescription = "Signaturer gemmes kun i din browser. De går tabt, hvis du rydder browserdata eller skifter browser."
+personalHeading = "Personlige signaturer"
+sharedHeading = "Delte signaturer"
+personalDescription = "Kun du kan se disse signaturer."
+sharedDescription = "Alle brugere kan se og bruge disse signaturer."
 
 [sign.saved.type]
 canvas = "Tegning"
@@ -3020,6 +3036,91 @@ title = "Få Info om PDF"
 header = "Få Info om PDF"
 submit = "Få Info"
 downloadJson = "Download JSON"
+processing = "Udtrækker oplysninger..."
+results = "Resultater"
+noResults = "Kør værktøjet for at generere en rapport."
+downloads = "Downloads"
+noneDetected = "Ingen registreret"
+indexTitle = "Indeks"
+
+[getPdfInfo.report]
+entryLabel = "Fuldt informationsresumé"
+shortTitle = "PDF-oplysninger"
+
+[getPdfInfo.sections]
+metadata = "Metadata"
+formFields = "Formularfelter"
+basicInfo = "Grundlæggende info"
+documentInfo = "Dokumentinfo"
+compliance = "Overensstemmelse"
+encryption = "Kryptering"
+permissions = "Tilladelser"
+other = "Andet"
+perPageInfo = "Info pr. side"
+tableOfContents = "Indholdsfortegnelse"
+
+[getPdfInfo.other]
+attachments = "Vedhæftninger"
+embeddedFiles = "Indlejrede filer"
+javaScript = "JavaScript"
+layers = "Lag"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Størrelse"
+annotations = "Anmærkninger"
+images = "Billeder"
+links = "Links"
+fonts = "Skrifttyper"
+xobjects = "Antal XObjects"
+multimedia = "Multimedie"
+
+[getPdfInfo.summary]
+pages = "Sider"
+fileSize = "Filstørrelse"
+pdfVersion = "PDF-version"
+language = "Sprog"
+title = "PDF-resumé"
+author = "Forfatter"
+created = "Oprettet"
+modified = "Ændret"
+permsAll = "Alle tilladelser tilladt"
+permsRestricted = "{{count}} begrænsninger"
+permsMixed = "Nogle tilladelser er begrænsede"
+hasCompliance = "Har overensstemmelsesstandarder"
+noCompliance = "Ingen overensstemmelsesstandarder"
+basic = "Grundlæggende oplysninger"
+documentInfo = "Dokumentoplysninger"
+securityTitle = "Sikkerhedsstatus"
+technical = "Teknisk"
+overviewTitle = "PDF-oversigt"
+
+[getPdfInfo.summary.security]
+encrypted = "Krypteret PDF - med adgangskodebeskyttelse"
+unencrypted = "Ukrypteret PDF - ingen adgangskodebeskyttelse"
+
+[getPdfInfo.summary.tech]
+images = "Billeder"
+fonts = "Skrifttyper"
+formFields = "Formularfelter"
+embeddedFiles = "Indlejrede filer"
+javaScript = "JavaScript"
+layers = "Lag"
+bookmarks = "Bogmærker"
+multimedia = "Multimedie"
+
+[getPdfInfo.summary.overview]
+untitled = "et dokument uden titel"
+unknown = "Ukendt forfatter"
+text = "Dette er en PDF på {{pages}} sider med titlen {{title}}, oprettet af {{author}} (PDF-version {{version}})."
+
+[getPdfInfo.error]
+partial = "Nogle filer kunne ikke behandles."
+unexpected = "Uventet fejl under udtrækning."
+
+[getPdfInfo.status]
+complete = "Udtrækning fuldført"
 
 [extractPage]
 tags = "udtræk"
@@ -3438,6 +3539,9 @@ signinTitle = "Log venligst ind"
 ssoSignIn = "Log ind via Single Sign-on"
 oAuth2AutoCreateDisabled = "OAUTH2 Auto-Opret Bruger Deaktiveret"
 oAuth2AdminBlockedUser = "Registrering eller login af ikke-registrerede brugere er i øjeblikket blokeret. Kontakt venligst administratoren."
+oAuth2RequiresLicense = "OAuth/SSO-login kræver en betalt licens (Server eller Enterprise). Kontakt administratoren for at opgradere din plan."
+saml2RequiresLicense = "SAML-login kræver en betalt licens (Server eller Enterprise). Kontakt administratoren for at opgradere din plan."
+maxUsersReached = "Maksimalt antal brugere er nået for din nuværende licens. Kontakt administratoren for at opgradere din plan eller tilføje flere pladser."
 oauth2RequestNotFound = "Autorisationsanmodning ikke fundet"
 oauth2InvalidUserInfoResponse = "Ugyldigt Brugerinfo Svar"
 oauth2invalidRequest = "Ugyldig Anmodning"
@@ -3771,7 +3875,7 @@ version = "Nuværende udgivelse"
 title = "API-dokumentation"
 header = "API-dokumentation"
 desc = "Se og test Stirling PDF API-endpoints"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,dokumentation,swagger,endepunkter,udvikling"
 
 [cookieBanner.popUp]
 title = "Sådan bruger vi cookies"
@@ -3846,14 +3950,17 @@ fitToWidth = "Tilpas til bredde"
 actualSize = "Faktisk størrelse"
 
 [viewer]
+cannotPreviewFile = "Kan ikke forhåndsvise fil"
+dualPageView = "To-siders visning"
 firstPage = "Første side"
 lastPage = "Sidste side"
-previousPage = "Forrige side"
 nextPage = "Næste side"
+onlyPdfSupported = "Visningen understøtter kun PDF-filer. Denne fil ser ud til at være et andet format."
+previousPage = "Forrige side"
+singlePageView = "Enkelt-sides visning"
+unknownFile = "Ukendt fil"
 zoomIn = "Zoom ind"
 zoomOut = "Zoom ud"
-singlePageView = "Enkelt-sides visning"
-dualPageView = "To-siders visning"
 
 [rightRail]
 closeSelected = "Luk valgte filer"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Skift sidepanel"
 exportSelected = "Eksporter valgte sider"
 toggleAnnotations = "Skift visning af annoteringer"
 annotationMode = "Skift annoteringstilstand"
+print = "Udskriv PDF"
 draw = "Tegn"
 save = "Gem"
 saveChanges = "Gem ændringer"
@@ -4235,11 +4343,11 @@ label = "Issuer-URL"
 description = "OAuth2-udbyderens issuer-URL"
 
 [admin.settings.connections.oauth2.clientId]
-label = "Client ID"
+label = "Klient-ID"
 description = "OAuth2 Client ID fra din udbyder"
 
 [admin.settings.connections.oauth2.clientSecret]
-label = "Client Secret"
+label = "Klienthemmelighed"
 description = "OAuth2 Client Secret fra din udbyder"
 
 [admin.settings.connections.oauth2.useAsUsername]
@@ -4343,7 +4451,7 @@ features = "Funktionsflag"
 processing = "Behandling"
 
 [admin.settings.advanced.endpoints]
-label = "Endpoints"
+label = "Slutpunkter"
 manage = "Administrer API-endpoints"
 description = "Endpointstyring konfigureres via YAML. Se dokumentationen for detaljer om aktivering/deaktivering af specifikke endpoints."
 
@@ -4494,6 +4602,7 @@ description = "URL eller filnavn til impressum (påkrævet i nogle jurisdiktione
 title = "Premium og Enterprise"
 description = "Konfigurer din premium- eller enterprise-licensnøgle."
 license = "Licenskonfiguration"
+noInput = "Angiv en licensnøgle eller fil"
 
 [admin.settings.premium.licenseKey]
 toggle = "Har du en licensnøgle eller en certifikatfil?"
@@ -4511,6 +4620,25 @@ line1 = "Overskrivning af din nuværende licensnøgle kan ikke fortrydes."
 line2 = "Din tidligere licens går permanent tabt, medmindre du har sikkerhedskopieret den andetsteds."
 line3 = "Vigtigt: Hold licensnøgler private og sikre. Del dem aldrig offentligt."
 
+[admin.settings.premium.inputMethod]
+text = "Licensnøgle"
+file = "Certifikatfil"
+
+[admin.settings.premium.file]
+label = "Licenscertifikatfil"
+description = "Upload din .lic- eller .cert-licensfil fra offlinekøb"
+choose = "Vælg licensfil"
+selected = "Valgt: {{filename}} ({{size}})"
+successMessage = "Licensfil uploadet og aktiveret. Genstart er ikke påkrævet."
+
+[admin.settings.premium.currentLicense]
+title = "Aktiv licens"
+file = "Kilde: Licensfil ({{path}})"
+key = "Kilde: Licensnøgle"
+type = "Type: {{type}}"
+noInput = "Angiv en licensnøgle eller upload en certifikatfil"
+success = "Succes"
+
 [admin.settings.premium.enabled]
 label = "Aktivér premium-funktioner"
 description = "Aktivér licensnøgletjek for pro-/enterprise-funktioner"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} valgt"
 download = "Download"
 delete = "Slet"
 unsupported = "Ikke understøttet"
+active = "Aktiv"
 addToUpload = "Føj til upload"
+closeFile = "Luk fil"
 deleteAll = "Slet alle"
 loadingFiles = "Indlæser filer..."
 noFiles = "Ingen filer tilgængelige"
@@ -5132,7 +5262,7 @@ upgrade = "Opgrader nu →"
 freeTitle = "Serverlicens"
 overLimitTitle = "Serverlicens påkrævet"
 overLimitBody = "Vores licens tillader op til <strong>{{freeTierLimit}}</strong> brugere gratis pr. server. Du har <strong>{{overLimitUserCopy}}</strong> Stirling-brugere. For at fortsætte uden afbrydelser skal du opgradere til Stirling Server-abonnementet – <strong>ubegrænsede pladser</strong>, PDF-tekstredigering og fuld admin-kontrol for $99/server/md."
-freeBody = "Vores <strong>Open-Core</strong>-licens tillader op til <strong>{{freeTierLimit}}</strong> brugere gratis pr. server. For at skalere uden afbrydelser og få tidlig adgang til vores nye <strong>PDF-tekstredigeringsværktøj</strong> anbefaler vi Stirling Server-planen – fuld redigering og <strong>ubegrænsede pladser</strong> for $99/server/md."
+freeBody = "Vores <strong>Open-Core</strong>-licens tillader op til <strong>{{freeTierLimit}}</strong> brugere gratis pr. server. For at skalere uden afbrydelser anbefaler vi Stirling Server-planen – <strong>ubegrænsede pladser</strong> og <strong>SSO-understøttelse</strong> for $99/server/md."
 
 [onboarding.desktopInstall]
 title = "Download"
@@ -5237,6 +5367,31 @@ error = "Kunne ikke opdatere brugerstatus"
 success = "Bruger slettet"
 error = "Kunne ikke slette bruger"
 
+[workspace.people.changePassword]
+action = "Skift adgangskode"
+title = "Skift adgangskode"
+subtitle = "Opdater adgangskoden for"
+newPassword = "Ny adgangskode"
+confirmPassword = "Bekræft adgangskode"
+placeholder = "Indtast en ny adgangskode"
+confirmPlaceholder = "Indtast den nye adgangskode igen"
+passwordRequired = "Angiv en ny adgangskode"
+passwordMismatch = "Adgangskoderne matcher ikke"
+generateRandom = "Generér sikker adgangskode"
+generatedPreview = "Genereret adgangskode:"
+copyTooltip = "Kopiér til udklipsholder"
+copiedToClipboard = "Adgangskode kopieret til udklipsholderen"
+copyFailed = "Kunne ikke kopiere adgangskoden"
+sendEmail = "Send en e-mail til brugeren om denne ændring"
+includePassword = "Medtag den nye adgangskode i e-mailen"
+forcePasswordChange = "Tving brugeren til at ændre adgangskode ved næste login"
+emailUnavailable = "Denne brugers e-mail er ikke en gyldig e-mailadresse. Meddelelser er deaktiveret."
+smtpDisabled = "E-mailmeddelelser kræver, at SMTP er aktiveret i indstillingerne."
+notifyOnly = "Der sendes en e-mail uden adgangskoden, som informerer brugeren om, at en administrator har ændret den."
+submit = "Opdater adgangskode"
+success = "Adgangskoden blev opdateret"
+error = "Kunne ikke opdatere adgangskoden"
+
 [workspace.people.emailInvite]
 tab = "E-mailinvitation"
 description = "Skriv eller indsæt e-mails nedenfor, adskilt af kommaer. Brugere modtager loginoplysninger via e-mail."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Mindst én e-mailadresse er påkrævet"
 submit = "Send invitationer"
 success = "Bruger(e) inviteret"
-partialSuccess = "Nogle invitationer mislykkedes"
+partialFailure = "Nogle invitationer mislykkedes"
 allFailed = "Kunne ikke invitere brugere"
 error = "Kunne ikke sende invitationer"
 
@@ -5288,8 +5443,8 @@ emailDisabled = "E-mailinvitationer kræver SMTP-konfiguration og mail.enableInv
 [workspace.people.license]
 users = "brugere"
 availableSlots = "Tilgængelige pladser"
-grandfathered = "Grandfathered"
-grandfatheredShort = "{{count}} grandfathered"
+grandfathered = "På gamle vilkår"
+grandfatheredShort = "{{count}} på gamle vilkår"
 fromLicense = "fra licens"
 slotsAvailable = "{{count}} ledig(e) brugerplads(er)"
 noSlotsAvailable = "Ingen pladser tilgængelige"
@@ -5709,7 +5864,7 @@ title = "Diagram over endpoint-brug"
 
 [usage.table]
 title = "Detaljeret statistik"
-endpoint = "Endpoint"
+endpoint = "Slutpunkt"
 visits = "Besøg"
 percentage = "Procent"
 noData = "Ingen data tilgængelige"
@@ -5752,7 +5907,7 @@ label = "Vælg server"
 description = "Selvhostet server"
 
 [setup.step3]
-label = "Login"
+label = "Log ind"
 description = "Indtast loginoplysninger"
 
 [setup.mode.saas]
@@ -5770,6 +5925,7 @@ subtitle = "Log ind med din Stirling-konto"
 [setup.selfhosted]
 title = "Log ind på server"
 subtitle = "Indtast dine server-loginoplysninger"
+link = "eller opret forbindelse til en selvhostet konto"
 
 [setup.server]
 title = "Forbind til server"
@@ -5788,6 +5944,14 @@ description = "Indtast den fulde URL til din selvhostede Stirling PDF-server"
 emptyUrl = "Indtast en server-URL"
 unreachable = "Kunne ikke forbinde til server"
 testFailed = "Forbindelsestest mislykkedes"
+configFetch = "Kunne ikke hente serverkonfiguration. Kontrollér URL'en, og prøv igen."
+
+[setup.server.error.securityDisabled]
+title = "Login ikke aktiveret"
+body = "Denne server har ikke login aktiveret. For at oprette forbindelse til denne server skal du aktivere godkendelse:"
+step1 = "Sæt DOCKER_ENABLE_SECURITY=true i dit miljø"
+step2 = "Eller sæt security.enableLogin=true i settings.yml"
+step3 = "Genstart serveren"
 
 [setup.login]
 title = "Log ind"
@@ -5797,6 +5961,13 @@ submit = "Log ind"
 signInWith = "Log ind med"
 oauthPending = "Åbner browser for godkendelse..."
 orContinueWith = "Eller fortsæt med email"
+serverRequirement = "Bemærk: Serveren skal have login aktiveret."
+showInstructions = "Hvordan aktiveres det?"
+hideInstructions = "Skjul instruktioner"
+instructions = "Sådan aktiverer du login på din Stirling PDF-server:"
+instructionsEnvVar = "Sæt miljøvariablen:"
+instructionsOrYml = "Eller i settings.yml:"
+instructionsRestart = "Genstart derefter serveren, så ændringerne træder i kraft."
 
 [setup.login.username]
 label = "Brugernavn"
@@ -5853,6 +6024,7 @@ earlyAccess = "Tidlig adgang"
 reset = "Nulstil ændringer"
 downloadJson = "Download JSON"
 generatePdf = "Generer PDF"
+saveChanges = "Gem ændringer"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Autoskalér tekst, så den passer i bokse"
@@ -5890,6 +6062,8 @@ alpha = "Denne alpha-fremviser er stadig under udvikling—visse skrifttyper, fa
 [pdfTextEditor.empty]
 title = "Intet dokument indlæst"
 subtitle = "Indlæs en PDF- eller JSON-fil for at begynde at redigere tekstindhold."
+dropzone = "Træk og slip en PDF- eller JSON-fil her, eller klik for at gennemse"
+dropzoneWithFiles = "Vælg en fil fra fanen Filer, eller træk og slip en PDF- eller JSON-fil her, eller klik for at gennemse"
 
 [pdfTextEditor.welcomeBanner]
 title = "Velkommen til PDF-teksteditor (Early Access)"
diff --git a/frontend/public/locales/de-DE/translation.toml b/frontend/public/locales/de-DE/translation.toml
index c8c8e6f71..d48c424f4 100644
--- a/frontend/public/locales/de-DE/translation.toml
+++ b/frontend/public/locales/de-DE/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Aus Favoriten entfernen"
 fullscreen = "In den Vollbildmodus wechseln"
 sidebar = "In den Seitenleistenmodus wechseln"
 
+[backendStartup]
+notFoundTitle = "Backend nicht gefunden"
+retry = "Erneut versuchen"
+unreachable = "Die Anwendung kann derzeit keine Verbindung zum Backend herstellen. Überprüfen Sie den Backend-Status und die Netzwerkverbindung und versuchen Sie es dann erneut."
+
 [zipWarning]
 title = "Große ZIP-Datei"
 message = "Dieses ZIP enthält {{count}} Dateien. Trotzdem extrahieren?"
@@ -347,7 +352,7 @@ teams = "Teams"
 title = "Konfiguration"
 systemSettings = "Systemeinstellungen"
 features = "Funktionen"
-endpoints = "Endpoints"
+endpoints = "Endpunkte"
 database = "Datenbank"
 advanced = "Erweitert"
 
@@ -383,7 +388,7 @@ logout = "Abmelden"
 
 [settings.connection.mode]
 saas = "Stirling Cloud"
-selfhosted = "Self-Hosted"
+selfhosted = "Selbst gehostet"
 
 [settings.general]
 title = "Allgemein"
@@ -612,7 +617,7 @@ desc = "Anzeigen, Kommentieren, Text oder Bilder hinzufügen"
 brandAlt = "Stirling PDF-Logo"
 openFiles = "Dateien öffnen"
 swipeHint = "Zum Wechseln der Ansicht nach links oder rechts wischen"
-tools = "Tools"
+tools = "Werkzeuge"
 toolsSlide = "Bereich für Toolauswahl"
 viewSwitcher = "Ansicht des Arbeitsbereichs wechseln"
 workbenchSlide = "Arbeitsbereichs-Panel"
@@ -912,9 +917,12 @@ desc = "Mehrstufige Arbeitsabläufe durch Verkettung von PDF-Aktionen erstellen.
 desc = "Ein PDF über ein anderes legen"
 title = "PDFs überlagern"
 
+[home.pdfTextEditor]
+title = "PDF-Texteditor"
+desc = "Vorhandenen Text und Bilder in PDFs bearbeiten"
 
 [home.addText]
-tags = "text,annotation,label"
+tags = "text,anmerkung,beschriftung"
 title = "Text hinzufügen"
 desc = "Beliebigen Text überall in Ihrem PDF hinzufügen"
 
@@ -1213,7 +1221,7 @@ pdfaDigitalSignatureWarning = "Das PDF enthält eine digitale Signatur. Sie wird
 fileFormat = "Dateiformat"
 wordDoc = "Word-Dokument"
 wordDocExt = "Word-Dokument (.docx)"
-odtExt = "OpenDocument Text (.odt)"
+odtExt = "OpenDocument-Text (.odt)"
 pptExt = "PowerPoint (.pptx)"
 odpExt = "OpenDocument Präsentation (.odp)"
 txtExt = "Einfacher Text (.txt)"
@@ -2259,12 +2267,20 @@ defaultCanvasLabel = "Gezeichnete Unterschrift"
 defaultImageLabel = "Hochgeladene Unterschrift"
 defaultTextLabel = "Getippte Unterschrift"
 saveButton = "Unterschrift speichern"
+savePersonal = "Persönlich speichern"
+saveShared = "Geteilt speichern"
 saveUnavailable = "Erstellen Sie zuerst eine Unterschrift, um sie zu speichern."
 noChanges = "Die aktuelle Unterschrift ist bereits gespeichert."
+tempStorageTitle = "Temporärer Browser-Speicher"
+tempStorageDescription = "Signaturen werden nur in Ihrem Browser gespeichert. Sie gehen verloren, wenn Sie Browserdaten löschen oder den Browser wechseln."
+personalHeading = "Persönliche Signaturen"
+sharedHeading = "Geteilte Signaturen"
+personalDescription = "Nur Sie können diese Signaturen sehen."
+sharedDescription = "Alle Benutzer können diese Signaturen sehen und verwenden."
 
 [sign.saved.type]
 canvas = "Zeichnung"
-image = "Upload"
+image = "Hochladen"
 text = "Text"
 
 [sign.saved.status]
@@ -3020,6 +3036,91 @@ title = "Alle Informationen anzeigen"
 header = "Alle Informationen anzeigen"
 submit = "Informationen anzeigen"
 downloadJson = "Als JSON herunterladen"
+processing = "Informationen werden extrahiert..."
+results = "Ergebnisse"
+noResults = "Führen Sie das Tool aus, um einen Bericht zu erstellen."
+downloads = "Downloads"
+noneDetected = "Keine erkannt"
+indexTitle = "Index"
+
+[getPdfInfo.report]
+entryLabel = "Vollständige Informationsübersicht"
+shortTitle = "PDF-Informationen"
+
+[getPdfInfo.sections]
+metadata = "Metadaten"
+formFields = "Formularfelder"
+basicInfo = "Grundlegende Informationen"
+documentInfo = "Dokumentinformationen"
+compliance = "Compliance"
+encryption = "Verschlüsselung"
+permissions = "Berechtigungen"
+other = "Sonstiges"
+perPageInfo = "Informationen pro Seite"
+tableOfContents = "Inhaltsverzeichnis"
+
+[getPdfInfo.other]
+attachments = "Anhänge"
+embeddedFiles = "Eingebettete Dateien"
+javaScript = "JavaScript"
+layers = "Ebenen"
+structureTree = "Strukturbaum"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Größe"
+annotations = "Anmerkungen"
+images = "Bilder"
+links = "Links"
+fonts = "Schriftarten"
+xobjects = "XObject-Anzahl"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Seiten"
+fileSize = "Dateigröße"
+pdfVersion = "PDF-Version"
+language = "Sprache"
+title = "PDF-Zusammenfassung"
+author = "Autor"
+created = "Erstellt"
+modified = "Geändert"
+permsAll = "Alle Berechtigungen erlaubt"
+permsRestricted = "{{count}} Einschränkungen"
+permsMixed = "Einige Berechtigungen eingeschränkt"
+hasCompliance = "Entspricht Compliance-Standards"
+noCompliance = "Keine Compliance-Standards"
+basic = "Grundlegende Informationen"
+documentInfo = "Dokumentinformationen"
+securityTitle = "Sicherheitsstatus"
+technical = "Technisch"
+overviewTitle = "PDF-Übersicht"
+
+[getPdfInfo.summary.security]
+encrypted = "Verschlüsseltes PDF - Passwortschutz vorhanden"
+unencrypted = "Unverschlüsseltes PDF - Kein Passwortschutz"
+
+[getPdfInfo.summary.tech]
+images = "Bilder"
+fonts = "Schriftarten"
+formFields = "Formularfelder"
+embeddedFiles = "Eingebettete Dateien"
+javaScript = "JavaScript"
+layers = "Ebenen"
+bookmarks = "Lesezeichen"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "ein unbenanntes Dokument"
+unknown = "Unbekannter Autor"
+text = "Dies ist ein {{pages}}-seitiges PDF mit dem Titel {{title}}, erstellt von {{author}} (PDF-Version {{version}})."
+
+[getPdfInfo.error]
+partial = "Einige Dateien konnten nicht verarbeitet werden."
+unexpected = "Unerwarteter Fehler während der Extraktion."
+
+[getPdfInfo.status]
+complete = "Extraktion abgeschlossen"
 
 [extractPage]
 tags = "extrahieren,seite"
@@ -3438,6 +3539,9 @@ signinTitle = "Bitte melden Sie sich an."
 ssoSignIn = "Anmeldung per Single Sign-On"
 oAuth2AutoCreateDisabled = "OAUTH2 Benutzer automatisch erstellen deaktiviert"
 oAuth2AdminBlockedUser = "Die Registrierung bzw. das anmelden von nicht registrierten Benutzern ist derzeit gesperrt. Bitte wenden Sie sich an den Administrator."
+oAuth2RequiresLicense = "OAuth/SSO-Anmeldung erfordert eine kostenpflichtige Lizenz (Server oder Enterprise). Bitte wenden Sie sich an den Administrator, um Ihren Plan zu aktualisieren."
+saml2RequiresLicense = "SAML-Anmeldung erfordert eine kostenpflichtige Lizenz (Server oder Enterprise). Bitte wenden Sie sich an den Administrator, um Ihren Plan zu aktualisieren."
+maxUsersReached = "Die maximale Benutzeranzahl für Ihre aktuelle Lizenz wurde erreicht. Bitte wenden Sie sich an den Administrator, um Ihren Plan zu aktualisieren oder weitere Benutzerplätze hinzuzufügen."
 oauth2RequestNotFound = "Autorisierungsanfrage nicht gefunden"
 oauth2InvalidUserInfoResponse = "Ungültige Benutzerinformationsantwort"
 oauth2invalidRequest = "ungültige Anfrage"
@@ -3846,14 +3950,17 @@ fitToWidth = "An Breite anpassen"
 actualSize = "Originalgröße"
 
 [viewer]
+cannotPreviewFile = "Datei kann nicht in der Vorschau angezeigt werden"
+dualPageView = "Doppelseitenansicht"
 firstPage = "Erste Seite"
 lastPage = "Letzte Seite"
-previousPage = "Vorherige Seite"
 nextPage = "Nächste Seite"
+onlyPdfSupported = "Der Viewer unterstützt nur PDF-Dateien. Diese Datei scheint ein anderes Format zu haben."
+previousPage = "Vorherige Seite"
+singlePageView = "Einzelseitenansicht"
+unknownFile = "Unbekannte Datei"
 zoomIn = "Vergrößern"
 zoomOut = "Verkleinern"
-singlePageView = "Einzelseitenansicht"
-dualPageView = "Doppelseitenansicht"
 
 [rightRail]
 closeSelected = "Ausgewählte Dateien schließen"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Seitenleiste umschalten"
 exportSelected = "Ausgewählte Seiten exportieren"
 toggleAnnotations = "Anmerkungen ein-/ausblenden"
 annotationMode = "Anmerkungsmodus umschalten"
+print = "PDF drucken"
 draw = "Zeichnen"
 save = "Speichern"
 saveChanges = "Änderungen speichern"
@@ -3928,7 +4036,7 @@ account = "Konto"
 config = "Konfig"
 settings = "Optionen"
 adminSettings = "Admin Optionen"
-allTools = "Tools"
+allTools = "Werkzeuge"
 reader = "Reader"
 
 [quickAccess.helpMenu]
@@ -4494,6 +4602,7 @@ description = "URL oder Dateiname zum Impressum (in einigen Rechtsordnungen erfo
 title = "Premium & Enterprise"
 description = "Ihren Premium- oder Enterprise-Lizenzschlüssel konfigurieren."
 license = "Lizenzkonfiguration"
+noInput = "Bitte geben Sie einen Lizenzschlüssel oder eine Datei an"
 
 [admin.settings.premium.licenseKey]
 toggle = "Lizenzschlüssel oder Zertifikatsdatei vorhanden?"
@@ -4511,6 +4620,25 @@ line1 = "Das Überschreiben Ihres aktuellen Lizenzschlüssels kann nicht rückg
 line2 = "Ihre vorherige Lizenz geht dauerhaft verloren, sofern Sie sie nicht anderweitig gesichert haben."
 line3 = "Wichtig: Halten Sie Lizenzschlüssel privat und sicher. Geben Sie sie niemals öffentlich weiter."
 
+[admin.settings.premium.inputMethod]
+text = "Lizenzschlüssel"
+file = "Zertifikatsdatei"
+
+[admin.settings.premium.file]
+label = "Lizenz-Zertifikatsdatei"
+description = "Laden Sie Ihre .lic- oder .cert-Lizenzdatei aus Offline-Käufen hoch"
+choose = "Lizenzdatei auswählen"
+selected = "Ausgewählt: {{filename}} ({{size}})"
+successMessage = "Lizenzdatei erfolgreich hochgeladen und aktiviert. Kein Neustart erforderlich."
+
+[admin.settings.premium.currentLicense]
+title = "Aktive Lizenz"
+file = "Quelle: Lizenzdatei ({{path}})"
+key = "Quelle: Lizenzschlüssel"
+type = "Typ: {{type}}"
+noInput = "Bitte geben Sie einen Lizenzschlüssel an oder laden Sie eine Zertifikatdatei hoch"
+success = "Erfolg"
+
 [admin.settings.premium.enabled]
 label = "Premium-Funktionen aktivieren"
 description = "Lizenzschlüssel-Prüfungen für Pro-/Enterprise-Funktionen aktivieren"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} ausgewählt"
 download = "Herunterladen"
 delete = "Löschen"
 unsupported = "Nicht unterstützt"
+active = "Aktiv"
 addToUpload = "Zum Upload hinzufügen"
+closeFile = "Datei schließen"
 deleteAll = "Alle löschen"
 loadingFiles = "Dateien werden geladen..."
 noFiles = "Keine Dateien verfügbar"
@@ -5132,7 +5262,7 @@ upgrade = "Jetzt upgraden →"
 freeTitle = "Server-Lizenz"
 overLimitTitle = "Server-Lizenz erforderlich"
 overLimitBody = "Unsere Lizenz erlaubt bis zu <strong>{{freeTierLimit}}</strong> Nutzer pro Server kostenlos. Sie haben <strong>{{overLimitUserCopy}}</strong> Stirling-Nutzer. Um ohne Unterbrechung fortzufahren, upgraden Sie auf den Stirling-Server-Plan – <strong>unbegrenzte Plätze</strong>, PDF-Textbearbeitung und volle Admin-Kontrolle für $99/Server/Monat."
-freeBody = "Unsere <strong>Open-Core</strong>-Lizenz erlaubt bis zu <strong>{{freeTierLimit}}</strong> Nutzer pro Server kostenlos. Für unterbrechungsfreies Skalieren und frühen Zugriff auf unser neues <strong>PDF-Textbearbeitungs-Tool</strong> empfehlen wir den Stirling-Server-Plan – volle Bearbeitung und <strong>unbegrenzte Plätze</strong> für $99/Server/Monat."
+freeBody = "Unsere <strong>Open-Core</strong>-Lizenz erlaubt bis zu <strong>{{freeTierLimit}}</strong> Nutzern pro Server kostenlos. Um unterbrechungsfrei zu skalieren, empfehlen wir den Stirling Server-Plan - <strong>unbegrenzte Plätze</strong> und <strong>SSO-Unterstützung</strong> für $99/Server/Monat."
 
 [onboarding.desktopInstall]
 title = "Download"
@@ -5237,6 +5367,31 @@ error = "Benutzerstatus konnte nicht aktualisiert werden"
 success = "Benutzer erfolgreich gelöscht"
 error = "Benutzer konnte nicht gelöscht werden"
 
+[workspace.people.changePassword]
+action = "Passwort ändern"
+title = "Passwort ändern"
+subtitle = "Passwort aktualisieren für"
+newPassword = "Neues Passwort"
+confirmPassword = "Passwort bestätigen"
+placeholder = "Neues Passwort eingeben"
+confirmPlaceholder = "Neues Passwort erneut eingeben"
+passwordRequired = "Bitte geben Sie ein neues Passwort ein"
+passwordMismatch = "Passwörter stimmen nicht überein"
+generateRandom = "Sicheres Passwort generieren"
+generatedPreview = "Generiertes Passwort:"
+copyTooltip = "In Zwischenablage kopieren"
+copiedToClipboard = "Passwort in die Zwischenablage kopiert"
+copyFailed = "Kopieren des Passworts fehlgeschlagen"
+sendEmail = "Den Benutzer per E-Mail über diese Änderung informieren"
+includePassword = "Neues Passwort in die E-Mail aufnehmen"
+forcePasswordChange = "Benutzer zwingen, das Passwort bei der nächsten Anmeldung zu ändern"
+emailUnavailable = "Die E-Mail-Adresse dieses Benutzers ist keine gültige E-Mail-Adresse. Benachrichtigungen sind deaktiviert."
+smtpDisabled = "E-Mail-Benachrichtigungen erfordern, dass SMTP in den Einstellungen aktiviert ist."
+notifyOnly = "Es wird eine E-Mail ohne das Passwort gesendet, die den Benutzer darüber informiert, dass ein Admin es geändert hat."
+submit = "Passwort aktualisieren"
+success = "Passwort erfolgreich aktualisiert"
+error = "Aktualisieren des Passworts fehlgeschlagen"
+
 [workspace.people.emailInvite]
 tab = "E-Mail-Einladung"
 description = "Geben Sie unten E-Mails ein oder fügen Sie sie ein, getrennt durch Kommas. Benutzer erhalten Anmeldedaten per E-Mail."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Mindestens eine E-Mail-Adresse ist erforderlich"
 submit = "Einladungen senden"
 success = "Benutzer erfolgreich eingeladen"
-partialSuccess = "Einige Einladungen sind fehlgeschlagen"
+partialFailure = "Einige Einladungen sind fehlgeschlagen"
 allFailed = "Benutzer konnten nicht eingeladen werden"
 error = "Einladungen konnten nicht gesendet werden"
 
@@ -5752,7 +5907,7 @@ label = "Server auswählen"
 description = "Self-Hosted-Server"
 
 [setup.step3]
-label = "Login"
+label = "Anmeldung"
 description = "Anmeldedaten eingeben"
 
 [setup.mode.saas]
@@ -5770,6 +5925,7 @@ subtitle = "Mit Ihrem Stirling-Konto anmelden"
 [setup.selfhosted]
 title = "Am Server anmelden"
 subtitle = "Geben Sie Ihre Server-Anmeldedaten ein"
+link = "oder mit einem selbstgehosteten Konto verbinden"
 
 [setup.server]
 title = "Mit Server verbinden"
@@ -5788,15 +5944,30 @@ description = "Geben Sie die vollständige URL Ihres selbst gehosteten Stirling
 emptyUrl = "Bitte eine Server-URL eingeben"
 unreachable = "Verbindung zum Server konnte nicht hergestellt werden"
 testFailed = "Verbindungstest fehlgeschlagen"
+configFetch = "Serverkonfiguration konnte nicht abgerufen werden. Bitte überprüfen Sie die URL und versuchen Sie es erneut."
+
+[setup.server.error.securityDisabled]
+title = "Anmeldung nicht aktiviert"
+body = "Auf diesem Server ist die Anmeldung nicht aktiviert. Um eine Verbindung zu diesem Server herzustellen, müssen Sie die Authentifizierung aktivieren:"
+step1 = "Setzen Sie DOCKER_ENABLE_SECURITY=true in Ihrer Umgebung"
+step2 = "Oder setzen Sie security.enableLogin=true in der settings.yml"
+step3 = "Starten Sie den Server neu"
 
 [setup.login]
 title = "Anmelden"
 subtitle = "Geben Sie Ihre Anmeldedaten ein, um fortzufahren"
 connectingTo = "Verbinden mit:"
-submit = "Login"
+submit = "Anmelden"
 signInWith = "Anmelden mit"
 oauthPending = "Browser zur Authentifizierung wird geöffnet..."
 orContinueWith = "Oder mit E-Mail fortfahren"
+serverRequirement = "Hinweis: Auf dem Server muss die Anmeldung aktiviert sein."
+showInstructions = "Wie aktivieren?"
+hideInstructions = "Anleitung ausblenden"
+instructions = "So aktivieren Sie die Anmeldung auf Ihrem Stirling PDF-Server:"
+instructionsEnvVar = "Setzen Sie die Umgebungsvariable:"
+instructionsOrYml = "Oder in der settings.yml:"
+instructionsRestart = "Starten Sie anschließend Ihren Server neu, damit die Änderungen wirksam werden."
 
 [setup.login.username]
 label = "Benutzername"
@@ -5847,12 +6018,13 @@ singleLine = "Einzeilig"
 [pdfTextEditor.badges]
 unsaved = "Bearbeitet"
 modified = "Bearbeitet"
-earlyAccess = "Early Access"
+earlyAccess = "Früher Zugriff"
 
 [pdfTextEditor.actions]
 reset = "Änderungen zurücksetzen"
 downloadJson = "JSON herunterladen"
 generatePdf = "PDF generieren"
+saveChanges = "Änderungen speichern"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Text automatisch in Rahmen einpassen"
@@ -5890,6 +6062,8 @@ alpha = "Dieser Alpha-Viewer entwickelt sich noch weiter – bestimmte Schriften
 [pdfTextEditor.empty]
 title = "Kein Dokument geladen"
 subtitle = "Laden Sie eine PDF- oder JSON-Datei, um mit der Textbearbeitung zu beginnen."
+dropzone = "Ziehen Sie eine PDF- oder JSON-Datei hierher, oder klicken Sie zum Durchsuchen"
+dropzoneWithFiles = "Wählen Sie eine Datei auf der Registerkarte Dateien aus oder ziehen Sie eine PDF- oder JSON-Datei hierher, oder klicken Sie zum Durchsuchen"
 
 [pdfTextEditor.welcomeBanner]
 title = "Willkommen beim PDF-Texteditor (Early Access)"
@@ -5957,8 +6131,8 @@ tags = "text,anmerkung,beschriftung"
 applySignatures = "Text anwenden"
 
 [addText.text]
-name = "Textinhalt"
-placeholder = "Geben Sie den hinzuzufügenden Text ein"
+name = "Text"
+placeholder = "Text eingeben"
 fontLabel = "Schriftart"
 fontSizeLabel = "Schriftgröße"
 fontSizePlaceholder = "Schriftgröße eingeben oder wählen (8-200)"
diff --git a/frontend/public/locales/el-GR/translation.toml b/frontend/public/locales/el-GR/translation.toml
index 265646627..5af71838c 100644
--- a/frontend/public/locales/el-GR/translation.toml
+++ b/frontend/public/locales/el-GR/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Αφαίρεση από τα Αγαπημένα"
 fullscreen = "Μετάβαση σε λειτουργία πλήρους οθόνης"
 sidebar = "Μετάβαση σε λειτουργία πλευρικής γραμμής"
 
+[backendStartup]
+notFoundTitle = "Το backend δεν βρέθηκε"
+retry = "Επανάληψη"
+unreachable = "Η εφαρμογή δεν μπορεί προς το παρόν να συνδεθεί με το backend. Ελέγξτε την κατάσταση του backend και τη συνδεσιμότητα δικτύου, μετά δοκιμάστε ξανά."
+
 [zipWarning]
 title = "Μεγάλο αρχείο ZIP"
 message = "Αυτό το ZIP περιέχει {{count}} αρχεία. Να γίνει αποσυμπίεση ούτως ή άλλως;"
@@ -287,7 +292,7 @@ help = "Βοήθεια Pipeline"
 scanHelp = "Βοήθεια σάρωσης φακέλων"
 deletePrompt = "Είστε βέβαιοι ότι θέλετε να διαγράψετε το pipeline;"
 tags = "αυτοματοποίηση,ακολουθία,προγραμματισμένο,επεξεργασία-παρτίδας"
-title = "Pipeline"
+title = "Ροή"
 
 [pipelineOptions]
 header = "Διαμόρφωση Pipeline"
@@ -296,7 +301,7 @@ saveSettings = "Αποθήκευση ρυθμίσεων λειτουργίας"
 pipelineNamePrompt = "Εισάγετε όνομα pipeline εδώ"
 selectOperation = "Επιλογή λειτουργίας"
 addOperationButton = "Προσθήκη λειτουργίας"
-pipelineHeader = "Pipeline:"
+pipelineHeader = "Ροή:"
 saveButton = "Λήψη"
 validateButton = "Επικύρωση"
 
@@ -347,7 +352,7 @@ teams = "Ομάδες"
 title = "Διαμόρφωση"
 systemSettings = "Ρυθμίσεις συστήματος"
 features = "Δυνατότητες"
-endpoints = "Endpoints"
+endpoints = "Σημεία τερματισμού"
 database = "Βάση δεδομένων"
 advanced = "Προχωρημένα"
 
@@ -369,7 +374,7 @@ privacy = "Απόρρητο"
 
 [settings.developer]
 title = "Προγραμματιστής"
-apiKeys = "API Keys"
+apiKeys = "Κλειδιά API"
 
 [settings.tooltips]
 enableLoginFirst = "Ενεργοποιήστε πρώτα τη λειτουργία σύνδεσης"
@@ -383,7 +388,7 @@ logout = "Αποσύνδεση"
 
 [settings.connection.mode]
 saas = "Stirling Cloud"
-selfhosted = "Self-Hosted"
+selfhosted = "Αυτο-φιλοξενούμενο"
 
 [settings.general]
 title = "Γενικά"
@@ -912,6 +917,9 @@ desc = "Δημιουργήστε ροές πολλών βημάτων συνδέ
 desc = "Επικάλυψη PDF πάνω σε άλλο PDF"
 title = "Επικάλυψη PDF"
 
+[home.pdfTextEditor]
+title = "Επεξεργαστής κειμένου PDF"
+desc = "Επεξεργαστείτε υπάρχον κείμενο και εικόνες μέσα σε αρχεία PDF"
 
 [home.addText]
 tags = "κείμενο,σχολιασμός,ετικέτα"
@@ -1173,7 +1181,7 @@ selectFilesPlaceholder = "Επιλέξτε αρχεία στην κύρια πρ
 settings = "Ρυθμίσεις"
 conversionCompleted = "Η μετατροπή ολοκληρώθηκε"
 results = "Αποτελέσματα"
-defaultFilename = "converted_file"
+defaultFilename = "μετατραπμένο_αρχείο"
 conversionResults = "Αποτελέσματα μετατροπής"
 convertFrom = "Μετατροπή από"
 convertTo = "Μετατροπή σε"
@@ -1360,7 +1368,7 @@ title = "Προσθήκη υδατογραφήματος"
 desc = "Προσθέστε υδατογραφήματα κειμένου ή εικόνας σε αρχεία PDF"
 completed = "Το υδατογράφημα προστέθηκε"
 submit = "Προσθήκη υδατογραφήματος"
-filenamePrefix = "watermarked"
+filenamePrefix = "υδατογραφημένο"
 
 [watermark.error]
 failed = "Παρουσιάστηκε σφάλμα κατά την προσθήκη υδατογραφήματος στο PDF."
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Σχεδιασμένη υπογραφή"
 defaultImageLabel = "Ανεβασμένη υπογραφή"
 defaultTextLabel = "Πληκτρολογημένη υπογραφή"
 saveButton = "Αποθήκευση υπογραφής"
+savePersonal = "Αποθήκευση ως Προσωπική"
+saveShared = "Αποθήκευση ως Κοινόχρηστη"
 saveUnavailable = "Δημιουργήστε πρώτα μια υπογραφή για να την αποθηκεύσετε."
 noChanges = "Η τρέχουσα υπογραφή είναι ήδη αποθηκευμένη."
+tempStorageTitle = "Προσωρινή αποθήκευση στον περιηγητή"
+tempStorageDescription = "Οι υπογραφές αποθηκεύονται μόνο στον περιηγητή σας. Θα χαθούν αν καθαρίσετε τα δεδομένα του περιηγητή ή αλλάξετε περιηγητή."
+personalHeading = "Προσωπικές υπογραφές"
+sharedHeading = "Κοινόχρηστες υπογραφές"
+personalDescription = "Μόνο εσείς μπορείτε να δείτε αυτές τις υπογραφές."
+sharedDescription = "Όλοι οι χρήστες μπορούν να βλέπουν και να χρησιμοποιούν αυτές τις υπογραφές."
 
 [sign.saved.type]
 canvas = "Σχέδιο"
@@ -2701,7 +2717,7 @@ header = "Αφαίρεση της ψηφιακής υπογραφής από τ
 selectPDF = "Επιλέξτε ένα αρχείο PDF:"
 submit = "Αφαίρεση υπογραφής"
 description = "Αυτό το εργαλείο θα αφαιρέσει τις υπογραφές ψηφιακού πιστοποιητικού από το PDF σας."
-filenamePrefix = "unsigned"
+filenamePrefix = "ανυπόγραφο"
 
 [removeCertSign.files]
 placeholder = "Επιλέξτε ένα αρχείο PDF στην κύρια προβολή για να ξεκινήσετε"
@@ -3020,6 +3036,91 @@ title = "Λήψη πληροφοριών PDF"
 header = "Λήψη πληροφοριών PDF"
 submit = "Λήψη πληροφοριών"
 downloadJson = "Λήψη JSON"
+processing = "Εξαγωγή πληροφοριών..."
+results = "Αποτελέσματα"
+noResults = "Εκτελέστε το εργαλείο για να δημιουργήσετε αναφορά."
+downloads = "Λήψεις"
+noneDetected = "Δεν εντοπίστηκε κανένα"
+indexTitle = "Ευρετήριο"
+
+[getPdfInfo.report]
+entryLabel = "Πλήρης σύνοψη πληροφοριών"
+shortTitle = "Πληροφορίες PDF"
+
+[getPdfInfo.sections]
+metadata = "Μεταδεδομένα"
+formFields = "Πεδία φόρμας"
+basicInfo = "Βασικές πληροφορίες"
+documentInfo = "Πληροφορίες εγγράφου"
+compliance = "Συμμόρφωση"
+encryption = "Κρυπτογράφηση"
+permissions = "Δικαιώματα"
+other = "Άλλα"
+perPageInfo = "Πληροφορίες ανά σελίδα"
+tableOfContents = "Πίνακας περιεχομένων"
+
+[getPdfInfo.other]
+attachments = "Συνημμένα"
+embeddedFiles = "Ενσωματωμένα αρχεία"
+javaScript = "JavaScript"
+layers = "Επίπεδα"
+structureTree = "Δέντρο δομής"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Μέγεθος"
+annotations = "Επισημειώσεις"
+images = "Εικόνες"
+links = "Σύνδεσμοι"
+fonts = "Γραμματοσειρές"
+xobjects = "Πλήθος XObject"
+multimedia = "Πολυμέσα"
+
+[getPdfInfo.summary]
+pages = "Σελίδες"
+fileSize = "Μέγεθος αρχείου"
+pdfVersion = "Έκδοση PDF"
+language = "Γλώσσα"
+title = "Σύνοψη PDF"
+author = "Συγγραφέας"
+created = "Δημιουργήθηκε"
+modified = "Τροποποιήθηκε"
+permsAll = "Όλα τα δικαιώματα επιτρέπονται"
+permsRestricted = "{{count}} περιορισμοί"
+permsMixed = "Ορισμένα δικαιώματα είναι περιορισμένα"
+hasCompliance = "Διαθέτει πρότυπα συμμόρφωσης"
+noCompliance = "Χωρίς πρότυπα συμμόρφωσης"
+basic = "Βασικές πληροφορίες"
+documentInfo = "Πληροφορίες εγγράφου"
+securityTitle = "Κατάσταση ασφάλειας"
+technical = "Τεχνικά"
+overviewTitle = "Επισκόπηση PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "Κρυπτογραφημένο PDF - Υπάρχει προστασία με κωδικό πρόσβασης"
+unencrypted = "Μη κρυπτογραφημένο PDF - Χωρίς προστασία με κωδικό πρόσβασης"
+
+[getPdfInfo.summary.tech]
+images = "Εικόνες"
+fonts = "Γραμματοσειρές"
+formFields = "Πεδία φόρμας"
+embeddedFiles = "Ενσωματωμένα αρχεία"
+javaScript = "JavaScript"
+layers = "Επίπεδα"
+bookmarks = "Σελιδοδείκτες"
+multimedia = "Πολυμέσα"
+
+[getPdfInfo.summary.overview]
+untitled = "ένα έγγραφο χωρίς τίτλο"
+unknown = "Άγνωστος συγγραφέας"
+text = "Πρόκειται για ένα PDF {{pages}} σελίδων με τίτλο {{title}} που δημιουργήθηκε από τον/την {{author}} (έκδοση PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Δεν ήταν δυνατή η επεξεργασία ορισμένων αρχείων."
+unexpected = "Μη αναμενόμενο σφάλμα κατά την εξαγωγή."
+
+[getPdfInfo.status]
+complete = "Η εξαγωγή ολοκληρώθηκε"
 
 [extractPage]
 tags = "εξαγωγή"
@@ -3438,6 +3539,9 @@ signinTitle = "Παρακαλώ συνδεθείτε"
 ssoSignIn = "Σύνδεση μέσω Single Sign-on"
 oAuth2AutoCreateDisabled = "Η αυτόματη δημιουργία χρήστη OAUTH2 είναι απενεργοποιημένη"
 oAuth2AdminBlockedUser = "Η εγγραφή ή σύνδεση μη εγγεγραμμένων χρηστών είναι προς το παρόν αποκλεισμένη. Παρακαλώ επικοινωνήστε με τον διαχειριστή."
+oAuth2RequiresLicense = "Η σύνδεση μέσω OAuth/SSO απαιτεί επί πληρωμή άδεια (Server ή Enterprise). Παρακαλούμε επικοινωνήστε με τον διαχειριστή για να αναβαθμίσετε το πλάνο σας."
+saml2RequiresLicense = "Η σύνδεση μέσω SAML απαιτεί επί πληρωμή άδεια (Server ή Enterprise). Παρακαλούμε επικοινωνήστε με τον διαχειριστή για να αναβαθμίσετε το πλάνο σας."
+maxUsersReached = "Έχει επιτευχθεί ο μέγιστος αριθμός χρηστών για την τρέχουσα άδειά σας. Παρακαλούμε επικοινωνήστε με τον διαχειριστή για να αναβαθμίσετε το πλάνο σας ή να προσθέσετε περισσότερες θέσεις."
 oauth2RequestNotFound = "Το αίτημα εξουσιοδότησης δεν βρέθηκε"
 oauth2InvalidUserInfoResponse = "Μη έγκυρη απόκριση πληροφοριών χρήστη"
 oauth2invalidRequest = "Μη έγκυρο αίτημα"
@@ -3533,7 +3637,7 @@ title = "PDF σε μία σελίδα"
 header = "PDF σε μία σελίδα"
 submit = "Μετατροπή σε μία σελίδα"
 description = "Αυτό το εργαλείο θα συγχωνεύσει όλες τις σελίδες του PDF σας σε μία μεγάλη ενιαία σελίδα. Το πλάτος θα παραμείνει ίδιο με των αρχικών σελίδων, αλλά το ύψος θα είναι το άθροισμα όλων των υψών."
-filenamePrefix = "single_page"
+filenamePrefix = "μονοσέλιδο"
 
 [pdfToSinglePage.files]
 placeholder = "Επιλέξτε ένα αρχείο PDF στην κύρια προβολή για να ξεκινήσετε"
@@ -3771,7 +3875,7 @@ version = "Τρέχουσα έκδοση"
 title = "Τεκμηρίωση API"
 header = "Τεκμηρίωση API"
 desc = "Προβάλετε και δοκιμάστε τα endpoints του Stirling PDF API"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,τεκμηρίωση,swagger,τελικά σημεία,ανάπτυξη"
 
 [cookieBanner.popUp]
 title = "Πώς χρησιμοποιούμε τα cookies"
@@ -3846,14 +3950,17 @@ fitToWidth = "Προσαρμογή στο πλάτος"
 actualSize = "Πραγματικό μέγεθος"
 
 [viewer]
+cannotPreviewFile = "Δεν είναι δυνατή η προεπισκόπηση του αρχείου"
+dualPageView = "Προβολή διπλής σελίδας"
 firstPage = "Πρώτη σελίδα"
 lastPage = "Τελευταία σελίδα"
-previousPage = "Προηγούμενη σελίδα"
 nextPage = "Επόμενη σελίδα"
+onlyPdfSupported = "Ο προβολέας υποστηρίζει μόνο αρχεία PDF. Αυτό το αρχείο φαίνεται να είναι διαφορετικής μορφής."
+previousPage = "Προηγούμενη σελίδα"
+singlePageView = "Προβολή μίας σελίδας"
+unknownFile = "Άγνωστο αρχείο"
 zoomIn = "Μεγέθυνση"
 zoomOut = "Σμίκρυνση"
-singlePageView = "Προβολή μίας σελίδας"
-dualPageView = "Προβολή διπλής σελίδας"
 
 [rightRail]
 closeSelected = "Κλείσιμο επιλεγμένων αρχείων"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Εναλλαγή πλευρικής γραμμής"
 exportSelected = "Εξαγωγή επιλεγμένων σελίδων"
 toggleAnnotations = "Εναλλαγή ορατότητας σχολιασμών"
 annotationMode = "Εναλλαγή λειτουργίας σχολιασμού"
+print = "Εκτύπωση PDF"
 draw = "Σχεδίαση"
 save = "Αποθήκευση"
 saveChanges = "Αποθήκευση αλλαγών"
@@ -4235,11 +4343,11 @@ label = "URL εκδότη"
 description = "Το URL εκδότη του παρόχου OAuth2"
 
 [admin.settings.connections.oauth2.clientId]
-label = "Client ID"
+label = "Αναγνωριστικό πελάτη (Client ID)"
 description = "Το Client ID OAuth2 από τον πάροχό σας"
 
 [admin.settings.connections.oauth2.clientSecret]
-label = "Client Secret"
+label = "Μυστικό πελάτη (Client Secret)"
 description = "Το Client Secret OAuth2 από τον πάροχό σας"
 
 [admin.settings.connections.oauth2.useAsUsername]
@@ -4459,7 +4567,7 @@ label = "Ενεργοποίηση προσκλήσεων μέσω email"
 description = "Να επιτρέπεται στους διαχειριστές να προσκαλούν χρήστες μέσω email με αυτόματα παραγόμενους κωδικούς"
 
 [admin.settings.mail.frontendUrl]
-label = "Frontend URL"
+label = "URL front-end"
 description = "Βασικό URL για το frontend (π.χ. https://pdf.example.com). Χρησιμοποιείται για τη δημιουργία συνδέσμων πρόσκλησης στα email. Αφήστε κενό για χρήση του backend URL."
 
 [admin.settings.legal]
@@ -4494,6 +4602,7 @@ description = "URL ή όνομα αρχείου για το impressum (απαι
 title = "Premium & Enterprise"
 description = "Ρυθμίστε το κλειδί άδειας premium ή enterprise."
 license = "Διαμόρφωση άδειας"
+noInput = "Παρακαλώ δώστε ένα κλειδί άδειας ή αρχείο"
 
 [admin.settings.premium.licenseKey]
 toggle = "Έχετε κλειδί άδειας ή αρχείο πιστοποιητικού;"
@@ -4511,6 +4620,25 @@ line1 = "Η αντικατάσταση του τρέχοντος κλειδιο
 line2 = "Η προηγούμενη άδεια θα χαθεί οριστικά εκτός αν την έχετε αποθηκεύσει αλλού."
 line3 = "Σημαντικό: Κρατήστε τα κλειδιά άδειας ιδιωτικά και ασφαλή. Μην τα κοινοποιείτε δημόσια."
 
+[admin.settings.premium.inputMethod]
+text = "Κλειδί άδειας"
+file = "Αρχείο πιστοποιητικού"
+
+[admin.settings.premium.file]
+label = "Αρχείο πιστοποιητικού άδειας"
+description = "Μεταφορτώστε το αρχείο άδειας .lic ή .cert από αγορές εκτός σύνδεσης"
+choose = "Επιλέξτε αρχείο άδειας"
+selected = "Επιλεγμένο: {{filename}} ({{size}})"
+successMessage = "Το αρχείο άδειας μεταφορτώθηκε και ενεργοποιήθηκε με επιτυχία. Δεν απαιτείται επανεκκίνηση."
+
+[admin.settings.premium.currentLicense]
+title = "Ενεργή άδεια"
+file = "Πηγή: Αρχείο άδειας ({{path}})"
+key = "Πηγή: Κλειδί άδειας"
+type = "Τύπος: {{type}}"
+noInput = "Παρακαλώ δώστε ένα κλειδί άδειας ή μεταφορτώστε ένα αρχείο πιστοποιητικού"
+success = "Επιτυχία"
+
 [admin.settings.premium.enabled]
 label = "Ενεργοποίηση λειτουργιών premium"
 description = "Ενεργοποίηση ελέγχων κλειδιού άδειας για λειτουργίες pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} επιλεγμένα"
 download = "Λήψη"
 delete = "Διαγραφή"
 unsupported = "Μη υποστηριζόμενο"
+active = "Ενεργό"
 addToUpload = "Προσθήκη στη μεταφόρτωση"
+closeFile = "Κλείσιμο αρχείου"
 deleteAll = "Διαγραφή όλων"
 loadingFiles = "Φόρτωση αρχείων..."
 noFiles = "Δεν υπάρχουν διαθέσιμα αρχεία"
@@ -5132,7 +5262,7 @@ upgrade = "Αναβάθμιση τώρα →"
 freeTitle = "Άδεια διακομιστή"
 overLimitTitle = "Απαιτείται άδεια διακομιστή"
 overLimitBody = "Η αδειοδότηση μας επιτρέπει έως <strong>{{freeTierLimit}}</strong> χρήστες δωρεάν ανά διακομιστή. Έχετε <strong>{{overLimitUserCopy}}</strong> χρήστες Stirling. Για να συνεχίσετε χωρίς διακοπές, αναβαθμίστε στο πλάνο Stirling Server - <strong>απεριόριστες θέσεις</strong>, επεξεργασία κειμένου PDF και πλήρης έλεγχος διαχειριστή για $99/server/μήνα."
-freeBody = "Η αδειοδότηση <strong>Open-Core</strong> μας επιτρέπει έως <strong>{{freeTierLimit}}</strong> χρήστες δωρεάν ανά διακομιστή. Για απρόσκοπτη κλιμάκωση και έγκαιρη πρόσβαση στο νέο <strong>εργαλείο επεξεργασίας κειμένου PDF</strong>, προτείνουμε το πλάνο Stirling Server - πλήρης επεξεργασία και <strong>απεριόριστες θέσεις</strong> για $99/server/μήνα."
+freeBody = "Οι άδειες χρήσης <strong>Open-Core</strong> επιτρέπουν έως και <strong>{{freeTierLimit}}</strong> χρήστες δωρεάν ανά διακομιστή. Για απρόσκοπτη κλιμάκωση, προτείνουμε το πλάνο Stirling Server - <strong>απεριόριστες θέσεις</strong> και <strong>υποστήριξη SSO</strong> με $99/διακομιστή/μήνα."
 
 [onboarding.desktopInstall]
 title = "Λήψη"
@@ -5237,6 +5367,31 @@ error = "Αποτυχία ενημέρωσης κατάστασης χρήστη
 success = "Ο χρήστης διαγράφηκε με επιτυχία"
 error = "Αποτυχία διαγραφής χρήστη"
 
+[workspace.people.changePassword]
+action = "Αλλαγή κωδικού πρόσβασης"
+title = "Αλλαγή κωδικού πρόσβασης"
+subtitle = "Ενημέρωση κωδικού πρόσβασης για"
+newPassword = "Νέος κωδικός πρόσβασης"
+confirmPassword = "Επιβεβαίωση κωδικού πρόσβασης"
+placeholder = "Εισαγάγετε νέο κωδικό πρόσβασης"
+confirmPlaceholder = "Εισαγάγετε ξανά τον νέο κωδικό πρόσβασης"
+passwordRequired = "Παρακαλούμε εισαγάγετε νέο κωδικό πρόσβασης"
+passwordMismatch = "Οι κωδικοί πρόσβασης δεν ταιριάζουν"
+generateRandom = "Δημιουργία ασφαλούς κωδικού πρόσβασης"
+generatedPreview = "Δημιουργημένος κωδικός πρόσβασης:"
+copyTooltip = "Αντιγραφή στο πρόχειρο"
+copiedToClipboard = "Ο κωδικός πρόσβασης αντιγράφηκε στο πρόχειρο"
+copyFailed = "Αποτυχία αντιγραφής κωδικού πρόσβασης"
+sendEmail = "Αποστολή email στον χρήστη για αυτήν την αλλαγή"
+includePassword = "Να συμπεριληφθεί ο νέος κωδικός πρόσβασης στο email"
+forcePasswordChange = "Υποχρεωτική αλλαγή κωδικού πρόσβασης κατά την επόμενη σύνδεση"
+emailUnavailable = "Το email αυτού του χρήστη δεν είναι έγκυρη διεύθυνση email. Οι ειδοποιήσεις είναι απενεργοποιημένες."
+smtpDisabled = "Οι ειδοποιήσεις μέσω email απαιτούν την ενεργοποίηση του SMTP στις ρυθμίσεις."
+notifyOnly = "Θα σταλεί email χωρίς τον κωδικό πρόσβασης, ενημερώνοντας τον χρήστη ότι ένας διαχειριστής τον άλλαξε."
+submit = "Ενημέρωση κωδικού πρόσβασης"
+success = "Ο κωδικός πρόσβασης ενημερώθηκε με επιτυχία"
+error = "Αποτυχία ενημέρωσης κωδικού πρόσβασης"
+
 [workspace.people.emailInvite]
 tab = "Πρόσκληση μέσω Email"
 description = "Πληκτρολογήστε ή επικολλήστε emails παρακάτω, χωρισμένα με κόμμα. Οι χρήστες θα λάβουν στοιχεία σύνδεσης μέσω email."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Απαιτείται τουλάχιστον μία διεύθυνση email"
 submit = "Αποστολή προσκλήσεων"
 success = "στάλθηκαν προσκλήσεις με επιτυχία"
-partialSuccess = "Κάποιες προσκλήσεις απέτυχαν"
+partialFailure = "Ορισμένες προσκλήσεις απέτυχαν"
 allFailed = "Αποτυχία πρόσκλησης χρηστών"
 error = "Αποτυχία αποστολής προσκλήσεων"
 
@@ -5709,7 +5864,7 @@ title = "Διάγραμμα χρήσης Endpoints"
 
 [usage.table]
 title = "Αναλυτικά στατιστικά"
-endpoint = "Endpoint"
+endpoint = "Σημείο τερματισμού"
 visits = "Επισκέψεις"
 percentage = "Ποσοστό"
 noData = "Δεν υπάρχουν διαθέσιμα δεδομένα"
@@ -5770,6 +5925,7 @@ subtitle = "Συνδεθείτε με τον λογαριασμό Stirling"
 [setup.selfhosted]
 title = "Σύνδεση στον διακομιστή"
 subtitle = "Εισαγάγετε τα διαπιστευτήρια του διακομιστή σας"
+link = "ή συνδεθείτε σε έναν self-hosted λογαριασμό"
 
 [setup.server]
 title = "Σύνδεση σε διακομιστή"
@@ -5788,6 +5944,14 @@ description = "Εισαγάγετε το πλήρες URL του self-hosted δ
 emptyUrl = "Εισαγάγετε URL διακομιστή"
 unreachable = "Αδυναμία σύνδεσης με τον διακομιστή"
 testFailed = "Αποτυχία ελέγχου σύνδεσης"
+configFetch = "Αποτυχία ανάκτησης της διαμόρφωσης του διακομιστή. Ελέγξτε το URL και δοκιμάστε ξανά."
+
+[setup.server.error.securityDisabled]
+title = "Η σύνδεση δεν είναι ενεργοποιημένη"
+body = "Σε αυτόν τον διακομιστή δεν είναι ενεργοποιημένη η σύνδεση. Για να συνδεθείτε σε αυτόν τον διακομιστή, πρέπει να ενεργοποιήσετε τον έλεγχο ταυτότητας:"
+step1 = "Ορίστε το DOCKER_ENABLE_SECURITY=true στο περιβάλλον σας"
+step2 = "Ή ορίστε security.enableLogin=true στο settings.yml"
+step3 = "Επανεκκινήστε τον διακομιστή"
 
 [setup.login]
 title = "Σύνδεση"
@@ -5797,6 +5961,13 @@ submit = "Σύνδεση"
 signInWith = "Σύνδεση με"
 oauthPending = "Άνοιγμα προγράμματος περιήγησης για έλεγχο ταυτότητας..."
 orContinueWith = "Ή συνεχίστε με email"
+serverRequirement = "Σημείωση: Ο διακομιστής πρέπει να έχει ενεργοποιημένη τη σύνδεση."
+showInstructions = "Πώς ενεργοποιείται;"
+hideInstructions = "Απόκρυψη οδηγιών"
+instructions = "Για να ενεργοποιήσετε τη σύνδεση στον διακομιστή Stirling PDF:"
+instructionsEnvVar = "Ορίστε τη μεταβλητή περιβάλλοντος:"
+instructionsOrYml = "Ή στο settings.yml:"
+instructionsRestart = "Στη συνέχεια, επανεκκινήστε τον διακομιστή σας για να εφαρμοστούν οι αλλαγές."
 
 [setup.login.username]
 label = "Όνομα χρήστη"
@@ -5853,6 +6024,7 @@ earlyAccess = "Πρόωρη πρόσβαση"
 reset = "Επαναφορά αλλαγών"
 downloadJson = "Λήψη JSON"
 generatePdf = "Δημιουργία PDF"
+saveChanges = "Αποθήκευση αλλαγών"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Αυτόματη προσαρμογή κειμένου στα πλαίσια"
@@ -5890,6 +6062,8 @@ alpha = "Αυτός ο προβολέας άλφα εξελίσσεται ακό
 [pdfTextEditor.empty]
 title = "Δεν φορτώθηκε έγγραφο"
 subtitle = "Φορτώστε ένα αρχείο PDF ή JSON για να ξεκινήσετε την επεξεργασία κειμένου."
+dropzone = "Σύρετε και αποθέστε εδώ ένα αρχείο PDF ή JSON, ή κάντε κλικ για περιήγηση"
+dropzoneWithFiles = "Επιλέξτε ένα αρχείο από την καρτέλα Αρχεία, ή σύρετε και αποθέστε εδώ ένα αρχείο PDF ή JSON, ή κάντε κλικ για περιήγηση"
 
 [pdfTextEditor.welcomeBanner]
 title = "Καλώς ορίσατε στο PDF Text Editor (Πρώιμη πρόσβαση)"
diff --git a/frontend/public/locales/en-GB/translation.toml b/frontend/public/locales/en-GB/translation.toml
index 626f589a4..f5142ef1c 100644
--- a/frontend/public/locales/en-GB/translation.toml
+++ b/frontend/public/locales/en-GB/translation.toml
@@ -312,10 +312,10 @@ yamlAdvert = "Stirling PDF Pro supports YAML configuration files and other SSO f
 ssoAdvert = "Looking for more user management features? Check out Stirling PDF Pro"
 
 [analytics]
-title = "Do you want make Stirling PDF better?"
-paragraph1 = "Stirling PDF has opt in analytics to help us improve the product. We do not track any personal information or file contents."
+title = "Do you want to help make Stirling PDF better?"
+paragraph1 = "Stirling PDF has opt-in analytics to help us improve the product. We do not track any personal information or file contents."
 paragraph2 = "Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better."
-learnMore = "Learn more"
+learnMore = "Learn more about our analytics"
 enable = "Enable analytics"
 disable = "Disable analytics"
 settings = "You can change the settings for analytics in the config/settings.yml file"
@@ -340,6 +340,10 @@ advance = "Advanced"
 edit = "View & Edit"
 popular = "Popular"
 
+[footer]
+discord = "Discord"
+issues = "GitHub"
+
 [settings.preferences]
 title = "Preferences"
 
@@ -435,6 +439,25 @@ latestVersion = "Latest Version"
 checkForUpdates = "Check for Updates"
 viewDetails = "View Details"
 
+[settings.security]
+title = "Security"
+description = "Update your password to keep your account secure."
+
+[settings.security.password]
+subtitle = "Change your password. You will be logged out after updating."
+required = "All fields are required."
+mismatch = "New passwords do not match."
+error = "Unable to update password. Please verify your current password and try again."
+success = "Password updated successfully. Please sign in again."
+ssoDisabled = "Password changes are managed by your identity provider."
+current = "Current password"
+currentPlaceholder = "Enter your current password"
+new = "New password"
+newPlaceholder = "Enter a new password"
+confirm = "Confirm new password"
+confirmPlaceholder = "Re-enter your new password"
+update = "Update password"
+
 [settings.hotkeys]
 title = "Keyboard Shortcuts"
 description = "Customize keyboard shortcuts for quick tool access. Click \"Change shortcut\" and press a new key combination. Press Esc to cancel."
@@ -488,11 +511,16 @@ low = "Low"
 title = "Change Credentials"
 header = "Update Your Account Details"
 changePassword = "You are using default login credentials. Please enter a new password"
+ssoManaged = "Your account is managed by your identity provider."
 newUsername = "New Username"
 oldPassword = "Current Password"
 newPassword = "New Password"
 confirmNewPassword = "Confirm New Password"
 submit = "Submit Changes"
+credsUpdated = "Account updated"
+description = "Changes saved. Please log in again."
+error = "Unable to update username. Please verify your password and try again."
+changeUsername = "Update your username. You will be logged out after updating."
 
 [account]
 title = "Account Settings"
@@ -3041,6 +3069,91 @@ title = "Get Info on PDF"
 header = "Get Info on PDF"
 submit = "Get Info"
 downloadJson = "Download JSON"
+processing = "Extracting information..."
+results = "Results"
+noResults = "Run the tool to generate a report."
+downloads = "Downloads"
+noneDetected = "None detected"
+indexTitle = "Index"
+
+[getPdfInfo.report]
+entryLabel = "Full information summary"
+shortTitle = "PDF Information"
+
+[getPdfInfo.sections]
+metadata = "Metadata"
+formFields = "Form Fields"
+basicInfo = "Basic Info"
+documentInfo = "Document Info"
+compliance = "Compliance"
+encryption = "Encryption"
+permissions = "Permissions"
+other = "Other"
+perPageInfo = "Per Page Info"
+tableOfContents = "Table of Contents"
+
+[getPdfInfo.other]
+attachments = "Attachments"
+embeddedFiles = "Embedded Files"
+javaScript = "JavaScript"
+layers = "Layers"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Size"
+annotations = "Annotations"
+images = "Images"
+links = "Links"
+fonts = "Fonts"
+xobjects = "XObject Counts"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Pages"
+fileSize = "File Size"
+pdfVersion = "PDF Version"
+language = "Language"
+title = "PDF Summary"
+author = "Author"
+created = "Created"
+modified = "Modified"
+permsAll = "All Permissions Allowed"
+permsRestricted = "{{count}} restrictions"
+permsMixed = "Some permissions restricted"
+hasCompliance = "Has compliance standards"
+noCompliance = "No Compliance Standards"
+basic = "Basic Information"
+documentInfo = "Document Information"
+securityTitle = "Security Status"
+technical = "Technical"
+overviewTitle = "PDF Overview"
+
+[getPdfInfo.summary.security]
+encrypted = "Encrypted PDF - Password protection present"
+unencrypted = "Unencrypted PDF - No password protection"
+
+[getPdfInfo.summary.tech]
+images = "Images"
+fonts = "Fonts"
+formFields = "Form Fields"
+embeddedFiles = "Embedded Files"
+javaScript = "JavaScript"
+layers = "Layers"
+bookmarks = "Bookmarks"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "an untitled document"
+unknown = "Unknown Author"
+text = "This is a {{pages}}-page PDF titled {{title}} created by {{author}} (PDF version {{version}})."
+
+[getPdfInfo.error]
+partial = "Some files could not be processed."
+unexpected = "Unexpected error during extraction."
+
+[getPdfInfo.status]
+complete = "Extraction complete"
 
 [extractPage]
 tags = "extract"
@@ -3459,8 +3572,8 @@ signinTitle = "Please sign in"
 ssoSignIn = "Login via Single Sign-on"
 oAuth2AutoCreateDisabled = "OAUTH2 Auto-Create User Disabled"
 oAuth2AdminBlockedUser = "Registration or logging in of non-registered users is currently blocked. Please contact the administrator."
-oAuth2RequiresLicense = "OAuth/SSO login requires a paid license (Server or Enterprise). Please contact the administrator to upgrade your plan."
-saml2RequiresLicense = "SAML login requires a paid license (Server or Enterprise). Please contact the administrator to upgrade your plan."
+oAuth2RequiresLicense = "OAuth/SSO login requires a Server or Enterprise license. Please contact the administrator to upgrade your plan."
+saml2RequiresLicense = "SAML login requires an Enterprise license. Please contact the administrator to upgrade your plan."
 maxUsersReached = "Maximum number of users reached for your current license. Please contact the administrator to upgrade your plan or add more seats."
 oauth2RequestNotFound = "Authorization request not found"
 oauth2InvalidUserInfoResponse = "Invalid User Info Response"
@@ -3623,6 +3736,16 @@ filesize = "File Size"
 [compress.grayscale]
 label = "Apply Grayscale for Compression"
 
+[compress.lineArt]
+label = "Convert images to line art"
+description = "Uses ImageMagick to reduce pages to high-contrast black and white for maximum size reduction."
+unavailable = "ImageMagick is not installed or enabled on this server"
+detailLevel = "Detail level"
+edgeEmphasis = "Edge emphasis"
+edgeLow = "Gentle"
+edgeMedium = "Balanced"
+edgeHigh = "Strong"
+
 [compress.tooltip.header]
 title = "Compress Settings Overview"
 
@@ -3640,6 +3763,10 @@ bullet2 = "Higher values reduce file size"
 title = "Grayscale"
 text = "Select this option to convert all images to black and white, which can significantly reduce file size especially for scanned PDFs or image-heavy documents."
 
+[compress.tooltip.lineArt]
+title = "Line Art"
+text = "Convert pages to high-contrast black and white using ImageMagick. Use detail level to control how much content becomes black, and edge emphasis to control how aggressively edges are detected."
+
 [compress.error]
 failed = "An error occurred while compressing the PDF."
 
@@ -4009,12 +4136,20 @@ settings = "Settings"
 adminSettings = "Admin Settings"
 allTools = "Tools"
 reader = "Reader"
+tours = "Tours"
+showMeAround = "Show me around"
+
+[quickAccess.toursTooltip]
+admin = "Watch walkthroughs here: Tools tour, New V2 layout tour, and the Admin tour."
+user = "Watch walkthroughs here: Tools tour and the New V2 layout tour."
 
 [quickAccess.helpMenu]
 toolsTour = "Tools Tour"
 toolsTourDesc = "Learn what the tools can do"
 adminTour = "Admin Tour"
 adminTourDesc = "Explore admin settings & features"
+whatsNewTour = "See what's new in V2"
+whatsNewTourDesc = "Tour the updated layout"
 
 [admin]
 error = "Error"
@@ -5041,6 +5176,7 @@ loading = "Loading..."
 back = "Back"
 continue = "Continue"
 error = "Error"
+save = "Save"
 
 [config.overview]
 title = "Application Configuration"
@@ -5207,6 +5343,16 @@ finish = "Finish"
 startTour = "Start Tour"
 startTourDescription = "Take a guided tour of Stirling PDF's key features"
 
+[onboarding.whatsNew]
+quickAccess = "Start at the <strong>Quick Access</strong> rail to jump between Reader, Automate, your files, and all the tours."
+leftPanel = "The left <strong>Tools</strong> panel lists everything you can do. Browse categories or search to find a tool quickly."
+fileUpload = "Use the <strong>Files</strong> button to upload or pick a recent PDF. We will load a sample so you can see the workspace."
+rightRail = "The <strong>Right Rail</strong> holds quick actions to select files, change theme or language, and download results."
+topBar = "The top bar lets you swap between <strong>Viewer</strong>, <strong>Page Editor</strong>, and <strong>Active Files</strong>."
+pageEditorView = "Switch to the Page Editor to reorder, rotate, or delete pages."
+activeFilesView = "Use Active Files to see everything you have open and pick what to work on."
+wrapUp = "That is what is new in V2. Open the <strong>Tours</strong> menu anytime to replay this, the Tools tour, or the Admin tour."
+
 [onboarding.welcomeModal]
 title = "Welcome to Stirling PDF!"
 description = "Would you like to take a quick 1-minute tour to learn the key features and how to get started?"
@@ -5227,6 +5373,10 @@ download = "Download →"
 showMeAround = "Show me around"
 skipTheTour = "Skip the tour"
 
+[onboarding.tourOverview]
+title = "Tour Overview"
+body = "Stirling PDF V2 ships with dozens of tools and a refreshed layout. Take a quick tour to see what changed and where to find the features you need."
+
 [onboarding.serverLicense]
 skip = "Skip for now"
 seePlans = "See Plans →"
@@ -5234,7 +5384,7 @@ upgrade = "Upgrade now →"
 freeTitle = "Server License"
 overLimitTitle = "Server License Needed"
 overLimitBody = "Our licensing permits up to <strong>{{freeTierLimit}}</strong> users for free per server. You have <strong>{{overLimitUserCopy}}</strong> Stirling users. To continue uninterrupted, upgrade to the Stirling Server plan - <strong>unlimited seats</strong>, PDF text editing, and full admin control for $99/server/mo."
-freeBody = "Our <strong>Open-Core</strong> licensing permits up to <strong>{{freeTierLimit}}</strong> users for free per server. To scale uninterrupted and get early access to our new <strong>PDF text editing tool</strong>, we recommend the Stirling Server plan - full editing and <strong>unlimited seats</strong> for $99/server/mo."
+freeBody = "Our <strong>Open-Core</strong> licensing permits up to <strong>{{freeTierLimit}}</strong> users for free per server. To scale uninterrupted, we recommend the Stirling Server plan - <strong>unlimited seats</strong> and <strong>SSO support</strong> for $99/server/mo."
 
 [onboarding.desktopInstall]
 title = "Download"
@@ -5339,6 +5489,31 @@ error = "Failed to update user status"
 success = "User deleted successfully"
 error = "Failed to delete user"
 
+[workspace.people.changePassword]
+action = "Change password"
+title = "Change password"
+subtitle = "Update the password for"
+newPassword = "New password"
+confirmPassword = "Confirm password"
+placeholder = "Enter a new password"
+confirmPlaceholder = "Re-enter the new password"
+passwordRequired = "Please enter a new password"
+passwordMismatch = "Passwords do not match"
+generateRandom = "Generate secure password"
+generatedPreview = "Generated password:"
+copyTooltip = "Copy to clipboard"
+copiedToClipboard = "Password copied to clipboard"
+copyFailed = "Failed to copy password"
+sendEmail = "Email the user about this change"
+includePassword = "Include the new password in the email"
+forcePasswordChange = "Force user to change password on next login"
+emailUnavailable = "This user's email is not a valid email address. Notifications are disabled."
+smtpDisabled = "Email notifications require SMTP to be enabled in settings."
+notifyOnly = "An email will be sent without the password, letting the user know an admin changed it."
+submit = "Update password"
+success = "Password updated successfully"
+error = "Failed to update password"
+
 [workspace.people.emailInvite]
 tab = "Email Invite"
 description = "Type or paste in emails below, separated by commas. Users will receive login credentials via email."
@@ -5515,6 +5690,28 @@ contactSales = "Contact Sales"
 contactToUpgrade = "Contact us to upgrade or customize your plan"
 maxUsers = "Max Users"
 upTo = "Up to"
+getLicense = "Get Server License"
+upgradeToEnterprise = "Upgrade to Enterprise"
+selectPeriod = "Select Billing Period"
+monthlyBilling = "Monthly Billing"
+yearlyBilling = "Yearly Billing"
+checkoutOpened = "Checkout Opened"
+checkoutInstructions = "Complete your purchase in the Stripe tab. After payment, return here and refresh the page to activate your license. You will also receive an email with your license key."
+activateLicense = "Activate Your License"
+
+[plan.static.licenseActivation]
+checkoutOpened = "Checkout Opened in New Tab"
+instructions = "Complete your purchase in the Stripe tab. Once your payment is complete, you will receive an email with your license key."
+enterKey = "Enter your license key below to activate your plan:"
+keyDescription = "Paste the license key from your email"
+activate = "Activate License"
+doLater = "I'll do this later"
+success = "License Activated!"
+successMessage = "Your license has been successfully activated. You can now close this window."
+
+[plan.static.billingPortal]
+title = "Email Verification Required"
+message = "You will need to verify your email address in the Stripe billing portal. Check your email for a login link."
 
 [plan.period]
 month = "month"
@@ -5718,6 +5915,8 @@ notAvailable = "Audit system not available"
 notAvailableMessage = "The audit system is not configured or not available."
 disabled = "Audit logging is disabled"
 disabledMessage = "Enable audit logging in your application configuration to track system events."
+enterpriseRequired = "Enterprise License Required"
+enterpriseRequiredMessage = "The audit logging system is an enterprise feature. Please upgrade to an enterprise license to access audit logs and analytics."
 
 [audit.error]
 title = "Error loading audit system"
@@ -5872,6 +6071,7 @@ subtitle = "Sign in with your Stirling account"
 [setup.selfhosted]
 title = "Sign in to Server"
 subtitle = "Enter your server credentials"
+link = "or connect to a self-hosted account"
 
 [setup.server]
 title = "Connect to Server"
@@ -5890,6 +6090,14 @@ description = "Enter the full URL of your self-hosted Stirling PDF server"
 emptyUrl = "Please enter a server URL"
 unreachable = "Could not connect to server"
 testFailed = "Connection test failed"
+configFetch = "Failed to fetch server configuration. Please check the URL and try again."
+
+[setup.server.error.securityDisabled]
+title = "Login Not Enabled"
+body = "This server does not have login enabled. To connect to this server, you must enable authentication:"
+step1 = "Set DOCKER_ENABLE_SECURITY=true in your environment"
+step2 = "Or set security.enableLogin=true in settings.yml"
+step3 = "Restart the server"
 
 [setup.login]
 title = "Sign In"
@@ -5962,6 +6170,7 @@ earlyAccess = "Early Access"
 reset = "Reset Changes"
 downloadJson = "Download JSON"
 generatePdf = "Generate PDF"
+saveChanges = "Save Changes"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Auto-scale text to fit boxes"
@@ -5999,6 +6208,8 @@ alpha = "This alpha viewer is still evolving—certain fonts, colours, transpare
 [pdfTextEditor.empty]
 title = "No document loaded"
 subtitle = "Load a PDF or JSON file to begin editing text content."
+dropzone = "Drag and drop a PDF or JSON file here, or click to browse"
+dropzoneWithFiles = "Select a file from the Files tab, or drag and drop a PDF or JSON file here, or click to browse"
 
 [pdfTextEditor.welcomeBanner]
 title = "Welcome to PDF Text Editor (Early Access)"
diff --git a/frontend/public/locales/es-ES/translation.toml b/frontend/public/locales/es-ES/translation.toml
index 7890318ff..a3faa4df1 100644
--- a/frontend/public/locales/es-ES/translation.toml
+++ b/frontend/public/locales/es-ES/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Quitar de favoritos"
 fullscreen = "Cambiar a modo pantalla completa"
 sidebar = "Cambiar a modo barra lateral"
 
+[backendStartup]
+notFoundTitle = "Backend no encontrado"
+retry = "Reintentar"
+unreachable = "La aplicación no puede conectarse actualmente al backend. Verifique el estado del backend y la conectividad de red, luego inténtelo de nuevo."
+
 [zipWarning]
 title = "Archivo ZIP grande"
 message = "Este ZIP contiene {{count}} archivos. ¿Extraer de todos modos?"
@@ -347,7 +352,7 @@ teams = "Equipos"
 title = "Configuración"
 systemSettings = "Ajustes del sistema"
 features = "Funciones"
-endpoints = "Endpoints"
+endpoints = "Puntos de conexión"
 database = "Base de datos"
 advanced = "Avanzado"
 
@@ -912,6 +917,9 @@ desc = "Crear flujos de trabajo de múltiples pasos encadenando acciones de PDF.
 desc = "Superponer PDFs encima de otro PDF"
 title = "Superponer PDFs"
 
+[home.pdfTextEditor]
+title = "Editor de texto de PDF"
+desc = "Edita texto e imágenes existentes dentro de archivos PDF"
 
 [home.addText]
 tags = "texto,anotación,etiqueta"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Firma dibujada"
 defaultImageLabel = "Firma subida"
 defaultTextLabel = "Firma escrita"
 saveButton = "Guardar firma"
+savePersonal = "Guardar personal"
+saveShared = "Guardar compartida"
 saveUnavailable = "Cree primero una firma para guardarla."
 noChanges = "La firma actual ya está guardada."
+tempStorageTitle = "Almacenamiento temporal del navegador"
+tempStorageDescription = "Las firmas se almacenan solo en tu navegador. Se perderán si borras los datos del navegador o cambias de navegador."
+personalHeading = "Firmas personales"
+sharedHeading = "Firmas compartidas"
+personalDescription = "Solo tú puedes ver estas firmas."
+sharedDescription = "Todos los usuarios pueden ver y usar estas firmas."
 
 [sign.saved.type]
 canvas = "Dibujo"
@@ -3020,6 +3036,91 @@ title = "Obtener Información del PDF"
 header = "Obtener Información del PDF"
 submit = "Obtener Información"
 downloadJson = "Descargar JSON"
+processing = "Extrayendo información..."
+results = "Resultados"
+noResults = "Ejecute la herramienta para generar un informe."
+downloads = "Descargas"
+noneDetected = "Ninguno detectado"
+indexTitle = "Índice"
+
+[getPdfInfo.report]
+entryLabel = "Resumen completo de información"
+shortTitle = "Información del PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadatos"
+formFields = "Campos de formulario"
+basicInfo = "Información básica"
+documentInfo = "Información del documento"
+compliance = "Conformidad"
+encryption = "Cifrado"
+permissions = "Permisos"
+other = "Otros"
+perPageInfo = "Información por página"
+tableOfContents = "Tabla de contenidos"
+
+[getPdfInfo.other]
+attachments = "Adjuntos"
+embeddedFiles = "Archivos incrustados"
+javaScript = "JavaScript"
+layers = "Capas"
+structureTree = "Árbol de estructura"
+xmp = "Metadatos XMP"
+
+[getPdfInfo.perPage]
+size = "Tamaño"
+annotations = "Anotaciones"
+images = "Imágenes"
+links = "Enlaces"
+fonts = "Fuentes"
+xobjects = "Recuento de XObject"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Páginas"
+fileSize = "Tamaño del archivo"
+pdfVersion = "Versión de PDF"
+language = "Idioma"
+title = "Resumen del PDF"
+author = "Autor"
+created = "Creado"
+modified = "Modificado"
+permsAll = "Todos los permisos permitidos"
+permsRestricted = "{{count}} restricciones"
+permsMixed = "Algunos permisos restringidos"
+hasCompliance = "Cumple con estándares"
+noCompliance = "Sin estándares de conformidad"
+basic = "Información básica"
+documentInfo = "Información del documento"
+securityTitle = "Estado de seguridad"
+technical = "Técnico"
+overviewTitle = "Vista general del PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF cifrado: protección con contraseña presente"
+unencrypted = "PDF sin cifrar: sin protección con contraseña"
+
+[getPdfInfo.summary.tech]
+images = "Imágenes"
+fonts = "Fuentes"
+formFields = "Campos de formulario"
+embeddedFiles = "Archivos incrustados"
+javaScript = "JavaScript"
+layers = "Capas"
+bookmarks = "Marcadores"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "un documento sin título"
+unknown = "Autor desconocido"
+text = "Este es un PDF de {{pages}} páginas titulado {{title}} creado por {{author}} (versión de PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Algunos archivos no se pudieron procesar."
+unexpected = "Error inesperado durante la extracción."
+
+[getPdfInfo.status]
+complete = "Extracción completada"
 
 [extractPage]
 tags = "extraer"
@@ -3438,6 +3539,9 @@ signinTitle = "Por favor, inicie sesión"
 ssoSignIn = "Iniciar sesión a través del inicio de sesión único"
 oAuth2AutoCreateDisabled = "Usuario de creación automática de OAUTH2 DESACTIVADO"
 oAuth2AdminBlockedUser = "El registro o inicio de sesión de usuarios no registrados está actualmente bloqueado. Por favor, póngase en contacto con el administrador."
+oAuth2RequiresLicense = "El inicio de sesión OAuth/SSO requiere una licencia de pago (Server o Enterprise). Póngase en contacto con el administrador para actualizar su plan."
+saml2RequiresLicense = "El inicio de sesión SAML requiere una licencia de pago (Server o Enterprise). Póngase en contacto con el administrador para actualizar su plan."
+maxUsersReached = "Se alcanzó el número máximo de usuarios para su licencia actual. Póngase en contacto con el administrador para actualizar su plan o añadir más plazas."
 oauth2RequestNotFound = "Solicitud de autorización no encontrada"
 oauth2InvalidUserInfoResponse = "Respuesta de información de usuario no válida"
 oauth2invalidRequest = "Solicitud no válida"
@@ -3846,14 +3950,17 @@ fitToWidth = "Ajustar al Ancho"
 actualSize = "Tamaño Real"
 
 [viewer]
+cannotPreviewFile = "No se puede previsualizar el archivo"
+dualPageView = "Vista de Página Doble"
 firstPage = "Primera Página"
 lastPage = "Última Página"
-previousPage = "Página Anterior"
 nextPage = "Página Siguiente"
+onlyPdfSupported = "El visor solo admite archivos PDF. Este archivo parece ser de un formato diferente."
+previousPage = "Página Anterior"
+singlePageView = "Vista de Página Única"
+unknownFile = "Archivo desconocido"
 zoomIn = "Acercar"
 zoomOut = "Alejar"
-singlePageView = "Vista de Página Única"
-dualPageView = "Vista de Página Doble"
 
 [rightRail]
 closeSelected = "Cerrar Archivos Seleccionados"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Alternar Barra Lateral"
 exportSelected = "Exportar páginas seleccionadas"
 toggleAnnotations = "Mostrar/ocultar anotaciones"
 annotationMode = "Cambiar modo de anotaciones"
+print = "Imprimir PDF"
 draw = "Dibujar"
 save = "Guardar"
 saveChanges = "Guardar cambios"
@@ -4494,6 +4602,7 @@ description = "URL o nombre de archivo del impressum (requerido en algunas juris
 title = "Premium y Enterprise"
 description = "Configura tu clave de licencia premium o enterprise."
 license = "Configuración de licencia"
+noInput = "Proporciona una clave o archivo de licencia"
 
 [admin.settings.premium.licenseKey]
 toggle = "¿Tiene una clave de licencia o un archivo de certificado?"
@@ -4511,6 +4620,25 @@ line1 = "Sobrescribir su clave de licencia actual no se puede deshacer."
 line2 = "Su licencia anterior se perderá de forma permanente a menos que la haya respaldado en otro lugar."
 line3 = "Importante: mantenga las claves de licencia privadas y seguras. Nunca las comparta públicamente."
 
+[admin.settings.premium.inputMethod]
+text = "Clave de licencia"
+file = "Archivo de certificado"
+
+[admin.settings.premium.file]
+label = "Archivo de certificado de licencia"
+description = "Sube tu archivo de licencia .lic o .cert de compras sin conexión"
+choose = "Elegir archivo de licencia"
+selected = "Seleccionado: {{filename}} ({{size}})"
+successMessage = "Archivo de licencia subido y activado correctamente. No es necesario reiniciar."
+
+[admin.settings.premium.currentLicense]
+title = "Licencia activa"
+file = "Origen: Archivo de licencia ({{path}})"
+key = "Origen: Clave de licencia"
+type = "Tipo: {{type}}"
+noInput = "Proporciona una clave de licencia o sube un archivo de certificado"
+success = "Éxito"
+
 [admin.settings.premium.enabled]
 label = "Habilitar funciones Premium"
 description = "Habilitar la verificación de la clave de licencia para funciones pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} seleccionados"
 download = "Descargar"
 delete = "Borrar"
 unsupported = "No Soportado"
+active = "Activo"
 addToUpload = "Añadir a la subida"
+closeFile = "Cerrar archivo"
 deleteAll = "Eliminar todo"
 loadingFiles = "Cargando archivos..."
 noFiles = "No hay archivos disponibles"
@@ -5132,7 +5262,7 @@ upgrade = "Actualizar ahora →"
 freeTitle = "Licencia del servidor"
 overLimitTitle = "Se necesita licencia de servidor"
 overLimitBody = "Nuestra licencia permite hasta <strong>{{freeTierLimit}}</strong> usuarios gratis por servidor. Tiene <strong>{{overLimitUserCopy}}</strong> usuarios de Stirling. Para continuar sin interrupciones, actualice al plan Stirling Server: <strong>plazas ilimitadas</strong>, edición de texto PDF y control total de administración por 99 $/servidor/mes."
-freeBody = "Nuestra licencia <strong>Open-Core</strong> permite hasta <strong>{{freeTierLimit}}</strong> usuarios gratis por servidor. Para escalar sin interrupciones y obtener acceso anticipado a nuestra nueva <strong>herramienta de edición de texto PDF</strong>, recomendamos el plan Stirling Server: edición completa y <strong>plazas ilimitadas</strong> por 99 $/servidor/mes."
+freeBody = "Nuestra licencia <strong>Open-Core</strong> permite hasta <strong>{{freeTierLimit}}</strong> usuarios gratis por servidor. Para escalar sin interrupciones, recomendamos el plan Stirling Server - <strong>plazas ilimitadas</strong> y <strong>soporte SSO</strong> por $99/servidor/mes."
 
 [onboarding.desktopInstall]
 title = "Descargar"
@@ -5204,7 +5334,7 @@ user = "Usuario"
 [workspace.people.addMember]
 title = "Añadir miembro"
 username = "Nombre de usuario (correo)"
-usernamePlaceholder = "user@example.com"
+usernamePlaceholder = "usuario@ejemplo.com"
 password = "Contraseña"
 passwordPlaceholder = "Introduce la contraseña"
 role = "Rol"
@@ -5237,15 +5367,40 @@ error = "No se pudo actualizar el estado del usuario"
 success = "Usuario eliminado correctamente"
 error = "No se pudo eliminar el usuario"
 
+[workspace.people.changePassword]
+action = "Cambiar contraseña"
+title = "Cambiar contraseña"
+subtitle = "Actualizar la contraseña de"
+newPassword = "Nueva contraseña"
+confirmPassword = "Confirmar contraseña"
+placeholder = "Introduzca una nueva contraseña"
+confirmPlaceholder = "Vuelva a introducir la nueva contraseña"
+passwordRequired = "Introduzca una nueva contraseña"
+passwordMismatch = "Las contraseñas no coinciden"
+generateRandom = "Generar contraseña segura"
+generatedPreview = "Contraseña generada:"
+copyTooltip = "Copiar al portapapeles"
+copiedToClipboard = "Contraseña copiada al portapapeles"
+copyFailed = "Error al copiar la contraseña"
+sendEmail = "Enviar un correo al usuario sobre este cambio"
+includePassword = "Incluir la nueva contraseña en el correo"
+forcePasswordChange = "Obligar al usuario a cambiar la contraseña en el próximo inicio de sesión"
+emailUnavailable = "El correo de este usuario no es una dirección válida. Las notificaciones están desactivadas."
+smtpDisabled = "Las notificaciones por correo requieren que SMTP esté habilitado en la configuración."
+notifyOnly = "Se enviará un correo sin la contraseña, informando al usuario de que un administrador la cambió."
+submit = "Actualizar contraseña"
+success = "Contraseña actualizada correctamente"
+error = "No se pudo actualizar la contraseña"
+
 [workspace.people.emailInvite]
 tab = "Invitación por correo electrónico"
 description = "Escribe o pega correos a continuación, separados por comas. Los usuarios recibirán credenciales de inicio de sesión por correo electrónico."
 emails = "Direcciones de correo electrónico"
-emailsPlaceholder = "user1@example.com, user2@example.com"
+emailsPlaceholder = "usuario1@ejemplo.com, usuario2@ejemplo.com"
 emailsRequired = "Se requiere al menos una dirección de correo electrónico"
 submit = "Enviar invitaciones"
 success = "usuario(s) invitado(s) correctamente"
-partialSuccess = "Algunas invitaciones fallaron"
+partialFailure = "Algunas invitaciones fallaron"
 allFailed = "No se pudo invitar a los usuarios"
 error = "No se pudieron enviar las invitaciones"
 
@@ -5541,7 +5696,7 @@ emailInvalid = "Introduzca una dirección de correo válida"
 title = "Introduzca su correo electrónico"
 description = "Lo usaremos para enviar su clave de licencia y recibos."
 emailLabel = "Dirección de correo electrónico"
-emailPlaceholder = "your@email.com"
+emailPlaceholder = "su@email.com"
 continue = "Continuar"
 modalTitle = "Comenzar - {{planName}}"
 
@@ -5770,6 +5925,7 @@ subtitle = "Inicie sesión con su cuenta de Stirling"
 [setup.selfhosted]
 title = "Inicie sesión en el servidor"
 subtitle = "Introduzca las credenciales de su servidor"
+link = "o conectarse a una cuenta autoalojada"
 
 [setup.server]
 title = "Conectar con el servidor"
@@ -5788,6 +5944,14 @@ description = "Introduzca la URL completa de su servidor autoalojado de Stirling
 emptyUrl = "Introduzca una URL de servidor"
 unreachable = "No se pudo conectar con el servidor"
 testFailed = "Falló la prueba de conexión"
+configFetch = "No se pudo obtener la configuración del servidor. Compruebe la URL e inténtelo de nuevo."
+
+[setup.server.error.securityDisabled]
+title = "Inicio de sesión no habilitado"
+body = "Este servidor no tiene habilitado el inicio de sesión. Para conectarse a este servidor, debe habilitar la autenticación:"
+step1 = "Establezca DOCKER_ENABLE_SECURITY=true en su entorno"
+step2 = "O establezca security.enableLogin=true en settings.yml"
+step3 = "Reinicie el servidor"
 
 [setup.login]
 title = "Iniciar sesión"
@@ -5797,13 +5961,20 @@ submit = "Iniciar sesión"
 signInWith = "Iniciar sesión con"
 oauthPending = "Abriendo el navegador para autenticación..."
 orContinueWith = "O continuar con email"
+serverRequirement = "Nota: el servidor debe tener el inicio de sesión habilitado."
+showInstructions = "¿Cómo habilitarlo?"
+hideInstructions = "Ocultar instrucciones"
+instructions = "Para habilitar el inicio de sesión en su servidor de Stirling PDF:"
+instructionsEnvVar = "Establezca la variable de entorno:"
+instructionsOrYml = "O en settings.yml:"
+instructionsRestart = "Luego reinicie su servidor para que los cambios surtan efecto."
 
 [setup.login.username]
 label = "Nombre de usuario"
 placeholder = "Introduzca su nombre de usuario"
 
 [setup.login.email]
-label = "Email"
+label = "Correo electrónico"
 placeholder = "Introduzca su email"
 
 [setup.login.password]
@@ -5840,7 +6011,7 @@ paragraph = "Página de párrafos"
 sparse = "Texto disperso"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automático"
 paragraph = "Párrafo"
 singleLine = "Línea única"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Acceso anticipado"
 reset = "Restablecer cambios"
 downloadJson = "Descargar JSON"
 generatePdf = "Generar PDF"
+saveChanges = "Guardar cambios"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Escalar texto automáticamente para ajustar a las cajas"
@@ -5890,6 +6062,8 @@ alpha = "Este visor alfa sigue evolucionando: ciertas fuentes, colores, efectos
 [pdfTextEditor.empty]
 title = "Ningún documento cargado"
 subtitle = "Carga un archivo PDF o JSON para empezar a editar el contenido de texto."
+dropzone = "Arrastre y suelte un archivo PDF o JSON aquí, o haga clic para explorar"
+dropzoneWithFiles = "Seleccione un archivo de la pestaña Archivos, o arrastre y suelte un archivo PDF o JSON aquí, o haga clic para explorar"
 
 [pdfTextEditor.welcomeBanner]
 title = "Bienvenido a PDF Text Editor (Acceso anticipado)"
diff --git a/frontend/public/locales/eu-ES/translation.toml b/frontend/public/locales/eu-ES/translation.toml
index 89a7dddd5..154689c17 100644
--- a/frontend/public/locales/eu-ES/translation.toml
+++ b/frontend/public/locales/eu-ES/translation.toml
@@ -99,7 +99,7 @@ visitGithub = "Bisitatu Github biltegia"
 donate = "Dohaintza egin"
 color = "Color"
 sponsor = "Babestu"
-info = "Info"
+info = "Informazioa"
 pro = "Pro"
 page = "Orrialdea"
 pages = "Orrialdeak"
@@ -131,7 +131,7 @@ unsupported = "Ez da onartzen"
 
 [toolPanel]
 placeholder = "Aukeratu tresna bat hasteko"
-alpha = "Alpha"
+alpha = "Alfa"
 premiumFeature = "Premium ezaugarria:"
 comingSoon = "Laster eskuragarri:"
 
@@ -163,6 +163,11 @@ unfavorite = "Kendu gogokoetatik"
 fullscreen = "Aldatu pantaila osoko modura"
 sidebar = "Aldatu alboko barra modura"
 
+[backendStartup]
+notFoundTitle = "Backend-a ez da aurkitu"
+retry = "Saiatu berriro"
+unreachable = "Aplikazioak une honetan ezin du backend-arekin konektatu. Egiaztatu backend-aren egoera eta sare-konexioa, eta saiatu berriro."
+
 [zipWarning]
 title = "ZIP fitxategi handia"
 message = "ZIP honek {{count}} fitxategi ditu. Erauzi hala ere?"
@@ -274,7 +279,7 @@ iAgreeToThe = "Onartzen ditut honako hauek guztiak"
 terms = "Baldintzak eta erabilera-baldintzak"
 accessibility = "Irisgarritasuna"
 cookie = "Cookie politika"
-impressum = "Impressum"
+impressum = "Lege oharra"
 showCookieBanner = "Cookie-hobespenak"
 
 [pipeline]
@@ -296,7 +301,7 @@ saveSettings = "Gorde eragiketa-ezarpenak"
 pipelineNamePrompt = "Sartu hemen pipeline izena"
 selectOperation = "Aukeratu eragiketa"
 addOperationButton = "Gehitu eragiketa"
-pipelineHeader = "Pipeline:"
+pipelineHeader = "Pipelinea:"
 saveButton = "Distira"
 validateButton = "Balidatu"
 
@@ -347,7 +352,7 @@ teams = "Taldeak"
 title = "Konfigurazioa"
 systemSettings = "Sistemaren ezarpenak"
 features = "Eginbideak"
-endpoints = "Endpoints"
+endpoints = "Amaiera-puntuak"
 database = "Datu-basea"
 advanced = "Aurreratua"
 
@@ -364,7 +369,7 @@ usageAnalytics = "Erabilera-analitika"
 
 [settings.policiesPrivacy]
 title = "Politikak eta Pribatutasuna"
-legal = "Legal"
+legal = "Lege"
 privacy = "Pribatutasuna"
 
 [settings.developer]
@@ -513,7 +518,7 @@ syncToAccount = "Sync Kontua <- Nabigatzailea"
 [adminUserSettings]
 title = "Erabiltzailearen Ezarpenen Kontrolak"
 header = "Admin Erabiltzailearen Ezarpenen Kontrolak"
-admin = "Admin"
+admin = "Administratzailea"
 user = "Erabiltzaile"
 addUser = "Erabiltzaile berria"
 deleteUser = "Ezabatu erabiltzailea"
@@ -912,6 +917,9 @@ desc = "Eraiki hainbat pausotako workflowak PDF ekintzak kateatuz. Egokia zeregi
 desc = "Overlays PDFs on-top of another PDF"
 title = "Gainjarri PDFak"
 
+[home.pdfTextEditor]
+title = "PDF testu editorea"
+desc = "Editatu PDFetako lehendik dauden testuak eta irudiak"
 
 [home.addText]
 tags = "testua,anotazioa,etiketa"
@@ -1217,7 +1225,7 @@ odtExt = "OpenDocument testua (.odt)"
 pptExt = "PowerPoint (.pptx)"
 odpExt = "OpenDocument aurkezpena (.odp)"
 txtExt = "Testu laua (.txt)"
-rtfExt = "Rich Text Format (.rtf)"
+rtfExt = "Testu aberatsaren formatua (.rtf)"
 selectedFiles = "Hautatutako fitxategiak"
 noFileSelected = "Ez da fitxategirik hautatu. Erabili fitxategi-panela fitxategiak gehitzeko."
 convertFiles = "Bihurtu fitxategiak"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Marrazketa sinadura"
 defaultImageLabel = "Igotako sinadura"
 defaultTextLabel = "Idatzitako sinadura"
 saveButton = "Gorde sinadura"
+savePersonal = "Gorde pertsonala"
+saveShared = "Gorde partekatua"
 saveUnavailable = "Lehenik sortu sinadura bat gordetzeko."
 noChanges = "Uneko sinadura dagoeneko gorde da."
+tempStorageTitle = "Aldi baterako nabigatzaileko biltegiratzea"
+tempStorageDescription = "Sinadurak zure nabigatzailean bakarrik gordetzen dira. Nabigatzailearen datuak ezabatzen badituzu edo nabigatzailea aldatzen baduzu, galdu egingo dira."
+personalHeading = "Sinadura pertsonalak"
+sharedHeading = "Partekatutako sinadurak"
+personalDescription = "Zuk bakarrik ikus ditzakezu sinadura hauek."
+sharedDescription = "Erabiltzaile guztiek ikus eta erabil ditzakete sinadura hauek."
 
 [sign.saved.type]
 canvas = "Marrazkia"
@@ -3020,6 +3036,91 @@ title = "Lortu informazioa PDFn"
 header = "Lortu informazioa PDFn"
 submit = "Lortu informazioa"
 downloadJson = "Deskargatu JSON"
+processing = "Informazioa erauzten..."
+results = "Emaitzak"
+noResults = "Exekutatu tresna txosten bat sortzeko."
+downloads = "Deskargak"
+noneDetected = "Ez da ezer detektatu"
+indexTitle = "Indizea"
+
+[getPdfInfo.report]
+entryLabel = "Informazio osoaren laburpena"
+shortTitle = "PDFren informazioa"
+
+[getPdfInfo.sections]
+metadata = "Metadatuak"
+formFields = "Inprimaki-eremuak"
+basicInfo = "Oinarrizko informazioa"
+documentInfo = "Dokumentuaren informazioa"
+compliance = "Arauen betetzea"
+encryption = "Zifratzea"
+permissions = "Baimenak"
+other = "Bestelakoak"
+perPageInfo = "Orrialdeko informazioa"
+tableOfContents = "Aurkibidea"
+
+[getPdfInfo.other]
+attachments = "Eranskinak"
+embeddedFiles = "Txertatutako fitxategiak"
+javaScript = "JavaScript"
+layers = "Geruzak"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Tamaina"
+annotations = "Anotazioak"
+images = "Irudiak"
+links = "Estekak"
+fonts = "Letra-tipoak"
+xobjects = "XObject kopuruak"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Orriak"
+fileSize = "Fitxategi-tamaina"
+pdfVersion = "PDF bertsioa"
+language = "Hizkuntza"
+title = "PDFren laburpena"
+author = "Egilea"
+created = "Sortua"
+modified = "Aldatua"
+permsAll = "Baimen guztiak baimenduta"
+permsRestricted = "{{count}} murrizketa"
+permsMixed = "Zenbait baimen murriztuta"
+hasCompliance = "Betetze-estandarrak ditu"
+noCompliance = "Ez dago betetze-estandarrik"
+basic = "Oinarrizko informazioa"
+documentInfo = "Dokumentuaren informazioa"
+securityTitle = "Segurtasun-egoera"
+technical = "Teknikoa"
+overviewTitle = "PDFren ikuspegi orokorra"
+
+[getPdfInfo.summary.security]
+encrypted = "Zifratutako PDFa - Pasahitz-babesa dago"
+unencrypted = "Zifratu gabeko PDFa - Ez dago pasahitz-babesik"
+
+[getPdfInfo.summary.tech]
+images = "Irudiak"
+fonts = "Letra-tipoak"
+formFields = "Inprimaki-eremuak"
+embeddedFiles = "Txertatutako fitxategiak"
+javaScript = "JavaScript"
+layers = "Geruzak"
+bookmarks = "Laster-markak"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "izenbururik gabeko dokumentu bat"
+unknown = "Egile ezezaguna"
+text = "Hau {{pages}} orrialdeko PDF bat da; izenburua: {{title}}, egilea: {{author}} (PDF bertsioa: {{version}})."
+
+[getPdfInfo.error]
+partial = "Fitxategi batzuk ezin izan dira prozesatu."
+unexpected = "Ustekabeko errorea erauzketan zehar."
+
+[getPdfInfo.status]
+complete = "Erau zketa amaituta"
 
 [extractPage]
 tags = "erauzi"
@@ -3438,6 +3539,9 @@ signinTitle = "Mesedez, hasi saioa"
 ssoSignIn = "Hasi saioa Saioa hasteko modu bakarraren bidez"
 oAuth2AutoCreateDisabled = "OAUTH2 Sortu automatikoki erabiltzailea desgaituta dago"
 oAuth2AdminBlockedUser = "Erregistratu gabeko erabiltzaileen erregistroa edo saio-hasiera une honetan blokeatuta dago. Jarri harremanetan administratzailearekin."
+oAuth2RequiresLicense = "OAuth/SSO bidezko saio-hasierak lizentzia ordaindua behar du (Server edo Enterprise). Mesedez, jarri harremanetan administratzailearekin plana eguneratzeko."
+saml2RequiresLicense = "SAML bidezko saio-hasierak lizentzia ordaindua behar du (Server edo Enterprise). Mesedez, jarri harremanetan administratzailearekin plana eguneratzeko."
+maxUsersReached = "Zure uneko lizentziarekin erabiltzaile kopuru maximoa gainditu da. Mesedez, jarri harremanetan administratzailearekin plana eguneratzeko edo eserleku gehiago gehitzeko."
 oauth2RequestNotFound = "Baimen-eskaera ez da aurkitu"
 oauth2InvalidUserInfoResponse = "Erabiltzaile-informazioaren erantzun baliogabea"
 oauth2invalidRequest = "Eskaera baliogabea"
@@ -3533,7 +3637,7 @@ title = "PDF Orrialde bakarrera"
 header = "PDF Orrialde bakarrera"
 submit = "Orrialde bakarrera bihurtu"
 description = "Tresna honek zure PDFko orri guztiak orri handi bakarrean batuko ditu. Zabalera bera izango du jatorrizko orrienarekin, baina altuera orri guztien altueren batura izango da."
-filenamePrefix = "single_page"
+filenamePrefix = "orrialde_bakarra"
 
 [pdfToSinglePage.files]
 placeholder = "Hautatu PDF fitxategi bat ikuspegi nagusian hasteko"
@@ -3846,14 +3950,17 @@ fitToWidth = "Zabalera egokitu"
 actualSize = "Benetako tamaina"
 
 [viewer]
+cannotPreviewFile = "Ezin da fitxategia aurreikusi"
+dualPageView = "Orri biko ikuspegia"
 firstPage = "Lehen orria"
 lastPage = "Azken orria"
-previousPage = "Aurreko orria"
 nextPage = "Hurrengo orria"
+onlyPdfSupported = "Ikustaileak PDF fitxategiak bakarrik onartzen ditu. Fitxategi honek beste formatu batekoa dirudi."
+previousPage = "Aurreko orria"
+singlePageView = "Orri bakarreko ikuspegia"
+unknownFile = "Fitxategi ezezaguna"
 zoomIn = "Zoom handitu"
 zoomOut = "Zoom txikitu"
-singlePageView = "Orri bakarreko ikuspegia"
-dualPageView = "Orri biko ikuspegia"
 
 [rightRail]
 closeSelected = "Itxi hautatutako fitxategiak"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Alboko barra txandakatu"
 exportSelected = "Esportatu hautatutako orriak"
 toggleAnnotations = "Oharpenen ikusgarritasuna txandakatu"
 annotationMode = "Oharpen modua txandakatu"
+print = "Inprimatu PDFa"
 draw = "Marraztu"
 save = "Gorde"
 saveChanges = "Aldaketak gorde"
@@ -4407,7 +4515,7 @@ description = "Sistema zabalagoko aldi baterako direktorioa garbitu ala ez (kont
 label = "Prozesu-exekutorearen mugak"
 description = "Konfiguratu saio-mugak eta denbora-mugak prozesu-exekutore bakoitzerako"
 libreOffice = "LibreOffice"
-pdfToHtml = "PDF to HTML"
+pdfToHtml = "PDFtik HTMLra"
 qpdf = "QPDF"
 tesseract = "Tesseract OCR"
 pythonOpenCv = "Python OpenCV"
@@ -4487,13 +4595,14 @@ label = "Cookieen politika"
 description = "Cookieen politikara doan URLa edo fitxategi-izena"
 
 [admin.settings.legal.impressum]
-label = "Impressum"
+label = "Lege oharra"
 description = "Impressum-era doan URLa edo fitxategi-izena (beharrezkoa jurisdikzio batzuetan)"
 
 [admin.settings.premium]
 title = "Premium eta Enterprise"
 description = "Konfiguratu zure premium edo enterprise lizentzia-gakoa."
 license = "Lizentziaren konfigurazioa"
+noInput = "Eman lizentzia-gakoa edo fitxategia, mesedez"
 
 [admin.settings.premium.licenseKey]
 toggle = "Lizentzia-gakoa edo ziurtagiri-fitxategia duzu?"
@@ -4511,6 +4620,25 @@ line1 = "Uneko lizentzia-gakoa gainidaztea ezin da desegin."
 line2 = "Aurreko lizentzia betiko galduko da beste nonbait babestu ezean."
 line3 = "Garrantzitsua: Mantendu lizentzia-gakoak pribatu eta seguru. Ez partekatu publikoki inoiz."
 
+[admin.settings.premium.inputMethod]
+text = "Lizentzia-gakoa"
+file = "Ziurtagiri-fitxategia"
+
+[admin.settings.premium.file]
+label = "Lizentzia-ziurtagiriaren fitxategia"
+description = "Igo zure .lic edo .cert lizentzia-fitxategia lineaz kanpoko erosketetatik"
+choose = "Aukeratu lizentzia-fitxategia"
+selected = "Hautatuta: {{filename}} ({{size}})"
+successMessage = "Lizentzia-fitxategia behar bezala igo eta aktibatu da. Ez da berrabiaraztea beharrezkoa."
+
+[admin.settings.premium.currentLicense]
+title = "Lizentzia aktiboa"
+file = "Iturburua: Lizentzia-fitxategia ({{path}})"
+key = "Iturburua: Lizentzia-gakoa"
+type = "Mota: {{type}}"
+noInput = "Eman lizentzia-gakoa edo igo ziurtagiri-fitxategi bat, mesedez"
+success = "Arrakasta"
+
 [admin.settings.premium.enabled]
 label = "Premium eginbideak gaitu"
 description = "Gaitu lizentzia-gakoen egiaztapenak pro/enterprise eginbideetarako"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} hautatuta"
 download = "Distira"
 delete = "ezabatu"
 unsupported = "Ez da onartzen"
+active = "Aktibo"
 addToUpload = "Gehitu igoerara"
+closeFile = "Itxi fitxategia"
 deleteAll = "Ezabatu denak"
 loadingFiles = "Fitxategiak kargatzen..."
 noFiles = "Ez dago fitxategirik eskuragarri"
@@ -5132,7 +5262,7 @@ upgrade = "Eguneratu orain →"
 freeTitle = "Zerbitzari-lizentzia"
 overLimitTitle = "Beharrezkoa da zerbitzari-lizentzia"
 overLimitBody = "Gure lizentziak baimentzen ditu <strong>{{freeTierLimit}}</strong> erabiltzaile doan zerbitzari bakoitzeko. <strong>{{overLimitUserCopy}}</strong> Stirling erabiltzaile dituzu. Jarraitzeko etenik gabe, eguneratu Stirling Server planera - <strong>eserleku mugagabeak</strong>, PDF testu-edizioa, eta admin kontrol osoa $99/zerbitzari/hilean."
-freeBody = "Gure <strong>Open-Core</strong> lizentziak <strong>{{freeTierLimit}}</strong> erabiltzaile arte baimentzen ditu doan zerbitzari bakoitzeko. Etenik gabe eskalatzeko eta gure <strong>PDF testu-edizio tresna</strong> berrirako sarbide goiztiarra lortzeko, gomendatzen dugu Stirling Server plana - edizio osoa eta <strong>eserleku mugagabeak</strong> $99/zerbitzari/hilean."
+freeBody = "Gure <strong>Open-Core</strong> lizentziak zerbitzari bakoitzeko doan gehienez <strong>{{freeTierLimit}}</strong> erabiltzaile baimentzen ditu. Etenik gabe eskalatzeko, Stirling Server plana gomendatzen dugu - <strong>eserleku mugagabeak</strong> eta <strong>SSO euskarria</strong> $99/server/mo."
 
 [onboarding.desktopInstall]
 title = "Deskargatu"
@@ -5178,7 +5308,7 @@ active = "Aktibo"
 disabled = "Desgaituta"
 activeSession = "Saio aktiboa"
 member = "Kidea"
-admin = "Admin"
+admin = "Administratzailea"
 editRole = "Rola editatu"
 enable = "Gaitu"
 disable = "Desgaitu"
@@ -5237,6 +5367,31 @@ error = "Ezin izan da erabiltzailearen egoera eguneratu"
 success = "Erabiltzailea ongi ezabatu da"
 error = "Ezin izan da erabiltzailea ezabatu"
 
+[workspace.people.changePassword]
+action = "Pasahitza aldatu"
+title = "Pasahitza aldatu"
+subtitle = "Honetarako pasahitza eguneratu"
+newPassword = "Pasahitz berria"
+confirmPassword = "Berretsi pasahitza"
+placeholder = "Sartu pasahitz berria"
+confirmPlaceholder = "Sartu berriro pasahitz berria"
+passwordRequired = "Sartu pasahitz berria"
+passwordMismatch = "Pasahitzak ez datoz bat"
+generateRandom = "Sortu pasahitz segurua"
+generatedPreview = "Sortutako pasahitza:"
+copyTooltip = "Kopiatu arbelera"
+copiedToClipboard = "Pasahitza arbelera kopiatu da"
+copyFailed = "Pasahitza kopiatzeak huts egin du"
+sendEmail = "Bidali mezu elektronikoa erabiltzaileari aldaketa honi buruz"
+includePassword = "Sartu pasahitz berria mezu elektronikoan"
+forcePasswordChange = "Behartu erabiltzailea hurrengo saio-hasieran pasahitza aldatzera"
+emailUnavailable = "Erabiltzaile honen helbide elektronikoa ez da baliozkoa. Jakinarazpenak desgaituta daude."
+smtpDisabled = "Posta elektroniko bidezko jakinarazpenek SMTP gaituta egotea eskatzen dute ezarpenetan."
+notifyOnly = "Pasahitzik gabe bidaliko da mezu elektronikoa; erabiltzaileari jakinaraziko zaio administratzaile batek aldatu duela."
+submit = "Eguneratu pasahitza"
+success = "Pasahitza ongi eguneratu da"
+error = "Pasahitza eguneratzeak huts egin du"
+
 [workspace.people.emailInvite]
 tab = "E-posta bidezko gonbidapena"
 description = "Idatzi edo itsatsi behean helbide elektronikoak, komaz bereizita. Erabiltzaileek saio-hasierako kredentzialak e-postaz jasoko dituzte."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Gutxienez helbide elektroniko bat behar da"
 submit = "Bidali gonbidapenak"
 success = "erabiltzaile(a)(k) ongi gonbidatu dira"
-partialSuccess = "Gonbidapen batzuek huts egin dute"
+partialFailure = "Gonbidapen batzuk huts egin dute"
 allFailed = "Ezin izan da erabiltzaileak gonbidatu"
 error = "Ezin izan dira gonbidapenak bidali"
 
@@ -5709,7 +5864,7 @@ title = "Endpoints erabileraren diagrama"
 
 [usage.table]
 title = "Estatistika xeheak"
-endpoint = "Endpoint"
+endpoint = "Amaiera-puntua"
 visits = "Bisitak"
 percentage = "Ehunekoa"
 noData = "Ez dago daturik eskuragarri"
@@ -5770,6 +5925,7 @@ subtitle = "Hasi saioa zure Stirling kontuarekin"
 [setup.selfhosted]
 title = "Hasi saioa zerbitzarian"
 subtitle = "Sartu zure zerbitzariaren kredentzialak"
+link = "edo konektatu autoostatutako kontu batera"
 
 [setup.server]
 title = "Konektatu zerbitzarira"
@@ -5788,6 +5944,14 @@ description = "Sartu zure auto-ostatuko Stirling PDF zerbitzariaren URLa osoa"
 emptyUrl = "Sartu zerbitzari baten URLa"
 unreachable = "Ezin izan da zerbitzarira konektatu"
 testFailed = "Konexio proba huts egin du"
+configFetch = "Ezin izan da zerbitzariaren konfigurazioa eskuratu. Egiaztatu URLa eta saiatu berriro."
+
+[setup.server.error.securityDisabled]
+title = "Saio-hasiera ez dago gaituta"
+body = "Zerbitzari honek ez du saio-hasiera gaituta. Zerbitzari honekin konektatzeko, autentifikazioa gaitu behar duzu:"
+step1 = "Ezarri DOCKER_ENABLE_SECURITY=true zure ingurunean"
+step2 = "Edo ezarri security.enableLogin=true settings.yml fitxategian"
+step3 = "Berrabiarazi zerbitzaria"
 
 [setup.login]
 title = "Hasi saioa"
@@ -5797,6 +5961,13 @@ submit = "Hasi saioa"
 signInWith = "Hasi saioa honekin"
 oauthPending = "Nabigatzailea irekitzen autentifikaziorako..."
 orContinueWith = "Edo jarraitu emailarekin"
+serverRequirement = "Oharra: zerbitzariak saioa hastea gaituta eduki behar du."
+showInstructions = "Nola gaitu?"
+hideInstructions = "Ezkutatu argibideak"
+instructions = "Saioa hastea gaitzeko zure Stirling PDF zerbitzarian:"
+instructionsEnvVar = "Ezarri ingurune-aldagaia:"
+instructionsOrYml = "Edo settings.yml fitxategian:"
+instructionsRestart = "Ondoren, berrabiarazi zerbitzaria aldaketak indarrean sartzeko."
 
 [setup.login.username]
 label = "Erabiltzaile-izena"
@@ -5840,7 +6011,7 @@ paragraph = "Paragrafo orria"
 sparse = "Testu sakabanatua"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automatikoa"
 paragraph = "Paragrafoa"
 singleLine = "Lerro bakarra"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Sarbide goiztiarra"
 reset = "Aldaketak berrezarri"
 downloadJson = "JSON deskargatu"
 generatePdf = "PDF sortu"
+saveChanges = "Gorde aldaketak"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Testua automatikoki eskalatu kutxetara egokitzeko"
@@ -5890,6 +6062,8 @@ alpha = "Ikusle alfa hau oraindik eboluzioan dago—zenbait letra-tipo, kolore,
 [pdfTextEditor.empty]
 title = "Ez da dokumenturik kargatu"
 subtitle = "Kargatu PDF edo JSON fitxategi bat testu-edukia editatzen hasteko."
+dropzone = "Arrastatu eta jaregin PDF edo JSON fitxategi bat hemen, edo egin klik arakatzeko"
+dropzoneWithFiles = "Hautatu fitxategi bat Fitxategiak fitxatik, edo arrastatu eta jaregin PDF edo JSON fitxategi bat hemen, edo egin klik arakatzeko"
 
 [pdfTextEditor.welcomeBanner]
 title = "Ongi etorri PDF Text Editor-era (Sarbide goiztiarra)"
diff --git a/frontend/public/locales/fa-IR/translation.toml b/frontend/public/locales/fa-IR/translation.toml
index f2cb9bd91..5e363a22a 100644
--- a/frontend/public/locales/fa-IR/translation.toml
+++ b/frontend/public/locales/fa-IR/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "حذف از علاقه‌مندی‌ها"
 fullscreen = "تغییر به حالت تمام‌صفحه"
 sidebar = "تغییر به حالت نوار کناری"
 
+[backendStartup]
+notFoundTitle = "بک‌اند یافت نشد"
+retry = "تلاش مجدد"
+unreachable = "برنامه در حال حاضر نمی‌تواند به بک‌اند متصل شود. وضعیت بک‌اند و اتصال شبکه را بررسی کرده و سپس دوباره تلاش کنید."
+
 [zipWarning]
 title = "فایل ZIP بزرگ"
 message = "این ZIP شامل {{count}} فایل است. با این حال استخراج شود؟"
@@ -912,6 +917,9 @@ desc = "ساخت گردش‌کارهای چندمرحله‌ای با زنجیر
 desc = "PDF‌ها را بر روی PDF دیگری هم‌پوشانی می‌کند"
 title = "هم‌پوشانی PDF‌ها"
 
+[home.pdfTextEditor]
+title = "ویرایشگر متن PDF"
+desc = "ویرایش متن و تصاویر موجود در PDFها"
 
 [home.addText]
 tags = "متن,حاشیه‌نویسی,برچسب"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "امضای ترسیمی"
 defaultImageLabel = "امضای بارگذاری‌شده"
 defaultTextLabel = "امضای تایپی"
 saveButton = "ذخیره امضا"
+savePersonal = "ذخیره شخصی"
+saveShared = "ذخیره اشتراکی"
 saveUnavailable = "برای ذخیره، ابتدا امضایی بسازید."
 noChanges = "امضای فعلی قبلاً ذخیره شده است."
+tempStorageTitle = "ذخیره‌سازی موقت در مرورگر"
+tempStorageDescription = "امضاها فقط در مرورگر شما ذخیره می‌شوند. در صورت پاک‌کردن داده‌های مرورگر یا تعویض مرورگر، از بین می‌روند."
+personalHeading = "امضاهای شخصی"
+sharedHeading = "امضاهای اشتراکی"
+personalDescription = "تنها شما می‌توانید این امضاها را ببینید."
+sharedDescription = "همه کاربران می‌توانند این امضاها را ببینند و استفاده کنند."
 
 [sign.saved.type]
 canvas = "ترسیمی"
@@ -3020,6 +3036,91 @@ title = "اطلاعات PDF را دریافت کنید"
 header = "اطلاعات PDF را دریافت کنید"
 submit = "دریافت اطلاعات"
 downloadJson = "دانلود JSON"
+processing = "در حال استخراج اطلاعات..."
+results = "نتایج"
+noResults = "برای ایجاد گزارش، ابزار را اجرا کنید."
+downloads = "دانلودها"
+noneDetected = "هیچ موردی شناسایی نشد"
+indexTitle = "نمایه"
+
+[getPdfInfo.report]
+entryLabel = "خلاصهٔ کامل اطلاعات"
+shortTitle = "اطلاعات PDF"
+
+[getPdfInfo.sections]
+metadata = "فراداده"
+formFields = "فیلدهای فرم"
+basicInfo = "اطلاعات پایه"
+documentInfo = "اطلاعات سند"
+compliance = "انطباق"
+encryption = "رمزگذاری"
+permissions = "مجوزها"
+other = "سایر"
+perPageInfo = "اطلاعات هر صفحه"
+tableOfContents = "فهرست مطالب"
+
+[getPdfInfo.other]
+attachments = "پیوست‌ها"
+embeddedFiles = "فایل‌های جاسازی‌شده"
+javaScript = "JavaScript"
+layers = "لایه‌ها"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "اندازه"
+annotations = "حاشیه‌نویسی‌ها"
+images = "تصاویر"
+links = "پیوندها"
+fonts = "فونت‌ها"
+xobjects = "تعداد XObject"
+multimedia = "چندرسانه‌ای"
+
+[getPdfInfo.summary]
+pages = "صفحات"
+fileSize = "حجم فایل"
+pdfVersion = "نسخهٔ PDF"
+language = "زبان"
+title = "خلاصهٔ PDF"
+author = "نویسنده"
+created = "ایجاد شده"
+modified = "ویرایش شده"
+permsAll = "همهٔ مجوزها مجاز هستند"
+permsRestricted = "{{count}} محدودیت"
+permsMixed = "برخی مجوزها محدود شده‌اند"
+hasCompliance = "دارای استانداردهای انطباق"
+noCompliance = "بدون استانداردهای انطباق"
+basic = "اطلاعات پایه"
+documentInfo = "اطلاعات سند"
+securityTitle = "وضعیت امنیتی"
+technical = "فنی"
+overviewTitle = "نمای کلی PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF رمزگذاری‌شده - دارای محافظت با گذرواژه"
+unencrypted = "PDF رمزگذاری‌نشده - بدون محافظت با گذرواژه"
+
+[getPdfInfo.summary.tech]
+images = "تصاویر"
+fonts = "فونت‌ها"
+formFields = "فیلدهای فرم"
+embeddedFiles = "فایل‌های جاسازی‌شده"
+javaScript = "JavaScript"
+layers = "لایه‌ها"
+bookmarks = "نشانک‌ها"
+multimedia = "چندرسانه‌ای"
+
+[getPdfInfo.summary.overview]
+untitled = "یک سند بدون عنوان"
+unknown = "نویسندهٔ نامشخص"
+text = "این یک PDF {{pages}} صفحه‌ای با عنوان {{title}} است که توسط {{author}} ایجاد شده است (نسخهٔ PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "برخی فایل‌ها قابل پردازش نبودند."
+unexpected = "خطای غیرمنتظره هنگام استخراج."
+
+[getPdfInfo.status]
+complete = "استخراج کامل شد"
 
 [extractPage]
 tags = "استخراج"
@@ -3438,6 +3539,9 @@ signinTitle = "لطفاً وارد شوید"
 ssoSignIn = "ورود از طریق Single Sign-on"
 oAuth2AutoCreateDisabled = "ایجاد خودکار کاربر با OAUTH2 غیرفعال است"
 oAuth2AdminBlockedUser = "ثبت‌نام یا ورود کاربران ثبت‌نشده در حال حاضر مسدود است. لطفاً با مدیر تماس بگیرید."
+oAuth2RequiresLicense = "ورود با OAuth/SSO به لایسنس پولی (Server یا Enterprise) نیاز دارد. لطفاً برای ارتقای طرح خود با مدیر تماس بگیرید."
+saml2RequiresLicense = "ورود با SAML به لایسنس پولی (Server یا Enterprise) نیاز دارد. لطفاً برای ارتقای طرح خود با مدیر تماس بگیرید."
+maxUsersReached = "حداکثر تعداد کاربران برای لایسنس کنونی شما به حد نصاب رسیده است. لطفاً برای ارتقای طرح یا افزودن کاربران بیشتر با مدیر تماس بگیرید."
 oauth2RequestNotFound = "درخواست احراز هویت پیدا نشد"
 oauth2InvalidUserInfoResponse = "پاسخ اطلاعات کاربری نامعتبر است"
 oauth2invalidRequest = "درخواست نامعتبر"
@@ -3846,14 +3950,17 @@ fitToWidth = "تناسب با عرض"
 actualSize = "اندازه واقعی"
 
 [viewer]
+cannotPreviewFile = "امکان پیش‌نمایش فایل نیست"
+dualPageView = "نمای دوصفحه‌ای"
 firstPage = "صفحه نخست"
 lastPage = "صفحه آخر"
-previousPage = "صفحه قبل"
 nextPage = "صفحه بعد"
+onlyPdfSupported = "نمایشگر فقط فایل‌های PDF را پشتیبانی می‌کند. به نظر می‌رسد این فایل قالب متفاوتی دارد."
+previousPage = "صفحه قبل"
+singlePageView = "نمای تک‌صفحه‌ای"
+unknownFile = "فایل ناشناخته"
 zoomIn = "بزرگ‌نمایی"
 zoomOut = "کوچک‌نمایی"
-singlePageView = "نمای تک‌صفحه‌ای"
-dualPageView = "نمای دوصفحه‌ای"
 
 [rightRail]
 closeSelected = "بستن فایل‌های انتخاب‌شده"
@@ -3877,6 +3984,7 @@ toggleSidebar = "تغییر وضعیت نوار کناری"
 exportSelected = "برون‌بری صفحات انتخاب‌شده"
 toggleAnnotations = "تغییر وضعیت نمایش حاشیه‌نویسی‌ها"
 annotationMode = "تغییر حالت حاشیه‌نویسی"
+print = "چاپ PDF"
 draw = "رسم"
 save = "ذخیره"
 saveChanges = "ذخیره تغییرات"
@@ -4235,11 +4343,11 @@ label = "URL صادرکننده"
 description = "Issuer URL ارائه‌دهنده OAuth2"
 
 [admin.settings.connections.oauth2.clientId]
-label = "Client ID"
+label = "شناسهٔ کلاینت"
 description = "Client ID مربوط به OAuth2 از ارائه‌دهنده شما"
 
 [admin.settings.connections.oauth2.clientSecret]
-label = "Client Secret"
+label = "راز کلاینت"
 description = "Client Secret مربوط به OAuth2 از ارائه‌دهنده شما"
 
 [admin.settings.connections.oauth2.useAsUsername]
@@ -4270,7 +4378,7 @@ label = "ارائه‌دهنده"
 description = "نام ارائه‌دهنده SAML2"
 
 [admin.settings.connections.saml2.registrationId]
-label = "Registration ID"
+label = "شناسهٔ ثبت‌نام"
 description = "شناسه ثبت‌نام SAML2"
 
 [admin.settings.connections.saml2.autoCreateUser]
@@ -4487,13 +4595,14 @@ label = "خط‌مشی کوکی"
 description = "URL یا نام فایل برای خط‌مشی کوکی"
 
 [admin.settings.legal.impressum]
-label = "Impressum"
+label = "اطلاعات حقوقی"
 description = "URL یا نام فایل برای impressum (در برخی حوزه‌های قضایی الزامی است)"
 
 [admin.settings.premium]
 title = "پرمیوم و سازمانی"
 description = "کلید لایسنس پرمیوم یا سازمانی خود را پیکربندی کنید."
 license = "پیکربندی لایسنس"
+noInput = "لطفاً کلید یا فایل مجوز را ارائه کنید"
 
 [admin.settings.premium.licenseKey]
 toggle = "کلید لایسنس یا فایل گواهی دارید؟"
@@ -4511,6 +4620,25 @@ line1 = "بازنویسی کلید لایسنس فعلی قابل بازگشت 
 line2 = "مگر آنکه در جایی پشتیبان گرفته باشید، لایسنس قبلی به‌طور دائمی از دست می‌رود."
 line3 = "مهم: کلیدهای لایسنس را خصوصی و امن نگه دارید. هرگز آن‌ها را عمومی به‌اشتراک نگذارید."
 
+[admin.settings.premium.inputMethod]
+text = "کلید مجوز"
+file = "فایل گواهی"
+
+[admin.settings.premium.file]
+label = "فایل گواهی مجوز"
+description = "فایل مجوز .lic یا .cert مربوط به خریدهای آفلاین خود را بارگذاری کنید"
+choose = "انتخاب فایل مجوز"
+selected = "انتخاب‌شده: {{filename}} ({{size}})"
+successMessage = "فایل مجوز با موفقیت بارگذاری و فعال شد. نیازی به راه‌اندازی مجدد نیست."
+
+[admin.settings.premium.currentLicense]
+title = "مجوز فعال"
+file = "منبع: فایل مجوز ({{path}})"
+key = "منبع: کلید مجوز"
+type = "نوع: {{type}}"
+noInput = "لطفاً کلید مجوز ارائه کنید یا فایل گواهی را بارگذاری کنید"
+success = "موفق"
+
 [admin.settings.premium.enabled]
 label = "فعال‌سازی قابلیت‌های پرمیوم"
 description = "فعال‌سازی بررسی کلید لایسنس برای قابلیت‌های حرفه‌ای/سازمانی"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} مورد انتخاب‌شده"
 download = "دانلود"
 delete = "حذف"
 unsupported = "پشتیبانی‌نشده"
+active = "فعال"
 addToUpload = "افزودن به بارگذاری"
+closeFile = "بستن فایل"
 deleteAll = "حذف همه"
 loadingFiles = "در حال بارگذاری فایل‌ها..."
 noFiles = "فایلی موجود نیست"
@@ -5132,7 +5262,7 @@ upgrade = "همین حالا ارتقا بده →"
 freeTitle = "لایسنس سرور"
 overLimitTitle = "نیاز به لایسنس سرور"
 overLimitBody = "مجوز ما تا <strong>{{freeTierLimit}}</strong> کاربر رایگان به‌ازای هر سرور را مجاز می‌داند. شما <strong>{{overLimitUserCopy}}</strong> کاربر Stirling دارید. برای ادامه بدون وقفه، به پلن Stirling Server ارتقا دهید - <strong>صندلی نامحدود</strong>، ویرایش متن PDF و کنترل کامل ادمین با 99$ به‌ازای هر سرور در ماه."
-freeBody = "مجوز <strong>Open-Core</strong> ما تا <strong>{{freeTierLimit}}</strong> کاربر رایگان به‌ازای هر سرور را مجاز می‌داند. برای مقیاس‌پذیری بدون وقفه و دسترسی زودهنگام به <strong>ابزار ویرایش متن PDF</strong> جدیدمان، پلن Stirling Server را پیشنهاد می‌کنیم - ویرایش کامل و <strong>صندلی نامحدود</strong> با 99$ به‌ازای هر سرور در ماه."
+freeBody = "مجوز <strong>Open-Core</strong> ما به‌ازای هر سرور اجازهٔ استفادهٔ رایگان برای حداکثر <strong>{{freeTierLimit}}</strong> کاربر را می‌دهد. برای مقیاس‌دهی بدون وقفه، طرح Stirling Server را توصیه می‌کنیم - <strong>تعداد کاربران نامحدود</strong> و <strong>پشتیبانی از SSO</strong> با $99/سرور/ماه."
 
 [onboarding.desktopInstall]
 title = "دانلود"
@@ -5237,6 +5367,31 @@ error = "به‌روزرسانی وضعیت کاربر ناموفق بود"
 success = "کاربر با موفقیت حذف شد"
 error = "حذف کاربر ناموفق بود"
 
+[workspace.people.changePassword]
+action = "تغییر گذرواژه"
+title = "تغییر گذرواژه"
+subtitle = "به‌روزرسانی گذرواژه برای"
+newPassword = "گذرواژهٔ جدید"
+confirmPassword = "تأیید گذرواژه"
+placeholder = "گذرواژهٔ جدید وارد کنید"
+confirmPlaceholder = "گذرواژهٔ جدید را دوباره وارد کنید"
+passwordRequired = "لطفاً یک گذرواژهٔ جدید وارد کنید"
+passwordMismatch = "گذرواژه‌ها یکسان نیستند"
+generateRandom = "ایجاد گذرواژهٔ امن"
+generatedPreview = "گذرواژهٔ تولیدشده:"
+copyTooltip = "کپی در کلیپ‌بورد"
+copiedToClipboard = "گذرواژه در کلیپ‌بورد کپی شد"
+copyFailed = "کپی گذرواژه ناموفق بود"
+sendEmail = "به کاربر دربارهٔ این تغییر ایمیل ارسال کنید"
+includePassword = "گذرواژهٔ جدید را در ایمیل درج کنید"
+forcePasswordChange = "کاربر را ملزم کنید در ورود بعدی گذرواژه را تغییر دهد"
+emailUnavailable = "ایمیل این کاربر معتبر نیست. اعلان‌ها غیرفعال شده‌اند."
+smtpDisabled = "برای اعلان‌های ایمیل باید SMTP در تنظیمات فعال باشد."
+notifyOnly = "ایمیلی بدون گذرواژه ارسال خواهد شد تا به کاربر اطلاع دهد که یک مدیر آن را تغییر داده است."
+submit = "به‌روزرسانی گذرواژه"
+success = "گذرواژه با موفقیت به‌روزرسانی شد"
+error = "به‌روزرسانی گذرواژه ناموفق بود"
+
 [workspace.people.emailInvite]
 tab = "دعوت ایمیلی"
 description = "در زیر ایمیل‌ها را تایپ یا بچسبانید و با کاما جدا کنید. به کاربران اطلاعات ورود از طریق ایمیل ارسال می‌شود."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "حداقل یک آدرس ایمیل الزامی است"
 submit = "ارسال دعوت‌نامه‌ها"
 success = "کاربر(ان) با موفقیت دعوت شد(ند)"
-partialSuccess = "برخی دعوت‌ها ناموفق بود"
+partialFailure = "برخی دعوت‌ها ناموفق بودند"
 allFailed = "دعوت کاربران ناموفق بود"
 error = "ارسال دعوت‌نامه‌ها ناموفق بود"
 
@@ -5770,6 +5925,7 @@ subtitle = "با حساب Stirling خود وارد شوید"
 [setup.selfhosted]
 title = "ورود به سرور"
 subtitle = "اطلاعات کاربری سرور خود را وارد کنید"
+link = "یا به یک حساب خودمیزبان متصل شوید"
 
 [setup.server]
 title = "اتصال به سرور"
@@ -5788,6 +5944,14 @@ description = "URL کامل سرور خودمیزبان Stirling PDF خود را
 emptyUrl = "لطفاً URL سرور را وارد کنید"
 unreachable = "اتصال به سرور ممکن نشد"
 testFailed = "آزمون اتصال ناموفق بود"
+configFetch = "بازیابی پیکربندی سرور ناموفق بود. لطفاً URL را بررسی کنید و دوباره تلاش کنید."
+
+[setup.server.error.securityDisabled]
+title = "ورود فعال نیست"
+body = "ورود در این سرور فعال نشده است. برای اتصال به این سرور باید احراز هویت را فعال کنید:"
+step1 = "DOCKER_ENABLE_SECURITY=true را در محیط خود تنظیم کنید"
+step2 = "یا security.enableLogin=true را در settings.yml تنظیم کنید"
+step3 = "سرور را راه‌اندازی مجدد کنید"
 
 [setup.login]
 title = "ورود"
@@ -5797,6 +5961,13 @@ submit = "ورود"
 signInWith = "ورود با"
 oauthPending = "در حال باز کردن مرورگر برای احراز هویت..."
 orContinueWith = "یا با ایمیل ادامه دهید"
+serverRequirement = "توجه: سرور باید ورود را فعال کرده باشد."
+showInstructions = "نحوه فعال‌سازی؟"
+hideInstructions = "مخفی کردن دستورالعمل‌ها"
+instructions = "برای فعال‌سازی ورود در سرور Stirling PDF خود:"
+instructionsEnvVar = "متغیر محیطی را تنظیم کنید:"
+instructionsOrYml = "یا در settings.yml:"
+instructionsRestart = "سپس سرور خود را راه‌اندازی مجدد کنید تا تغییرات اعمال شوند."
 
 [setup.login.username]
 label = "نام کاربری"
@@ -5853,6 +6024,7 @@ earlyAccess = "دسترسی زودهنگام"
 reset = "بازنشانی تغییرات"
 downloadJson = "دانلود JSON"
 generatePdf = "تولید PDF"
+saveChanges = "ذخیرهٔ تغییرات"
 
 [pdfTextEditor.options.autoScaleText]
 title = "مقیاس خودکار متن برای جا شدن در باکس‌ها"
@@ -5890,6 +6062,8 @@ alpha = "این نمایشگر آلفا هنوز در حال تکامل است
 [pdfTextEditor.empty]
 title = "هیچ سندی بارگذاری نشده است"
 subtitle = "برای شروع ویرایش متن، یک فایل PDF یا JSON بارگذاری کنید."
+dropzone = "یک فایل PDF یا JSON را اینجا بکشید و رها کنید، یا برای مرور کلیک کنید"
+dropzoneWithFiles = "یک فایل را از برگهٔ فایل‌ها انتخاب کنید، یا یک فایل PDF یا JSON را اینجا بکشید و رها کنید، یا برای مرور کلیک کنید"
 
 [pdfTextEditor.welcomeBanner]
 title = "به ویرایشگر متن PDF (دسترسی زودهنگام) خوش آمدید"
diff --git a/frontend/public/locales/fr-FR/translation.toml b/frontend/public/locales/fr-FR/translation.toml
index 2bd5da5c5..37d11a274 100644
--- a/frontend/public/locales/fr-FR/translation.toml
+++ b/frontend/public/locales/fr-FR/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Retirer des favoris"
 fullscreen = "Passer en mode plein écran"
 sidebar = "Passer en mode barre latérale"
 
+[backendStartup]
+notFoundTitle = "Backend introuvable"
+retry = "Réessayer"
+unreachable = "L’application ne peut actuellement pas se connecter au backend. Vérifiez l’état du backend et la connectivité réseau, puis réessayez."
+
 [zipWarning]
 title = "Fichier ZIP volumineux"
 message = "Ce ZIP contient {{count}} fichiers. Extraire quand même ?"
@@ -347,7 +352,7 @@ teams = "Équipes"
 title = "Configuration"
 systemSettings = "Paramètres système"
 features = "Fonctionnalités"
-endpoints = "Endpoints"
+endpoints = "Points de terminaison"
 database = "Base de données"
 advanced = "Avancé"
 
@@ -358,7 +363,7 @@ connections = "Connexions"
 
 [settings.licensingAnalytics]
 title = "Licences et analyses"
-plan = "Plan"
+plan = "Forfait"
 audit = "Audit"
 usageAnalytics = "Analyses d'utilisation"
 
@@ -912,6 +917,9 @@ desc = "Créez des workflows multi-étapes en enchaînant des actions PDF. Idéa
 desc = "Superposer un PDF sur un autre"
 title = "Superposer des PDF"
 
+[home.pdfTextEditor]
+title = "Éditeur de texte PDF"
+desc = "Modifier le texte et les images existants dans les PDF"
 
 [home.addText]
 tags = "texte,annotation,étiquette"
@@ -1217,7 +1225,7 @@ odtExt = "Texte OpenDocument (.odt)"
 pptExt = "PowerPoint (.pptx)"
 odpExt = "Présentation OpenDocument (.odp)"
 txtExt = "Texte brut (.txt)"
-rtfExt = "Rich Text Format (.rtf)"
+rtfExt = "Format de texte enrichi (.rtf)"
 selectedFiles = "Fichiers sélectionnés"
 noFileSelected = "Aucun fichier sélectionné. Utilisez le panneau de fichiers pour ajouter des fichiers."
 convertFiles = "Convertir les fichiers"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Signature dessinée"
 defaultImageLabel = "Signature téléversée"
 defaultTextLabel = "Signature saisie"
 saveButton = "Enregistrer la signature"
+savePersonal = "Enregistrer en personnel"
+saveShared = "Enregistrer en partagé"
 saveUnavailable = "Créez d’abord une signature pour l’enregistrer."
 noChanges = "La signature actuelle est déjà enregistrée."
+tempStorageTitle = "Stockage temporaire du navigateur"
+tempStorageDescription = "Les signatures sont stockées uniquement dans votre navigateur. Elles seront perdues si vous effacez les données du navigateur ou si vous changez de navigateur."
+personalHeading = "Signatures personnelles"
+sharedHeading = "Signatures partagées"
+personalDescription = "Vous seul pouvez voir ces signatures."
+sharedDescription = "Tous les utilisateurs peuvent voir et utiliser ces signatures."
 
 [sign.saved.type]
 canvas = "Dessin"
@@ -3020,6 +3036,91 @@ title = "Récupérer les informations"
 header = "Récupérer les informations"
 submit = "Récupérer les informations"
 downloadJson = "Télécharger le JSON"
+processing = "Extraction des informations..."
+results = "Résultats"
+noResults = "Exécutez l'outil pour générer un rapport."
+downloads = "Téléchargements"
+noneDetected = "Aucun détecté"
+indexTitle = "Index"
+
+[getPdfInfo.report]
+entryLabel = "Résumé complet des informations"
+shortTitle = "Informations PDF"
+
+[getPdfInfo.sections]
+metadata = "Métadonnées"
+formFields = "Champs de formulaire"
+basicInfo = "Informations de base"
+documentInfo = "Informations sur le document"
+compliance = "Conformité"
+encryption = "Chiffrement"
+permissions = "Autorisations"
+other = "Autre"
+perPageInfo = "Informations par page"
+tableOfContents = "Table des matières"
+
+[getPdfInfo.other]
+attachments = "Pièces jointes"
+embeddedFiles = "Fichiers intégrés"
+javaScript = "JavaScript"
+layers = "Calques"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Taille"
+annotations = "Annotations"
+images = "Images"
+links = "Liens"
+fonts = "Polices"
+xobjects = "Nombre d'objets XObject"
+multimedia = "Multimédia"
+
+[getPdfInfo.summary]
+pages = "Pages"
+fileSize = "Taille du fichier"
+pdfVersion = "Version PDF"
+language = "Langue"
+title = "Résumé PDF"
+author = "Auteur"
+created = "Créé"
+modified = "Modifié"
+permsAll = "Toutes les autorisations accordées"
+permsRestricted = "{{count}} restrictions"
+permsMixed = "Certaines autorisations sont restreintes"
+hasCompliance = "Respecte des normes de conformité"
+noCompliance = "Aucune norme de conformité"
+basic = "Informations de base"
+documentInfo = "Informations sur le document"
+securityTitle = "État de sécurité"
+technical = "Technique"
+overviewTitle = "Aperçu du PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF chiffré - Protection par mot de passe présente"
+unencrypted = "PDF non chiffré - Aucune protection par mot de passe"
+
+[getPdfInfo.summary.tech]
+images = "Images"
+fonts = "Polices"
+formFields = "Champs de formulaire"
+embeddedFiles = "Fichiers intégrés"
+javaScript = "JavaScript"
+layers = "Calques"
+bookmarks = "Signets"
+multimedia = "Multimédia"
+
+[getPdfInfo.summary.overview]
+untitled = "un document sans titre"
+unknown = "Auteur inconnu"
+text = "Ceci est un PDF de {{pages}} pages intitulé {{title}} créé par {{author}} (version PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Certains fichiers n'ont pas pu être traités."
+unexpected = "Erreur inattendue lors de l'extraction."
+
+[getPdfInfo.status]
+complete = "Extraction terminée"
 
 [extractPage]
 tags = "extraire,extract"
@@ -3438,6 +3539,9 @@ signinTitle = "Veuillez vous connecter"
 ssoSignIn = "Se connecter via l'authentification unique"
 oAuth2AutoCreateDisabled = "OAUTH2 Création automatique d'utilisateur désactivée"
 oAuth2AdminBlockedUser = "La création ou l'authentification d'utilisateurs non enregistrés est actuellement bloquée. Veuillez contacter l'administrateur."
+oAuth2RequiresLicense = "La connexion OAuth/SSO nécessite une licence payante (Server ou Enterprise). Veuillez contacter l’administrateur pour mettre à niveau votre plan."
+saml2RequiresLicense = "La connexion SAML nécessite une licence payante (Server ou Enterprise). Veuillez contacter l’administrateur pour mettre à niveau votre plan."
+maxUsersReached = "Nombre maximal d’utilisateurs atteint pour votre licence actuelle. Veuillez contacter l’administrateur pour mettre à niveau votre plan ou ajouter des places."
 oauth2RequestNotFound = "Demande d'autorisation introuvable"
 oauth2InvalidUserInfoResponse = "Réponse contenant les informations de l'utilisateur est invalide"
 oauth2invalidRequest = "Requête invalide"
@@ -3846,14 +3950,17 @@ fitToWidth = "Ajuster à la largeur"
 actualSize = "Taille réelle"
 
 [viewer]
+cannotPreviewFile = "Impossible d’afficher un aperçu du fichier"
+dualPageView = "Vue double page"
 firstPage = "Première page"
 lastPage = "Dernière page"
-previousPage = "Page précédente"
 nextPage = "Page suivante"
+onlyPdfSupported = "Le visualiseur prend uniquement en charge les fichiers PDF. Ce fichier semble être d’un autre format."
+previousPage = "Page précédente"
+singlePageView = "Vue page unique"
+unknownFile = "Fichier inconnu"
 zoomIn = "Zoom avant"
 zoomOut = "Zoom arrière"
-singlePageView = "Vue page unique"
-dualPageView = "Vue double page"
 
 [rightRail]
 closeSelected = "Fermer les fichiers sélectionnés"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Afficher/masquer la barre latérale"
 exportSelected = "Exporter les pages sélectionnées"
 toggleAnnotations = "Afficher/masquer les annotations"
 annotationMode = "Basculer en mode annotation"
+print = "Imprimer le PDF"
 draw = "Dessiner"
 save = "Enregistrer"
 saveChanges = "Enregistrer les modifications"
@@ -4153,7 +4261,7 @@ description = "Suivre les actions des utilisateurs et les événements système
 
 [admin.settings.security.audit.level]
 label = "Niveau d’audit"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=DÉSACTIVÉ, 1=BASIQUE, 2=STANDARD, 3=VERBEUX"
 
 [admin.settings.security.audit.retentionDays]
 label = "Rétention des journaux (jours)"
@@ -4491,9 +4599,10 @@ label = "Mentions légales"
 description = "URL ou nom de fichier de l’impressum (obligatoire dans certaines juridictions)"
 
 [admin.settings.premium]
-title = "Premium & Enterprise"
+title = "Premium et Entreprise"
 description = "Configurer votre clé de licence Premium ou Enterprise."
 license = "Configuration de la licence"
+noInput = "Veuillez fournir une clé de licence ou un fichier"
 
 [admin.settings.premium.licenseKey]
 toggle = "Vous avez une clé de licence ou un fichier de certificat ?"
@@ -4511,6 +4620,25 @@ line1 = "Écraser votre clé de licence actuelle est irréversible."
 line2 = "Votre licence précédente sera définitivement perdue, sauf si vous l’avez sauvegardée ailleurs."
 line3 = "Important : gardez vos clés de licence privées et sécurisées. Ne les partagez jamais publiquement."
 
+[admin.settings.premium.inputMethod]
+text = "Clé de licence"
+file = "Fichier de certificat"
+
+[admin.settings.premium.file]
+label = "Fichier de certificat de licence"
+description = "Téléversez votre fichier de licence .lic ou .cert issu d’achats hors ligne"
+choose = "Choisir le fichier de licence"
+selected = "Sélectionné: {{filename}} ({{size}})"
+successMessage = "Fichier de licence téléversé et activé avec succès. Aucun redémarrage requis."
+
+[admin.settings.premium.currentLicense]
+title = "Licence active"
+file = "Source: Fichier de licence ({{path}})"
+key = "Source: Clé de licence"
+type = "Type : {{type}}"
+noInput = "Veuillez fournir une clé de licence ou téléverser un fichier de certificat"
+success = "Succès"
+
 [admin.settings.premium.enabled]
 label = "Activer les fonctionnalités Premium"
 description = "Activer la vérification de la clé de licence pour les fonctionnalités Pro/Enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} sélectionné(s)"
 download = "Télécharger"
 delete = "Supprimer"
 unsupported = "Non pris en charge"
+active = "Actif"
 addToUpload = "Ajouter au téléversement"
+closeFile = "Fermer le fichier"
 deleteAll = "Tout supprimer"
 loadingFiles = "Chargement des fichiers..."
 noFiles = "Aucun fichier disponible"
@@ -5132,7 +5262,7 @@ upgrade = "Mettre à niveau maintenant →"
 freeTitle = "Licence serveur"
 overLimitTitle = "Licence serveur requise"
 overLimitBody = "Notre licence autorise jusqu’à <strong>{{freeTierLimit}}</strong> utilisateurs gratuits par serveur. Vous avez <strong>{{overLimitUserCopy}}</strong> utilisateurs Stirling. Pour continuer sans interruption, passez au plan Stirling Server — <strong>places illimitées</strong>, édition de texte PDF et contrôle d’administration complet pour 99 $/serveur/mois."
-freeBody = "Notre licence <strong>Open-Core</strong> autorise jusqu’à <strong>{{freeTierLimit}}</strong> utilisateurs gratuits par serveur. Pour évoluer sans interruption et accéder en avant-première à notre nouvel <strong>outil d’édition de texte PDF</strong>, nous recommandons le plan Stirling Server — édition complète et <strong>places illimitées</strong> pour 99 $/serveur/mois."
+freeBody = "Notre régime de licence <strong>Open-Core</strong> autorise jusqu'à <strong>{{freeTierLimit}}</strong> utilisateurs gratuitement par serveur. Pour évoluer sans interruption, nous recommandons le forfait Stirling Server - <strong>places illimitées</strong> et <strong>prise en charge du SSO</strong> pour 99 $/serveur/mois."
 
 [onboarding.desktopInstall]
 title = "Télécharger"
@@ -5178,7 +5308,7 @@ active = "Actif"
 disabled = "Désactivé"
 activeSession = "Session active"
 member = "Membre"
-admin = "Admin"
+admin = "Administrateur"
 editRole = "Modifier le rôle"
 enable = "Activer"
 disable = "Désactiver"
@@ -5237,6 +5367,31 @@ error = "Échec de la mise à jour du statut de l’utilisateur"
 success = "Utilisateur supprimé avec succès"
 error = "Échec de la suppression de l’utilisateur"
 
+[workspace.people.changePassword]
+action = "Changer le mot de passe"
+title = "Changer le mot de passe"
+subtitle = "Mettre à jour le mot de passe de"
+newPassword = "Nouveau mot de passe"
+confirmPassword = "Confirmer le mot de passe"
+placeholder = "Saisissez un nouveau mot de passe"
+confirmPlaceholder = "Saisissez à nouveau le nouveau mot de passe"
+passwordRequired = "Veuillez saisir un nouveau mot de passe"
+passwordMismatch = "Les mots de passe ne correspondent pas"
+generateRandom = "Générer un mot de passe sécurisé"
+generatedPreview = "Mot de passe généré :"
+copyTooltip = "Copier dans le presse-papiers"
+copiedToClipboard = "Mot de passe copié dans le presse-papiers"
+copyFailed = "Échec de la copie du mot de passe"
+sendEmail = "Envoyer un e-mail à l'utilisateur à propos de ce changement"
+includePassword = "Inclure le nouveau mot de passe dans l'e-mail"
+forcePasswordChange = "Forcer l'utilisateur à changer son mot de passe à la prochaine connexion"
+emailUnavailable = "L'e-mail de cet utilisateur n'est pas une adresse valide. Les notifications sont désactivées."
+smtpDisabled = "Les notifications par e-mail nécessitent l'activation de SMTP dans les paramètres."
+notifyOnly = "Un e-mail sera envoyé sans le mot de passe, informant l'utilisateur qu'un administrateur l'a modifié."
+submit = "Mettre à jour le mot de passe"
+success = "Mot de passe mis à jour avec succès"
+error = "Échec de la mise à jour du mot de passe"
+
 [workspace.people.emailInvite]
 tab = "Invitation par e-mail"
 description = "Saisissez ou collez des adresses e-mail ci-dessous, séparées par des virgules. Les utilisateurs recevront leurs identifiants de connexion par e-mail."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Au moins une adresse e-mail est requise"
 submit = "Envoyer les invitations"
 success = "Utilisateur(s) invité(s) avec succès"
-partialSuccess = "Certaines invitations ont échoué"
+partialFailure = "Certaines invitations ont échoué"
 allFailed = "Échec de l’invitation des utilisateurs"
 error = "Échec de l’envoi des invitations"
 
@@ -5709,7 +5864,7 @@ title = "Graphique d’utilisation des endpoints"
 
 [usage.table]
 title = "Statistiques détaillées"
-endpoint = "Endpoint"
+endpoint = "Point de terminaison"
 visits = "Visites"
 percentage = "Pourcentage"
 noData = "Aucune donnée disponible"
@@ -5770,6 +5925,7 @@ subtitle = "Connectez-vous avec votre compte Stirling"
 [setup.selfhosted]
 title = "Se connecter au serveur"
 subtitle = "Saisissez les identifiants du serveur"
+link = "ou connectez-vous à un compte auto-hébergé"
 
 [setup.server]
 title = "Connexion au serveur"
@@ -5788,6 +5944,14 @@ description = "Saisissez l’URL complète de votre serveur Stirling PDF auto‑
 emptyUrl = "Veuillez saisir une URL de serveur"
 unreachable = "Connexion au serveur impossible"
 testFailed = "Échec du test de connexion"
+configFetch = "Échec de la récupération de la configuration du serveur. Veuillez vérifier l'URL et réessayer."
+
+[setup.server.error.securityDisabled]
+title = "Connexion non activée"
+body = "La connexion n'est pas activée sur ce serveur. Pour vous y connecter, vous devez activer l'authentification :"
+step1 = "Définissez DOCKER_ENABLE_SECURITY=true dans votre environnement"
+step2 = "Ou définissez security.enableLogin=true dans settings.yml"
+step3 = "Redémarrez le serveur"
 
 [setup.login]
 title = "Se connecter"
@@ -5797,13 +5961,20 @@ submit = "Se connecter"
 signInWith = "Se connecter avec"
 oauthPending = "Ouverture du navigateur pour l'authentification..."
 orContinueWith = "Ou continuer avec l’email"
+serverRequirement = "Remarque : le serveur doit avoir la connexion activée."
+showInstructions = "Comment l’activer ?"
+hideInstructions = "Masquer les instructions"
+instructions = "Pour activer la connexion sur votre serveur Stirling PDF :"
+instructionsEnvVar = "Définissez la variable d’environnement :"
+instructionsOrYml = "Ou dans settings.yml :"
+instructionsRestart = "Redémarrez ensuite votre serveur pour que les modifications prennent effet."
 
 [setup.login.username]
 label = "Nom d’utilisateur"
 placeholder = "Entrez votre nom d’utilisateur"
 
 [setup.login.email]
-label = "Email"
+label = "E-mail"
 placeholder = "Saisissez votre email"
 
 [setup.login.password]
@@ -5840,7 +6011,7 @@ paragraph = "Page de paragraphe"
 sparse = "Texte clairsemé"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automatique"
 paragraph = "Paragraphe"
 singleLine = "Ligne unique"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Accès anticipé"
 reset = "Réinitialiser les modifications"
 downloadJson = "Télécharger le JSON"
 generatePdf = "Générer le PDF"
+saveChanges = "Enregistrer les modifications"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Ajuster automatiquement le texte aux cadres"
@@ -5890,6 +6062,8 @@ alpha = "Ce visualiseur alpha évolue encore — certaines polices, couleurs, ef
 [pdfTextEditor.empty]
 title = "Aucun document chargé"
 subtitle = "Chargez un fichier PDF ou JSON pour commencer à modifier le texte."
+dropzone = "Glissez-déposez un fichier PDF ou JSON ici, ou cliquez pour parcourir"
+dropzoneWithFiles = "Sélectionnez un fichier depuis l'onglet Fichiers, ou glissez-déposez un fichier PDF ou JSON ici, ou cliquez pour parcourir"
 
 [pdfTextEditor.welcomeBanner]
 title = "Bienvenue dans l'éditeur de texte PDF (accès anticipé)"
diff --git a/frontend/public/locales/ga-IE/translation.toml b/frontend/public/locales/ga-IE/translation.toml
index d34fbfba5..868f4203a 100644
--- a/frontend/public/locales/ga-IE/translation.toml
+++ b/frontend/public/locales/ga-IE/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Bain den Cheanáin"
 fullscreen = "Athraigh go mód lánscáileáin"
 sidebar = "Athraigh go mód barra taoibh"
 
+[backendStartup]
+notFoundTitle = "Níor aimsíodh an cúlchóras"
+retry = "Atriail"
+unreachable = "Ní féidir leis an bhfeidhmchlár ceangal leis an gcúlchóras faoi láthair. Deimhnigh stádas an chúlchórais agus nascacht an líonra, ansin bain triail eile as."
+
 [zipWarning]
 title = "Comhad ZIP Mór"
 message = "Tá {{count}} comhad sa ZIP seo. An mbaineann tú amach mar sin féin?"
@@ -912,6 +917,9 @@ desc = "Tóg sreafaí oibre ilchéime trí ghníomhartha PDF a nascadh le chéil
 desc = "Forleagain PDF ar bharr PDF eile"
 title = "Forleagan PDF"
 
+[home.pdfTextEditor]
+title = "Eagarthóir Téacs PDF"
+desc = "Cuir téacs agus íomhánna atá ann cheana in eagar laistigh de PDFanna"
 
 [home.addText]
 tags = "téacs,anótáil,lipéad"
@@ -1635,7 +1643,7 @@ subtitle = "Íoslódáil an comhad próiseáilte nó cealaigh an oibríocht thí
 [removePages]
 tags = "Bain leathanaigh, scrios leathanaigh"
 title = "Bain"
-filenamePrefix = "pages_removed"
+filenamePrefix = "leathanaigh_bainte"
 submit = "Bain"
 
 [removePages.pageNumbers]
@@ -1837,7 +1845,7 @@ title = "Bain Léamh-Amháin ó Réimsí Foirme"
 header = "Díghlasáil Foirmeacha PDF"
 submit = "Remove"
 description = "Bainfidh an uirlis seo srianta léamh-amáin ó réimsí foirme PDF, rud a fhágann go mbeidh siad in-eagarthóireachta agus inlíonta."
-filenamePrefix = "unlocked_forms"
+filenamePrefix = "foirmeacha_díghlasáilte"
 
 [unlockPDFForms.files]
 placeholder = "Roghnaigh comhad PDF sa phríomh-amharc chun tosú"
@@ -1851,7 +1859,7 @@ title = "Torthaí Díghlasála Foirmeacha"
 [changeMetadata]
 header = "Athraigh Meiteashonraí"
 submit = "Athrú"
-filenamePrefix = "metadata"
+filenamePrefix = "meiteashonraí"
 
 [changeMetadata.settings]
 title = "Socruithe Meiteashonraí"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Síniú líníochta"
 defaultImageLabel = "Síniú uaslódáilte"
 defaultTextLabel = "Síniú clóscríofa"
 saveButton = "Sábháil síniú"
+savePersonal = "Sábháil Pearsanta"
+saveShared = "Sábháil Comhroinnte"
 saveUnavailable = "Cruthaigh síniú ar dtús chun é a shábháil."
 noChanges = "Tá an síniú reatha sábháilte cheana."
+tempStorageTitle = "Stóráil shealadach an bhrabhsálaí"
+tempStorageDescription = "Stóráiltear na sínithe i do bhrabhsálaí amháin. Caillfear iad má ghlanann tú sonraí an bhrabhsálaí nó má athraíonn tú brabhsálaithe."
+personalHeading = "Sínithe Pearsanta"
+sharedHeading = "Sínithe Comhroinnte"
+personalDescription = "Ní féidir ach leatsa na sínithe seo a fheiceáil."
+sharedDescription = "Is féidir le gach úsáideoir na sínithe seo a fheiceáil agus a úsáid."
 
 [sign.saved.type]
 canvas = "Líníocht"
@@ -2318,7 +2334,7 @@ title = "Comhcheangail"
 header = "PDF cothromú"
 flattenOnlyForms = "Flatten foirmeacha amháin"
 submit = "Comhcheangail"
-filenamePrefix = "flattened"
+filenamePrefix = "maolaithe"
 
 [flatten.files]
 placeholder = "Roghnaigh comhad PDF sa phríomh-amharc chun tosú"
@@ -2366,7 +2382,7 @@ title = "Deisiúchán"
 header = "PDF a dheisiú"
 submit = "Deisiúchán"
 description = "Déanfaidh an uirlis seo iarracht comhaid PDF truaillithe nó damáiste a dheisiú. Níl aon socruithe breise ag teastáil."
-filenamePrefix = "repaired"
+filenamePrefix = "deisithe"
 
 [repair.files]
 placeholder = "Roghnaigh comhad PDF sa phríomh-amharc chun tosú"
@@ -2567,7 +2583,7 @@ stopButton = "Stop comparáid"
 [certSign]
 tags = "fíordheimhnigh, PEM, P12, oifigiúil, criptigh"
 title = "Síniú Teastais"
-filenamePrefix = "signed"
+filenamePrefix = "síníthe"
 chooseCertificate = "Roghnaigh Comhad Teastais"
 chooseJksFile = "Roghnaigh Comhad JKS"
 chooseP12File = "Roghnaigh Comhad PKCS12"
@@ -2701,7 +2717,7 @@ header = "Bain an deimhniú digiteach ó PDF"
 selectPDF = "Roghnaigh comhad PDF:"
 submit = "Bain Síniú"
 description = "Bainfidh an uirlis seo sínithe teastais dhigiteacha de do dhoiciméad PDF."
-filenamePrefix = "unsigned"
+filenamePrefix = "neamhshínithe"
 
 [removeCertSign.files]
 placeholder = "Roghnaigh comhad PDF sa phríomh-amharc chun tosú"
@@ -3020,6 +3036,91 @@ title = "Faigh eolas ar PDF"
 header = "Faigh eolas ar PDF"
 submit = "Faigh Eolas"
 downloadJson = "Íosluchtaigh ceol JSON"
+processing = "Ag eastóscadh faisnéise..."
+results = "Torthaí"
+noResults = "Rith an uirlis chun tuairisc a ghiniúint."
+downloads = "Íoslódálacha"
+noneDetected = "Níor braitheadh aon cheann"
+indexTitle = "Innéacs"
+
+[getPdfInfo.report]
+entryLabel = "Achoimre iomlán eolais"
+shortTitle = "Eolas PDF"
+
+[getPdfInfo.sections]
+metadata = "Meiteashonraí"
+formFields = "Réimsí Foirme"
+basicInfo = "Buneolas"
+documentInfo = "Eolas faoin Doiciméad"
+compliance = "Comhlíonadh"
+encryption = "Criptiú"
+permissions = "Ceadanna"
+other = "Eile"
+perPageInfo = "Eolas in aghaidh an leathanaigh"
+tableOfContents = "Clár Ábhair"
+
+[getPdfInfo.other]
+attachments = "Iatáin"
+embeddedFiles = "Comhaid Leabaithe"
+javaScript = "JavaScript"
+layers = "Sraitheanna"
+structureTree = "Crann Struchtúir"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Méid"
+annotations = "Anótálacha"
+images = "Íomhánna"
+links = "Naisc"
+fonts = "Clónna"
+xobjects = "Líon XObjectanna"
+multimedia = "Ilmheáin"
+
+[getPdfInfo.summary]
+pages = "Leathanaigh"
+fileSize = "Méid Comhaid"
+pdfVersion = "Leagan PDF"
+language = "Teanga"
+title = "Achoimre PDF"
+author = "Údar"
+created = "Cruthaithe"
+modified = "Athraithe"
+permsAll = "Gach cead ceadaithe"
+permsRestricted = "{{count}} srianta"
+permsMixed = "Tá roinnt ceadanna srianta"
+hasCompliance = "Tá caighdeáin chomhlíonta ann"
+noCompliance = "Gan chaighdeáin chomhlíonta"
+basic = "Buneolas"
+documentInfo = "Eolas faoin Doiciméad"
+securityTitle = "Stádas Slándála"
+technical = "Teicniúil"
+overviewTitle = "Forbhreathnú PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF criptithe - cosaint le focal faire"
+unencrypted = "PDF neamchriptithe - gan chosaint le focal faire"
+
+[getPdfInfo.summary.tech]
+images = "Íomhánna"
+fonts = "Clónna"
+formFields = "Réimsí Foirme"
+embeddedFiles = "Comhaid Leabaithe"
+javaScript = "JavaScript"
+layers = "Sraitheanna"
+bookmarks = "Leabharmharcanna"
+multimedia = "Ilmheáin"
+
+[getPdfInfo.summary.overview]
+untitled = "doiciméad gan teideal"
+unknown = "Údar Anaithnid"
+text = "Is PDF {{pages}} leathanach dar teideal {{title}} é, a chruthaigh {{author}} (leagan PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Níorbh fhéidir roinnt comhad a phróiseáil."
+unexpected = "Earráid gan choinne le linn eastósctha."
+
+[getPdfInfo.status]
+complete = "Eastóscadh críochnaithe"
 
 [extractPage]
 tags = "sliocht"
@@ -3438,6 +3539,9 @@ signinTitle = "Sínigh isteach le do thoil"
 ssoSignIn = "Logáil isteach trí Chlárú Aonair"
 oAuth2AutoCreateDisabled = "OAUTH2 Uath-Chruthaigh Úsáideoir faoi Mhíchumas"
 oAuth2AdminBlockedUser = "Tá bac faoi láthair ar chlárú nó logáil isteach úsáideoirí neamhchláraithe. Déan teagmháil leis an riarthóir le do thoil."
+oAuth2RequiresLicense = "Teastaíonn ceadúnas íoctha (Server nó Enterprise) chun logáil isteach le OAuth/SSO. Déan teagmháil leis an riarthóir chun do phlean a uasghrádú."
+saml2RequiresLicense = "Teastaíonn ceadúnas íoctha (Server nó Enterprise) chun logáil isteach le SAML. Déan teagmháil leis an riarthóir chun do phlean a uasghrádú."
+maxUsersReached = "Sroicheadh an líon uasta úsáideoirí do do cheadúnas reatha. Déan teagmháil leis an riarthóir chun do phlean a uasghrádú nó suíocháin bhreise a chur leis."
 oauth2RequestNotFound = "Níor aimsíodh iarratas údaraithe"
 oauth2InvalidUserInfoResponse = "Freagra Neamhbhailí Faisnéise Úsáideora"
 oauth2invalidRequest = "Iarratas Neamhbhailí"
@@ -3533,7 +3637,7 @@ title = "PDF go leathanach amháin"
 header = "PDF go leathanach amháin"
 submit = "Tiontaigh go Leathanach Aonair"
 description = "Cuirfidh an uirlis seo gach leathanach de do PDF le chéile in aon leathanach mór amháin. Fanfaidh an leithead mar an gcéanna leis na leathanaigh bhunaidh, ach beidh an airde cothrom le suim airde na leathanach go léir."
-filenamePrefix = "single_page"
+filenamePrefix = "leathanach_aonair"
 
 [pdfToSinglePage.files]
 placeholder = "Roghnaigh comhad PDF sa phríomh-amharc chun tosú"
@@ -3846,14 +3950,17 @@ fitToWidth = "Oiriúnaigh don Leithead"
 actualSize = "Fíormhéid"
 
 [viewer]
+cannotPreviewFile = "Ní féidir an comhad a réamhamharc."
+dualPageView = "Amharc Dhá Leathanach"
 firstPage = "An Chéad Leathanach"
 lastPage = "An Leathanach Deireanach"
-previousPage = "Leathanach Roimhe Seo"
 nextPage = "Leathanach Ar Aghaidh"
+onlyPdfSupported = "Ní thacaíonn an t-amharcán ach le comhaid PDF. Is cosúil gur formáid eile é an comhad seo."
+previousPage = "Leathanach Roimhe Seo"
+singlePageView = "Amharc Leathanach Aonair"
+unknownFile = "Comhad anaithnid"
 zoomIn = "Súmáil Isteach"
 zoomOut = "Súmáil Amach"
-singlePageView = "Amharc Leathanach Aonair"
-dualPageView = "Amharc Dhá Leathanach"
 
 [rightRail]
 closeSelected = "Dún na Comhaid Roghnaithe"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Athraigh an Barra Taoibh"
 exportSelected = "Easpórtáil na Leathanaigh Roghnaithe"
 toggleAnnotations = "Athraigh Infheictheacht Anótálacha"
 annotationMode = "Athraigh Mód Anótála"
+print = "Priontáil PDF"
 draw = "Tarraing"
 save = "Sábháil"
 saveChanges = "Sábháil Athruithe"
@@ -4494,6 +4602,7 @@ description = "URL nó ainm comhaid don impressum (riachtanach i roinnt dlínsí
 title = "Préimh & Fiontar"
 description = "Cumraigh do eochair cheadúnais préimhe nó fiontair."
 license = "Cumraíocht Ceadúnais"
+noInput = "Tabhair eochair nó comhad ceadúnais, le do thoil"
 
 [admin.settings.premium.licenseKey]
 toggle = "An bhfuil eochair cheadúnais nó comhad teastais agat?"
@@ -4511,6 +4620,25 @@ line1 = "Ní féidir forshcríobh ar do eochair cheadúnais reatha a chealú."
 line2 = "Caillefar do cheadúnas roimhe seo go buan mura bhfuil cúltaca de in áit eile agat."
 line3 = "Tábhachtach: Coinnigh eochracha ceadúnais príobháideach agus slán. Ná roinn go poiblí riamh."
 
+[admin.settings.premium.inputMethod]
+text = "Eochair Ceadúnais"
+file = "Comhad Teastais"
+
+[admin.settings.premium.file]
+label = "Comhad Teastais Ceadúnais"
+description = "Uaslódáil do chomhad ceadúnais .lic nó .cert ó cheannacháin as líne"
+choose = "Roghnaigh Comhad Ceadúnais"
+selected = "Roghnaithe: {{filename}} ({{size}})"
+successMessage = "D’éirigh le huaslódáil agus gníomhachtú an chomhaid cheadúnais. Níl atosú ag teastáil."
+
+[admin.settings.premium.currentLicense]
+title = "Ceadúnas Gníomhach"
+file = "Foinse: Comhad ceadúnais ({{path}})"
+key = "Foinse: Eochair ceadúnais"
+type = "Cineál: {{type}}"
+noInput = "Tabhair eochair ceadúnais nó uaslódáil comhad teastais, le do thoil"
+success = "Rath"
+
 [admin.settings.premium.enabled]
 label = "Cumasaigh Gnéithe Préimhe"
 description = "Cumasaigh seiceálacha eochrach ceadúnais do ghnéithe pro/fiontair"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} roghnaithe"
 download = "Íosluchtaigh"
 delete = "Scrios"
 unsupported = "Gan tacaíocht"
+active = "Gníomhach"
 addToUpload = "Cuir leis an Uaslódáil"
+closeFile = "Dún an comhad"
 deleteAll = "Scrios Uile"
 loadingFiles = "Comhaid á Luchtú..."
 noFiles = "Níl comhaid ar fáil"
@@ -5132,7 +5262,7 @@ upgrade = "Uasghrádaigh anois →"
 freeTitle = "Ceadúnas Freastalaí"
 overLimitTitle = "Ceadúnas Freastalaí de dhíth"
 overLimitBody = "Ceadaíonn ár gceadúnú suas le <strong>{{freeTierLimit}}</strong> úsáideoir in aisce in aghaidh freastalaí. Tá <strong>{{overLimitUserCopy}}</strong> úsáideoir Stirling agat. Chun leanúint gan bhriseadh, uasghrádaigh go plean Freastalaí Stirling - <strong>suíocháin neamhtheoranta</strong>, eagarthóireacht téacs PDF, agus lánrialú riaracháin ar $99/freastalaí/mí."
-freeBody = "Ceadaíonn ár gceadúnú <strong>Open-Core</strong> suas le <strong>{{freeTierLimit}}</strong> úsáideoir in aisce in aghaidh freastalaí. Chun méadú gan bhriseadh agus rochtain luath a fháil ar ár <strong>uirlis eagarthóireachta téacs PDF</strong> nua, molaimid Plean Freastalaí Stirling - eagarthóireacht iomlán agus <strong>suíocháin neamhtheoranta</strong> ar $99/freastalaí/mí."
+freeBody = "Ceadaíonn ár gceadúnú <strong>Open-Core</strong> suas le <strong>{{freeTierLimit}}</strong> úsáideoirí saor in aisce in aghaidh an fhreastalaí. Chun scálú gan bhriseadh, molaimid an plean Stirling Server - <strong>suíocháin neamhtheoranta</strong> agus <strong>tacaíocht SSO</strong> ar $99/server/mo."
 
 [onboarding.desktopInstall]
 title = "Íoslódáil"
@@ -5237,6 +5367,31 @@ error = "Theip ar stádas úsáideora a nuashonrú"
 success = "Scriosadh an t-úsáideoir go rathúil"
 error = "Theip ar an úsáideoir a scriosadh"
 
+[workspace.people.changePassword]
+action = "Athraigh an focal faire"
+title = "Athraigh an focal faire"
+subtitle = "Nuashonraigh an focal faire do"
+newPassword = "Focal faire nua"
+confirmPassword = "Deimhnigh an focal faire"
+placeholder = "Cuir focal faire nua isteach"
+confirmPlaceholder = "Cuir an focal faire nua isteach arís"
+passwordRequired = "Cuir focal faire nua isteach le do thoil"
+passwordMismatch = "Ní hionann na focail faire"
+generateRandom = "Gin focal faire slán"
+generatedPreview = "Focal faire ginte:"
+copyTooltip = "Cóipeáil chuig an ngearrthaisce"
+copiedToClipboard = "Cóipeáladh an focal faire chuig an ngearrthaisce"
+copyFailed = "Níor éirigh le cóipeáil an fhocail fhaire"
+sendEmail = "Seol ríomhphost chuig an úsáideoir faoin athrú seo"
+includePassword = "Cuir an focal faire nua san ríomhphost"
+forcePasswordChange = "Cuir iallach ar an úsáideoir an focal faire a athrú ag an gcéad logáil isteach eile"
+emailUnavailable = "Níl seoladh ríomhphoist bailí ag an úsáideoir seo. Tá fógraí díchumasaithe."
+smtpDisabled = "Teastaíonn SMTP cumasaithe sna socruithe le haghaidh fógraí ríomhphoist."
+notifyOnly = "Seolfar ríomhphost gan an focal faire, ag cur in iúl don úsáideoir gur d’athraigh riarthóir é."
+submit = "Nuashonraigh an focal faire"
+success = "Nuashonraíodh an focal faire go rathúil"
+error = "Níor éirigh le focal faire a nuashonrú"
+
 [workspace.people.emailInvite]
 tab = "Cuireadh Ríomhphoist"
 description = "Clóscríobh nó greamaigh seoltaí ríomhphoist thíos, scartha le camóga. Gheobhaidh úsáideoirí dintiúir logála isteach trí r-phost."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Tá ar a laghad seoladh ríomhphoist amháin de dhíth"
 submit = "Seol Cuirí"
 success = "Tugadh cuireadh d’úsáideoir(í) go rathúil"
-partialSuccess = "Theip ar chuid de na cuirí"
+partialFailure = "Níor éirigh le roinnt cuirí"
 allFailed = "Theip ar úsáideoirí a thabhairt isteach"
 error = "Theip ar churí a sheoladh"
 
@@ -5288,8 +5443,8 @@ emailDisabled = "Teastaíonn cumraíocht SMTP agus mail.enableInvites=true sna s
 [workspace.people.license]
 users = "úsáideoirí"
 availableSlots = "Áiteanna Ar Fáil"
-grandfathered = "Grandfathered"
-grandfatheredShort = "{{count}} grandfathered"
+grandfathered = "Ceadaithe roimhe seo"
+grandfatheredShort = "{{count}} ceadaithe roimhe seo"
 fromLicense = "ón gceadúnas"
 slotsAvailable = "{{count}} áit(í) úsáideora ar fáil"
 noSlotsAvailable = "Níl aon áiteanna ar fáil"
@@ -5770,6 +5925,7 @@ subtitle = "Sínigh isteach le do chuntas Stirling"
 [setup.selfhosted]
 title = "Sínigh isteach chuig an bhFreastalaí"
 subtitle = "Cuir isteach dintiúir do fhreastalaí"
+link = "nó ceangail le cuntas féinóstáilte"
 
 [setup.server]
 title = "Ceangail leis an bhFreastalaí"
@@ -5788,6 +5944,14 @@ description = "Cuir isteach URL iomlán do fhreastalaí Stirling PDF féin-óst
 emptyUrl = "Cuir isteach URL freastalaí le do thoil"
 unreachable = "Níorbh fhéidir ceangal leis an bhfreastalaí"
 testFailed = "Theip ar thástáil an cheangail"
+configFetch = "Níor éirigh le cumraíocht an fhreastalaí a fháil. Seiceáil an URL agus bain triail eile as."
+
+[setup.server.error.securityDisabled]
+title = "Níl an Logáil Isteach Cumasaithe"
+body = "Níl logáil isteach cumasaithe ar an bhfreastalaí seo. Chun ceangal leis an bhfreastalaí seo, ní mór duit fíordheimhniú a chumasú:"
+step1 = "Socraigh DOCKER_ENABLE_SECURITY=true i do thimpeallacht"
+step2 = "Nó socraigh security.enableLogin=true i settings.yml"
+step3 = "Atosaigh an freastalaí"
 
 [setup.login]
 title = "Sínigh Isteach"
@@ -5797,6 +5961,13 @@ submit = "Logáil Isteach"
 signInWith = "Sínigh isteach le"
 oauthPending = "Brabhsálaí á oscailt le haghaidh fíordheimhnithe..."
 orContinueWith = "Nó lean ar aghaidh le ríomhphost"
+serverRequirement = "Nóta: Ní mór an cumas logála isteach a bheith cumasaithe ar an bhfreastalaí."
+showInstructions = "Conas é a chumasú?"
+hideInstructions = "Folaigh na treoracha"
+instructions = "Chun logáil isteach a chumasú ar do fhreastalaí Stirling PDF:"
+instructionsEnvVar = "Socraigh an athróg chomhshaoil:"
+instructionsOrYml = "Nó i settings.yml:"
+instructionsRestart = "Ansin atosaigh do fhreastalaí chun go mbeidh na hathruithe i bhfeidhm."
 
 [setup.login.username]
 label = "Ainm Úsáideora"
@@ -5853,6 +6024,7 @@ earlyAccess = "Rochtain Luath"
 reset = "Athshocraigh Athruithe"
 downloadJson = "Íoslódáil JSON"
 generatePdf = "Gin PDF"
+saveChanges = "Sábháil Athruithe"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Scálaigh téacs go huathoibríoch chun boscaí a fheistiú"
@@ -5890,6 +6062,8 @@ alpha = "Tá an t-amharcóir alfa seo fós ag forbairt — d’fhéadfadh clónn
 [pdfTextEditor.empty]
 title = "Níl aon cháipéis luchtaithe"
 subtitle = "Luchtaigh comhad PDF nó JSON chun eagarthóireacht ar ábhar téacs a thosú."
+dropzone = "Tarraing agus scaoil comhad PDF nó JSON anseo, nó cliceáil chun brabhsáil"
+dropzoneWithFiles = "Roghnaigh comhad ón gcluaisín Comhaid, nó tarraing agus scaoil comhad PDF nó JSON anseo, nó cliceáil chun brabhsáil"
 
 [pdfTextEditor.welcomeBanner]
 title = "Fáilte go dtí Eagarthóir Téacs PDF (Rochtain Luath)"
diff --git a/frontend/public/locales/hi-IN/translation.toml b/frontend/public/locales/hi-IN/translation.toml
index f0fcf7833..c636e7eac 100644
--- a/frontend/public/locales/hi-IN/translation.toml
+++ b/frontend/public/locales/hi-IN/translation.toml
@@ -131,7 +131,7 @@ unsupported = "असमर्थित"
 
 [toolPanel]
 placeholder = "शुरू करने के लिए कोई टूल चुनें"
-alpha = "Alpha"
+alpha = "अल्फा"
 premiumFeature = "प्रीमियम फीचर:"
 comingSoon = "जल्द आ रहा है:"
 
@@ -163,6 +163,11 @@ unfavorite = "पसंदीदा से हटाएं"
 fullscreen = "फुलस्क्रीन मोड पर स्विच करें"
 sidebar = "साइडबार मोड पर स्विच करें"
 
+[backendStartup]
+notFoundTitle = "बैकएंड नहीं मिला"
+retry = "पुनः प्रयास करें"
+unreachable = "एप्लिकेशन फिलहाल बैकएंड से कनेक्ट नहीं हो पा रहा है। कृपया बैकएंड की स्थिति और नेटवर्क कनेक्टिविटी जांचें, फिर पुनः प्रयास करें।"
+
 [zipWarning]
 title = "बड़ी ZIP फ़ाइल"
 message = "इस ZIP में {{count}} फ़ाइलें हैं। फिर भी निकालें?"
@@ -369,7 +374,7 @@ privacy = "गोपनीयता"
 
 [settings.developer]
 title = "डेवलपर"
-apiKeys = "API Keys"
+apiKeys = "API कुंजियाँ"
 
 [settings.tooltips]
 enableLoginFirst = "पहले लॉगिन मोड सक्षम करें"
@@ -829,7 +834,7 @@ title = "PDF हस्ताक्षर सत्यापित करें"
 desc = "PDF दस्तावेजों में डिजिटल हस्ताक्षर और प्रमाणपत्रों को सत्यापित करें"
 
 [home.swagger]
-tags = "API,documentation,test"
+tags = "API,दस्तावेज़ीकरण,परीक्षण"
 title = "API दस्तावेज़ीकरण"
 desc = "API दस्तावेज़ देखें और एंडपॉइंट टेस्ट करें"
 
@@ -878,7 +883,7 @@ title = "रंग बदलें/उलटें"
 desc = "PDF दस्तावेज़ों में रंगों को प्रतिस्थापित या उलटें"
 
 [home.devApi]
-tags = "API,development,documentation"
+tags = "API,विकास,दस्तावेज़ीकरण"
 title = "API"
 desc = "API दस्तावेज़ के लिए लिंक"
 
@@ -912,9 +917,12 @@ desc = "PDF क्रियाओं को जोड़कर बहु-चर
 desc = "PDF को दूसरी PDF के ऊपर ओवरले करें"
 title = "PDF ओवरले करें"
 
+[home.pdfTextEditor]
+title = "PDF टेक्स्ट एडिटर"
+desc = "PDF फ़ाइलों के भीतर मौजूदा टेक्स्ट और इमेज संपादित करें"
 
 [home.addText]
-tags = "text,annotation,label"
+tags = "पाठ,टिप्पणी,लेबल"
 title = "टेक्स्ट जोड़ें"
 desc = "अपने PDF में कहीं भी कस्टम टेक्स्ट जोड़ें"
 
@@ -1173,7 +1181,7 @@ selectFilesPlaceholder = "शुरू करने के लिए मुख
 settings = "सेटिंग्स"
 conversionCompleted = "रूपांतरण पूरा हुआ"
 results = "परिणाम"
-defaultFilename = "converted_file"
+defaultFilename = "परिवर्तित_फ़ाइल"
 conversionResults = "रूपांतरण परिणाम"
 convertFrom = "से रूपांतरित करें"
 convertTo = "में रूपांतरित करें"
@@ -1213,11 +1221,11 @@ pdfaDigitalSignatureWarning = "PDF में एक डिजिटल हस्
 fileFormat = "फ़ाइल फ़ॉर्मेट"
 wordDoc = "Word दस्तावेज़"
 wordDocExt = "Word दस्तावेज़ (.docx)"
-odtExt = "OpenDocument Text (.odt)"
+odtExt = "OpenDocument टेक्स्ट (.odt)"
 pptExt = "PowerPoint (.pptx)"
-odpExt = "OpenDocument Presentation (.odp)"
-txtExt = "Plain Text (.txt)"
-rtfExt = "Rich Text Format (.rtf)"
+odpExt = "OpenDocument प्रस्तुति (.odp)"
+txtExt = "सादा पाठ (.txt)"
+rtfExt = "रिच टेक्स्ट फ़ॉर्मेट (.rtf)"
 selectedFiles = "चयनित फ़ाइलें"
 noFileSelected = "कोई फ़ाइल चयनित नहीं। फ़ाइलें जोड़ने के लिए फ़ाइल पैनल का उपयोग करें।"
 convertFiles = "फ़ाइलें रूपांतरित करें"
@@ -1360,7 +1368,7 @@ title = "वॉटरमार्क जोड़ें"
 desc = "PDF फ़ाइलों में टेक्स्ट या इमेज वॉटरमार्क जोड़ें"
 completed = "वॉटरमार्क जोड़ा गया"
 submit = "वॉटरमार्क जोड़ें"
-filenamePrefix = "watermarked"
+filenamePrefix = "वॉटरमार्क_युक्त"
 
 [watermark.error]
 failed = "PDF में वॉटरमार्क जोड़ते समय एक त्रुटि हुई।"
@@ -1635,7 +1643,7 @@ subtitle = "प्रोसेस्ड फ़ाइल डाउनलोड 
 [removePages]
 tags = "पृष्ठ निकालें,पृष्ठ हटाएं"
 title = "निकालें"
-filenamePrefix = "pages_removed"
+filenamePrefix = "पृष्ठ_हटाए_गए"
 submit = "निकालें"
 
 [removePages.pageNumbers]
@@ -1832,12 +1840,12 @@ title = "उन्नत"
 tags = "कम्प्रेस,छोटा,छोटा"
 
 [unlockPDFForms]
-tags = "remove,delete,form,field,readonly"
+tags = "हटाएं,मिटाएं,फॉर्म,फ़ील्ड,रीड-ओनली"
 title = "फॉर्म फ़ील्ड से Read-Only हटाएं"
 header = "PDF फॉर्म अनलॉक करें"
 submit = "Remove"
 description = "यह टूल PDF फॉर्म फ़ील्ड से Read-Only प्रतिबंध हटाएगा, जिससे वे संपादन योग्य और भरने योग्य बनेंगे।"
-filenamePrefix = "unlocked_forms"
+filenamePrefix = "अनलॉक_फ़ॉर्म"
 
 [unlockPDFForms.files]
 placeholder = "शुरू करने के लिए मुख्य दृश्य में एक PDF फ़ाइल चुनें"
@@ -1851,7 +1859,7 @@ title = "अनलॉक किए गए फॉर्म के परिणा
 [changeMetadata]
 header = "मेटाडेटा बदलें"
 submit = "बदलें"
-filenamePrefix = "metadata"
+filenamePrefix = "मेटाडेटा"
 
 [changeMetadata.settings]
 title = "मेटाडेटा सेटिंग्स"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "ड्रॉइंग हस्ताक्षर"
 defaultImageLabel = "अपलोड किया गया हस्ताक्षर"
 defaultTextLabel = "टाइप किया हुआ हस्ताक्षर"
 saveButton = "हस्ताक्षर सहेजें"
+savePersonal = "व्यक्तिगत सहेजें"
+saveShared = "साझा सहेजें"
 saveUnavailable = "सेव करने के लिए पहले एक हस्ताक्षर बनाएँ।"
 noChanges = "वर्तमान हस्ताक्षर पहले से सहेजा गया है।"
+tempStorageTitle = "अस्थायी ब्राउज़र संग्रहण"
+tempStorageDescription = "हस्ताक्षर केवल आपके ब्राउज़र में संग्रहीत होते हैं। ब्राउज़र डेटा साफ़ करने या ब्राउज़र बदलने पर वे खो जाएंगे।"
+personalHeading = "व्यक्तिगत हस्ताक्षर"
+sharedHeading = "साझा हस्ताक्षर"
+personalDescription = "इन हस्ताक्षरों को केवल आप देख सकते हैं।"
+sharedDescription = "सभी उपयोगकर्ता इन हस्ताक्षरों को देख और उपयोग कर सकते हैं।"
 
 [sign.saved.type]
 canvas = "ड्रॉइंग"
@@ -2318,7 +2334,7 @@ title = "समतल करें"
 header = "PDF समतल करें"
 flattenOnlyForms = "केवल फ़ॉर्म समतल करें"
 submit = "समतल करें"
-filenamePrefix = "flattened"
+filenamePrefix = "समतलीकृत"
 
 [flatten.files]
 placeholder = "शुरू करने के लिए मुख्य दृश्य में एक PDF फ़ाइल चुनें"
@@ -2366,7 +2382,7 @@ title = "मरम्मत"
 header = "PDF मरम्मत"
 submit = "मरम्मत"
 description = "यह टूल भ्रष्ट या क्षतिग्रस्त PDF फ़ाइलों की मरम्मत करने का प्रयास करेगा। कोई अतिरिक्त सेटिंग्स आवश्यक नहीं हैं।"
-filenamePrefix = "repaired"
+filenamePrefix = "मरम्मत_किया"
 
 [repair.files]
 placeholder = "शुरू करने के लिए मुख्य दृश्य में एक PDF फ़ाइल चुनें"
@@ -2567,7 +2583,7 @@ stopButton = "तुलना रोकें"
 [certSign]
 tags = "प्रमाणीकरण,PEM,P12,आधिकारिक,एन्क्रिप्ट"
 title = "प्रमाणपत्र हस्ताक्षर"
-filenamePrefix = "signed"
+filenamePrefix = "हस्ताक्षरित"
 chooseCertificate = "प्रमाणपत्र फ़ाइल चुनें"
 chooseJksFile = "JKS फ़ाइल चुनें"
 chooseP12File = "PKCS12 फ़ाइल चुनें"
@@ -2701,7 +2717,7 @@ header = "PDF से डिजिटल प्रमाणपत्र हटा
 selectPDF = "PDF फ़ाइल चुनें:"
 submit = "हस्ताक्षर हटाएं"
 description = "यह टूल आपके PDF दस्तावेज़ से डिजिटल प्रमाणपत्र हस्ताक्षर हटाएगा।"
-filenamePrefix = "unsigned"
+filenamePrefix = "अनहस्ताक्षरित"
 
 [removeCertSign.files]
 placeholder = "शुरू करने के लिए मुख्य दृश्य में एक PDF फ़ाइल चुनें"
@@ -2731,7 +2747,7 @@ submit = "जमा करें"
 failed = "मल्टी-पृष्ठ लेआउट बनाते समय त्रुटि हुई।"
 
 [bookletImposition]
-tags = "booklet,imposition,printing,binding,folding,signature"
+tags = "बुकलेट,इम्पोज़िशन,प्रिंटिंग,बाइंडिंग,फोल्डिंग,सिग्नेचर"
 title = "बुकलेट इम्पोज़िशन"
 header = "बुकलेट इम्पोज़िशन"
 submit = "बुकलेट बनाएँ"
@@ -2830,7 +2846,7 @@ scaleFactor = "एक पृष्ठ का ज़ूम स्तर (क्
 submit = "जमा करें"
 
 [adjustPageScale]
-tags = "resize,modify,dimension,adapt"
+tags = "आकार बदलें,संशोधित करें,आयाम,अनुकूलित करें"
 title = "पृष्ठ स्केल समायोजित करें"
 header = "पृष्ठ स्केल समायोजित करें"
 submit = "पृष्ठ स्केल समायोजित करें"
@@ -3020,6 +3036,91 @@ title = "PDF की जानकारी प्राप्त करें"
 header = "PDF की जानकारी प्राप्त करें"
 submit = "जानकारी प्राप्त करें"
 downloadJson = "JSON डाउनलोड करें"
+processing = "जानकारी निकाली जा रही है..."
+results = "परिणाम"
+noResults = "रिपोर्ट बनाने के लिए टूल चलाएँ।"
+downloads = "डाउनलोड"
+noneDetected = "कुछ भी पता नहीं चला"
+indexTitle = "अनुक्रमणिका"
+
+[getPdfInfo.report]
+entryLabel = "पूरी जानकारी का सारांश"
+shortTitle = "PDF जानकारी"
+
+[getPdfInfo.sections]
+metadata = "मेटाडेटा"
+formFields = "फ़ॉर्म फ़ील्ड्स"
+basicInfo = "मूल जानकारी"
+documentInfo = "दस्तावेज़ जानकारी"
+compliance = "अनुपालन"
+encryption = "एन्क्रिप्शन"
+permissions = "अनुमतियाँ"
+other = "अन्य"
+perPageInfo = "प्रति पेज जानकारी"
+tableOfContents = "विषय सूची"
+
+[getPdfInfo.other]
+attachments = "संलग्नक"
+embeddedFiles = "एम्बेडेड फ़ाइलें"
+javaScript = "JavaScript"
+layers = "लेयर्स"
+structureTree = "स्ट्रक्चर ट्री"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "आकार"
+annotations = "टिप्पणियाँ"
+images = "छवियाँ"
+links = "लिंक"
+fonts = "फ़ॉन्ट्स"
+xobjects = "XObject की संख्या"
+multimedia = "मल्टीमीडिया"
+
+[getPdfInfo.summary]
+pages = "पृष्ठ"
+fileSize = "फ़ाइल आकार"
+pdfVersion = "PDF संस्करण"
+language = "भाषा"
+title = "PDF सारांश"
+author = "लेखक"
+created = "निर्मित"
+modified = "संशोधित"
+permsAll = "सभी अनुमतियाँ स्वीकृत"
+permsRestricted = "{{count}} प्रतिबंध"
+permsMixed = "कुछ अनुमतियाँ प्रतिबंधित"
+hasCompliance = "अनुपालन मानक मौजूद हैं"
+noCompliance = "कोई अनुपालन मानक नहीं"
+basic = "मूल जानकारी"
+documentInfo = "दस्तावेज़ जानकारी"
+securityTitle = "सुरक्षा स्थिति"
+technical = "तकनीकी"
+overviewTitle = "PDF अवलोकन"
+
+[getPdfInfo.summary.security]
+encrypted = "एन्क्रिप्टेड PDF - पासवर्ड सुरक्षा मौजूद है"
+unencrypted = "बिना एन्क्रिप्शन वाला PDF - पासवर्ड सुरक्षा नहीं है"
+
+[getPdfInfo.summary.tech]
+images = "छवियाँ"
+fonts = "फ़ॉन्ट्स"
+formFields = "फ़ॉर्म फ़ील्ड्स"
+embeddedFiles = "एम्बेडेड फ़ाइलें"
+javaScript = "JavaScript"
+layers = "लेयर्स"
+bookmarks = "बुकमार्क"
+multimedia = "मल्टीमीडिया"
+
+[getPdfInfo.summary.overview]
+untitled = "एक बिना शीर्षक वाला दस्तावेज़"
+unknown = "अज्ञात लेखक"
+text = "यह {{pages}}-पृष्ठ वाला PDF है जिसका शीर्षक {{title}} है, जिसे {{author}} ने बनाया है (PDF संस्करण {{version}})."
+
+[getPdfInfo.error]
+partial = "कुछ फ़ाइलों का प्रसंस्करण नहीं हो सका।"
+unexpected = "निकालते समय अप्रत्याशित त्रुटि हुई।"
+
+[getPdfInfo.status]
+complete = "एक्सट्रैक्शन पूर्ण"
 
 [extractPage]
 tags = "निकालें"
@@ -3380,7 +3481,7 @@ certHint = "कस्टम ट्रस्ट स्रोत के विर
 title = "सत्यापन सेटिंग्स"
 
 [replaceColor]
-tags = "Replace Colour,Page operations,Back end,server side"
+tags = "रंग बदलें,पृष्ठ संचालन,Back end,server side"
 
 [replaceColor.labels]
 settings = "सेटिंग्स"
@@ -3438,6 +3539,9 @@ signinTitle = "कृपया साइन इन करें"
 ssoSignIn = "सिंगल साइन-ऑन के माध्यम से लॉगिन करें"
 oAuth2AutoCreateDisabled = "OAUTH2 स्वतः उपयोगकर्ता निर्माण अक्षम है"
 oAuth2AdminBlockedUser = "गैर-पंजीकृत उपयोगकर्ताओं का पंजीकरण या लॉगिन वर्तमान में अवरुद्ध है। कृपया व्यवस्थापक से संपर्क करें।"
+oAuth2RequiresLicense = "OAuth/SSO लॉगिन के लिए पेड लाइसेंस (Server या Enterprise) आवश्यक है। कृपया अपना प्लान अपग्रेड करने के लिए व्यवस्थापक से संपर्क करें।"
+saml2RequiresLicense = "SAML लॉगिन के लिए पेड लाइसेंस (Server या Enterprise) आवश्यक है। कृपया अपना प्लान अपग्रेड करने के लिए व्यवस्थापक से संपर्क करें।"
+maxUsersReached = "आपके वर्तमान लाइसेंस के लिए उपयोगकर्ताओं की अधिकतम सीमा पूरी हो चुकी है। कृपया अपना प्लान अपग्रेड करने या अधिक सीटें जोड़ने के लिए व्यवस्थापक से संपर्क करें।"
 oauth2RequestNotFound = "प्राधिकरण अनुरोध नहीं मिला"
 oauth2InvalidUserInfoResponse = "अमान्य उपयोगकर्ता जानकारी प्रतिक्रिया"
 oauth2invalidRequest = "अमान्य अनुरोध"
@@ -3533,7 +3637,7 @@ title = "PDF को एकल पृष्ठ में"
 header = "PDF को एकल पृष्ठ में"
 submit = "एकल पृष्ठ में बदलें"
 description = "यह टूल आपके PDF के सभी पृष्ठों को एक बड़े एकल पृष्ठ में मिला देगा। चौड़ाई मूल पृष्ठों जैसी ही रहेगी, पर ऊँचाई सभी पृष्ठ ऊँचाइयों का योग होगी।"
-filenamePrefix = "single_page"
+filenamePrefix = "एकल_पृष्ठ"
 
 [pdfToSinglePage.files]
 placeholder = "शुरू करने के लिए मुख्य दृश्य में एक PDF फ़ाइल चुनें"
@@ -3771,7 +3875,7 @@ version = "वर्तमान रिलीज़"
 title = "API दस्तावेज़ीकरण"
 header = "API दस्तावेज़ीकरण"
 desc = "Stirling PDF API एंडपॉइंट्स देखें और परीक्षण करें"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,दस्तावेज़ीकरण,swagger,endpoints,विकास"
 
 [cookieBanner.popUp]
 title = "हम कुकीज़ का उपयोग कैसे करते हैं"
@@ -3846,14 +3950,17 @@ fitToWidth = "चौड़ाई के अनुसार फिट करे
 actualSize = "वास्तविक आकार"
 
 [viewer]
+cannotPreviewFile = "फ़ाइल का पूर्वावलोकन नहीं किया जा सकता"
+dualPageView = "दोहरा पृष्ठ दृश्य"
 firstPage = "पहला पृष्ठ"
 lastPage = "अंतिम पृष्ठ"
-previousPage = "पिछला पृष्ठ"
 nextPage = "अगला पृष्ठ"
+onlyPdfSupported = "व्यूअर केवल PDF फ़ाइलों का समर्थन करता है। यह फ़ाइल किसी भिन्न फ़ॉर्मेट में प्रतीत होती है।"
+previousPage = "पिछला पृष्ठ"
+singlePageView = "एकल पृष्ठ दृश्य"
+unknownFile = "अज्ञात फ़ाइल"
 zoomIn = "ज़ूम इन"
 zoomOut = "ज़ूम आउट"
-singlePageView = "एकल पृष्ठ दृश्य"
-dualPageView = "दोहरा पृष्ठ दृश्य"
 
 [rightRail]
 closeSelected = "चयनित फ़ाइलें बंद करें"
@@ -3877,6 +3984,7 @@ toggleSidebar = "साइडबार टॉगल करें"
 exportSelected = "चयनित पृष्ठ निर्यात करें"
 toggleAnnotations = "एनोटेशन दृश्यता टॉगल करें"
 annotationMode = "एनोटेशन मोड टॉगल करें"
+print = "PDF प्रिंट करें"
 draw = "ड्रॉ"
 save = "सहेजें"
 saveChanges = "परिवर्तनों को सहेजें"
@@ -4231,15 +4339,15 @@ label = "प्रदाता"
 description = "प्रमाणीकरण के लिए उपयोग किया जाने वाला OAuth2 प्रदाता"
 
 [admin.settings.connections.oauth2.issuer]
-label = "Issuer URL"
+label = "जारीकर्ता URL"
 description = "OAuth2 प्रदाता का Issuer URL"
 
 [admin.settings.connections.oauth2.clientId]
-label = "Client ID"
+label = "क्लाइंट ID"
 description = "आपके प्रदाता से प्राप्त OAuth2 Client ID"
 
 [admin.settings.connections.oauth2.clientSecret]
-label = "Client Secret"
+label = "क्लाइंट सीक्रेट"
 description = "आपके प्रदाता से प्राप्त OAuth2 Client Secret"
 
 [admin.settings.connections.oauth2.useAsUsername]
@@ -4407,7 +4515,7 @@ description = "विस्तृत सिस्टम टेम्प डा
 label = "प्रोसेस एक्सीक्यूटर सीमाएँ"
 description = "प्रत्येक प्रोसेस एक्सीक्यूटर के लिए सेशन सीमाएँ और टाइमआउट कॉन्फ़िगर करें"
 libreOffice = "LibreOffice"
-pdfToHtml = "PDF to HTML"
+pdfToHtml = "PDF से HTML"
 qpdf = "QPDF"
 tesseract = "Tesseract OCR"
 pythonOpenCv = "Python OpenCV"
@@ -4494,6 +4602,7 @@ description = "Impressum का URL या फ़ाइल नाम (कुछ
 title = "प्रीमियम और एंटरप्राइज़"
 description = "अपनी प्रीमियम या एंटरप्राइज़ लाइसेंस कुंजी कॉन्फ़िगर करें।"
 license = "लाइसेंस कॉन्फ़िगरेशन"
+noInput = "कृपया लाइसेंस कुंजी या फ़ाइल प्रदान करें"
 
 [admin.settings.premium.licenseKey]
 toggle = "क्या आपके पास लाइसेंस की या सर्टिफिकेट फ़ाइल है?"
@@ -4511,6 +4620,25 @@ line1 = "वर्तमान लाइसेंस की को ओवरर
 line2 = "यदि आपने कहीं और बैकअप नहीं रखा है तो आपका पिछला लाइसेंस स्थायी रूप से खो जाएगा।"
 line3 = "महत्वपूर्ण: लाइसेंस की को निजी और सुरक्षित रखें। इन्हें कभी सार्वजनिक रूप से साझा न करें।"
 
+[admin.settings.premium.inputMethod]
+text = "लाइसेंस कुंजी"
+file = "प्रमाणपत्र फ़ाइल"
+
+[admin.settings.premium.file]
+label = "लाइसेंस प्रमाणपत्र फ़ाइल"
+description = "ऑफ़लाइन खरीद से अपनी .lic या .cert लाइसेंस फ़ाइल अपलोड करें"
+choose = "लाइसेंस फ़ाइल चुनें"
+selected = "चयनित: {{filename}} ({{size}})"
+successMessage = "लाइसेंस फ़ाइल सफलतापूर्वक अपलोड और सक्रिय की गई। पुनः आरंभ की आवश्यकता नहीं।"
+
+[admin.settings.premium.currentLicense]
+title = "सक्रिय लाइसेंस"
+file = "स्रोत: लाइसेंस फ़ाइल ({{path}})"
+key = "स्रोत: लाइसेंस कुंजी"
+type = "प्रकार: {{type}}"
+noInput = "कृपया लाइसेंस कुंजी प्रदान करें या एक प्रमाणपत्र फ़ाइल अपलोड करें"
+success = "सफलता"
+
 [admin.settings.premium.enabled]
 label = "प्रीमियम फ़ीचर्स सक्रिय करें"
 description = "प्रो/एंटरप्राइज़ फ़ीचर्स के लिए लाइसेंस कुंजी जाँच सक्षम करें"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} चयनित"
 download = "डाउनलोड करें"
 delete = "हटाएं"
 unsupported = "असमर्थित"
+active = "सक्रिय"
 addToUpload = "अपलोड में जोड़ें"
+closeFile = "फ़ाइल बंद करें"
 deleteAll = "सब हटाएँ"
 loadingFiles = "फ़ाइलें लोड हो रही हैं..."
 noFiles = "कोई फ़ाइल उपलब्ध नहीं"
@@ -5132,7 +5262,7 @@ upgrade = "अभी अपग्रेड करें →"
 freeTitle = "सर्वर लाइसेंस"
 overLimitTitle = "सर्वर लाइसेंस आवश्यक"
 overLimitBody = "हमारा लाइसेंसिंग प्रति सर्वर अधिकतम <strong>{{freeTierLimit}}</strong> उपयोगकर्ताओं को मुफ्त अनुमति देता है। आपके पास <strong>{{overLimitUserCopy}}</strong> Stirling उपयोगकर्ता हैं। बिना बाधा के जारी रखने के लिए, Stirling Server प्लान में अपग्रेड करें - <strong>अनलिमिटेड सीट्स</strong>, PDF टेक्स्ट एडिटिंग, और पूर्ण एडमिन नियंत्रण $99/server/mo में।"
-freeBody = "हमारा <strong>Open-Core</strong> लाइसेंसिंग प्रति सर्वर अधिकतम <strong>{{freeTierLimit}}</strong> उपयोगकर्ताओं को मुफ्त अनुमति देता है। बिना बाधा स्केल करने और हमारे नए <strong>PDF टेक्स्ट एडिटिंग टूल</strong> की प्रारंभिक पहुँच पाने के लिए हम Stirling Server प्लान की सलाह देते हैं - पूर्ण एडिटिंग और <strong>अनलिमिटेड सीट्स</strong> $99/server/mo में।"
+freeBody = "हमारा <strong>Open-Core</strong> लाइसेंसिंग प्रति सर्वर अधिकतम <strong>{{freeTierLimit}}</strong> उपयोगकर्ताओं को निःशुल्क अनुमति देता है। बिना रुकावट स्केल करने के लिए, हम Stirling Server प्लान की अनुशंसा करते हैं - <strong>असीमित सीटें</strong> और <strong>SSO समर्थन</strong> $99/सर्वर/माह पर।"
 
 [onboarding.desktopInstall]
 title = "डाउनलोड"
@@ -5237,6 +5367,31 @@ error = "उपयोगकर्ता स्थिति अपडेट क
 success = "उपयोगकर्ता सफलतापूर्वक हटाया गया"
 error = "उपयोगकर्ता हटाने में विफल"
 
+[workspace.people.changePassword]
+action = "पासवर्ड बदलें"
+title = "पासवर्ड बदलें"
+subtitle = "के लिए पासवर्ड अपडेट करें"
+newPassword = "नया पासवर्ड"
+confirmPassword = "पासवर्ड की पुष्टि करें"
+placeholder = "नया पासवर्ड दर्ज करें"
+confirmPlaceholder = "नया पासवर्ड फिर से दर्ज करें"
+passwordRequired = "कृपया नया पासवर्ड दर्ज करें"
+passwordMismatch = "पासवर्ड मेल नहीं खाते"
+generateRandom = "सुरक्षित पासवर्ड जनरेट करें"
+generatedPreview = "जनरेट किया गया पासवर्ड:"
+copyTooltip = "क्लिपबोर्ड पर कॉपी करें"
+copiedToClipboard = "पासवर्ड क्लिपबोर्ड पर कॉपी किया गया"
+copyFailed = "पासवर्ड कॉपी करने में विफल"
+sendEmail = "इस बदलाव के बारे में उपयोगकर्ता को ईमेल करें"
+includePassword = "ईमेल में नया पासवर्ड शामिल करें"
+forcePasswordChange = "अगले लॉगिन पर उपयोगकर्ता को पासवर्ड बदलने के लिए बाध्य करें"
+emailUnavailable = "इस उपयोगकर्ता का ईमेल एक मान्य ईमेल पता नहीं है। सूचनाएँ अक्षम हैं।"
+smtpDisabled = "ईमेल सूचनाओं के लिए सेटिंग्स में SMTP सक्षम होना आवश्यक है।"
+notifyOnly = "पासवर्ड के बिना एक ईमेल भेजा जाएगा, जिससे उपयोगकर्ता को पता चलेगा कि किसी व्यवस्थापक ने इसे बदला है।"
+submit = "पासवर्ड अपडेट करें"
+success = "पासवर्ड सफलतापूर्वक अपडेट किया गया"
+error = "पासवर्ड अपडेट करने में विफल"
+
 [workspace.people.emailInvite]
 tab = "ईमेल आमंत्रण"
 description = "नीचे ईमेल टाइप या पेस्ट करें, अल्पविराम से अलग करें। उपयोगकर्ताओं को ईमेल के माध्यम से लॉगिन क्रेडेंशियल मिलेंगे।"
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "कम से कम एक ईमेल पता आवश्यक है"
 submit = "आमंत्रण भेजें"
 success = "उपयोगकर्ता(ओं) को सफलतापूर्वक आमंत्रित किया गया"
-partialSuccess = "कुछ आमंत्रण विफल रहे"
+partialFailure = "कुछ निमंत्रण विफल हुए"
 allFailed = "उपयोगकर्ताओं को आमंत्रित करने में विफल"
 error = "आमंत्रण भेजने में विफल"
 
@@ -5770,6 +5925,7 @@ subtitle = "अपने Stirling खाते से साइन इन कर
 [setup.selfhosted]
 title = "सर्वर में साइन इन"
 subtitle = "अपने सर्वर क्रेडेंशियल्स दर्ज करें"
+link = "या किसी स्व-होस्टेड खाते से कनेक्ट करें"
 
 [setup.server]
 title = "सर्वर से कनेक्ट करें"
@@ -5788,6 +5944,14 @@ description = "अपने सेल्फ-होस्टेड Stirling PDF 
 emptyUrl = "कृपया सर्वर URL दर्ज करें"
 unreachable = "सर्वर से कनेक्ट नहीं हो सका"
 testFailed = "कनेक्शन परीक्षण विफल"
+configFetch = "सर्वर कॉन्फ़िगरेशन प्राप्त करने में विफल। कृपया URL जाँचें और फिर से प्रयास करें।"
+
+[setup.server.error.securityDisabled]
+title = "लॉगिन सक्षम नहीं है"
+body = "इस सर्वर पर लॉगिन सक्षम नहीं है। इस सर्वर से कनेक्ट करने के लिए, आपको प्रमाणीकरण सक्षम करना होगा:"
+step1 = "अपने एनवायरनमेंट में DOCKER_ENABLE_SECURITY=true सेट करें"
+step2 = "या settings.yml में security.enableLogin=true सेट करें"
+step3 = "सर्वर को पुनः प्रारंभ करें"
 
 [setup.login]
 title = "साइन इन"
@@ -5797,6 +5961,13 @@ submit = "लॉगिन"
 signInWith = "इसके साथ साइन इन करें"
 oauthPending = "प्रमाणीकरण के लिए ब्राउज़र खुल रहा है..."
 orContinueWith = "या ईमेल के साथ जारी रखें"
+serverRequirement = "ध्यान दें: सर्वर पर लॉगिन सक्षम होना चाहिए।"
+showInstructions = "कैसे सक्षम करें?"
+hideInstructions = "निर्देश छिपाएँ"
+instructions = "अपने Stirling PDF सर्वर पर लॉगिन सक्षम करने के लिए:"
+instructionsEnvVar = "एन्वायरनमेंट वेरिएबल सेट करें:"
+instructionsOrYml = "या settings.yml में:"
+instructionsRestart = "इसके बाद बदलाव प्रभावी करने के लिए अपना सर्वर पुनः प्रारंभ करें।"
 
 [setup.login.username]
 label = "उपयोगकर्ता नाम"
@@ -5853,6 +6024,7 @@ earlyAccess = "अर्ली एक्सेस"
 reset = "परिवर्तन रीसेट करें"
 downloadJson = "JSON डाउनलोड करें"
 generatePdf = "PDF जनरेट करें"
+saveChanges = "परिवर्तन सहेजें"
 
 [pdfTextEditor.options.autoScaleText]
 title = "टेक्स्ट को बॉक्स में फिट करने हेतु ऑटो-स्केल"
@@ -5890,6 +6062,8 @@ alpha = "यह alpha व्यूअर अभी विकसित हो र
 [pdfTextEditor.empty]
 title = "कोई दस्तावेज़ लोड नहीं"
 subtitle = "टेक्स्ट सामग्री संपादित करने के लिए PDF या JSON फ़ाइल लोड करें."
+dropzone = "यहाँ PDF या JSON फ़ाइल खींचकर छोड़ें, या ब्राउज़ करने के लिए क्लिक करें"
+dropzoneWithFiles = "फ़ाइलें टैब से कोई फ़ाइल चुनें, या यहाँ PDF या JSON फ़ाइल खींचकर छोड़ें, या ब्राउज़ करने के लिए क्लिक करें"
 
 [pdfTextEditor.welcomeBanner]
 title = "PDF Text Editor में आपका स्वागत है (Early Access)"
@@ -5932,7 +6106,7 @@ warnings = "चेतावनियाँ"
 suggestions = "नोट्स"
 currentPageFonts = "इस पेज के फ़ॉन्ट्स"
 allFonts = "सभी फ़ॉन्ट्स"
-fallback = "fallback"
+fallback = "फॉलबैक"
 missing = "गायब"
 perfectMessage = "सभी फ़ॉन्ट्स को पूरी तरह पुनरुत्पादित किया जा सकता है."
 warningMessage = "कुछ फ़ॉन्ट्स सही से रेंडर नहीं हो सकते हैं."
@@ -5953,7 +6127,7 @@ insufficientPermissions = "आपके पास यह क्रिया क
 [addText]
 title = "टेक्स्ट जोड़ें"
 header = "PDFs में टेक्स्ट जोड़ें"
-tags = "text,annotation,label"
+tags = "पाठ,टिप्पणी,लेबल"
 applySignatures = "टेक्स्ट लागू करें"
 
 [addText.text]
diff --git a/frontend/public/locales/hr-HR/translation.toml b/frontend/public/locales/hr-HR/translation.toml
index c19e67180..a523fc1b7 100644
--- a/frontend/public/locales/hr-HR/translation.toml
+++ b/frontend/public/locales/hr-HR/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Ukloni iz omiljenih"
 fullscreen = "Prebaci na način cijelog zaslona"
 sidebar = "Prebaci na način bočne trake"
 
+[backendStartup]
+notFoundTitle = "Backend nije pronađen"
+retry = "Pokušaj ponovno"
+unreachable = "Aplikacija se trenutačno ne može povezati s backendom. Provjerite status backenda i mrežnu povezanost, zatim pokušajte ponovno."
+
 [zipWarning]
 title = "Velika ZIP datoteka"
 message = "Ovaj ZIP sadrži {{count}} datoteka. Ipak izdvojiti?"
@@ -912,6 +917,9 @@ desc = "Izgradite višekoračne tijekove rada povezivanjem PDF radnji. Idealno z
 desc = "Preklapa PDF-ove na drugi PDF"
 title = "Preklapanje PDF-ova"
 
+[home.pdfTextEditor]
+title = "Uređivač teksta PDF-a"
+desc = "Uređujte postojeći tekst i slike unutar PDF-ova"
 
 [home.addText]
 tags = "tekst,anotacija,oznaka"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Crtani potpis"
 defaultImageLabel = "Učitani potpis"
 defaultTextLabel = "Upisani potpis"
 saveButton = "Spremi potpis"
+savePersonal = "Spremi osobno"
+saveShared = "Spremi dijeljeno"
 saveUnavailable = "Najprije izradite potpis da biste ga spremili."
 noChanges = "Trenutačni potpis je već spremljen."
+tempStorageTitle = "Privremena pohrana u pregledniku"
+tempStorageDescription = "Potpisi se pohranjuju samo u vašem pregledniku. Izgubit će se ako očistite podatke preglednika ili promijenite preglednik."
+personalHeading = "Osobni potpisi"
+sharedHeading = "Dijeljeni potpisi"
+personalDescription = "Samo vi možete vidjeti ove potpise."
+sharedDescription = "Svi korisnici mogu vidjeti i koristiti ove potpise."
 
 [sign.saved.type]
 canvas = "Crtanje"
@@ -3020,6 +3036,91 @@ title = "Informacije o PDF-u"
 header = "Informacije o PDF-u"
 submit = "Informacije"
 downloadJson = "Preuzmite JSON"
+processing = "Izdvajanje informacija..."
+results = "Rezultati"
+noResults = "Pokrenite alat za generiranje izvješća."
+downloads = "Preuzimanja"
+noneDetected = "Ništa nije otkriveno"
+indexTitle = "Indeks"
+
+[getPdfInfo.report]
+entryLabel = "Potpuni sažetak informacija"
+shortTitle = "Informacije o PDF-u"
+
+[getPdfInfo.sections]
+metadata = "Metapodaci"
+formFields = "Polja obrasca"
+basicInfo = "Osnovne informacije"
+documentInfo = "Informacije o dokumentu"
+compliance = "Sukladnost"
+encryption = "Šifriranje"
+permissions = "Dozvole"
+other = "Ostalo"
+perPageInfo = "Informacije po stranici"
+tableOfContents = "Sadržaj"
+
+[getPdfInfo.other]
+attachments = "Privici"
+embeddedFiles = "Ugrađene datoteke"
+javaScript = "JavaScript"
+layers = "Slojevi"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Veličina"
+annotations = "Bilješke"
+images = "Slike"
+links = "Poveznice"
+fonts = "Fontovi"
+xobjects = "Broj XObjecta"
+multimedia = "Multimedija"
+
+[getPdfInfo.summary]
+pages = "Stranice"
+fileSize = "Veličina datoteke"
+pdfVersion = "PDF verzija"
+language = "Jezik"
+title = "Sažetak PDF-a"
+author = "Autor"
+created = "Stvoreno"
+modified = "Izmijenjeno"
+permsAll = "Sve dozvole dopuštene"
+permsRestricted = "{{count}} ograničenja"
+permsMixed = "Neke dozvole su ograničene"
+hasCompliance = "Ima standarde sukladnosti"
+noCompliance = "Nema standarda sukladnosti"
+basic = "Osnovne informacije"
+documentInfo = "Informacije o dokumentu"
+securityTitle = "Status sigurnosti"
+technical = "Tehničko"
+overviewTitle = "Pregled PDF-a"
+
+[getPdfInfo.summary.security]
+encrypted = "Šifrirani PDF - prisutna zaštita lozinkom"
+unencrypted = "Nešifrirani PDF - bez zaštite lozinkom"
+
+[getPdfInfo.summary.tech]
+images = "Slike"
+fonts = "Fontovi"
+formFields = "Polja obrasca"
+embeddedFiles = "Ugrađene datoteke"
+javaScript = "JavaScript"
+layers = "Slojevi"
+bookmarks = "Oznake"
+multimedia = "Multimedija"
+
+[getPdfInfo.summary.overview]
+untitled = "neimenovani dokument"
+unknown = "Nepoznat autor"
+text = "Ovo je PDF od {{pages}} stranica pod nazivom {{title}}, čiji je autor {{author}} (PDF verzija {{version}})."
+
+[getPdfInfo.error]
+partial = "Neke datoteke nije bilo moguće obraditi."
+unexpected = "Neočekivana pogreška tijekom izdvajanja."
+
+[getPdfInfo.status]
+complete = "Izdvajanje dovršeno"
 
 [extractPage]
 tags = "izdvajanje"
@@ -3438,6 +3539,9 @@ signinTitle = "Molimo vas da se prijavite"
 ssoSignIn = "Prijavite se putem jedinstvene prijave"
 oAuth2AutoCreateDisabled = "OAUTH2 automatsko kreiranje korisnika je onemogućeno"
 oAuth2AdminBlockedUser = "Registracija ili prijava nekadreguiranih korisnika trenutno su blokirane. Molimo Vas da kontaktirate administratora."
+oAuth2RequiresLicense = "Prijava putem OAuth/SSO zahtijeva plaćenu licencu (Server ili Enterprise). Obratite se administratoru radi nadogradnje vašeg plana."
+saml2RequiresLicense = "Prijava putem SAML zahtijeva plaćenu licencu (Server ili Enterprise). Obratite se administratoru radi nadogradnje vašeg plana."
+maxUsersReached = "Dosegnut je maksimalan broj korisnika za vašu trenutačnu licencu. Obratite se administratoru radi nadogradnje plana ili dodavanja dodatnih mjesta."
 oauth2RequestNotFound = "Zahtjev za autorizaciju nije pronađen"
 oauth2InvalidUserInfoResponse = "Nevažeće informacije o korisniku"
 oauth2invalidRequest = "Neispravan zahtjev"
@@ -3846,14 +3950,17 @@ fitToWidth = "Prilagodi širini"
 actualSize = "Stvarna veličina"
 
 [viewer]
+cannotPreviewFile = "Nije moguće pregledati datoteku"
+dualPageView = "Prikaz dviju stranica"
 firstPage = "Prva stranica"
 lastPage = "Zadnja stranica"
-previousPage = "Prethodna stranica"
 nextPage = "Sljedeća stranica"
+onlyPdfSupported = "Preglednik podržava samo PDF datoteke. Čini se da je ova datoteka u drugačijem formatu."
+previousPage = "Prethodna stranica"
+singlePageView = "Prikaz jedne stranice"
+unknownFile = "Nepoznata datoteka"
 zoomIn = "Povećaj"
 zoomOut = "Umanji"
-singlePageView = "Prikaz jedne stranice"
-dualPageView = "Prikaz dviju stranica"
 
 [rightRail]
 closeSelected = "Zatvori odabrane datoteke"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Prebaci bočnu traku"
 exportSelected = "Izvezi odabrane stranice"
 toggleAnnotations = "Prebaci vidljivost bilješki"
 annotationMode = "Prebaci način bilješki"
+print = "Ispis PDF-a"
 draw = "Crtaj"
 save = "Spremi"
 saveChanges = "Spremi promjene"
@@ -4494,6 +4602,7 @@ description = "URL ili naziv datoteke za impresum (obvezno u nekim nadležnostim
 title = "Premium i Enterprise"
 description = "Konfigurirajte svoj premium ili enterprise licencni ključ."
 license = "Konfiguracija licence"
+noInput = "Molimo navedite licencni ključ ili datoteku"
 
 [admin.settings.premium.licenseKey]
 toggle = "Imate licencni ključ ili datoteku certifikata?"
@@ -4511,6 +4620,25 @@ line1 = "Prepisivanje vašeg trenutačnog licencnog ključa ne može se poništi
 line2 = "Vaša će prethodna licenca trajno biti izgubljena osim ako je niste sigurnosno kopirali drugdje."
 line3 = "Važno: Licencne ključeve držite privatnima i sigurnima. Nikada ih javno ne dijelite."
 
+[admin.settings.premium.inputMethod]
+text = "Licencni ključ"
+file = "Datoteka certifikata"
+
+[admin.settings.premium.file]
+label = "Datoteka certifikata licence"
+description = "Učitajte svoju .lic ili .cert licencnu datoteku iz izvanmrežnih kupnji"
+choose = "Odaberite licencnu datoteku"
+selected = "Odabrano: {{filename}} ({{size}})"
+successMessage = "Licencna datoteka je uspješno učitana i aktivirana. Nije potrebno ponovno pokretanje."
+
+[admin.settings.premium.currentLicense]
+title = "Aktivna licenca"
+file = "Izvor: Licencna datoteka ({{path}})"
+key = "Izvor: Licencni ključ"
+type = "Vrsta: {{type}}"
+noInput = "Navedite licencni ključ ili učitajte datoteku certifikata"
+success = "Uspjeh"
+
 [admin.settings.premium.enabled]
 label = "Omogući premium značajke"
 description = "Omogući provjere licencnog ključa za pro/enterprise značajke"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} odabrano"
 download = "Preuzmi datoteku"
 delete = "Izbriši"
 unsupported = "Nepodržano"
+active = "Aktivno"
 addToUpload = "Dodaj za otpremu"
+closeFile = "Zatvori datoteku"
 deleteAll = "Izbriši sve"
 loadingFiles = "Učitavanje datoteka..."
 noFiles = "Nema dostupnih datoteka"
@@ -5132,7 +5262,7 @@ upgrade = "Nadogradi odmah →"
 freeTitle = "Poslužiteljska licenca"
 overLimitTitle = "Potrebna poslužiteljska licenca"
 overLimitBody = "Naše licenciranje dopušta do <strong>{{freeTierLimit}}</strong> korisnika besplatno po poslužitelju. Imate <strong>{{overLimitUserCopy}}</strong> Stirling korisnika. Za nesmetan nastavak, nadogradite na Stirling Server plan - <strong>neograničena mjesta</strong>, uređivanje teksta u PDF-u i puna admin kontrola za $99/server/mo."
-freeBody = "Naše <strong>Open-Core</strong> licenciranje dopušta do <strong>{{freeTierLimit}}</strong> korisnika besplatno po poslužitelju. Za nesmetano skaliranje i rani pristup našem novom <strong>alatu za uređivanje teksta u PDF-u</strong>, preporučujemo Stirling Server plan - potpuno uređivanje i <strong>neograničena mjesta</strong> za $99/server/mo."
+freeBody = "Naše licenciranje <strong>Open-Core</strong> omogućuje do <strong>{{freeTierLimit}}</strong> korisnika besplatno po poslužitelju. Za neometano skaliranje preporučujemo Stirling Server plan - <strong>neograničena mjesta</strong> i <strong>podrška za SSO</strong> za $99/poslužitelj/mj."
 
 [onboarding.desktopInstall]
 title = "Preuzimanje"
@@ -5237,6 +5367,31 @@ error = "Nije uspjelo ažuriranje statusa korisnika"
 success = "Korisnik je uspješno izbrisan"
 error = "Nije uspjelo brisanje korisnika"
 
+[workspace.people.changePassword]
+action = "Promijeni lozinku"
+title = "Promijeni lozinku"
+subtitle = "Ažuriraj lozinku za"
+newPassword = "Nova lozinka"
+confirmPassword = "Potvrdi lozinku"
+placeholder = "Unesite novu lozinku"
+confirmPlaceholder = "Ponovno unesite novu lozinku"
+passwordRequired = "Unesite novu lozinku"
+passwordMismatch = "Lozinke se ne podudaraju"
+generateRandom = "Generiraj sigurnu lozinku"
+generatedPreview = "Generirana lozinka:"
+copyTooltip = "Kopiraj u međuspremnik"
+copiedToClipboard = "Lozinka kopirana u međuspremnik"
+copyFailed = "Nije uspjelo kopiranje lozinke"
+sendEmail = "Pošalji korisniku e-poruku o ovoj promjeni"
+includePassword = "Uključi novu lozinku u e-poruku"
+forcePasswordChange = "Prisili korisnika da promijeni lozinku pri sljedećoj prijavi"
+emailUnavailable = "E-adresa ovog korisnika nije valjana. Obavijesti su onemogućene."
+smtpDisabled = "Obavijesti e-poštom zahtijevaju da SMTP bude omogućen u postavkama."
+notifyOnly = "Poslat će se e-poruka bez lozinke kako bi se korisniku javilo da ju je administrator promijenio."
+submit = "Ažuriraj lozinku"
+success = "Lozinka je uspješno ažurirana"
+error = "Nije uspjelo ažuriranje lozinke"
+
 [workspace.people.emailInvite]
 tab = "Poziv e-poštom"
 description = "Utipkajte ili zalijepite e-adrese dolje, odvojene zarezima. Korisnici će putem e-pošte dobiti pristupne podatke."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Potreban je barem jedan e-mail"
 submit = "Pošalji pozive"
 success = "Korisnici su uspješno pozvani"
-partialSuccess = "Neki pozivi nisu uspjeli"
+partialFailure = "Neke pozivnice nisu uspjele"
 allFailed = "Pozivanje korisnika nije uspjelo"
 error = "Slanje poziva nije uspjelo"
 
@@ -5770,6 +5925,7 @@ subtitle = "Prijavite se svojim Stirling računom"
 [setup.selfhosted]
 title = "Prijavite se na poslužitelj"
 subtitle = "Unesite vjerodajnice poslužitelja"
+link = "ili se povežite sa samohostiranim računom"
 
 [setup.server]
 title = "Povežite se s poslužiteljem"
@@ -5788,6 +5944,14 @@ description = "Unesite puni URL svog self-hosted Stirling PDF poslužitelja"
 emptyUrl = "Unesite URL poslužitelja"
 unreachable = "Nije moguće povezati se s poslužiteljem"
 testFailed = "Test veze nije uspio"
+configFetch = "Neuspjelo dohvaćanje konfiguracije poslužitelja. Provjerite URL i pokušajte ponovno."
+
+[setup.server.error.securityDisabled]
+title = "Prijava nije omogućena"
+body = "Na ovom poslužitelju prijava nije omogućena. Da biste se povezali s ovim poslužiteljem, morate omogućiti autentikaciju:"
+step1 = "Postavite DOCKER_ENABLE_SECURITY=true u svom okruženju"
+step2 = "Ili postavite security.enableLogin=true u settings.yml"
+step3 = "Ponovno pokrenite poslužitelj"
 
 [setup.login]
 title = "Prijava"
@@ -5797,6 +5961,13 @@ submit = "Prijava"
 signInWith = "Prijavite se pomoću"
 oauthPending = "Otvaranje preglednika za autentikaciju..."
 orContinueWith = "Ili nastavite s e-poštom"
+serverRequirement = "Napomena: Poslužitelj mora imati omogućenu prijavu."
+showInstructions = "Kako omogućiti?"
+hideInstructions = "Sakrij upute"
+instructions = "Da biste omogućili prijavu na svom Stirling PDF poslužitelju:"
+instructionsEnvVar = "Postavite varijablu okruženja:"
+instructionsOrYml = "Ili u settings.yml:"
+instructionsRestart = "Zatim ponovno pokrenite poslužitelj kako bi promjene stupile na snagu."
 
 [setup.login.username]
 label = "Korisničko ime"
@@ -5840,7 +6011,7 @@ paragraph = "Stranica s odlomcima"
 sparse = "Rijedak tekst"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automatski"
 paragraph = "Odlomak"
 singleLine = "Jedan redak"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Rani pristup"
 reset = "Poništi promjene"
 downloadJson = "Preuzmi JSON"
 generatePdf = "Generiraj PDF"
+saveChanges = "Spremi promjene"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Automatski skaliraj tekst kako bi stao u okvire"
@@ -5890,6 +6062,8 @@ alpha = "Ovaj alfa preglednik još se razvija — određeni fontovi, boje, efekt
 [pdfTextEditor.empty]
 title = "Nijedan dokument nije učitan"
 subtitle = "Učitajte PDF ili JSON datoteku kako biste započeli uređivanje teksta."
+dropzone = "Ovdje povucite i ispustite PDF ili JSON datoteku ili kliknite za pregledavanje"
+dropzoneWithFiles = "Odaberite datoteku s kartice Datoteke ili ovdje povucite i ispustite PDF ili JSON datoteku, ili kliknite za pregledavanje"
 
 [pdfTextEditor.welcomeBanner]
 title = "Dobrodošli u PDF uređivač teksta (rani pristup)"
diff --git a/frontend/public/locales/hu-HU/translation.toml b/frontend/public/locales/hu-HU/translation.toml
index 514db6f07..d68e3a0bb 100644
--- a/frontend/public/locales/hu-HU/translation.toml
+++ b/frontend/public/locales/hu-HU/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Eltávolítás a kedvencekből"
 fullscreen = "Váltás teljes képernyős módra"
 sidebar = "Váltás oldalsáv módra"
 
+[backendStartup]
+notFoundTitle = "Backend nem található"
+retry = "Próbálja újra"
+unreachable = "Az alkalmazás jelenleg nem tud csatlakozni a Backendhez. Ellenőrizze a Backend állapotát és a hálózati kapcsolatot, majd próbálja újra."
+
 [zipWarning]
 title = "Nagy ZIP fájl"
 message = "Ez a ZIP {{count}} fájlt tartalmaz. Mégis kibontja?"
@@ -912,6 +917,9 @@ desc = "Többlépéses munkafolyamatok összeállítása PDF műveletek összef
 desc = "PDF-ek egymásra helyezése egy másik PDF-en"
 title = "PDF-ek egymásra helyezése"
 
+[home.pdfTextEditor]
+title = "PDF szövegszerkesztő"
+desc = "Meglévő szöveg és képek szerkesztése a PDF-ekben"
 
 [home.addText]
 tags = "szöveg, megjegyzés, címke"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Rajzolt aláírás"
 defaultImageLabel = "Feltöltött aláírás"
 defaultTextLabel = "Gépelt aláírás"
 saveButton = "Aláírás mentése"
+savePersonal = "Mentés személyesként"
+saveShared = "Mentés megosztottként"
 saveUnavailable = "Előbb hozzon létre egy aláírást a mentéshez."
 noChanges = "Az aktuális aláírás már mentve van."
+tempStorageTitle = "Ideiglenes böngészőbeli tárolás"
+tempStorageDescription = "Az aláírások csak a böngészőben tárolódnak. Elvesznek, ha törli a böngészőadatokat vagy böngészőt vált."
+personalHeading = "Személyes aláírások"
+sharedHeading = "Megosztott aláírások"
+personalDescription = "Csak Ön láthatja ezeket az aláírásokat."
+sharedDescription = "Minden felhasználó láthatja és használhatja ezeket az aláírásokat."
 
 [sign.saved.type]
 canvas = "Rajz"
@@ -3020,6 +3036,91 @@ title = "PDF információk lekérése"
 header = "PDF információk lekérése"
 submit = "Információk lekérése"
 downloadJson = "JSON letöltése"
+processing = "Információk kinyerése..."
+results = "Eredmények"
+noResults = "Futtassa az eszközt a jelentés létrehozásához."
+downloads = "Letöltések"
+noneDetected = "Nem található"
+indexTitle = "Index"
+
+[getPdfInfo.report]
+entryLabel = "Teljes információs összefoglaló"
+shortTitle = "PDF-információk"
+
+[getPdfInfo.sections]
+metadata = "Metaadatok"
+formFields = "Űrlapmezők"
+basicInfo = "Alapinformációk"
+documentInfo = "Dokumentuminformációk"
+compliance = "Megfelelőség"
+encryption = "Titkosítás"
+permissions = "Engedélyek"
+other = "Egyéb"
+perPageInfo = "Oldalankénti információk"
+tableOfContents = "Tartalomjegyzék"
+
+[getPdfInfo.other]
+attachments = "Mellékletek"
+embeddedFiles = "Beágyazott fájlok"
+javaScript = "JavaScript"
+layers = "Rétegek"
+structureTree = "Struktúrafa"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Méret"
+annotations = "Megjegyzések"
+images = "Képek"
+links = "Hivatkozások"
+fonts = "Betűtípusok"
+xobjects = "XObject-ek száma"
+multimedia = "Multimédia"
+
+[getPdfInfo.summary]
+pages = "Oldalak"
+fileSize = "Fájlméret"
+pdfVersion = "PDF-verzió"
+language = "Nyelv"
+title = "PDF-összefoglaló"
+author = "Szerző"
+created = "Létrehozva"
+modified = "Módosítva"
+permsAll = "Minden jogosultság engedélyezve"
+permsRestricted = "{{count}} korlátozás"
+permsMixed = "Néhány jogosultság korlátozott"
+hasCompliance = "Megfelelőségi szabványokkal rendelkezik"
+noCompliance = "Nincsenek megfelelőségi szabványok"
+basic = "Alapinformációk"
+documentInfo = "Dokumentuminformációk"
+securityTitle = "Biztonsági állapot"
+technical = "Technikai"
+overviewTitle = "PDF-áttekintés"
+
+[getPdfInfo.summary.security]
+encrypted = "Titkosított PDF – jelszóvédelemmel"
+unencrypted = "Titkosítatlan PDF – nincs jelszóvédelem"
+
+[getPdfInfo.summary.tech]
+images = "Képek"
+fonts = "Betűtípusok"
+formFields = "Űrlapmezők"
+embeddedFiles = "Beágyazott fájlok"
+javaScript = "JavaScript"
+layers = "Rétegek"
+bookmarks = "Könyvjelzők"
+multimedia = "Multimédia"
+
+[getPdfInfo.summary.overview]
+untitled = "egy cím nélküli dokumentum"
+unknown = "Ismeretlen szerző"
+text = "Ez egy {{pages}} oldalas, {{title}} című PDF, amelyet {{author}} készített (PDF-verzió: {{version}})."
+
+[getPdfInfo.error]
+partial = "Néhány fájlt nem sikerült feldolgozni."
+unexpected = "Váratlan hiba a kinyerés során."
+
+[getPdfInfo.status]
+complete = "Kinyerés befejezve"
 
 [extractPage]
 tags = "kinyerés"
@@ -3438,6 +3539,9 @@ signinTitle = "Kérjük, jelentkezzen be"
 ssoSignIn = "Bejelentkezés egyszeri bejelentkezéssel"
 oAuth2AutoCreateDisabled = "OAuth2 automatikus felhasználólétrehozás letiltva"
 oAuth2AdminBlockedUser = "A nem regisztrált felhasználók regisztrációja vagy bejelentkezése jelenleg le van tiltva. Kérjük, forduljon a rendszergazdához."
+oAuth2RequiresLicense = "Az OAuth/SSO bejelentkezés fizetős licencet igényel (Server vagy Enterprise). Kérjük, lépjen kapcsolatba az adminisztrátorral a csomag frissítéséhez."
+saml2RequiresLicense = "A SAML bejelentkezés fizetős licencet igényel (Server vagy Enterprise). Kérjük, lépjen kapcsolatba az adminisztrátorral a csomag frissítéséhez."
+maxUsersReached = "Elérte az aktuális licenchez tartozó felhasználók maximális számát. Kérjük, lépjen kapcsolatba az adminisztrátorral a csomag frissítéséhez vagy további felhasználói helyek hozzáadásához."
 oauth2RequestNotFound = "A hitelesítési kérés nem található"
 oauth2InvalidUserInfoResponse = "Érvénytelen felhasználói információ válasz"
 oauth2invalidRequest = "Érvénytelen kérés"
@@ -3846,14 +3950,17 @@ fitToWidth = "Szélességhez igazítás"
 actualSize = "Tényleges méret"
 
 [viewer]
+cannotPreviewFile = "A fájl előnézete nem lehetséges"
+dualPageView = "Kétoldalas nézet"
 firstPage = "Első oldal"
 lastPage = "Utolsó oldal"
-previousPage = "Előző oldal"
 nextPage = "Következő oldal"
+onlyPdfSupported = "A megjelenítő csak PDF fájlokat támogat. Úgy tűnik, ez a fájl más formátumú."
+previousPage = "Előző oldal"
+singlePageView = "Egyoldalas nézet"
+unknownFile = "Ismeretlen fájl"
 zoomIn = "Nagyítás"
 zoomOut = "Kicsinyítés"
-singlePageView = "Egyoldalas nézet"
-dualPageView = "Kétoldalas nézet"
 
 [rightRail]
 closeSelected = "Kijelölt fájlok bezárása"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Oldalsáv ki/be"
 exportSelected = "Kijelölt oldalak exportálása"
 toggleAnnotations = "Jegyzetek láthatóságának váltása"
 annotationMode = "Jegyzetelési mód váltása"
+print = "PDF nyomtatása"
 draw = "Rajzolás"
 save = "Mentés"
 saveChanges = "Változtatások mentése"
@@ -4494,6 +4602,7 @@ description = "URL vagy fájlnév az impresszumhoz (egyes joghatóságokban köt
 title = "Prémium és Vállalati"
 description = "Prémium vagy vállalati licenckulcs konfigurálása."
 license = "Licenckonfiguráció"
+noInput = "Kérjük, adjon meg egy licenckulcsot vagy fájlt"
 
 [admin.settings.premium.licenseKey]
 toggle = "Van licenckulcsa vagy tanúsítványfájlja?"
@@ -4511,6 +4620,25 @@ line1 = "A jelenlegi licenckulcs felülírása nem vonható vissza."
 line2 = "A korábbi licenc végleg elveszik, hacsak nem készített róla máshol biztonsági másolatot."
 line3 = "Fontos: Tartsa a licenckulcsokat bizalmasan és biztonságban. Soha ne ossza meg nyilvánosan."
 
+[admin.settings.premium.inputMethod]
+text = "Licenckulcs"
+file = "Tanúsítványfájl"
+
+[admin.settings.premium.file]
+label = "Licenc tanúsítványfájl"
+description = "Töltse fel az offline vásárlásból származó .lic vagy .cert licencfájlt"
+choose = "Licencfájl kiválasztása"
+selected = "Kiválasztva: {{filename}} ({{size}})"
+successMessage = "A licencfájl feltöltése és aktiválása sikeres. Nincs szükség újraindításra."
+
+[admin.settings.premium.currentLicense]
+title = "Aktív licenc"
+file = "Forrás: licencfájl ({{path}})"
+key = "Forrás: licenckulcs"
+type = "Típus: {{type}}"
+noInput = "Adjon meg egy licenckulcsot, vagy töltsön fel tanúsítványfájlt"
+success = "Siker"
+
 [admin.settings.premium.enabled]
 label = "Prémium funkciók engedélyezése"
 description = "Licenckulcs-ellenőrzések engedélyezése a pro/vállalati funkciókhoz"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} kiválasztva"
 download = "Letöltés"
 delete = "Törlés"
 unsupported = "Nem támogatott"
+active = "Aktív"
 addToUpload = "Hozzáadás a feltöltéshez"
+closeFile = "Fájl bezárása"
 deleteAll = "Összes törlése"
 loadingFiles = "Fájlok betöltése..."
 noFiles = "Nem állnak rendelkezésre fájlok"
@@ -5132,7 +5262,7 @@ upgrade = "Frissítés most →"
 freeTitle = "Szerverlicenc"
 overLimitTitle = "Szerverlicenc szükséges"
 overLimitBody = "Licencelésünk szerverenként legfeljebb <strong>{{freeTierLimit}}</strong> felhasználót enged ingyen. Önnek <strong>{{overLimitUserCopy}}</strong> Stirling felhasználója van. A zavartalan használathoz váltson a Stirling Server csomagra – <strong>korlátlan hely</strong>, PDF szövegszerkesztés és teljes adminisztrátori vezérlés $99/szerver/hó áron."
-freeBody = "Az <strong>Open-Core</strong> licencelésünk szerverenként legfeljebb <strong>{{freeTierLimit}}</strong> felhasználót enged ingyen. A zavartalan bővüléshez és az új <strong>PDF szövegszerkesztő eszköz</strong> korai eléréséhez a Stirling Server csomagot ajánljuk – teljes szerkesztés és <strong>korlátlan hely</strong> $99/szerver/hó áron."
+freeBody = "A <strong>Open-Core</strong> licencünk szerverenként legfeljebb <strong>{{freeTierLimit}}</strong> felhasználót engedélyez ingyenesen. A zökkenőmentes skálázáshoz a Stirling Server csomagot ajánljuk - <strong>korlátlan felhasználó</strong> és <strong>SSO támogatás</strong> $99/szerver/hó."
 
 [onboarding.desktopInstall]
 title = "Letöltés"
@@ -5237,6 +5367,31 @@ error = "Nem sikerült frissíteni a felhasználói állapotot"
 success = "Felhasználó sikeresen törölve"
 error = "Nem sikerült törölni a felhasználót"
 
+[workspace.people.changePassword]
+action = "Jelszó módosítása"
+title = "Jelszó módosítása"
+subtitle = "Jelszó frissítése ehhez:"
+newPassword = "Új jelszó"
+confirmPassword = "Jelszó megerősítése"
+placeholder = "Adjon meg egy új jelszót"
+confirmPlaceholder = "Adja meg újra az új jelszót"
+passwordRequired = "Kérjük, adjon meg egy új jelszót"
+passwordMismatch = "A jelszavak nem egyeznek"
+generateRandom = "Biztonságos jelszó generálása"
+generatedPreview = "Generált jelszó:"
+copyTooltip = "Másolás a vágólapra"
+copiedToClipboard = "A jelszó a vágólapra másolva"
+copyFailed = "A jelszó másolása nem sikerült"
+sendEmail = "E-mail küldése a felhasználónak a változásról"
+includePassword = "Az új jelszó szerepeljen az e-mailben"
+forcePasswordChange = "A felhasználó kényszerítése a jelszó megváltoztatására a következő bejelentkezéskor"
+emailUnavailable = "Ennek a felhasználónak az e-mail címe érvénytelen. Az értesítések le vannak tiltva."
+smtpDisabled = "Az e-mail értesítésekhez az SMTP engedélyezése szükséges a beállításokban."
+notifyOnly = "E-mailt küldünk jelszó nélkül, amelyben értesítjük a felhasználót, hogy egy admin módosította a jelszót."
+submit = "Jelszó frissítése"
+success = "A jelszó sikeresen frissítve"
+error = "A jelszó frissítése nem sikerült"
+
 [workspace.people.emailInvite]
 tab = "E-mail meghívó"
 description = "Írja be vagy illessze be alább az e-mail címeket, vesszővel elválasztva. A felhasználók e-mailben kapják meg a bejelentkezési adatokat."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Legalább egy e-mail cím megadása szükséges"
 submit = "Meghívók küldése"
 success = "felhasználó sikeresen meghívva"
-partialSuccess = "Néhány meghívó sikertelen volt"
+partialFailure = "Néhány meghívás sikertelen volt"
 allFailed = "Nem sikerült meghívni a felhasználókat"
 error = "Nem sikerült elküldeni a meghívókat"
 
@@ -5770,6 +5925,7 @@ subtitle = "Jelentkezzen be Stirling-fiókjával"
 [setup.selfhosted]
 title = "Bejelentkezés a szerverre"
 subtitle = "Adja meg a szerver hitelesítő adatait"
+link = "vagy csatlakozzon egy saját üzemeltetésű fiókhoz"
 
 [setup.server]
 title = "Csatlakozás a szerverhez"
@@ -5788,6 +5944,14 @@ description = "Adja meg az önhostolt Stirling PDF szerver teljes URL-jét"
 emptyUrl = "Adjon meg egy szerver URL-t"
 unreachable = "Nem sikerült kapcsolódni a szerverhez"
 testFailed = "A kapcsolat tesztje sikertelen"
+configFetch = "Nem sikerült letölteni a szerver konfigurációját. Ellenőrizze az URL-t, és próbálja meg újra."
+
+[setup.server.error.securityDisabled]
+title = "A bejelentkezés nincs engedélyezve"
+body = "Ezen a szerveren a bejelentkezés nincs engedélyezve. A csatlakozáshoz engedélyeznie kell a hitelesítést:"
+step1 = "Állítsa be a DOCKER_ENABLE_SECURITY=true értéket a környezetében"
+step2 = "Vagy állítsa be a security.enableLogin=true értéket a settings.yml fájlban"
+step3 = "Indítsa újra a szervert"
 
 [setup.login]
 title = "Bejelentkezés"
@@ -5797,6 +5961,13 @@ submit = "Bejelentkezés"
 signInWith = "Bejelentkezés ezzel"
 oauthPending = "Böngésző megnyitása hitelesítéshez..."
 orContinueWith = "Vagy folytassa e-maillel"
+serverRequirement = "Megjegyzés: A szerveren engedélyezni kell a bejelentkezést."
+showInstructions = "Hogyan engedélyezhető?"
+hideInstructions = "Utasítások elrejtése"
+instructions = "A bejelentkezés engedélyezéséhez a Stirling PDF szerverén:"
+instructionsEnvVar = "Állítsa be a környezeti változót:"
+instructionsOrYml = "Vagy a settings.yml-ben:"
+instructionsRestart = "Ezután indítsa újra a szervert, hogy a módosítások életbe lépjenek."
 
 [setup.login.username]
 label = "Felhasználónév"
@@ -5853,6 +6024,7 @@ earlyAccess = "Korai hozzáférés"
 reset = "Módosítások visszaállítása"
 downloadJson = "JSON letöltése"
 generatePdf = "PDF generálása"
+saveChanges = "Változtatások mentése"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Szöveg automatikus méretezése a dobozokhoz"
@@ -5890,6 +6062,8 @@ alpha = "Ez az alfa néző még fejlődik—bizonyos betűtípusok, színek, át
 [pdfTextEditor.empty]
 title = "Nincs dokumentum betöltve"
 subtitle = "Töltsön be egy PDF- vagy JSON-fájlt a szövegtartalom szerkesztésének megkezdéséhez."
+dropzone = "Húzzon ide egy PDF vagy JSON fájlt, vagy kattintson a tallózáshoz"
+dropzoneWithFiles = "Válasszon fájlt a Fájlok fülön, vagy húzzon ide egy PDF vagy JSON fájlt, illetve kattintson a tallózáshoz"
 
 [pdfTextEditor.welcomeBanner]
 title = "Üdvözöljük a PDF Text Editorben (korai hozzáférés)"
diff --git a/frontend/public/locales/id-ID/translation.toml b/frontend/public/locales/id-ID/translation.toml
index 010266296..77758a492 100644
--- a/frontend/public/locales/id-ID/translation.toml
+++ b/frontend/public/locales/id-ID/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Hapus dari Favorit"
 fullscreen = "Beralih ke mode layar penuh"
 sidebar = "Beralih ke mode bilah sisi"
 
+[backendStartup]
+notFoundTitle = "Backend tidak ditemukan"
+retry = "Coba lagi"
+unreachable = "Aplikasi saat ini tidak dapat terhubung ke backend. Periksa status backend dan konektivitas jaringan, lalu coba lagi."
+
 [zipWarning]
 title = "File ZIP Besar"
 message = "ZIP ini berisi {{count}} file. Tetap ekstrak?"
@@ -190,7 +195,7 @@ title = "Pengaturan Dibuka"
 message = "Silakan pilih Stirling PDF di pengaturan sistem Anda"
 
 [defaultApp.error]
-title = "Error"
+title = "Kesalahan"
 message = "Gagal menyetel penangan PDF default"
 
 [language]
@@ -348,7 +353,7 @@ title = "Konfigurasi"
 systemSettings = "Pengaturan Sistem"
 features = "Fitur"
 endpoints = "Endpoint"
-database = "Database"
+database = "Basis Data"
 advanced = "Lanjutan"
 
 [settings.securityAuth]
@@ -383,7 +388,7 @@ logout = "Keluar"
 
 [settings.connection.mode]
 saas = "Stirling Cloud"
-selfhosted = "Self-Hosted"
+selfhosted = "Dihost Sendiri"
 
 [settings.general]
 title = "Umum"
@@ -544,8 +549,8 @@ usage = "Lihat Penggunaan"
 [endpointStatistics]
 title = "Statistik Endpoint"
 header = "Statistik Endpoint"
-top10 = "Top 10"
-top20 = "Top 20"
+top10 = "10 Teratas"
+top20 = "20 Teratas"
 all = "Semua"
 refresh = "Muat Ulang"
 dataTypeLabel = "Tipe Data:"
@@ -912,6 +917,9 @@ desc = "Bangun alur kerja multi-langkah dengan merangkai tindakan PDF. Ideal unt
 desc = "Menumpuk PDF di atas PDF lain"
 title = "Tumpuk PDF"
 
+[home.pdfTextEditor]
+title = "Editor Teks PDF"
+desc = "Edit teks dan gambar yang ada di dalam PDF"
 
 [home.addText]
 tags = "teks,anotasi,label"
@@ -1173,7 +1181,7 @@ selectFilesPlaceholder = "Pilih file di tampilan utama untuk memulai"
 settings = "Pengaturan"
 conversionCompleted = "Konversi selesai"
 results = "Hasil"
-defaultFilename = "converted_file"
+defaultFilename = "file_terkonversi"
 conversionResults = "Hasil Konversi"
 convertFrom = "Konversi dari"
 convertTo = "Konversi ke"
@@ -1360,7 +1368,7 @@ title = "Tambahkan Watermark"
 desc = "Tambahkan tanda air teks atau gambar ke file PDF"
 completed = "Tanda air ditambahkan"
 submit = "Tambahkan Watermark"
-filenamePrefix = "watermarked"
+filenamePrefix = "bertanda_air"
 
 [watermark.error]
 failed = "Terjadi kesalahan saat menambahkan tanda air ke PDF."
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Tanda tangan gambar"
 defaultImageLabel = "Tanda tangan terunggah"
 defaultTextLabel = "Tanda tangan ketik"
 saveButton = "Simpan tanda tangan"
+savePersonal = "Simpan Pribadi"
+saveShared = "Simpan Bersama"
 saveUnavailable = "Buat tanda tangan terlebih dahulu untuk menyimpannya."
 noChanges = "Tanda tangan saat ini sudah disimpan."
+tempStorageTitle = "Penyimpanan browser sementara"
+tempStorageDescription = "Tanda tangan disimpan hanya di browser Anda. Data akan hilang jika Anda membersihkan data browser atau berpindah browser."
+personalHeading = "Tanda Tangan Pribadi"
+sharedHeading = "Tanda Tangan Bersama"
+personalDescription = "Hanya Anda yang dapat melihat tanda tangan ini."
+sharedDescription = "Semua pengguna dapat melihat dan menggunakan tanda tangan ini."
 
 [sign.saved.type]
 canvas = "Gambar"
@@ -2701,7 +2717,7 @@ header = "Hapus sertifikat digital dari PDF"
 selectPDF = "Pilih file PDF:"
 submit = "Hapus Tanda Tangan"
 description = "Alat ini akan menghapus tanda tangan sertifikat digital dari dokumen PDF Anda."
-filenamePrefix = "unsigned"
+filenamePrefix = "tanpa_tanda_tangan"
 
 [removeCertSign.files]
 placeholder = "Pilih file PDF di tampilan utama untuk memulai"
@@ -3020,6 +3036,91 @@ title = "Dapatkan Info tentang PDF"
 header = "Dapatkan Info tentang PDF"
 submit = "Dapatkan Info"
 downloadJson = "Unduh JSON"
+processing = "Mengekstrak informasi..."
+results = "Hasil"
+noResults = "Jalankan alat untuk menghasilkan laporan."
+downloads = "Unduhan"
+noneDetected = "Tidak ada yang terdeteksi"
+indexTitle = "Indeks"
+
+[getPdfInfo.report]
+entryLabel = "Ringkasan informasi lengkap"
+shortTitle = "Informasi PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadata"
+formFields = "Bidang Formulir"
+basicInfo = "Info Dasar"
+documentInfo = "Info Dokumen"
+compliance = "Kepatuhan"
+encryption = "Enkripsi"
+permissions = "Izin"
+other = "Lainnya"
+perPageInfo = "Info per Halaman"
+tableOfContents = "Daftar Isi"
+
+[getPdfInfo.other]
+attachments = "Lampiran"
+embeddedFiles = "File Tertanam"
+javaScript = "JavaScript"
+layers = "Lapisan"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Ukuran"
+annotations = "Anotasi"
+images = "Gambar"
+links = "Tautan"
+fonts = "Font"
+xobjects = "Jumlah XObject"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Halaman"
+fileSize = "Ukuran File"
+pdfVersion = "Versi PDF"
+language = "Bahasa"
+title = "Ringkasan PDF"
+author = "Penulis"
+created = "Dibuat"
+modified = "Diubah"
+permsAll = "Semua izin diperbolehkan"
+permsRestricted = "{{count}} pembatasan"
+permsMixed = "Beberapa izin dibatasi"
+hasCompliance = "Memiliki standar kepatuhan"
+noCompliance = "Tidak ada standar kepatuhan"
+basic = "Informasi Dasar"
+documentInfo = "Informasi Dokumen"
+securityTitle = "Status Keamanan"
+technical = "Teknis"
+overviewTitle = "Gambaran Umum PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF terenkripsi - Perlindungan kata sandi aktif"
+unencrypted = "PDF tidak terenkripsi - Tanpa perlindungan kata sandi"
+
+[getPdfInfo.summary.tech]
+images = "Gambar"
+fonts = "Font"
+formFields = "Bidang Formulir"
+embeddedFiles = "File Tertanam"
+javaScript = "JavaScript"
+layers = "Lapisan"
+bookmarks = "Bookmark"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "dokumen tanpa judul"
+unknown = "Penulis tidak diketahui"
+text = "Ini adalah PDF {{pages}} halaman berjudul {{title}} yang dibuat oleh {{author}} (versi PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Beberapa file tidak dapat diproses."
+unexpected = "Kesalahan tak terduga saat ekstraksi."
+
+[getPdfInfo.status]
+complete = "Ekstraksi selesai"
 
 [extractPage]
 tags = "ekstrak"
@@ -3438,6 +3539,9 @@ signinTitle = "Silakan masuk"
 ssoSignIn = "Masuk melalui Single Sign - on"
 oAuth2AutoCreateDisabled = "OAUTH2 Buat Otomatis Pengguna Dinonaktifkan"
 oAuth2AdminBlockedUser = "Registrasi atau login pengguna yang tidak terdaftar saat ini diblokir. Silakan hubungi administrator."
+oAuth2RequiresLicense = "Login OAuth/SSO memerlukan lisensi berbayar (Server atau Enterprise). Silakan hubungi administrator untuk meningkatkan paket Anda."
+saml2RequiresLicense = "Login SAML memerlukan lisensi berbayar (Server atau Enterprise). Silakan hubungi administrator untuk meningkatkan paket Anda."
+maxUsersReached = "Jumlah pengguna maksimum untuk lisensi Anda saat ini telah tercapai. Silakan hubungi administrator untuk meningkatkan paket Anda atau menambah seat."
 oauth2RequestNotFound = "Permintaan otorisasi tidak ditemukan"
 oauth2InvalidUserInfoResponse = "Respons Info Pengguna Tidak Valid"
 oauth2invalidRequest = "Permintaan Tidak Valid"
@@ -3533,7 +3637,7 @@ title = "PDF Ke Halaman Tunggal"
 header = "PDF Ke Halaman Tunggal"
 submit = "Konversi ke Halaman Tunggal"
 description = "Alat ini akan menggabungkan semua halaman PDF Anda menjadi satu halaman besar. Lebarnya akan tetap sama dengan halaman asli, tetapi tingginya merupakan penjumlahan dari semua tinggi halaman."
-filenamePrefix = "single_page"
+filenamePrefix = "halaman_tunggal"
 
 [pdfToSinglePage.files]
 placeholder = "Pilih file PDF di tampilan utama untuk memulai"
@@ -3846,14 +3950,17 @@ fitToWidth = "Sesuaikan ke Lebar"
 actualSize = "Ukuran Asli"
 
 [viewer]
+cannotPreviewFile = "Tidak dapat menampilkan pratinjau file"
+dualPageView = "Tampilan Dua Halaman"
 firstPage = "Halaman Pertama"
 lastPage = "Halaman Terakhir"
-previousPage = "Halaman Sebelumnya"
 nextPage = "Halaman Berikutnya"
+onlyPdfSupported = "Penampil hanya mendukung file PDF. File ini tampaknya memiliki format yang berbeda."
+previousPage = "Halaman Sebelumnya"
+singlePageView = "Tampilan Satu Halaman"
+unknownFile = "File tidak dikenal"
 zoomIn = "Perbesar"
 zoomOut = "Perkecil"
-singlePageView = "Tampilan Satu Halaman"
-dualPageView = "Tampilan Dua Halaman"
 
 [rightRail]
 closeSelected = "Tutup File Terpilih"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Alihkan Sidebar"
 exportSelected = "Ekspor Halaman Terpilih"
 toggleAnnotations = "Alihkan Visibilitas Anotasi"
 annotationMode = "Alihkan Mode Anotasi"
+print = "Cetak PDF"
 draw = "Gambar"
 save = "Simpan"
 saveChanges = "Simpan Perubahan"
@@ -4282,7 +4390,7 @@ label = "Blokir Pendaftaran"
 description = "Cegah pendaftaran pengguna baru melalui SAML2"
 
 [admin.settings.database]
-title = "Database"
+title = "Basis Data"
 description = "Konfigurasikan pengaturan koneksi database kustom untuk penerapan enterprise."
 configuration = "Konfigurasi Database"
 
@@ -4494,6 +4602,7 @@ description = "URL atau nama file untuk impressum (diperlukan di beberapa yurisd
 title = "Premium & Enterprise"
 description = "Konfigurasikan kunci lisensi premium atau enterprise Anda."
 license = "Konfigurasi Lisensi"
+noInput = "Harap berikan kunci atau file lisensi"
 
 [admin.settings.premium.licenseKey]
 toggle = "Punya kunci lisensi atau file sertifikat?"
@@ -4511,6 +4620,25 @@ line1 = "Menimpa kunci lisensi Anda saat ini tidak dapat dibatalkan."
 line2 = "Lisensi sebelumnya akan hilang permanen kecuali Anda mencadangkannya di tempat lain."
 line3 = "Penting: Jaga kunci lisensi tetap privat dan aman. Jangan pernah membagikannya secara publik."
 
+[admin.settings.premium.inputMethod]
+text = "Kunci Lisensi"
+file = "File Sertifikat"
+
+[admin.settings.premium.file]
+label = "File Sertifikat Lisensi"
+description = "Unggah file lisensi .lic atau .cert Anda dari pembelian offline"
+choose = "Pilih File Lisensi"
+selected = "Dipilih: {{filename}} ({{size}})"
+successMessage = "File lisensi berhasil diunggah dan diaktifkan. Tidak perlu restart."
+
+[admin.settings.premium.currentLicense]
+title = "Lisensi Aktif"
+file = "Sumber: File lisensi ({{path}})"
+key = "Sumber: Kunci lisensi"
+type = "Tipe: {{type}}"
+noInput = "Harap berikan kunci lisensi atau unggah file sertifikat"
+success = "Berhasil"
+
 [admin.settings.premium.enabled]
 label = "Aktifkan Fitur Premium"
 description = "Aktifkan pemeriksaan kunci lisensi untuk fitur pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} dipilih"
 download = "Unduh"
 delete = "Hapus"
 unsupported = "Tidak didukung"
+active = "Aktif"
 addToUpload = "Tambahkan ke Unggahan"
+closeFile = "Tutup File"
 deleteAll = "Hapus Semua"
 loadingFiles = "Memuat file..."
 noFiles = "Tidak ada file tersedia"
@@ -4938,13 +5068,13 @@ done = "Selesai"
 loading = "Memuat..."
 back = "Kembali"
 continue = "Lanjut"
-error = "Error"
+error = "Kesalahan"
 
 [config.overview]
 title = "Konfigurasi Aplikasi"
 description = "Pengaturan dan detail konfigurasi aplikasi saat ini."
 loading = "Memuat konfigurasi..."
-error = "Error"
+error = "Kesalahan"
 warning = "Peringatan Konfigurasi"
 
 [config.overview.sections]
@@ -5132,7 +5262,7 @@ upgrade = "Upgrade sekarang →"
 freeTitle = "Lisensi Server"
 overLimitTitle = "Perlu Lisensi Server"
 overLimitBody = "Lisensi kami mengizinkan hingga <strong>{{freeTierLimit}}</strong> pengguna gratis per server. Anda memiliki <strong>{{overLimitUserCopy}}</strong> pengguna Stirling. Untuk terus berjalan tanpa gangguan, upgrade ke paket Stirling Server - <strong>kursi tanpa batas</strong>, pengeditan teks PDF, dan kontrol admin penuh seharga $99/server/bulan."
-freeBody = "Lisensi <strong>Open-Core</strong> kami mengizinkan hingga <strong>{{freeTierLimit}}</strong> pengguna gratis per server. Untuk skala tanpa hambatan dan mendapatkan akses awal ke <strong>alat pengeditan teks PDF</strong> baru kami, kami sarankan paket Stirling Server - pengeditan penuh dan <strong>kursi tanpa batas</strong> seharga $99/server/bulan."
+freeBody = "Lisensi <strong>Open-Core</strong> kami mengizinkan hingga <strong>{{freeTierLimit}}</strong> pengguna gratis per server. Untuk meningkatkan skala tanpa gangguan, kami merekomendasikan paket Stirling Server - <strong>pengguna tanpa batas</strong> dan <strong>dukungan SSO</strong> seharga $99/server/mo."
 
 [onboarding.desktopInstall]
 title = "Unduh"
@@ -5237,6 +5367,31 @@ error = "Gagal memperbarui status pengguna"
 success = "Pengguna berhasil dihapus"
 error = "Gagal menghapus pengguna"
 
+[workspace.people.changePassword]
+action = "Ubah kata sandi"
+title = "Ubah kata sandi"
+subtitle = "Perbarui kata sandi untuk"
+newPassword = "Kata sandi baru"
+confirmPassword = "Konfirmasi kata sandi"
+placeholder = "Masukkan kata sandi baru"
+confirmPlaceholder = "Masukkan ulang kata sandi baru"
+passwordRequired = "Silakan masukkan kata sandi baru"
+passwordMismatch = "Kata sandi tidak cocok"
+generateRandom = "Buat kata sandi aman"
+generatedPreview = "Kata sandi yang dibuat:"
+copyTooltip = "Salin ke papan klip"
+copiedToClipboard = "Kata sandi disalin ke papan klip"
+copyFailed = "Gagal menyalin kata sandi"
+sendEmail = "Kirim email kepada pengguna tentang perubahan ini"
+includePassword = "Sertakan kata sandi baru dalam email"
+forcePasswordChange = "Paksa pengguna mengganti kata sandi saat login berikutnya"
+emailUnavailable = "Email pengguna ini bukan alamat email yang valid. Notifikasi dinonaktifkan."
+smtpDisabled = "Notifikasi email memerlukan SMTP diaktifkan di pengaturan."
+notifyOnly = "Email akan dikirim tanpa kata sandi, memberi tahu pengguna bahwa admin telah mengubahnya."
+submit = "Perbarui kata sandi"
+success = "Kata sandi berhasil diperbarui"
+error = "Gagal memperbarui kata sandi"
+
 [workspace.people.emailInvite]
 tab = "Undangan Email"
 description = "Ketik atau tempel email di bawah, dipisahkan dengan koma. Pengguna akan menerima kredensial login melalui email."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Setidaknya satu alamat email diperlukan"
 submit = "Kirim Undangan"
 success = "pengguna berhasil diundang"
-partialSuccess = "Beberapa undangan gagal"
+partialFailure = "Beberapa undangan gagal"
 allFailed = "Gagal mengundang pengguna"
 error = "Gagal mengirim undangan"
 
@@ -5388,7 +5543,7 @@ hideComparison = "Sembunyikan Perbandingan Fitur"
 featureComparison = "Perbandingan Fitur"
 from = "Mulai"
 perMonth = "/bulan"
-perSeat = "/seat"
+perSeat = "/pengguna"
 withServer = "+ Paket Server"
 licensedSeats = "Berlisensi: {{count}} seat"
 includedInCurrent = "Termasuk dalam Paket Anda"
@@ -5549,7 +5704,7 @@ modalTitle = "Mulai - {{planName}}"
 title = "Pilih Periode Penagihan"
 savingsNote = "Hemat {{percent}}% dengan penagihan tahunan"
 basePrice = "Harga Dasar"
-seatPrice = "Per Seat"
+seatPrice = "Per Pengguna"
 totalForSeats = "Total ({{count}} seat)"
 selectMonthly = "Pilih Bulanan"
 selectYearly = "Pilih Tahunan"
@@ -5752,7 +5907,7 @@ label = "Pilih Server"
 description = "Server self-hosted"
 
 [setup.step3]
-label = "Login"
+label = "Masuk"
 description = "Masukkan kredensial"
 
 [setup.mode.saas]
@@ -5770,6 +5925,7 @@ subtitle = "Masuk dengan akun Stirling Anda"
 [setup.selfhosted]
 title = "Masuk ke Server"
 subtitle = "Masukkan kredensial server Anda"
+link = "atau hubungkan ke akun self-hosted"
 
 [setup.server]
 title = "Sambungkan ke Server"
@@ -5788,15 +5944,30 @@ description = "Masukkan URL lengkap server Stirling PDF self-hosted Anda"
 emptyUrl = "Masukkan URL server"
 unreachable = "Tidak dapat terhubung ke server"
 testFailed = "Tes koneksi gagal"
+configFetch = "Gagal mengambil konfigurasi server. Periksa URL dan coba lagi."
+
+[setup.server.error.securityDisabled]
+title = "Login Tidak Diaktifkan"
+body = "Server ini tidak mengaktifkan login. Untuk terhubung ke server ini, Anda harus mengaktifkan autentikasi:"
+step1 = "Setel DOCKER_ENABLE_SECURITY=true di lingkungan Anda"
+step2 = "Atau setel security.enableLogin=true di settings.yml"
+step3 = "Mulai ulang server"
 
 [setup.login]
 title = "Masuk"
 subtitle = "Masukkan kredensial Anda untuk melanjutkan"
 connectingTo = "Menghubungkan ke:"
-submit = "Login"
+submit = "Masuk"
 signInWith = "Masuk dengan"
 oauthPending = "Membuka browser untuk autentikasi..."
 orContinueWith = "Atau lanjut dengan email"
+serverRequirement = "Catatan: Server harus mengaktifkan login."
+showInstructions = "Bagaimana cara mengaktifkannya?"
+hideInstructions = "Sembunyikan instruksi"
+instructions = "Untuk mengaktifkan login pada server Stirling PDF Anda:"
+instructionsEnvVar = "Setel variabel lingkungan:"
+instructionsOrYml = "Atau di settings.yml:"
+instructionsRestart = "Kemudian mulai ulang server Anda agar perubahan diterapkan."
 
 [setup.login.username]
 label = "Nama pengguna"
@@ -5853,6 +6024,7 @@ earlyAccess = "Akses Awal"
 reset = "Reset Perubahan"
 downloadJson = "Unduh JSON"
 generatePdf = "Buat PDF"
+saveChanges = "Simpan Perubahan"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Sesuaikan teks otomatis ke kotak"
@@ -5890,6 +6062,8 @@ alpha = "Penampil alpha ini masih berkembang—beberapa font, warna, efek transp
 [pdfTextEditor.empty]
 title = "Tidak ada dokumen dimuat"
 subtitle = "Muat file PDF atau JSON untuk mulai mengedit konten teks."
+dropzone = "Seret dan letakkan file PDF atau JSON di sini, atau klik untuk memilih"
+dropzoneWithFiles = "Pilih file dari tab File, atau seret dan letakkan file PDF atau JSON di sini, atau klik untuk memilih"
 
 [pdfTextEditor.welcomeBanner]
 title = "Selamat datang di PDF Text Editor (Akses Awal)"
diff --git a/frontend/public/locales/it-IT/translation.toml b/frontend/public/locales/it-IT/translation.toml
index ef9d94d83..20796ceb0 100644
--- a/frontend/public/locales/it-IT/translation.toml
+++ b/frontend/public/locales/it-IT/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Rimuovi dai preferiti"
 fullscreen = "Passa alla modalità a schermo intero"
 sidebar = "Passa alla modalità barra laterale"
 
+[backendStartup]
+notFoundTitle = "Backend non trovato"
+retry = "Riprova"
+unreachable = "L'applicazione al momento non riesce a connettersi al backend. Verificare lo stato del backend e la connettività di rete, quindi riprovare."
+
 [zipWarning]
 title = "File ZIP di grandi dimensioni"
 message = "Questo ZIP contiene {{count}} file. Estrarre comunque?"
@@ -339,7 +344,7 @@ popular = "Popolare"
 title = "Preferenze"
 
 [settings.workspace]
-title = "Workspace"
+title = "Area di lavoro"
 people = "Persone"
 teams = "Team"
 
@@ -912,6 +917,9 @@ desc = "Crea flussi multi‑step concatenando azioni PDF. Ideale per attività r
 desc = "Sovrapponi un PDF sopra un altro"
 title = "Sovrapponi PDF"
 
+[home.pdfTextEditor]
+title = "Editor di testo PDF"
+desc = "Modifica testo e immagini esistenti nei PDF"
 
 [home.addText]
 tags = "testo,annotazione,etichetta"
@@ -1400,7 +1408,7 @@ arabic = "Arabo"
 japanese = "Giapponese"
 korean = "Coreano"
 chinese = "Cinese"
-thai = "Thai"
+thai = "Tailandese"
 
 [watermark.steps]
 type = "Tipo di filigrana"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Firma disegnata"
 defaultImageLabel = "Firma caricata"
 defaultTextLabel = "Firma digitata"
 saveButton = "Salva firma"
+savePersonal = "Salva come personale"
+saveShared = "Salva come condivisa"
 saveUnavailable = "Crea prima una firma per salvarla."
 noChanges = "La firma corrente è già salvata."
+tempStorageTitle = "Archiviazione temporanea del browser"
+tempStorageDescription = "Le firme sono archiviate solo nel tuo browser. Verranno perse se cancelli i dati del browser o cambi browser."
+personalHeading = "Firme personali"
+sharedHeading = "Firme condivise"
+personalDescription = "Solo tu puoi vedere queste firme."
+sharedDescription = "Tutti gli utenti possono vedere e usare queste firme."
 
 [sign.saved.type]
 canvas = "Disegno"
@@ -2841,8 +2857,8 @@ label = "Fattore di scala"
 [adjustPageScale.pageSize]
 label = "Dimensione pagina di destinazione"
 keep = "Mantieni dimensioni originali"
-letter = "Letter"
-legal = "Legal"
+letter = "Lettera"
+legal = "Legale"
 
 [adjustPageScale.error]
 failed = "Si è verificato un errore durante la regolazione della scala della pagina."
@@ -3020,6 +3036,91 @@ title = "Ottieni informazioni in PDF"
 header = "Ottieni informazioni in PDF"
 submit = "Ottieni informazioni"
 downloadJson = "Scarica JSON"
+processing = "Estrazione delle informazioni in corso..."
+results = "Risultati"
+noResults = "Esegui lo strumento per generare un report."
+downloads = "Download"
+noneDetected = "Nessuno rilevato"
+indexTitle = "Indice"
+
+[getPdfInfo.report]
+entryLabel = "Riepilogo completo delle informazioni"
+shortTitle = "Informazioni PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadati"
+formFields = "Campi del modulo"
+basicInfo = "Informazioni di base"
+documentInfo = "Informazioni sul documento"
+compliance = "Conformità"
+encryption = "Crittografia"
+permissions = "Autorizzazioni"
+other = "Altro"
+perPageInfo = "Info per pagina"
+tableOfContents = "Sommario"
+
+[getPdfInfo.other]
+attachments = "Allegati"
+embeddedFiles = "File incorporati"
+javaScript = "JavaScript"
+layers = "Livelli"
+structureTree = "Albero della struttura"
+xmp = "Metadati XMP"
+
+[getPdfInfo.perPage]
+size = "Dimensioni"
+annotations = "Annotazioni"
+images = "Immagini"
+links = "Link"
+fonts = "Font"
+xobjects = "Conteggi XObject"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Pagine"
+fileSize = "Dimensione file"
+pdfVersion = "Versione PDF"
+language = "Lingua"
+title = "Riepilogo PDF"
+author = "Autore"
+created = "Creato"
+modified = "Modificato"
+permsAll = "Tutte le autorizzazioni consentite"
+permsRestricted = "{{count}} restrizioni"
+permsMixed = "Alcune autorizzazioni limitate"
+hasCompliance = "Conforme agli standard"
+noCompliance = "Nessuno standard di conformità"
+basic = "Informazioni di base"
+documentInfo = "Informazioni sul documento"
+securityTitle = "Stato della sicurezza"
+technical = "Tecnico"
+overviewTitle = "Panoramica PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF crittografato - Protezione tramite password presente"
+unencrypted = "PDF non crittografato - Nessuna protezione tramite password"
+
+[getPdfInfo.summary.tech]
+images = "Immagini"
+fonts = "Font"
+formFields = "Campi del modulo"
+embeddedFiles = "File incorporati"
+javaScript = "JavaScript"
+layers = "Livelli"
+bookmarks = "Segnalibri"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "un documento senza titolo"
+unknown = "Autore sconosciuto"
+text = "Questo è un PDF di {{pages}} pagine intitolato {{title}} creato da {{author}} (versione PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Non è stato possibile elaborare alcuni file."
+unexpected = "Errore imprevisto durante l'estrazione."
+
+[getPdfInfo.status]
+complete = "Estrazione completata"
 
 [extractPage]
 tags = "estrarre"
@@ -3438,6 +3539,9 @@ signinTitle = "Per favore accedi"
 ssoSignIn = "Accedi tramite Single Sign-on"
 oAuth2AutoCreateDisabled = "Creazione automatica utente OAUTH2 DISABILITATA"
 oAuth2AdminBlockedUser = "La registrazione o l'accesso degli utenti non registrati è attualmente bloccata. Si prega di contattare l'amministratore."
+oAuth2RequiresLicense = "L'accesso OAuth/SSO richiede una licenza a pagamento (Server o Enterprise). Contatta l'amministratore per aggiornare il tuo piano."
+saml2RequiresLicense = "L'accesso SAML richiede una licenza a pagamento (Server o Enterprise). Contatta l'amministratore per aggiornare il tuo piano."
+maxUsersReached = "Numero massimo di utenti raggiunto per la licenza corrente. Contatta l'amministratore per aggiornare il piano o aggiungere altri posti."
 oauth2RequestNotFound = "Richiesta di autorizzazione non trovata"
 oauth2InvalidUserInfoResponse = "Risposta relativa alle informazioni utente non valida"
 oauth2invalidRequest = "Richiesta non valida"
@@ -3846,14 +3950,17 @@ fitToWidth = "Adatta alla larghezza"
 actualSize = "Dimensione reale"
 
 [viewer]
+cannotPreviewFile = "Impossibile visualizzare l'anteprima del file"
+dualPageView = "Vista doppia pagina"
 firstPage = "Prima pagina"
 lastPage = "Ultima pagina"
-previousPage = "Pagina precedente"
 nextPage = "Pagina successiva"
+onlyPdfSupported = "Il visualizzatore supporta solo file PDF. Questo file sembra essere in un formato diverso."
+previousPage = "Pagina precedente"
+singlePageView = "Vista pagina singola"
+unknownFile = "File sconosciuto"
 zoomIn = "Ingrandisci"
 zoomOut = "Riduci"
-singlePageView = "Vista pagina singola"
-dualPageView = "Vista doppia pagina"
 
 [rightRail]
 closeSelected = "Chiudi file selezionati"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Mostra/Nascondi barra laterale"
 exportSelected = "Esporta pagine selezionate"
 toggleAnnotations = "Attiva/disattiva visibilità annotazioni"
 annotationMode = "Attiva/disattiva modalità annotazione"
+print = "Stampa PDF"
 draw = "Disegna"
 save = "Salva"
 saveChanges = "Salva modifiche"
@@ -3925,7 +4033,7 @@ files = "File"
 activity = "Attività"
 help = "Guida"
 account = "Account"
-config = "Config"
+config = "Configurazione"
 settings = "Opzioni"
 adminSettings = "Opzioni Admin"
 allTools = "Funzioni"
@@ -4153,7 +4261,7 @@ description = "Traccia azioni degli utenti ed eventi di sistema per conformità
 
 [admin.settings.security.audit.level]
 label = "Livello audit"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=SPENTO, 1=BASE, 2=STANDARD, 3=DETTAGLIATO"
 
 [admin.settings.security.audit.retentionDays]
 label = "Conservazione audit (giorni)"
@@ -4487,13 +4595,14 @@ label = "Informativa sui cookie"
 description = "URL o nome file della cookie policy"
 
 [admin.settings.legal.impressum]
-label = "Impressum"
+label = "Note legali"
 description = "URL o nome file dell'Impressum (richiesto in alcune giurisdizioni)"
 
 [admin.settings.premium]
 title = "Premium e Enterprise"
 description = "Configura la tua chiave di licenza premium o enterprise."
 license = "Configurazione licenza"
+noInput = "Fornisci una chiave o un file di licenza"
 
 [admin.settings.premium.licenseKey]
 toggle = "Hai una chiave di licenza o un file di certificato?"
@@ -4511,6 +4620,25 @@ line1 = "La sovrascrittura della licenza attuale non può essere annullata."
 line2 = "La tua licenza precedente andrà persa in modo permanente a meno che tu non l'abbia salvata altrove."
 line3 = "Importante: mantieni le chiavi di licenza private e sicure. Non condividerle mai pubblicamente."
 
+[admin.settings.premium.inputMethod]
+text = "Chiave di licenza"
+file = "File del certificato"
+
+[admin.settings.premium.file]
+label = "File del certificato di licenza"
+description = "Carica il file di licenza .lic o .cert degli acquisti offline"
+choose = "Scegli file di licenza"
+selected = "Selezionato: {{filename}} ({{size}})"
+successMessage = "File di licenza caricato e attivato con successo. Non è richiesto il riavvio."
+
+[admin.settings.premium.currentLicense]
+title = "Licenza attiva"
+file = "Origine: File di licenza ({{path}})"
+key = "Origine: Chiave di licenza"
+type = "Tipo: {{type}}"
+noInput = "Fornisci una chiave di licenza o carica un file di certificato"
+success = "Successo"
+
 [admin.settings.premium.enabled]
 label = "Abilita funzionalità Premium"
 description = "Abilita i controlli della chiave di licenza per funzionalità pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} selezionati"
 download = "Salva"
 delete = "Elimina"
 unsupported = "Non supportato"
+active = "Attivo"
 addToUpload = "Aggiungi al caricamento"
+closeFile = "Chiudi file"
 deleteAll = "Elimina tutto"
 loadingFiles = "Caricamento file..."
 noFiles = "Nessun file disponibile"
@@ -5132,7 +5262,7 @@ upgrade = "Esegui upgrade ora →"
 freeTitle = "Licenza server"
 overLimitTitle = "Licenza server necessaria"
 overLimitBody = "La nostra licenza consente fino a <strong>{{freeTierLimit}}</strong> utenti gratuiti per server. Hai <strong>{{overLimitUserCopy}}</strong> utenti Stirling. Per continuare senza interruzioni, esegui l'upgrade al piano Stirling Server - <strong>posti illimitati</strong>, modifica del testo PDF e pieno controllo admin a $99/server/mese."
-freeBody = "La nostra licenza <strong>Open-Core</strong> consente fino a <strong>{{freeTierLimit}}</strong> utenti gratuiti per server. Per scalare senza interruzioni e ottenere accesso anticipato al nuovo <strong>strumento di modifica testo PDF</strong>, consigliamo il piano Stirling Server - modifica completa e <strong>posti illimitati</strong> a $99/server/mese."
+freeBody = "La nostra licenza <strong>Open-Core</strong> consente fino a <strong>{{freeTierLimit}}</strong> utenti gratuiti per server. Per scalare senza interruzioni, consigliamo il piano Stirling Server - <strong>posti illimitati</strong> e <strong>supporto SSO</strong> a $99/server/mese."
 
 [onboarding.desktopInstall]
 title = "Download"
@@ -5194,7 +5324,7 @@ subtitle = "Digita o incolla le email qui sotto, separate da virgole. La tua are
 
 [workspace.people.actions]
 label = "Azioni"
-upgrade = "Upgrade"
+upgrade = "Aggiorna"
 
 [workspace.people.roleDescriptions]
 admin = "Può gestire impostazioni e invitare membri, con pieno accesso amministrativo."
@@ -5237,6 +5367,31 @@ error = "Impossibile aggiornare lo stato utente"
 success = "Utente eliminato con successo"
 error = "Impossibile eliminare l'utente"
 
+[workspace.people.changePassword]
+action = "Cambia password"
+title = "Cambia password"
+subtitle = "Aggiorna la password per"
+newPassword = "Nuova password"
+confirmPassword = "Conferma password"
+placeholder = "Inserisci una nuova password"
+confirmPlaceholder = "Reinserisci la nuova password"
+passwordRequired = "Inserisci una nuova password"
+passwordMismatch = "Le password non coincidono"
+generateRandom = "Genera password sicura"
+generatedPreview = "Password generata:"
+copyTooltip = "Copia negli appunti"
+copiedToClipboard = "Password copiata negli appunti"
+copyFailed = "Impossibile copiare la password"
+sendEmail = "Invia un'email all'utente riguardo a questa modifica"
+includePassword = "Includi la nuova password nell'email"
+forcePasswordChange = "Obbliga l'utente a cambiare password al prossimo accesso"
+emailUnavailable = "L'email di questo utente non è un indirizzo valido. Le notifiche sono disabilitate."
+smtpDisabled = "Le notifiche email richiedono che SMTP sia abilitato nelle impostazioni."
+notifyOnly = "Verrà inviata un'email senza la password, informando l'utente che un amministratore l'ha modificata."
+submit = "Aggiorna password"
+success = "Password aggiornata correttamente"
+error = "Impossibile aggiornare la password"
+
 [workspace.people.emailInvite]
 tab = "Invito via email"
 description = "Digita o incolla le email qui sotto, separate da virgole. Gli utenti riceveranno le credenziali di accesso via email."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "È richiesto almeno un indirizzo email"
 submit = "Invia inviti"
 success = "utente/i invitato/i con successo"
-partialSuccess = "Alcuni inviti non sono riusciti"
+partialFailure = "Alcuni inviti non sono riusciti"
 allFailed = "Impossibile invitare gli utenti"
 error = "Invio inviti non riuscito"
 
@@ -5752,7 +5907,7 @@ label = "Seleziona server"
 description = "Server self-hosted"
 
 [setup.step3]
-label = "Login"
+label = "Accesso"
 description = "Inserisci credenziali"
 
 [setup.mode.saas]
@@ -5770,6 +5925,7 @@ subtitle = "Accedi con il tuo account Stirling"
 [setup.selfhosted]
 title = "Accedi al server"
 subtitle = "Inserisci le credenziali del server"
+link = "oppure connettiti a un account self-hosted"
 
 [setup.server]
 title = "Connetti al server"
@@ -5788,15 +5944,30 @@ description = "Inserisci l'URL completo del tuo server Stirling PDF self-hosted"
 emptyUrl = "Inserisci un URL del server"
 unreachable = "Impossibile connettersi al server"
 testFailed = "Test di connessione non riuscito"
+configFetch = "Impossibile recuperare la configurazione del server. Controlla l'URL e riprova."
+
+[setup.server.error.securityDisabled]
+title = "Accesso non abilitato"
+body = "L'accesso non è abilitato su questo server. Per connetterti, devi abilitare l'autenticazione:"
+step1 = "Imposta DOCKER_ENABLE_SECURITY=true nel tuo ambiente"
+step2 = "Oppure imposta security.enableLogin=true in settings.yml"
+step3 = "Riavvia il server"
 
 [setup.login]
 title = "Accedi"
 subtitle = "Inserisci le credenziali per continuare"
 connectingTo = "Connessione a:"
-submit = "Login"
+submit = "Accedi"
 signInWith = "Accedi con"
 oauthPending = "Apertura del browser per l'autenticazione..."
 orContinueWith = "Oppure continua con email"
+serverRequirement = "Nota: il server deve avere il login abilitato."
+showInstructions = "Come abilitarlo?"
+hideInstructions = "Nascondi istruzioni"
+instructions = "Per abilitare il login sul tuo server Stirling PDF:"
+instructionsEnvVar = "Imposta la variabile d'ambiente:"
+instructionsOrYml = "Oppure in settings.yml:"
+instructionsRestart = "Quindi riavvia il server affinché le modifiche abbiano effetto."
 
 [setup.login.username]
 label = "Nome utente"
@@ -5840,7 +6011,7 @@ paragraph = "Pagina a paragrafi"
 sparse = "Testo sparso"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automatico"
 paragraph = "Paragrafo"
 singleLine = "Riga singola"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Accesso anticipato"
 reset = "Reimposta modifiche"
 downloadJson = "Scarica JSON"
 generatePdf = "Genera PDF"
+saveChanges = "Salva modifiche"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Ridimensiona automaticamente il testo alle caselle"
@@ -5890,6 +6062,8 @@ alpha = "Questo visualizzatore alpha è in evoluzione: alcuni font, colori, effe
 [pdfTextEditor.empty]
 title = "Nessun documento caricato"
 subtitle = "Carica un file PDF o JSON per iniziare a modificare il testo."
+dropzone = "Trascina qui un file PDF o JSON oppure fai clic per sfogliare"
+dropzoneWithFiles = "Seleziona un file dalla scheda File oppure trascina qui un file PDF o JSON, o fai clic per sfogliare"
 
 [pdfTextEditor.welcomeBanner]
 title = "Benvenuto in PDF Text Editor (Accesso anticipato)"
diff --git a/frontend/public/locales/ja-JP/translation.toml b/frontend/public/locales/ja-JP/translation.toml
index 90b5eeee4..dda2f9b81 100644
--- a/frontend/public/locales/ja-JP/translation.toml
+++ b/frontend/public/locales/ja-JP/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "お気に入りから削除"
 fullscreen = "フルスクリーンモードに切り替え"
 sidebar = "サイドバーモードに切り替え"
 
+[backendStartup]
+notFoundTitle = "バックエンドが見つかりません"
+retry = "再試行"
+unreachable = "現在、アプリケーションはバックエンドに接続できません。バックエンドの稼働状況とネットワーク接続を確認し、再度お試しください。"
+
 [zipWarning]
 title = "大きな ZIP ファイル"
 message = "このZIPには{{count}}個のファイルが含まれています。展開しますか？"
@@ -912,6 +917,9 @@ desc = "PDF アクションを連結して複数ステップのワークフロ
 desc = "1つのPDFを別のPDFの上に重ねます"
 title = "PDFを重ね合わせ"
 
+[home.pdfTextEditor]
+title = "PDFテキストエディタ"
+desc = "PDF内の既存のテキストと画像を編集"
 
 [home.addText]
 tags = "テキスト,注釈,ラベル"
@@ -1173,7 +1181,7 @@ selectFilesPlaceholder = "開始するにはメインビューでファイルを
 settings = "設定"
 conversionCompleted = "変換が完了しました"
 results = "結果"
-defaultFilename = "converted_file"
+defaultFilename = "変換済みファイル"
 conversionResults = "変換結果"
 convertFrom = "変換元"
 convertTo = "変換先"
@@ -1360,7 +1368,7 @@ title = "透かしの追加"
 desc = "PDF ファイルにテキストまたは画像の透かしを追加"
 completed = "透かしを追加しました"
 submit = "透かしを追加"
-filenamePrefix = "watermarked"
+filenamePrefix = "透かし入り"
 
 [watermark.error]
 failed = "PDF への透かし追加中にエラーが発生しました。"
@@ -1635,7 +1643,7 @@ subtitle = "処理済みファイルをダウンロードするか、下で操
 [removePages]
 tags = "ページを削除,ページ削除"
 title = "削除"
-filenamePrefix = "pages_removed"
+filenamePrefix = "ページ削除済み"
 submit = "削除"
 
 [removePages.pageNumbers]
@@ -1837,7 +1845,7 @@ title = "フォームフィールドから読み取り専用を削除"
 header = "PDFフォームのロックを解除"
 submit = "Remove"
 description = "このツールは PDF フォームフィールドの読み取り専用制限を解除し、編集・入力可能にします。"
-filenamePrefix = "unlocked_forms"
+filenamePrefix = "フォームのロック解除済み"
 
 [unlockPDFForms.files]
 placeholder = "メインビューで PDF ファイルを選択して開始してください"
@@ -1851,7 +1859,7 @@ title = "フォームのロック解除結果"
 [changeMetadata]
 header = "メタデータの変更"
 submit = "変更"
-filenamePrefix = "metadata"
+filenamePrefix = "メタデータ"
 
 [changeMetadata.settings]
 title = "メタデータ設定"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "手書き署名"
 defaultImageLabel = "アップロードした署名"
 defaultTextLabel = "入力した署名"
 saveButton = "署名を保存"
+savePersonal = "個人用として保存"
+saveShared = "共有用として保存"
 saveUnavailable = "まず署名を作成してから保存してください。"
 noChanges = "現在の署名はすでに保存済みです。"
+tempStorageTitle = "ブラウザーの一時ストレージ"
+tempStorageDescription = "署名はブラウザー内のみに保存されます。ブラウザーのデータを消去するか、別のブラウザーに切り替えると失われます。"
+personalHeading = "個人用署名"
+sharedHeading = "共有署名"
+personalDescription = "これらの署名はあなただけが表示できます。"
+sharedDescription = "すべてのユーザーがこれらの署名を表示して使用できます。"
 
 [sign.saved.type]
 canvas = "描画"
@@ -2318,7 +2334,7 @@ title = "平坦化"
 header = "PDFを平坦化する"
 flattenOnlyForms = "フォームのみを平坦にする"
 submit = "平坦化"
-filenamePrefix = "flattened"
+filenamePrefix = "フラット化済み"
 
 [flatten.files]
 placeholder = "開始するにはメインビューで PDF ファイルを選択してください"
@@ -2366,7 +2382,7 @@ title = "修復"
 header = "PDFを修復"
 submit = "修復"
 description = "このツールは破損または損傷した PDF ファイルの修復を試みます。追加の設定は不要です。"
-filenamePrefix = "repaired"
+filenamePrefix = "修復済み"
 
 [repair.files]
 placeholder = "開始するにはメイン画面で PDF ファイルを選択してください"
@@ -2567,7 +2583,7 @@ stopButton = "比較を停止"
 [certSign]
 tags = "authenticate,PEM,P12,official,encrypt"
 title = "証明書による署名"
-filenamePrefix = "signed"
+filenamePrefix = "署名済み"
 chooseCertificate = "証明書ファイルを選択"
 chooseJksFile = "JKS ファイルを選択"
 chooseP12File = "PKCS12 ファイルを選択"
@@ -2701,7 +2717,7 @@ header = "PDFから電子証明書を削除する"
 selectPDF = "PDFファイルの選択:"
 submit = "署名の削除"
 description = "このツールは PDF 文書からデジタル証明書署名を削除します。"
-filenamePrefix = "unsigned"
+filenamePrefix = "署名なし"
 
 [removeCertSign.files]
 placeholder = "開始するにはメイン画面で PDF ファイルを選択してください"
@@ -3020,6 +3036,91 @@ title = "PDFの情報を入手"
 header = "PDFの情報を入手"
 submit = "情報を入手"
 downloadJson = "JSONでダウンロード"
+processing = "情報を抽出しています..."
+results = "結果"
+noResults = "レポートを生成するにはツールを実行してください。"
+downloads = "ダウンロード"
+noneDetected = "検出なし"
+indexTitle = "インデックス"
+
+[getPdfInfo.report]
+entryLabel = "全情報の概要"
+shortTitle = "PDF情報"
+
+[getPdfInfo.sections]
+metadata = "メタデータ"
+formFields = "フォームフィールド"
+basicInfo = "基本情報"
+documentInfo = "ドキュメント情報"
+compliance = "準拠"
+encryption = "暗号化"
+permissions = "権限"
+other = "その他"
+perPageInfo = "ページごとの情報"
+tableOfContents = "目次"
+
+[getPdfInfo.other]
+attachments = "添付ファイル"
+embeddedFiles = "埋め込みファイル"
+javaScript = "JavaScript"
+layers = "レイヤー"
+structureTree = "構造ツリー"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "サイズ"
+annotations = "注釈"
+images = "画像"
+links = "リンク"
+fonts = "フォント"
+xobjects = "XObject の数"
+multimedia = "マルチメディア"
+
+[getPdfInfo.summary]
+pages = "ページ数"
+fileSize = "ファイルサイズ"
+pdfVersion = "PDF バージョン"
+language = "言語"
+title = "PDF 概要"
+author = "作成者"
+created = "作成日"
+modified = "更新日"
+permsAll = "すべての権限が許可されています"
+permsRestricted = "{{count}} 件の制限"
+permsMixed = "一部の権限が制限されています"
+hasCompliance = "準拠規格あり"
+noCompliance = "準拠規格なし"
+basic = "基本情報"
+documentInfo = "ドキュメント情報"
+securityTitle = "セキュリティ状態"
+technical = "技術情報"
+overviewTitle = "PDF 概要"
+
+[getPdfInfo.summary.security]
+encrypted = "暗号化された PDF - パスワード保護あり"
+unencrypted = "暗号化されていない PDF - パスワード保護なし"
+
+[getPdfInfo.summary.tech]
+images = "画像"
+fonts = "フォント"
+formFields = "フォームフィールド"
+embeddedFiles = "埋め込みファイル"
+javaScript = "JavaScript"
+layers = "レイヤー"
+bookmarks = "ブックマーク"
+multimedia = "マルチメディア"
+
+[getPdfInfo.summary.overview]
+untitled = "無題のドキュメント"
+unknown = "不明な作成者"
+text = "これは {{author}} によって作成された、タイトル {{title}} の {{pages}} ページの PDF です（PDF バージョン {{version}}）。"
+
+[getPdfInfo.error]
+partial = "一部のファイルを処理できませんでした。"
+unexpected = "抽出中に予期しないエラーが発生しました。"
+
+[getPdfInfo.status]
+complete = "抽出が完了しました"
 
 [extractPage]
 tags = "抽出"
@@ -3438,6 +3539,9 @@ signinTitle = "サインインしてください"
 ssoSignIn = "シングルサインオンでログイン"
 oAuth2AutoCreateDisabled = "OAuth 2自動作成ユーザーが無効"
 oAuth2AdminBlockedUser = "現在、未登録ユーザーの登録またはログインはブロックされています。管理者にお問い合わせください。"
+oAuth2RequiresLicense = "OAuth/SSO ログインには有料ライセンス（Server または Enterprise）が必要です。プランのアップグレードについては管理者にお問い合わせください。"
+saml2RequiresLicense = "SAML ログインには有料ライセンス（Server または Enterprise）が必要です。プランのアップグレードについては管理者にお問い合わせください。"
+maxUsersReached = "現在のライセンスのユーザー数上限に達しました。プランのアップグレードまたはシート数の追加について、管理者にお問い合わせください。"
 oauth2RequestNotFound = "認証リクエストが見つかりません"
 oauth2InvalidUserInfoResponse = "無効なユーザー情報の応答"
 oauth2invalidRequest = "無効なリクエスト"
@@ -3533,7 +3637,7 @@ title = "PDFを単一ページに変換"
 header = "PDFを単一ページに変換"
 submit = "単一ページに変換"
 description = "このツールは PDF の全ページを 1 つの大きな単一ページに結合します。幅は元のページと同じで、高さは全ページの高さの合計になります。"
-filenamePrefix = "single_page"
+filenamePrefix = "単一ページ"
 
 [pdfToSinglePage.files]
 placeholder = "開始するにはメイン画面で PDF ファイルを選択してください"
@@ -3846,14 +3950,17 @@ fitToWidth = "幅に合わせる"
 actualSize = "原寸"
 
 [viewer]
+cannotPreviewFile = "ファイルをプレビューできません"
+dualPageView = "見開き表示"
 firstPage = "最初のページ"
 lastPage = "最後のページ"
-previousPage = "前のページ"
 nextPage = "次のページ"
+onlyPdfSupported = "このビューアは PDF ファイルのみをサポートしています。このファイルは別の形式のようです。"
+previousPage = "前のページ"
+singlePageView = "単一ページ表示"
+unknownFile = "不明なファイル"
 zoomIn = "拡大"
 zoomOut = "縮小"
-singlePageView = "単一ページ表示"
-dualPageView = "見開き表示"
 
 [rightRail]
 closeSelected = "選択したファイルを閉じる"
@@ -3877,6 +3984,7 @@ toggleSidebar = "サイドバーを切り替え"
 exportSelected = "選択したページを書き出し"
 toggleAnnotations = "注釈の表示を切り替え"
 annotationMode = "注釈モードを切り替え"
+print = "PDFを印刷"
 draw = "描画"
 save = "保存"
 saveChanges = "変更を保存"
@@ -4231,15 +4339,15 @@ label = "プロバイダ"
 description = "認証に使用する OAuth2 プロバイダ"
 
 [admin.settings.connections.oauth2.issuer]
-label = "Issuer URL"
+label = "発行者 URL"
 description = "OAuth2 プロバイダの Issuer URL"
 
 [admin.settings.connections.oauth2.clientId]
-label = "Client ID"
+label = "クライアント ID"
 description = "プロバイダから発行された OAuth2 の Client ID"
 
 [admin.settings.connections.oauth2.clientSecret]
-label = "Client Secret"
+label = "クライアント シークレット"
 description = "プロバイダから発行された OAuth2 の Client Secret"
 
 [admin.settings.connections.oauth2.useAsUsername]
@@ -4270,7 +4378,7 @@ label = "プロバイダ"
 description = "SAML2 プロバイダ名"
 
 [admin.settings.connections.saml2.registrationId]
-label = "Registration ID"
+label = "登録 ID"
 description = "SAML2 の登録識別子"
 
 [admin.settings.connections.saml2.autoCreateUser]
@@ -4407,7 +4515,7 @@ description = "より広範なシステム一時ディレクトリをクリー
 label = "プロセス実行制限"
 description = "各プロセス実行器のセッション上限とタイムアウトを設定"
 libreOffice = "LibreOffice"
-pdfToHtml = "PDF to HTML"
+pdfToHtml = "PDF を HTML に"
 qpdf = "QPDF"
 tesseract = "Tesseract OCR"
 pythonOpenCv = "Python OpenCV"
@@ -4494,6 +4602,7 @@ description = "インプリントへの URL またはファイル名（地域に
 title = "プレミアムとエンタープライズ"
 description = "プレミアムまたはエンタープライズのライセンスキーを構成します。"
 license = "ライセンス設定"
+noInput = "ライセンスキーまたはファイルを入力してください"
 
 [admin.settings.premium.licenseKey]
 toggle = "ライセンスキーまたは証明書ファイルをお持ちですか？"
@@ -4511,6 +4620,25 @@ line1 = "現在のライセンスキーを上書きすると元に戻せませ
 line2 = "別途バックアップしていない限り、以前のライセンスは永久に失われます。"
 line3 = "重要: ライセンスキーは秘密に安全に保管してください。公開で共有しないでください。"
 
+[admin.settings.premium.inputMethod]
+text = "ライセンスキー"
+file = "証明書ファイル"
+
+[admin.settings.premium.file]
+label = "ライセンス証明書ファイル"
+description = "オフライン購入の .lic または .cert ライセンスファイルをアップロードしてください"
+choose = "ライセンスファイルを選択"
+selected = "選択済み: {{filename}} ({{size}})"
+successMessage = "ライセンスファイルをアップロードして有効化しました。再起動は不要です。"
+
+[admin.settings.premium.currentLicense]
+title = "有効なライセンス"
+file = "ソース: ライセンスファイル ({{path}})"
+key = "ソース: ライセンスキー"
+type = "種類: {{type}}"
+noInput = "ライセンスキーを入力するか、証明書ファイルをアップロードしてください"
+success = "成功"
+
 [admin.settings.premium.enabled]
 label = "プレミアム機能を有効化"
 description = "Pro/Enterprise 機能のライセンスキー検証を有効化"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} 件選択"
 download = "ダウンロード"
 delete = "削除"
 unsupported = "未対応"
+active = "アクティブ"
 addToUpload = "アップロードに追加"
+closeFile = "ファイルを閉じる"
 deleteAll = "すべて削除"
 loadingFiles = "ファイルを読み込み中..."
 noFiles = "ファイルはありません"
@@ -4669,7 +4799,7 @@ title = "サニタイズ"
 desc = "PDF ファイルから潜在的に有害な要素を削除します。"
 submit = "PDFをサニタイズ"
 completed = "サニタイズが正常に完了しました"
-filenamePrefix = "sanitised"
+filenamePrefix = "サニタイズ済み"
 sanitizationResults = "サニタイズ結果"
 
 [sanitize.error]
@@ -4717,7 +4847,7 @@ title = "パスワードの追加"
 desc = "パスワードで PDF 文書を暗号化します。"
 completed = "パスワード保護を適用しました"
 submit = "暗号化"
-filenamePrefix = "encrypted"
+filenamePrefix = "暗号化済み"
 
 [addPassword.error]
 failed = "PDF の暗号化中にエラーが発生しました。"
@@ -4812,7 +4942,7 @@ text = "これらの権限を変更不可にするには、パスワード追加
 title = "パスワードの削除"
 desc = "PDFからパスワードの削除します。"
 tags = "セキュア,復号,セキュリティ,パスワード解除,パスワード削除"
-filenamePrefix = "decrypted"
+filenamePrefix = "復号済み"
 submit = "削除"
 
 [removePassword.password]
@@ -5132,7 +5262,7 @@ upgrade = "今すぐアップグレード →"
 freeTitle = "サーバーライセンス"
 overLimitTitle = "サーバーライセンスが必要です"
 overLimitBody = "当社のライセンスでは、サーバーごとに <strong>{{freeTierLimit}}</strong> ユーザーまで無料です。現在 <strong>{{overLimitUserCopy}}</strong> の Stirling ユーザーがいます。中断なく利用を続けるには、Stirling Server プランにアップグレードしてください - <strong>無制限席数</strong>、PDF テキスト編集、完全な管理機能が $99/サーバー/月 です。"
-freeBody = "当社の <strong>オープンコア</strong> ライセンスでは、サーバーごとに最大 <strong>{{freeTierLimit}}</strong> ユーザーまで無料です。中断なく拡張し、新しい <strong>PDF テキスト編集ツール</strong> に早期アクセスするには、Stirling Server プランをお勧めします。完全編集と <strong>無制限席数</strong> が $99/サーバー/月 です。"
+freeBody = "当社の<strong>Open-Core</strong>ライセンスでは、サーバーごとに最大<strong>{{freeTierLimit}}</strong>ユーザーまで無料でご利用いただけます。中断なくスケールするには、Stirling Server プランをおすすめします - <strong>無制限の席数</strong>と<strong>SSO サポート</strong>で $99/サーバー/月。"
 
 [onboarding.desktopInstall]
 title = "ダウンロード"
@@ -5237,6 +5367,31 @@ error = "ユーザーのステータスの更新に失敗しました"
 success = "ユーザーを削除しました"
 error = "ユーザーの削除に失敗しました"
 
+[workspace.people.changePassword]
+action = "パスワードを変更"
+title = "パスワードを変更"
+subtitle = "のパスワードを更新"
+newPassword = "新しいパスワード"
+confirmPassword = "パスワードの確認"
+placeholder = "新しいパスワードを入力"
+confirmPlaceholder = "新しいパスワードを再入力"
+passwordRequired = "新しいパスワードを入力してください"
+passwordMismatch = "パスワードが一致しません"
+generateRandom = "安全なパスワードを生成"
+generatedPreview = "生成されたパスワード:"
+copyTooltip = "クリップボードにコピー"
+copiedToClipboard = "パスワードをクリップボードにコピーしました"
+copyFailed = "パスワードのコピーに失敗しました"
+sendEmail = "この変更についてユーザーにメールする"
+includePassword = "メールに新しいパスワードを含める"
+forcePasswordChange = "次回ログイン時にユーザーにパスワード変更を強制する"
+emailUnavailable = "このユーザーのメールは有効なメールアドレスではありません。通知は無効です。"
+smtpDisabled = "メール通知には設定で SMTP を有効にする必要があります。"
+notifyOnly = "パスワードを含めずにメールを送信し、管理者が変更したことをユーザーに知らせます。"
+submit = "パスワードを更新"
+success = "パスワードを更新しました"
+error = "パスワードの更新に失敗しました"
+
 [workspace.people.emailInvite]
 tab = "メール招待"
 description = "下にメールアドレスをカンマ区切りで入力または貼り付けてください。ユーザーにはメールでログイン情報が届きます。"
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "少なくとも1件のメールアドレスが必要です"
 submit = "招待を送信"
 success = "ユーザーを招待しました"
-partialSuccess = "一部の招待に失敗しました"
+partialFailure = "一部の招待に失敗しました"
 allFailed = "ユーザーの招待に失敗しました"
 error = "招待の送信に失敗しました"
 
@@ -5770,6 +5925,7 @@ subtitle = "Stirling アカウントでサインイン"
 [setup.selfhosted]
 title = "サーバーにサインイン"
 subtitle = "サーバーの認証情報を入力"
+link = "またはセルフホスト型アカウントに接続"
 
 [setup.server]
 title = "サーバーに接続"
@@ -5788,6 +5944,14 @@ description = "セルフホストの Stirling PDF サーバーの完全な URL 
 emptyUrl = "サーバー URL を入力してください"
 unreachable = "サーバーに接続できませんでした"
 testFailed = "接続テストに失敗しました"
+configFetch = "サーバー構成の取得に失敗しました。URL を確認して、もう一度お試しください。"
+
+[setup.server.error.securityDisabled]
+title = "ログインが有効になっていません"
+body = "このサーバーではログインが有効になっていません。このサーバーに接続するには、認証を有効にする必要があります:"
+step1 = "環境で DOCKER_ENABLE_SECURITY=true を設定する"
+step2 = "または settings.yml で security.enableLogin=true を設定する"
+step3 = "サーバーを再起動する"
 
 [setup.login]
 title = "サインイン"
@@ -5797,13 +5961,20 @@ submit = "ログイン"
 signInWith = "でサインイン"
 oauthPending = "認証のためブラウザーを開いています..."
 orContinueWith = "またはメールで続行"
+serverRequirement = "注: サーバーでログインを有効にする必要があります。"
+showInstructions = "有効化するには？"
+hideInstructions = "手順を非表示"
+instructions = "Stirling PDF サーバーでログインを有効にするには:"
+instructionsEnvVar = "環境変数を設定:"
+instructionsOrYml = "または settings.yml で:"
+instructionsRestart = "その後、サーバーを再起動して変更を反映させてください。"
 
 [setup.login.username]
 label = "ユーザー名"
 placeholder = "ユーザー名を入力"
 
 [setup.login.email]
-label = "Email"
+label = "メールアドレス"
 placeholder = "メールアドレスを入力"
 
 [setup.login.password]
@@ -5853,6 +6024,7 @@ earlyAccess = "早期アクセス"
 reset = "変更をリセット"
 downloadJson = "JSON をダウンロード"
 generatePdf = "PDF を生成"
+saveChanges = "変更を保存"
 
 [pdfTextEditor.options.autoScaleText]
 title = "ボックスに収まるようテキストを自動スケール"
@@ -5890,6 +6062,8 @@ alpha = "このアルファ版ビューアは開発途上です。一部のフ
 [pdfTextEditor.empty]
 title = "ドキュメントが読み込まれていません"
 subtitle = "テキスト編集を開始するにはPDFまたはJSONファイルを読み込んでください。"
+dropzone = "ここに PDF または JSON ファイルをドラッグ＆ドロップするか、クリックして参照"
+dropzoneWithFiles = "ファイルタブからファイルを選択するか、ここに PDF または JSON ファイルをドラッグ＆ドロップするか、クリックして参照"
 
 [pdfTextEditor.welcomeBanner]
 title = "PDF Text Editor（早期アクセス）へようこそ"
diff --git a/frontend/public/locales/ko-KR/translation.toml b/frontend/public/locales/ko-KR/translation.toml
index f63fd82c6..63c1018c9 100644
--- a/frontend/public/locales/ko-KR/translation.toml
+++ b/frontend/public/locales/ko-KR/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "즐겨찾기에서 제거"
 fullscreen = "전체 화면 모드로 전환"
 sidebar = "사이드바 모드로 전환"
 
+[backendStartup]
+notFoundTitle = "백엔드를 찾을 수 없음"
+retry = "재시도"
+unreachable = "현재 애플리케이션이 백엔드에 연결할 수 없습니다. 백엔드 상태와 네트워크 연결을 확인한 후 다시 시도하세요."
+
 [zipWarning]
 title = "큰 ZIP 파일"
 message = "이 ZIP에는 {{count}}개의 파일이 포함되어 있습니다. 그래도 압축을 해제하시겠습니까?"
@@ -912,6 +917,9 @@ desc = "PDF 작업을 연결하여 다단계 워크플로를 구성하세요. 
 desc = "PDF를 다른 PDF 위에 오버레이"
 title = "PDF 오버레이"
 
+[home.pdfTextEditor]
+title = "PDF 텍스트 편집기"
+desc = "PDF 내부의 기존 텍스트와 이미지를 편집합니다"
 
 [home.addText]
 tags = "텍스트,주석,레이블"
@@ -1901,8 +1909,8 @@ placeholder = "수정 날짜"
 [changeMetadata.trapped]
 label = "트래핑 상태"
 unknown = "알 수 없음"
-true = "True"
-false = "False"
+true = "참"
+false = "거짓"
 
 [changeMetadata.advanced]
 title = "고급 옵션"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "그린 서명"
 defaultImageLabel = "업로드된 서명"
 defaultTextLabel = "입력한 서명"
 saveButton = "서명 저장"
+savePersonal = "개인용으로 저장"
+saveShared = "공유용으로 저장"
 saveUnavailable = "먼저 서명을 만든 후 저장하세요."
 noChanges = "현재 서명이 이미 저장되어 있습니다."
+tempStorageTitle = "임시 브라우저 저장소"
+tempStorageDescription = "서명은 브라우저에만 저장됩니다. 브라우저 데이터를 삭제하거나 브라우저를 변경하면 사라집니다."
+personalHeading = "개인 서명"
+sharedHeading = "공유 서명"
+personalDescription = "이 서명은 본인만 볼 수 있습니다."
+sharedDescription = "모든 사용자가 이 서명을 보고 사용할 수 있습니다."
 
 [sign.saved.type]
 canvas = "그리기"
@@ -3020,6 +3036,91 @@ title = "PDF 정보 가져오기"
 header = "PDF 정보 가져오기"
 submit = "정보 가져오기"
 downloadJson = "JSON 다운로드"
+processing = "정보를 추출하는 중..."
+results = "결과"
+noResults = "보고서를 생성하려면 도구를 실행하세요."
+downloads = "다운로드"
+noneDetected = "감지되지 않음"
+indexTitle = "색인"
+
+[getPdfInfo.report]
+entryLabel = "전체 정보 요약"
+shortTitle = "PDF 정보"
+
+[getPdfInfo.sections]
+metadata = "메타데이터"
+formFields = "양식 필드"
+basicInfo = "기본 정보"
+documentInfo = "문서 정보"
+compliance = "규격 준수"
+encryption = "암호화"
+permissions = "권한"
+other = "기타"
+perPageInfo = "페이지별 정보"
+tableOfContents = "목차"
+
+[getPdfInfo.other]
+attachments = "첨부 파일"
+embeddedFiles = "내장 파일"
+javaScript = "JavaScript"
+layers = "레이어"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "크기"
+annotations = "주석"
+images = "이미지"
+links = "링크"
+fonts = "글꼴"
+xobjects = "XObject 개수"
+multimedia = "멀티미디어"
+
+[getPdfInfo.summary]
+pages = "페이지 수"
+fileSize = "파일 크기"
+pdfVersion = "PDF 버전"
+language = "언어"
+title = "PDF 요약"
+author = "작성자"
+created = "생성됨"
+modified = "수정됨"
+permsAll = "모든 권한 허용"
+permsRestricted = "{{count}}개의 제한"
+permsMixed = "일부 권한이 제한됨"
+hasCompliance = "규격 준수 기준 있음"
+noCompliance = "규격 준수 기준 없음"
+basic = "기본 정보"
+documentInfo = "문서 정보"
+securityTitle = "보안 상태"
+technical = "기술 정보"
+overviewTitle = "PDF 개요"
+
+[getPdfInfo.summary.security]
+encrypted = "암호화된 PDF - 암호 보호 적용"
+unencrypted = "암호화되지 않은 PDF - 암호 보호 없음"
+
+[getPdfInfo.summary.tech]
+images = "이미지"
+fonts = "글꼴"
+formFields = "양식 필드"
+embeddedFiles = "내장 파일"
+javaScript = "JavaScript"
+layers = "레이어"
+bookmarks = "북마크"
+multimedia = "멀티미디어"
+
+[getPdfInfo.summary.overview]
+untitled = "제목 없는 문서"
+unknown = "알 수 없는 작성자"
+text = "이 문서는 {{pages}}페이지 분량의 PDF로, 제목은 {{title}}이며 작성자는 {{author}}입니다(PDF 버전 {{version}})."
+
+[getPdfInfo.error]
+partial = "일부 파일을 처리하지 못했습니다."
+unexpected = "추출 중 예기치 않은 오류가 발생했습니다."
+
+[getPdfInfo.status]
+complete = "추출 완료"
 
 [extractPage]
 tags = "추출"
@@ -3438,6 +3539,9 @@ signinTitle = "로그인해 주세요"
 ssoSignIn = "단일 로그인으로 로그인"
 oAuth2AutoCreateDisabled = "OAuth2 사용자 자동 생성이 비활성화되었습니다"
 oAuth2AdminBlockedUser = "현재 미등록 사용자의 등록 또는 로그인이 차단되어 있습니다. 관리자에게 문의하세요."
+oAuth2RequiresLicense = "OAuth/SSO 로그인은 유료 라이선스(서버 또는 엔터프라이즈)가 필요합니다. 플랜 업그레이드를 위해 관리자에게 문의하세요."
+saml2RequiresLicense = "SAML 로그인은 유료 라이선스(서버 또는 엔터프라이즈)가 필요합니다. 플랜 업그레이드를 위해 관리자에게 문의하세요."
+maxUsersReached = "현재 라이선스에서 허용된 최대 사용자 수에 도달했습니다. 플랜 업그레이드 또는 시트 추가를 위해 관리자에게 문의하세요."
 oauth2RequestNotFound = "인증 요청을 찾을 수 없습니다"
 oauth2InvalidUserInfoResponse = "잘못된 사용자 정보 응답"
 oauth2invalidRequest = "잘못된 요청"
@@ -3846,14 +3950,17 @@ fitToWidth = "너비에 맞추기"
 actualSize = "실제 크기"
 
 [viewer]
+cannotPreviewFile = "파일을 미리보기할 수 없습니다"
+dualPageView = "두 페이지 보기"
 firstPage = "첫 페이지"
 lastPage = "마지막 페이지"
-previousPage = "이전 페이지"
 nextPage = "다음 페이지"
+onlyPdfSupported = "뷰어는 PDF 파일만 지원합니다. 이 파일은 다른 형식인 것으로 보입니다."
+previousPage = "이전 페이지"
+singlePageView = "단일 페이지 보기"
+unknownFile = "알 수 없는 파일"
 zoomIn = "확대"
 zoomOut = "축소"
-singlePageView = "단일 페이지 보기"
-dualPageView = "두 페이지 보기"
 
 [rightRail]
 closeSelected = "선택한 파일 닫기"
@@ -3877,6 +3984,7 @@ toggleSidebar = "사이드바 전환"
 exportSelected = "선택한 페이지 내보내기"
 toggleAnnotations = "주석 가시성 전환"
 annotationMode = "주석 모드 전환"
+print = "PDF 인쇄"
 draw = "그리기"
 save = "저장"
 saveChanges = "변경 내용 저장"
@@ -4153,7 +4261,7 @@ description = "컴플라이언스 및 보안 모니터링을 위해 사용자 
 
 [admin.settings.security.audit.level]
 label = "감사 수준"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=끄기, 1=기본, 2=표준, 3=상세"
 
 [admin.settings.security.audit.retentionDays]
 label = "감사 로그 보존 기간(일)"
@@ -4407,7 +4515,7 @@ description = "더 넓은 시스템 임시 디렉터리를 정리할지 여부(
 label = "프로세스 실행기 제한"
 description = "각 프로세스 실행기의 세션 제한 및 시간 제한을 구성합니다"
 libreOffice = "LibreOffice"
-pdfToHtml = "PDF to HTML"
+pdfToHtml = "PDF를 HTML로"
 qpdf = "QPDF"
 tesseract = "Tesseract OCR"
 pythonOpenCv = "Python OpenCV"
@@ -4487,13 +4595,14 @@ label = "쿠키 정책"
 description = "쿠키 정책의 URL 또는 파일 이름"
 
 [admin.settings.legal.impressum]
-label = "Impressum"
+label = "법적 고지"
 description = "Impressum의 URL 또는 파일 이름(일부 관할권에서 필수)"
 
 [admin.settings.premium]
 title = "프리미엄 및 엔터프라이즈"
 description = "프리미엄 또는 엔터프라이즈 라이선스 키를 구성합니다."
 license = "라이선스 구성"
+noInput = "라이선스 키 또는 파일을 입력해 주세요"
 
 [admin.settings.premium.licenseKey]
 toggle = "라이선스 키나 인증서 파일이 있나요?"
@@ -4511,6 +4620,25 @@ line1 = "현재 라이선스 키를 덮어쓰면 되돌릴 수 없습니다."
 line2 = "다른 곳에 백업하지 않았다면 이전 라이선스는 영구적으로 손실됩니다."
 line3 = "중요: 라이선스 키는 개인적으로 안전하게 보관하세요. 공개적으로 공유하지 마세요."
 
+[admin.settings.premium.inputMethod]
+text = "라이선스 키"
+file = "인증서 파일"
+
+[admin.settings.premium.file]
+label = "라이선스 인증서 파일"
+description = "오프라인 구매 시 받은 .lic 또는 .cert 라이선스 파일을 업로드하세요"
+choose = "라이선스 파일 선택"
+selected = "선택됨: {{filename}} ({{size}})"
+successMessage = "라이선스 파일이 업로드되어 성공적으로 활성화되었습니다. 재시작은 필요하지 않습니다."
+
+[admin.settings.premium.currentLicense]
+title = "활성 라이선스"
+file = "소스: 라이선스 파일 ({{path}})"
+key = "소스: 라이선스 키"
+type = "유형: {{type}}"
+noInput = "라이선스 키를 입력하거나 인증서 파일을 업로드해 주세요"
+success = "성공"
+
 [admin.settings.premium.enabled]
 label = "프리미엄 기능 활성화"
 description = "프로/엔터프라이즈 기능에 대한 라이선스 키 확인 활성화"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}}개 선택됨"
 download = "다운로드"
 delete = "삭제"
 unsupported = "지원되지 않음"
+active = "활성"
 addToUpload = "업로드에 추가"
+closeFile = "파일 닫기"
 deleteAll = "모두 삭제"
 loadingFiles = "파일 불러오는 중..."
 noFiles = "사용 가능한 파일이 없습니다"
@@ -5132,7 +5262,7 @@ upgrade = "지금 업그레이드 →"
 freeTitle = "서버 라이선스"
 overLimitTitle = "서버 라이선스 필요"
 overLimitBody = "당사의 라이선스는 서버당 무료로 최대 <strong>{{freeTierLimit}}</strong>명의 사용자를 허용합니다. 현재 <strong>{{overLimitUserCopy}}</strong>명의 Stirling 사용자가 있습니다. 중단 없이 계속 사용하려면 Stirling Server 플랜으로 업그레이드하세요 - <strong>무제한 좌석</strong>, PDF 텍스트 편집, 전체 관리자 제어 제공, $99/서버/월."
-freeBody = "당사의 <strong>Open-Core</strong> 라이선스는 서버당 최대 <strong>{{freeTierLimit}}</strong>명의 사용자를 무료로 허용합니다. 중단 없이 확장하고 새로운 <strong>PDF 텍스트 편집 도구</strong>에 조기 액세스하려면 Stirling Server 플랜을 권장합니다 - 전체 편집과 <strong>무제한 좌석</strong>을 $99/서버/월에 제공합니다."
+freeBody = "당사의 <strong>Open-Core</strong> 라이선스는 서버당 최대 <strong>{{freeTierLimit}}</strong>명의 사용자를 무료로 허용합니다. 중단 없이 확장하려면 Stirling Server 플랜을 권장합니다 - <strong>무제한 좌석</strong> 및 <strong>SSO 지원</strong>, $99/서버/월."
 
 [onboarding.desktopInstall]
 title = "다운로드"
@@ -5237,6 +5367,31 @@ error = "사용자 상태 업데이트에 실패했습니다"
 success = "사용자를 성공적으로 삭제했습니다"
 error = "사용자 삭제에 실패했습니다"
 
+[workspace.people.changePassword]
+action = "비밀번호 변경"
+title = "비밀번호 변경"
+subtitle = "다음 사용자의 비밀번호 업데이트"
+newPassword = "새 비밀번호"
+confirmPassword = "비밀번호 확인"
+placeholder = "새 비밀번호를 입력하세요"
+confirmPlaceholder = "새 비밀번호를 다시 입력하세요"
+passwordRequired = "새 비밀번호를 입력해 주세요"
+passwordMismatch = "비밀번호가 일치하지 않습니다"
+generateRandom = "안전한 비밀번호 생성"
+generatedPreview = "생성된 비밀번호:"
+copyTooltip = "클립보드에 복사"
+copiedToClipboard = "비밀번호를 클립보드에 복사했습니다"
+copyFailed = "비밀번호 복사 실패"
+sendEmail = "이 변경 사항을 사용자에게 이메일로 알리기"
+includePassword = "이메일에 새 비밀번호 포함"
+forcePasswordChange = "다음 로그인 시 비밀번호 변경 강제"
+emailUnavailable = "이 사용자의 이메일이 올바른 주소가 아니므로 알림이 비활성화되었습니다."
+smtpDisabled = "이메일 알림을 사용하려면 설정에서 SMTP를 활성화해야 합니다."
+notifyOnly = "비밀번호 없이 이메일이 발송되며, 관리자가 변경했음을 사용자에게 알려 줍니다."
+submit = "비밀번호 업데이트"
+success = "비밀번호가 성공적으로 업데이트되었습니다"
+error = "비밀번호 업데이트에 실패했습니다"
+
 [workspace.people.emailInvite]
 tab = "이메일 초대"
 description = "아래에 이메일을 쉼표로 구분해 입력하거나 붙여넣으세요. 사용자는 이메일로 로그인 자격 증명을 받습니다."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "이메일 주소를 최소 한 개 이상 입력해야 합니다"
 submit = "초대장 보내기"
 success = "사용자 초대가 완료되었습니다"
-partialSuccess = "일부 초대가 실패했습니다"
+partialFailure = "일부 초대가 실패했습니다"
 allFailed = "사용자 초대에 실패했습니다"
 error = "초대장 전송에 실패했습니다"
 
@@ -5770,6 +5925,7 @@ subtitle = "Stirling 계정으로 로그인"
 [setup.selfhosted]
 title = "서버에 로그인"
 subtitle = "서버 자격 증명을 입력하세요"
+link = "또는 셀프 호스팅 계정에 연결"
 
 [setup.server]
 title = "서버에 연결"
@@ -5788,6 +5944,14 @@ description = "자가 호스팅 Stirling PDF 서버의 전체 URL을 입력하
 emptyUrl = "서버 URL을 입력하세요"
 unreachable = "서버에 연결할 수 없습니다"
 testFailed = "연결 테스트에 실패했습니다"
+configFetch = "서버 구성을 가져오지 못했습니다. URL을 확인하고 다시 시도하세요."
+
+[setup.server.error.securityDisabled]
+title = "로그인이 활성화되어 있지 않음"
+body = "이 서버에는 로그인이 활성화되어 있지 않습니다. 이 서버에 연결하려면 인증을 활성화해야 합니다:"
+step1 = "환경에서 DOCKER_ENABLE_SECURITY=true를 설정하세요"
+step2 = "또는 settings.yml에서 security.enableLogin=true를 설정하세요"
+step3 = "서버를 재시작하세요"
 
 [setup.login]
 title = "로그인"
@@ -5797,6 +5961,13 @@ submit = "로그인"
 signInWith = "다음으로 로그인"
 oauthPending = "인증을 위해 브라우저를 여는 중..."
 orContinueWith = "또는 이메일로 계속"
+serverRequirement = "참고: 서버에서 로그인 기능이 활성화되어 있어야 합니다."
+showInstructions = "활성화 방법"
+hideInstructions = "지침 숨기기"
+instructions = "Stirling PDF 서버에서 로그인 기능을 활성화하려면:"
+instructionsEnvVar = "다음 환경 변수를 설정하세요:"
+instructionsOrYml = "또는 settings.yml에서:"
+instructionsRestart = "그런 다음 변경 사항을 적용하려면 서버를 재시작하세요."
 
 [setup.login.username]
 label = "사용자 이름"
@@ -5853,6 +6024,7 @@ earlyAccess = "얼리 액세스"
 reset = "변경 사항 초기화"
 downloadJson = "JSON 다운로드"
 generatePdf = "PDF 생성"
+saveChanges = "변경 사항 저장"
 
 [pdfTextEditor.options.autoScaleText]
 title = "텍스트 자동 크기 조정"
@@ -5890,6 +6062,8 @@ alpha = "이 알파 뷰어는 아직 발전 중입니다—일부 글꼴, 색상
 [pdfTextEditor.empty]
 title = "로드된 문서 없음"
 subtitle = "텍스트 편집을 시작하려면 PDF 또는 JSON 파일을 로드하세요."
+dropzone = "여기에 PDF 또는 JSON 파일을 끌어다 놓거나 클릭하여 찾아보세요"
+dropzoneWithFiles = "파일 탭에서 파일을 선택하거나, 여기에 PDF 또는 JSON 파일을 끌어다 놓거나 클릭하여 찾아보세요"
 
 [pdfTextEditor.welcomeBanner]
 title = "PDF 텍스트 편집기(얼리 액세스)에 오신 것을 환영합니다"
diff --git a/frontend/public/locales/ml-ML/translation.toml b/frontend/public/locales/ml-ML/translation.toml
index b7f97c3c2..2da56e0fc 100644
--- a/frontend/public/locales/ml-ML/translation.toml
+++ b/frontend/public/locales/ml-ML/translation.toml
@@ -131,7 +131,7 @@ unsupported = "പിന്തുണയില്ല"
 
 [toolPanel]
 placeholder = "തുടങ്ങാൻ ഒരു ടൂൾ തിരഞ്ഞെടുക്കുക"
-alpha = "Alpha"
+alpha = "ആൽഫ"
 premiumFeature = "പ്രീമിയം ഫീച്ചർ:"
 comingSoon = "വരുന്നു:"
 
@@ -163,6 +163,11 @@ unfavorite = "പ്രിയപ്പെട്ടവയിൽ നിന്ന
 fullscreen = "ഫുൾസ്ക്രീൻ മോഡിലേക്കു മാറ്റുക"
 sidebar = "സൈഡ്ബാർ മോഡിലേക്കു മാറ്റുക"
 
+[backendStartup]
+notFoundTitle = "ബാക്ക്‌എൻഡ് കണ്ടെത്താനായില്ല"
+retry = "വീണ്ടും ശ്രമിക്കുക"
+unreachable = "ഈ ആപ്പ്ലിക്കേഷൻ നിലവിൽ ബാക്ക്‌എൻഡുമായി കണക്റ്റ് ചെയ്യാൻ കഴിയുന്നില്ല. ബാക്ക്‌എൻഡിന്റെ നിലയും നെറ്റ്‌വർക്ക് കണക്റ്റിവിറ്റിയും പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക."
+
 [zipWarning]
 title = "വലിയ ZIP ഫയൽ"
 message = "ഈ ZIP-ൽ {{count}} ഫയലുകൾ ഉണ്ട്. എങ്കിലും എക്സ്ട്രാക്റ്റ് ചെയ്യട്ടേ?"
@@ -369,7 +374,7 @@ privacy = "സ്വകാര്യത"
 
 [settings.developer]
 title = "ഡെവലപ്പർ"
-apiKeys = "API Keys"
+apiKeys = "API കീകൾ"
 
 [settings.tooltips]
 enableLoginFirst = "ആദ്യം ലോഗിൻ മോഡ് സജീവമാക്കുക"
@@ -709,7 +714,7 @@ title = "പരത്തുക"
 desc = "ഒരു PDF-ൽ നിന്ന് എല്ലാ ഇന്ററാക്ടീവ് ഘടകങ്ങളും ഫോമുകളും നീക്കം ചെയ്യുക"
 
 [home.certSign]
-tags = "authenticate,PEM,P12,official,encrypt,sign,certificate,PKCS12,JKS,server,manual,auto"
+tags = "പ്രാമാണീകരണം,PEM,P12,ഔദ്യോഗികം,എൻക്രിപ്റ്റ്,സൈൻ,സർട്ടിഫിക്കറ്റ്,PKCS12,JKS,സെർവർ,മാനുവൽ,ഓട്ടോ"
 title = "സർട്ടിഫിക്കറ്റ് ഉപയോഗിച്ച് ഒപ്പിടുക"
 desc = "ഒരു സർട്ടിഫിക്കറ്റ്/കീ (PEM/P12) ഉപയോഗിച്ച് ഒരു PDF ഒപ്പിടുന്നു"
 
@@ -794,7 +799,7 @@ title = "ഒരൊറ്റ വലിയ പേജ്"
 desc = "എല്ലാ PDF പേജുകളും ഒരൊറ്റ വലിയ പേജിലേക്ക് ലയിപ്പിക്കുന്നു"
 
 [home.showJS]
-tags = "javascript,code,script"
+tags = "javascript,കോഡ്,സ്ക്രിപ്റ്റ്"
 title = "ജാവാസ്ക്രിപ്റ്റ് കാണിക്കുക"
 desc = "ഒരു PDF-ൽ കുത്തിവച്ച ഏതെങ്കിലും JS തിരയുകയും പ്രദർശിപ്പിക്കുകയും ചെയ്യുന്നു"
 
@@ -912,9 +917,12 @@ desc = "PDF പ്രവർത്തനങ്ങൾ ബന്ധിപ്പി
 desc = "മറ്റൊരു PDF-ന് മുകളിൽ PDF-കൾ ഓവർലേ ചെയ്യുന്നു"
 title = "PDF-കൾ ഓവർലേ ചെയ്യുക"
 
+[home.pdfTextEditor]
+title = "PDF ടെക്സ്റ്റ് എഡിറ്റർ"
+desc = "PDFകളിലെ നിലവിലുള്ള ടെക്സ്റ്റും ചിത്രങ്ങളും തിരുത്തുക"
 
 [home.addText]
-tags = "text,annotation,label"
+tags = "ടെക്സ്റ്റ്,അനോട്ടേഷൻ,ലേബൽ"
 title = "ടെക്സ്റ്റ് ചേർക്കുക"
 desc = "നിങ്ങളുടെ PDF-ൽ എവിടെയിലും കസ്റ്റം ടെക്സ്റ്റ് ചേർക്കുക"
 
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "വരച്ച ഒപ്പ്"
 defaultImageLabel = "അപ്‌ലോഡ് ചെയ്ത ഒപ്പ്"
 defaultTextLabel = "ടൈപ്പ് ചെയ്ത ഒപ്പ്"
 saveButton = "ഒപ്പ് സേവ് ചെയ്യുക"
+savePersonal = "വ്യക്തിപരമായി സംരക്ഷിക്കുക"
+saveShared = "പങ്കിട്ടതായി സംരക്ഷിക്കുക"
 saveUnavailable = "സേവ് ചെയ്യാൻ ആദ്യം ഒരു ഒപ്പ് സൃഷ്ടിക്കുക."
 noChanges = "നിലവിലെ ഒപ്പ് ഇതിനകം സേവ് ചെയ്തിട്ടുണ്ട്."
+tempStorageTitle = "താൽക്കാലിക ബ്രൗസർ സ്റ്റോറേജ്"
+tempStorageDescription = "ഒപ്പുകൾ നിങ്ങളുടെ ബ്രൗസറിൽ മാത്രം സംഭരിക്കപ്പെടും. ബ്രൗസർ ഡാറ്റ നീക്കം ചെയ്താൽ അല്ലെങ്കിൽ ബ്രൗസർ മാറ്റിയാൽ അവ നഷ്ടപ്പെടും."
+personalHeading = "വ്യക്തിഗത ഒപ്പുകൾ"
+sharedHeading = "പങ്കിട്ട ഒപ്പുകൾ"
+personalDescription = "ഈ ഒപ്പുകൾ നിങ്ങള്ക്ക് മാത്രമേ കാണാനാകൂ."
+sharedDescription = "എല്ലാ ഉപയോക്താക്കളും ഈ ഒപ്പുകൾ കാണുകയും ഉപയോഗിക്കുകയും ചെയ്യാം."
 
 [sign.saved.type]
 canvas = "ഡ്രോയിംഗ്"
@@ -2731,7 +2747,7 @@ submit = "സമർപ്പിക്കുക"
 failed = "മൾട്ടി-പേജ് ലേഔട്ട് സൃഷ്ടിക്കുമ്പോൾ പിശക് സംഭവിച്ചു."
 
 [bookletImposition]
-tags = "booklet,imposition,printing,binding,folding,signature"
+tags = "ബുക്ക്‌ലെറ്റ്,ഇംപോസിഷൻ,പ്രിന്റിംഗ്,ബൈൻഡിംഗ്,മടക്കൽ,സിഗ്നേച്ചർ"
 title = "ബുക്ക്ലെറ്റ് ഇംപോസിഷൻ"
 header = "ബുക്ക്ലെറ്റ് ഇംപോസിഷൻ"
 submit = "ബുക്ക്ലെറ്റ് സൃഷ്ടിക്കുക"
@@ -2830,7 +2846,7 @@ scaleFactor = "ഒരു പേജിന്റെ സൂം നില (ക്ര
 submit = "സമർപ്പിക്കുക"
 
 [adjustPageScale]
-tags = "resize,modify,dimension,adapt"
+tags = "വലിപ്പമാറ്റം,ഭേദഗതി,പരിമാണം,അനുസൃതമാക്കൽ"
 title = "പേജ് സ്കെയിൽ ക്രമപ്പെടുത്തുക"
 header = "പേജ് സ്കെയിൽ ക്രമപ്പെടുത്തുക"
 submit = "പേജ് സ്കെയിൽ ക്രമപ്പെടുത്തുക"
@@ -2841,8 +2857,8 @@ label = "സ്കെയിൽ ഫാക്ടർ"
 [adjustPageScale.pageSize]
 label = "ടാർഗറ്റ് പേജ് വലിപ്പം"
 keep = "അസൽ വലിപ്പം നിലനിർത്തുക"
-letter = "Letter"
-legal = "Legal"
+letter = "ലറ്റർ"
+legal = "ലീഗൽ"
 
 [adjustPageScale.error]
 failed = "പേജ് സ്കെയിൽ ക്രമപ്പെടുത്തുന്നതിനിടെ പിശക് സംഭവിച്ചു."
@@ -3020,6 +3036,91 @@ title = "PDF-നെക്കുറിച്ചുള്ള വിവരങ്ങ
 header = "PDF-നെക്കുറിച്ചുള്ള വിവരങ്ങൾ നേടുക"
 submit = "വിവരങ്ങൾ നേടുക"
 downloadJson = "JSON ഡൗൺലോഡ് ചെയ്യുക"
+processing = "വിവരങ്ങൾ പുറത്തെടുക്കുന്നു..."
+results = "ഫലങ്ങൾ"
+noResults = "ഒരു റിപ്പോർട്ട് സൃഷ്ടിക്കാൻ ഉപകരണം പ്രവർത്തിപ്പിക്കുക."
+downloads = "ഡൗൺലോഡുകൾ"
+noneDetected = "ഒന്നും കണ്ടെത്തിയില്ല"
+indexTitle = "സൂചിക"
+
+[getPdfInfo.report]
+entryLabel = "പൂർണ്ണ വിവര സംഗ്രഹം"
+shortTitle = "PDF വിവരം"
+
+[getPdfInfo.sections]
+metadata = "മെറ്റാഡാറ്റ"
+formFields = "ഫോം ഫീൽഡുകൾ"
+basicInfo = "അടിസ്ഥാന വിവരം"
+documentInfo = "പ്രമാണ വിവരം"
+compliance = "അനുസരണം"
+encryption = "എൻക്രിപ്ഷൻ"
+permissions = "അനുമതികൾ"
+other = "മറ്റ്"
+perPageInfo = "ഓരോ പേജിലെ വിവരം"
+tableOfContents = "വിഷയസൂചിക"
+
+[getPdfInfo.other]
+attachments = "അറ്റാച്ച്മെന്റുകൾ"
+embeddedFiles = "എംബെഡ് ചെയ്ത ഫയലുകൾ"
+javaScript = "JavaScript"
+layers = "ലെയറുകൾ"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "വലുപ്പം"
+annotations = "അനോട്ടേഷനുകൾ"
+images = "ചിത്രങ്ങൾ"
+links = "ലിങ്കുകൾ"
+fonts = "ഫോണ്ടുകൾ"
+xobjects = "XObject എണ്ണങ്ങൾ"
+multimedia = "മൾട്ടിമീഡിയ"
+
+[getPdfInfo.summary]
+pages = "പേജുകൾ"
+fileSize = "ഫയൽ വലുപ്പം"
+pdfVersion = "PDF പതിപ്പ്"
+language = "ഭാഷ"
+title = "PDF സംഗ്രഹം"
+author = "രചയിതാവ്"
+created = "സൃഷ്ടിച്ചത്"
+modified = "തിരുത്തിയത്"
+permsAll = "എല്ലാ അനുമതികളും അനുവദിച്ചിട്ടുണ്ട്"
+permsRestricted = "{{count}} നിയന്ത്രണങ്ങൾ"
+permsMixed = "ചില അനുമതികൾ നിയന്ത്രിച്ചിരിക്കുന്നു"
+hasCompliance = "അനുസരണ മാനദണ്ഡങ്ങൾ ഉണ്ട്"
+noCompliance = "അനുസരണ മാനദണ്ഡങ്ങളില്ല"
+basic = "അടിസ്ഥാന വിവരം"
+documentInfo = "പ്രമാണ വിവരം"
+securityTitle = "സുരക്ഷാ നില"
+technical = "സാങ്കേതിക"
+overviewTitle = "PDF അവലോകനം"
+
+[getPdfInfo.summary.security]
+encrypted = "എൻക്രിപ്റ്റ് ചെയ്ത PDF - പാസ്‌വേഡ് സംരക്ഷണം ഉണ്ട്"
+unencrypted = "എൻക്രിപ്റ്റ് ചെയ്യാത്ത PDF - പാസ്‌വേഡ് സംരക്ഷണമില്ല"
+
+[getPdfInfo.summary.tech]
+images = "ചിത്രങ്ങൾ"
+fonts = "ഫോണ്ടുകൾ"
+formFields = "ഫോം ഫീൽഡുകൾ"
+embeddedFiles = "എംബെഡ് ചെയ്ത ഫയലുകൾ"
+javaScript = "JavaScript"
+layers = "ലെയറുകൾ"
+bookmarks = "ബുക്ക്‌മാർക്കുകൾ"
+multimedia = "മൾട്ടിമീഡിയ"
+
+[getPdfInfo.summary.overview]
+untitled = "ഒരു ശീർഷകമില്ലാത്ത പ്രമാണം"
+unknown = "അജ്ഞാത രചയിതാവ്"
+text = "ഇത് {{author}} സൃഷ്ടിച്ച, {{title}} എന്ന ശീർഷകമുള്ള {{pages}}-പേജ് PDF ആണ് (PDF പതിപ്പ് {{version}})."
+
+[getPdfInfo.error]
+partial = "ചില ഫയലുകൾ പ്രോസസ്സ് ചെയ്യാൻ കഴിഞ്ഞില്ല."
+unexpected = "പുറത്തെടുക്കുന്നതിനിടെ അപ്രതീക്ഷിത പിശക്."
+
+[getPdfInfo.status]
+complete = "പുറത്തെടുക്കൽ പൂർത്തിയായി"
 
 [extractPage]
 tags = "വേർതിരിച്ചെടുക്കുക"
@@ -3380,7 +3481,7 @@ certHint = "കസ്റ്റം ട്രസ്റ്റ് സോഴ്‌സ
 title = "സ്ഥിരീകരണ സെറ്റിങ്ങുകൾ"
 
 [replaceColor]
-tags = "Replace Colour,Page operations,Back end,server side"
+tags = "നിറം പകരുക,പേജ് പ്രവർത്തനങ്ങൾ,ബാക്ക്‌എൻഡ്,സെർവർ-സൈഡ്"
 
 [replaceColor.labels]
 settings = "സെറ്റിങ്ങുകൾ"
@@ -3438,6 +3539,9 @@ signinTitle = "ദയവായി സൈൻ ഇൻ ചെയ്യുക"
 ssoSignIn = "സിംഗിൾ സൈൻ-ഓൺ വഴി ലോഗിൻ ചെയ്യുക"
 oAuth2AutoCreateDisabled = "OAUTH2 ഓട്ടോ-ക്രിയേറ്റ് യൂസർ പ്രവർത്തനരഹിതമാക്കി"
 oAuth2AdminBlockedUser = "രജിസ്റ്റർ ചെയ്യാത്ത ഉപയോക്താക്കളുടെ രജിസ്ട്രേഷനോ ലോഗിൻ ചെയ്യുന്നതോ നിലവിൽ തടഞ്ഞിരിക്കുന്നു. ദയവായി അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക."
+oAuth2RequiresLicense = "OAuth/SSO ലോഗിനിന് ഒരു പെയ്ഡ് ലൈസൻസ് (Server അല്ലെങ്കിൽ Enterprise) ആവശ്യമാണ്. നിങ്ങളുടെ പ്ലാൻ അപ്‌ഗ്രേഡ് ചെയ്യാൻ അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക."
+saml2RequiresLicense = "SAML ലോഗിനിന് ഒരു പെയ്ഡ് ലൈസൻസ് (Server അല്ലെങ്കിൽ Enterprise) ആവശ്യമാണ്. നിങ്ങളുടെ പ്ലാൻ അപ്‌ഗ്രേഡ് ചെയ്യാൻ അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക."
+maxUsersReached = "നിലവിലുള്ള ലൈസൻസിലെ പരമാവധി ഉപയോക്താക്കൾ എത്തിച്ചേർന്നു. നിങ്ങളുടെ പ്ലാൻ അപ്‌ഗ്രേഡ് ചെയ്യുകയോ കൂടുതൽ സീറ്റുകൾ ചേർക്കുകയോ ചെയ്യാൻ അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക."
 oauth2RequestNotFound = "അംഗീകാര അഭ്യർത്ഥന കണ്ടെത്തിയില്ല"
 oauth2InvalidUserInfoResponse = "അസാധുവായ ഉപയോക്തൃ വിവര പ്രതികരണം"
 oauth2invalidRequest = "അസാധുവായ അഭ്യർത്ഥന"
@@ -3771,7 +3875,7 @@ version = "നിലവിലെ റിലീസ്"
 title = "API ഡോക്യുമെന്റേഷൻ"
 header = "API ഡോക്യുമെന്റേഷൻ"
 desc = "Stirling PDF API എൻഡ്പോയിന്റുകൾ കാണുകയും പരിശോധിക്കുകയും ചെയ്യുക"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,ഡോക്യുമെന്റേഷൻ,swagger,എൻഡ്പോയിന്റുകൾ,വികസനം"
 
 [cookieBanner.popUp]
 title = "ഞങ്ങൾ കുക്കികൾ എങ്ങനെ ഉപയോഗിക്കുന്നു"
@@ -3846,14 +3950,17 @@ fitToWidth = "വീതിക്ക് ഒത്താക്കുക"
 actualSize = "യഥാർത്ഥ വലിപ്പം"
 
 [viewer]
+cannotPreviewFile = "ഫയൽ പ്രിവ്യൂ ചെയ്യാൻ കഴിയില്ല"
+dualPageView = "രണ്ടുപേജ് ദൃശ്യം"
 firstPage = "ആദ്യ പേജ്"
 lastPage = "അവസാന പേജ്"
-previousPage = "മുൻപത്തെ പേജ്"
 nextPage = "അടുത്ത പേജ്"
+onlyPdfSupported = "വ്യൂവറിന് PDF ഫയലുകൾ മാത്രം പിന്തുണയ്ക്കാം. ഈ ഫയൽ വേറെ ഒരു ഫോർമാറ്റാണെന്ന് തോന്നുന്നു."
+previousPage = "മുൻപത്തെ പേജ്"
+singlePageView = "ഒറ്റ പേജ് ദൃശ്യം"
+unknownFile = "അപരിചിതമായ ഫയൽ"
 zoomIn = "സൂം ഇൻ"
 zoomOut = "സൂം ഔട്ട്"
-singlePageView = "ഒറ്റ പേജ് ദൃശ്യം"
-dualPageView = "രണ്ടുപേജ് ദൃശ്യം"
 
 [rightRail]
 closeSelected = "തിരഞ്ഞെടുത്ത ഫയലുകൾ അടയ്‌ക്കുക"
@@ -3877,6 +3984,7 @@ toggleSidebar = "സൈഡ്ബാർ മാറ്റുക"
 exportSelected = "തിരഞ്ഞെടുത്ത പേജുകൾ എക്സ്പോർട്ട് ചെയ്യുക"
 toggleAnnotations = "അനോട്ടേഷൻ ദൃശ്യമാനം മാറ്റുക"
 annotationMode = "അനോട്ടേഷൻ മോഡ് മാറ്റുക"
+print = "PDF അച്ചടിക്കുക"
 draw = "വരയ്ക്കുക"
 save = "സംരക്ഷിക്കുക"
 saveChanges = "മാറ്റങ്ങൾ സംരക്ഷിക്കുക"
@@ -4231,7 +4339,7 @@ label = "പ്രൊവൈഡർ"
 description = "ഓതന്റിക്കേഷനായി ഉപയോഗിക്കുന്ന OAuth2 പ്രൊവൈഡർ"
 
 [admin.settings.connections.oauth2.issuer]
-label = "Issuer URL"
+label = "ഇഷ്യൂവർ URL"
 description = "OAuth2 പ്രൊവൈഡറിന്റെ issuer URL"
 
 [admin.settings.connections.oauth2.clientId]
@@ -4255,7 +4363,7 @@ label = "രജിസ്‌ട്രേഷൻ തടയുക"
 description = "OAuth2 വഴി പുതിയ ഉപയോക്തൃ രജിസ്‌ട്രേഷൻ തടയുക"
 
 [admin.settings.connections.oauth2.scopes]
-label = "OAuth2 Scopes"
+label = "OAuth2 സ്കോപ്പുകൾ"
 description = "OAuth2 സ്കോപ്പുകളുടെ കോമ ഉപയോഗിച്ച് വേർതിരിച്ച പട്ടിക (ഉദാ., openid, profile, email)"
 
 [admin.settings.connections.saml2]
@@ -4494,6 +4602,7 @@ description = "Impressum-ലേക്ക് URL അല്ലെങ്കിൽ 
 title = "പ്രീമിയം & എന്റർപ്രൈസ്"
 description = "നിങ്ങളുടെ പ്രീമിയം അല്ലെങ്കിൽ എന്റർപ്രൈസ് ലൈസൻസ് കീ ക്രമീകരിക്കുക."
 license = "ലൈസൻസ് കോൺഫിഗറേഷൻ"
+noInput = "ദയവായി ഒരു ലൈസന്റ്‌സ് കീ അല്ലെങ്കിൽ ഫയൽ നൽകുക"
 
 [admin.settings.premium.licenseKey]
 toggle = "ലൈസൻസ് കീ അല്ലെങ്കിൽ സർട്ടിഫിക്കറ്റ് ഫയൽ ഉണ്ടോ?"
@@ -4511,6 +4620,25 @@ line1 = "നിലവിലെ ലൈസൻസ് കീ ഓവർറൈറ്
 line2 = "നിങ്ങൾ മറ്റെവിടെയെങ്കിലും ബാക്കപ്പ് എടുത്തിട്ടില്ലെങ്കിൽ നിങ്ങളുടെ പഴയ ലൈസൻസ് സ്ഥിരമായി നഷ്ടപ്പെടും."
 line3 = "പ്രധാനപ്പെട്ടത്: ലൈസൻസ് കീകൾ സ്വകാര്യവും സുരക്ഷിതവുമാക്കി സൂക്ഷിക്കുക. ഒരിക്കലും അവ പൊതു വേദിയിൽ പങ്കുവെക്കരുത്."
 
+[admin.settings.premium.inputMethod]
+text = "ലൈസൻസ് കീ"
+file = "സർട്ടിഫിക്കറ്റ് ഫയൽ"
+
+[admin.settings.premium.file]
+label = "ലൈസൻസ് സർട്ടിഫിക്കറ്റ് ഫയൽ"
+description = "നിങ്ങളുടെ ഓഫ്ലൈൻ വാങ്ങലുകളിൽ നിന്നുള്ള .lic അല്ലെങ്കിൽ .cert ലൈസൻസ് ഫയൽ അപ്‌ലോഡ് ചെയ്യുക"
+choose = "ലൈസൻസ് ഫയൽ തിരഞ്ഞെടുക്കുക"
+selected = "തിരഞ്ഞെടുക്കിയത്: {{filename}} ({{size}})"
+successMessage = "ലൈസൻസ് ഫയൽ അപ്‌ലോഡ് ചെയ്തു വിജയകരമായി സജീവമാക്കിയിരിക്കുന്നു. റീസ്റ്റാർട്ട് ആവശ്യമില്ല."
+
+[admin.settings.premium.currentLicense]
+title = "സജീവ ലൈസൻസ്"
+file = "ഉറവിടം: ലൈസൻസ് ഫയൽ ({{path}})"
+key = "ഉറവിടം: ലൈസൻസ് കീ"
+type = "തരം: {{type}}"
+noInput = "ദയവായി ഒരു ലൈസൻസ് കീ നൽകുകയോ ഒരു സർട്ടിഫിക്കറ്റ് ഫയൽ അപ്‌ലോഡ് ചെയ്യുകയോ ചെയ്യുക"
+success = "വിജയം"
+
 [admin.settings.premium.enabled]
 label = "പ్రీമിയം സവിശേഷതകൾ പ്രാപ്തമാക്കുക"
 description = "പ്രോ/എന്റർപ്രൈസ് സവിശേഷതകൾക്കായി ലൈസൻസ് കീ പരിശോധനകൾ പ്രാപ്തമാക്കുക"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} തിരഞ്ഞെടുക്കപ്പെട
 download = "ഡൗൺലോഡ്"
 delete = "ഇല്ലാതാക്കുക"
 unsupported = "പിന്തുണയില്ല"
+active = "സജീവം"
 addToUpload = "അപ്‌ലോഡിലേക്ക് ചേർക്കുക"
+closeFile = "ഫയൽ അടയ്ക്കുക"
 deleteAll = "എല്ലാം ഇല്ലാതാക്കുക"
 loadingFiles = "ഫയലുകൾ ലോഡുചെയ്യുന്നു..."
 noFiles = "ഫയലുകളൊന്നും ലഭ്യമല്ല"
@@ -5132,7 +5262,7 @@ upgrade = "ഇപ്പോൾ അപ്‌ഗ്രേഡ് ചെയ്യു
 freeTitle = "സെർവർ ലൈസൻസ്"
 overLimitTitle = "സെർവർ ലൈസൻസ് ആവശ്യമാണ്"
 overLimitBody = "ഞങ്ങളുടെ ലൈസൻസിംഗ് ഓരോ സെർവർക്കും പരമാവധി <strong>{{freeTierLimit}}</strong> ഉപയോക്താക്കളെ സൗജന്യമായി അനുവദിക്കുന്നു. നിങ്ങള്ക്ക് <strong>{{overLimitUserCopy}}</strong> Stirling ഉപയോക്താക്കളുണ്ട്. തടസ്സമില്ലാതെ തുടരാൻ, Stirling Server പ്ലാനിലേക്ക് അപ്‌ഗ്രേഡ് ചെയ്യുക - <strong>unlimited seats</strong>, PDF text editing, പൂർണ്ണ അഡ്മിൻ നിയന്ത്രണം, $99/server/mo."
-freeBody = "ഞങ്ങളുടെ <strong>Open-Core</strong> ലൈസൻസിംഗ് ഓരോ സെർവർക്കും പരമാവധി <strong>{{freeTierLimit}}</strong> ഉപയോക്താക്കളെ സൗജന്യമായി അനുവദിക്കുന്നു. തടസ്സമില്ലാതെ സ്കെയിൽ ചെയ്യാനും പുതിയ <strong>PDF text editing tool</strong> ന് മുൻകാല ആക്സസ് നേടാനും, Stirling Server പ്ലാൻ ഞങ്ങൾ ശുപാർശ ചെയ്യുന്നു - പൂർണ്ണ എഡിറ്റിംഗും <strong>unlimited seats</strong> ഉം $99/server/mo."
+freeBody = "ഞങ്ങളുടെ <strong>Open-Core</strong> ലൈസൻസിംഗ് ഓരോ സെർവർക്കും പരമാവധി <strong>{{freeTierLimit}}</strong> ഉപയോക്താക്കളെ സൗജന്യമായി അനുവദിക്കുന്നു. തടസ്സമില്ലാതെ സ്‌കെയിൽ ചെയ്യാൻ, ഞങ്ങൾ Stirling Server പ്ലാൻ ശുപാർശ ചെയ്യുന്നു - <strong>പരിമിതിയില്ലാത്ത സീറ്റുകൾ</strong>യും <strong>SSO പിന്തുണ</strong>യും for $99/server/mo."
 
 [onboarding.desktopInstall]
 title = "ഡൗൺലോഡ്"
@@ -5237,6 +5367,31 @@ error = "ഉപയോക്താവിന്റെ നില അപ്‌ഡേ
 success = "ഉപയോക്താവിനെ വിജയകരമായി ഇല്ലാതാക്കി"
 error = "ഉപയോക്താവിനെ ഇല്ലാതാക്കൽ പരാജയപ്പെട്ടു"
 
+[workspace.people.changePassword]
+action = "പാസ്‌വേഡ് മാറ്റുക"
+title = "പാസ്‌വേഡ് മാറ്റുക"
+subtitle = "ഇതിനായുള്ള പാസ്‌വേഡ് പുതുക്കുക"
+newPassword = "പുതിയ പാസ്‌വേഡ്"
+confirmPassword = "പാസ്‌വേഡ് ശരിവെക്കുക"
+placeholder = "ഒരു പുതിയ പാസ്‌വേഡ് നൽകുക"
+confirmPlaceholder = "പുതിയ പാസ്‌വേഡ് വീണ്ടും നൽകുക"
+passwordRequired = "ദയവായി ഒരു പുതിയ പാസ്‌വേഡ് നൽകുക"
+passwordMismatch = "പാസ്‌വേഡുകൾ പൊരുത്തപ്പെടുന്നില്ല"
+generateRandom = "സുരക്ഷിത പാസ്‌വേഡ് സൃഷ്ടിക്കുക"
+generatedPreview = "സൃഷ്ടിച്ച പാസ്‌വേഡ്:"
+copyTooltip = "ക്ലിപ്പ്ബോർഡിലേയ്ക്ക് പകർത്തുക"
+copiedToClipboard = "പാസ്‌വേഡ് ക്ലിപ്പ്ബോർഡിലേയ്ക്ക് പകർത്തി"
+copyFailed = "പാസ്‌വേഡ് പകർത്തൽ പരാജയപ്പെട്ടു"
+sendEmail = "ഈ മാറ്റത്തെക്കുറിച്ച് ഉപയോക്താവിന് ഇമെയിൽ അയയ്ക്കുക"
+includePassword = "പുതിയ പാസ്‌വേഡ് ഇമെയിലിൽ ഉൾപ്പെടുത്തുക"
+forcePasswordChange = "അടുത്ത ലോഗിനിൽ ഉപയോക്താവിനെ പാസ്‌വേഡ് മാറ്റാൻ നിർബന്ധിക്കുക"
+emailUnavailable = "ഈ ഉപയോക്താവിന്റെ ഇമെയിൽ ഒരു സാധുവായ ഇമെയിൽ വിലാസമല്ല. അറിയിപ്പുകൾ പ്രവർത്തനരഹിതമാണ്."
+smtpDisabled = "ഇമെയിൽ അറിയിപ്പുകൾക്കായി ക്രമീകരണങ്ങളിൽ SMTP സജീവമാക്കണം."
+notifyOnly = "പാസ്‌വേഡ് ഇല്ലാതെ ഒരു ഇമെയിൽ അയയ്ക്കപ്പെടും; അഡ്മിൻ അത് മാറ്റിയതായി ഉപയോക്താവിനെ അറിയിക്കും."
+submit = "പാസ്‌വേഡ് പുതുക്കുക"
+success = "പാസ്‌വേഡ് വിജയകരമായി പുതുക്കി"
+error = "പാസ്‌വേഡ് പുതുക്കൽ പരാജയപ്പെട്ടു"
+
 [workspace.people.emailInvite]
 tab = "ഇമെയിൽ ക്ഷണം"
 description = "താഴെ ഇമെയിലുകൾ കോമ ഉപയോഗിച്ച് വേർതിരിച്ച് ടൈപ്പ് ചെയ്യുകയോ പതിക്കുകയോ ചെയ്യുക. ഉപയോക്താക്കൾക്ക് ലോഗിൻ വിവരങ്ങൾ ഇമെയിലിലൂടെ ലഭിക്കും."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "കുറഞ്ഞത് ഒരു ഇമെയിൽ വിലാസമെങ്കിലും ആവശ്യമാണ്"
 submit = "ക്ഷണങ്ങൾ അയയ്ക്കുക"
 success = "ഉപയോക്താക്കളെ വിജയകരമായി ക്ഷണിച്ചു"
-partialSuccess = "ചില ക്ഷണങ്ങൾ പരാജയപ്പെട്ടു"
+partialFailure = "ചില ക്ഷണങ്ങൾ പരാജയപ്പെട്ടു"
 allFailed = "ഉപയോക്താക്കളെ ക്ഷണിക്കൽ പരാജയപ്പെട്ടു"
 error = "ക്ഷണങ്ങൾ അയയ്ക്കൽ പരാജയപ്പെട്ടു"
 
@@ -5770,6 +5925,7 @@ subtitle = "നിങ്ങളുടെ Stirling അക്കൗണ്ടില
 [setup.selfhosted]
 title = "സെർവറിൽ സൈൻ ഇൻ ചെയ്യുക"
 subtitle = "നിങ്ങളുടെ സെർവർ ക്രെഡൻഷ്യലുകൾ നൽകുക"
+link = "അല്ലെങ്കിൽ സ്വയം-ഹോസ്റ്റുചെയ്ത അക്കൗണ്ടുമായി ബന്ധിപ്പിക്കുക"
 
 [setup.server]
 title = "സെർവറിലേക്ക് കണക്റ്റുചെയ്യുക"
@@ -5788,6 +5944,14 @@ description = "നിങ്ങളുടെ സെൽഫ്-ഹോസ്റ്റ
 emptyUrl = "ദയവായി ഒരു സെർവർ URL നൽകുക"
 unreachable = "സെർവറുമായി ബന്ധപ്പെടാൻ കഴിഞ്ഞില്ല"
 testFailed = "കണക്ഷൻ ടെസ്റ്റ് പരാജയപ്പെട്ടു"
+configFetch = "സർവർ കോൺഫിഗറേഷൻ ലഭ്യമാക്കൽ പരാജയപ്പെട്ടു. ദയവായി URL പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക."
+
+[setup.server.error.securityDisabled]
+title = "ലോഗിൻ സജീവമാക്കിയിട്ടില്ല"
+body = "ഈ സർവറിൽ ലോഗിൻ സജീവമാക്കിയിട്ടില്ല. ഈ സർവറുമായി ബന്ധപ്പെടാൻ, ഓതന്റിക്കേഷൻ സജീവമാക്കണം:"
+step1 = "നിങ്ങളുടെ പരിസ്ഥിതിയിൽ DOCKER_ENABLE_SECURITY=true ആയി ക്രമീകരിക്കുക"
+step2 = "അല്ലെങ്കിൽ settings.yml ൽ security.enableLogin=true ആയി ക്രമീകരിക്കുക"
+step3 = "സർവർ പുനരാരംഭിക്കുക"
 
 [setup.login]
 title = "സൈൻ ഇൻ"
@@ -5797,6 +5961,13 @@ submit = "ലോഗിൻ"
 signInWith = "ഇതുപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുക"
 oauthPending = "ഓതന്റിക്കേഷനായി ബ്രൗസർ തുറക്കുന്നു..."
 orContinueWith = "അല്ലെങ്കിൽ ഇമെയിലോടെ തുടരുക"
+serverRequirement = "ശ്രദ്ധിക്കുക: സെർവറിൽ ലോഗിൻ പ്രവർത്തനക്ഷമമാക്കിയിരിക്കണം."
+showInstructions = "എങ്ങനെ പ്രവർത്തനക്ഷമമാക്കാം?"
+hideInstructions = "നിർദ്ദേശങ്ങൾ മറയ്ക്കുക"
+instructions = "നിങ്ങളുടെ Stirling PDF സെർവറിൽ ലോഗിൻ പ്രവർത്തനക്ഷമമാക്കാൻ:"
+instructionsEnvVar = "Environment variable സജ്ജമാക്കുക:"
+instructionsOrYml = "അല്ലെങ്കിൽ settings.yml-ൽ:"
+instructionsRestart = "തുടർന്ന് മാറ്റങ്ങൾ പ്രാബല്യത്തിൽ വരാൻ നിങ്ങളുടെ സെർവർ റീസ്റ്റാർട്ട് ചെയ്യുക."
 
 [setup.login.username]
 label = "യൂസർനെയിം"
@@ -5847,12 +6018,13 @@ singleLine = "സിംഗിൾ ലൈൻ"
 [pdfTextEditor.badges]
 unsaved = "എഡിറ്റ് ചെയ്തു"
 modified = "എഡിറ്റ് ചെയ്തു"
-earlyAccess = "Early Access"
+earlyAccess = "എർലി ആക്‌സസ്"
 
 [pdfTextEditor.actions]
 reset = "മാറ്റങ്ങൾ റീസെറ്റ് ചെയ്യുക"
 downloadJson = "JSON ഡൗൺലോഡ് ചെയ്യുക"
 generatePdf = "PDF സൃഷ്ടിക്കുക"
+saveChanges = "മാറ്റങ്ങൾ സംരക്ഷിക്കുക"
 
 [pdfTextEditor.options.autoScaleText]
 title = "ബോക്‌സിൽ ഒതുങ്ങാൻ ടെക്സ്റ്റ് സ്വയം സ്കെയിൽ ചെയ്യുക"
@@ -5890,6 +6062,8 @@ alpha = "ഈ ആൽഫ വീവർ ഇനിയും വികസനത്ത
 [pdfTextEditor.empty]
 title = "പ്രമാണം ലോഡ് ചെയ്തിട്ടില്ല"
 subtitle = "ടെക്സ്റ്റ് എഡിറ്റ് ആരംഭിക്കാൻ PDF അല്ലെങ്കിൽ JSON ഫയൽ ലോഡ് ചെയ്യുക."
+dropzone = "ഒരു PDF അല്ലെങ്കിൽ JSON ഫയൽ ഇവിടെ വലിച്ചിടുക, അല്ലെങ്കിൽ ബ്രൗസ് ചെയ്യാൻ ക്ലിക്ക് ചെയ്യുക"
+dropzoneWithFiles = "Files ടാബിൽ നിന്ന് ഒരു ഫയൽ തിരഞ്ഞെടുക്കുക, അല്ലെങ്കിൽ ഒരു PDF അല്ലെങ്കിൽ JSON ഫയൽ ഇവിടെ വലിച്ചിടുക, അല്ലെങ്കിൽ ബ്രൗസ് ചെയ്യാൻ ക്ലിക്ക് ചെയ്യുക"
 
 [pdfTextEditor.welcomeBanner]
 title = "PDF Text Editor-ലേക്ക് സ്വാഗതം (Early Access)"
diff --git a/frontend/public/locales/nl-NL/translation.toml b/frontend/public/locales/nl-NL/translation.toml
index 321acd475..b9599e127 100644
--- a/frontend/public/locales/nl-NL/translation.toml
+++ b/frontend/public/locales/nl-NL/translation.toml
@@ -131,7 +131,7 @@ unsupported = "Niet ondersteund"
 
 [toolPanel]
 placeholder = "Kies een tool om te beginnen"
-alpha = "Alpha"
+alpha = "Alfa"
 premiumFeature = "Premiumfunctie:"
 comingSoon = "Binnenkort beschikbaar:"
 
@@ -163,6 +163,11 @@ unfavorite = "Uit favorieten verwijderen"
 fullscreen = "Overschakelen naar volledig scherm"
 sidebar = "Overschakelen naar zijbalkmodus"
 
+[backendStartup]
+notFoundTitle = "Backend niet gevonden"
+retry = "Opnieuw proberen"
+unreachable = "De applicatie kan momenteel geen verbinding maken met de backend. Controleer de status van de backend en de netwerkverbinding en probeer het vervolgens opnieuw."
+
 [zipWarning]
 title = "Groot ZIP-bestand"
 message = "Dit ZIP-bestand bevat {{count}} bestanden. Toch uitpakken?"
@@ -347,7 +352,7 @@ teams = "Teams"
 title = "Configuratie"
 systemSettings = "Systeeminstellingen"
 features = "Functies"
-endpoints = "Endpoints"
+endpoints = "Eindpunten"
 database = "Database"
 advanced = "Geavanceerd"
 
@@ -556,7 +561,7 @@ totalEndpoints = "Totaal aantal endpoints"
 totalVisits = "Totaal aantal bezoeken"
 showing = "Weergeven"
 selectedVisits = "Geselecteerde bezoeken"
-endpoint = "Endpoint"
+endpoint = "Eindpunt"
 visits = "Bezoeken"
 percentage = "Percentage"
 loading = "Laden..."
@@ -912,6 +917,9 @@ desc = "Bouw workflows met meerdere stappen door PDF-acties te koppelen. Ideaal
 desc = "Plaatst PDF's over een andere PDF heen"
 title = "PDF's overlappen"
 
+[home.pdfTextEditor]
+title = "PDF-teksteditor"
+desc = "Bewerk bestaande tekst en afbeeldingen in PDF's"
 
 [home.addText]
 tags = "tekst,annotatie,label"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Getekende handtekening"
 defaultImageLabel = "Geüploade handtekening"
 defaultTextLabel = "Getypte handtekening"
 saveButton = "Handtekening opslaan"
+savePersonal = "Als persoonlijk opslaan"
+saveShared = "Als gedeeld opslaan"
 saveUnavailable = "Maak eerst een handtekening om deze op te slaan."
 noChanges = "De huidige handtekening is al opgeslagen."
+tempStorageTitle = "Tijdelijke browseropslag"
+tempStorageDescription = "Handtekeningen worden alleen in je browser opgeslagen. Ze gaan verloren als je je browsergegevens wist of van browser wisselt."
+personalHeading = "Persoonlijke handtekeningen"
+sharedHeading = "Gedeelde handtekeningen"
+personalDescription = "Alleen jij kunt deze handtekeningen zien."
+sharedDescription = "Alle gebruikers kunnen deze handtekeningen zien en gebruiken."
 
 [sign.saved.type]
 canvas = "Tekening"
@@ -3020,6 +3036,91 @@ title = "Informatie over PDF ophalen"
 header = "Informatie over PDF ophalen"
 submit = "Haal informatie op"
 downloadJson = "JSON downloaden"
+processing = "Informatie wordt geëxtraheerd..."
+results = "Resultaten"
+noResults = "Voer de tool uit om een rapport te genereren."
+downloads = "Downloads"
+noneDetected = "Niets gedetecteerd"
+indexTitle = "Index"
+
+[getPdfInfo.report]
+entryLabel = "Volledig informatieoverzicht"
+shortTitle = "PDF-informatie"
+
+[getPdfInfo.sections]
+metadata = "Metadata"
+formFields = "Formuliervelden"
+basicInfo = "Basisinformatie"
+documentInfo = "Documentinformatie"
+compliance = "Compliance"
+encryption = "Versleuteling"
+permissions = "Machtigingen"
+other = "Overig"
+perPageInfo = "Informatie per pagina"
+tableOfContents = "Inhoudsopgave"
+
+[getPdfInfo.other]
+attachments = "Bijlagen"
+embeddedFiles = "Ingesloten bestanden"
+javaScript = "JavaScript"
+layers = "Lagen"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Grootte"
+annotations = "Annotaties"
+images = "Afbeeldingen"
+links = "Koppelingen"
+fonts = "Lettertypen"
+xobjects = "Aantal XObjects"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Pagina's"
+fileSize = "Bestandsgrootte"
+pdfVersion = "PDF-versie"
+language = "Taal"
+title = "PDF-samenvatting"
+author = "Auteur"
+created = "Gemaakt"
+modified = "Gewijzigd"
+permsAll = "Alle machtigingen toegestaan"
+permsRestricted = "{{count}} beperkingen"
+permsMixed = "Sommige machtigingen beperkt"
+hasCompliance = "Voldoet aan compliancestandaarden"
+noCompliance = "Geen compliancestandaarden"
+basic = "Basisinformatie"
+documentInfo = "Documentinformatie"
+securityTitle = "Beveiligingsstatus"
+technical = "Technisch"
+overviewTitle = "PDF-overzicht"
+
+[getPdfInfo.summary.security]
+encrypted = "Versleutelde PDF - Wachtwoordbeveiliging aanwezig"
+unencrypted = "Onversleutelde PDF - Geen wachtwoordbeveiliging"
+
+[getPdfInfo.summary.tech]
+images = "Afbeeldingen"
+fonts = "Lettertypen"
+formFields = "Formuliervelden"
+embeddedFiles = "Ingesloten bestanden"
+javaScript = "JavaScript"
+layers = "Lagen"
+bookmarks = "Bladwijzers"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "een document zonder titel"
+unknown = "Onbekende auteur"
+text = "Dit is een PDF van {{pages}} pagina's met de titel {{title}}, gemaakt door {{author}} (PDF-versie {{version}})."
+
+[getPdfInfo.error]
+partial = "Sommige bestanden konden niet worden verwerkt."
+unexpected = "Onverwachte fout tijdens het extraheren."
+
+[getPdfInfo.status]
+complete = "Extractie voltooid"
 
 [extractPage]
 tags = "extraheren"
@@ -3438,6 +3539,9 @@ signinTitle = "Gelieve in te loggen"
 ssoSignIn = "Inloggen via Single Sign-on"
 oAuth2AutoCreateDisabled = "OAUTH2 Automatisch aanmaken gebruiker uitgeschakeld"
 oAuth2AdminBlockedUser = "Registratie of inloggen van niet-registreerde gebruikers is helaas momenteel geblokkeerd. Neem contact op met de beheerder."
+oAuth2RequiresLicense = "OAuth/SSO-inloggen vereist een betaalde licentie (Server of Enterprise). Neem contact op met de beheerder om uw abonnement te upgraden."
+saml2RequiresLicense = "SAML-inloggen vereist een betaalde licentie (Server of Enterprise). Neem contact op met de beheerder om uw abonnement te upgraden."
+maxUsersReached = "Het maximumaantal gebruikers voor uw huidige licentie is bereikt. Neem contact op met de beheerder om uw abonnement te upgraden of extra plaatsen toe te voegen."
 oauth2RequestNotFound = "Autorisatieverzoek niet gevonden"
 oauth2InvalidUserInfoResponse = "Ongeldige reactie op gebruikersinfo"
 oauth2invalidRequest = "Ongeldig verzoek"
@@ -3805,7 +3909,7 @@ description = "These cookies are essential for the website to function properly.
 2 = "Altijd ingeschakeld"
 
 [cookieBanner.preferencesModal.analytics]
-title = "Analytics"
+title = "Analyse"
 description = "Deze cookies helpen ons te begrijpen hoe onze tools worden gebruikt, zodat we ons kunnen richten op het bouwen van de functies die onze community het meest waardeert. Wees gerust—Stirling PDF kan niet en zal nooit de inhoud van de documenten waarmee je werkt volgen."
 
 [cookieBanner.services]
@@ -3846,14 +3950,17 @@ fitToWidth = "Passend op breedte"
 actualSize = "Werkelijke grootte"
 
 [viewer]
+cannotPreviewFile = "Kan voorbeeld van bestand niet weergeven"
+dualPageView = "Dubbele paginaweergave"
 firstPage = "Eerste pagina"
 lastPage = "Laatste pagina"
-previousPage = "Vorige pagina"
 nextPage = "Volgende pagina"
+onlyPdfSupported = "De viewer ondersteunt alleen PDF-bestanden. Dit bestand lijkt een ander formaat te hebben."
+previousPage = "Vorige pagina"
+singlePageView = "Enkele paginaweergave"
+unknownFile = "Onbekend bestand"
 zoomIn = "Inzoomen"
 zoomOut = "Uitzoomen"
-singlePageView = "Enkele paginaweergave"
-dualPageView = "Dubbele paginaweergave"
 
 [rightRail]
 closeSelected = "Geselecteerde bestanden sluiten"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Zijbalk tonen/verbergen"
 exportSelected = "Geselecteerde pagina's exporteren"
 toggleAnnotations = "Annotaties tonen/verbergen"
 annotationMode = "Annotatiemodus schakelen"
+print = "PDF afdrukken"
 draw = "Tekenen"
 save = "Opslaan"
 saveChanges = "Wijzigingen opslaan"
@@ -4343,7 +4451,7 @@ features = "Feature-flags"
 processing = "Verwerking"
 
 [admin.settings.advanced.endpoints]
-label = "Endpoints"
+label = "Eindpunten"
 manage = "API-endpoints beheren"
 description = "Endpointbeheer wordt geconfigureerd via YAML. Zie de documentatie voor details over het in-/uitschakelen van specifieke endpoints."
 
@@ -4494,6 +4602,7 @@ description = "URL of bestandsnaam van het impressum (in sommige jurisdicties ve
 title = "Premium & Enterprise"
 description = "Configureer je premium- of enterprise-licentiesleutel."
 license = "Licentieconfiguratie"
+noInput = "Geef een licentiesleutel of bestand op"
 
 [admin.settings.premium.licenseKey]
 toggle = "Heb je een licentiesleutel of certificaatbestand?"
@@ -4511,6 +4620,25 @@ line1 = "Het overschrijven van je huidige licentiesleutel kan niet ongedaan word
 line2 = "Je vorige licentie gaat permanent verloren, tenzij je er elders een back-up van hebt."
 line3 = "Belangrijk: houd licentiesleutels privé en veilig. Deel ze nooit openbaar."
 
+[admin.settings.premium.inputMethod]
+text = "Licentiesleutel"
+file = "Certificaatbestand"
+
+[admin.settings.premium.file]
+label = "Licentiecertificaatbestand"
+description = "Upload je .lic- of .cert-licentiebestand van offline aankopen"
+choose = "Kies licentiebestand"
+selected = "Geselecteerd: {{filename}} ({{size}})"
+successMessage = "Licentiebestand succesvol geüpload en geactiveerd. Herstarten niet vereist."
+
+[admin.settings.premium.currentLicense]
+title = "Actieve licentie"
+file = "Bron: licentiebestand ({{path}})"
+key = "Bron: licentiesleutel"
+type = "Type: {{type}}"
+noInput = "Geef een licentiesleutel op of upload een certificaatbestand"
+success = "Succes"
+
 [admin.settings.premium.enabled]
 label = "Premiumfuncties inschakelen"
 description = "Licentiesleutelcontrole inschakelen voor pro-/enterprise-functies"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} geselecteerd"
 download = "Downloaden"
 delete = "Verwijderen"
 unsupported = "Niet ondersteund"
+active = "Actief"
 addToUpload = "Aan upload toevoegen"
+closeFile = "Bestand sluiten"
 deleteAll = "Alles verwijderen"
 loadingFiles = "Bestanden laden..."
 noFiles = "Geen bestanden beschikbaar"
@@ -5132,7 +5262,7 @@ upgrade = "Nu upgraden →"
 freeTitle = "Serverlicentie"
 overLimitTitle = "Serverlicentie vereist"
 overLimitBody = "Onze licentie staat tot <strong>{{freeTierLimit}}</strong> gebruikers gratis per server toe. Je hebt <strong>{{overLimitUserCopy}}</strong> Stirling-gebruikers. Om zonder onderbreking door te gaan, upgrade naar het Stirling Server-plan - <strong>onbeperkte plaatsen</strong>, PDF-tekstbewerking en volledige admincontrole voor $99/server/maand."
-freeBody = "Onze <strong>Open-Core</strong>-licentie staat tot <strong>{{freeTierLimit}}</strong> gebruikers gratis per server toe. Om ononderbroken te schalen en vroege toegang te krijgen tot onze nieuwe <strong>PDF-tekstbewerkingstool</strong>, raden we het Stirling Server-plan aan - volledige bewerking en <strong>onbeperkte plaatsen</strong> voor $99/server/maand."
+freeBody = "Onze <strong>Open-Core</strong>-licentie staat tot <strong>{{freeTierLimit}}</strong> gebruikers per server gratis toe. Om ononderbroken op te schalen, raden we het Stirling Server-abonnement aan - <strong>onbeperkte plaatsen</strong> en <strong>SSO-ondersteuning</strong> voor $99/server/maand."
 
 [onboarding.desktopInstall]
 title = "Downloaden"
@@ -5237,6 +5367,31 @@ error = "Bijwerken van gebruikersstatus is mislukt"
 success = "Gebruiker succesvol verwijderd"
 error = "Gebruiker verwijderen is mislukt"
 
+[workspace.people.changePassword]
+action = "Wachtwoord wijzigen"
+title = "Wachtwoord wijzigen"
+subtitle = "Wachtwoord bijwerken voor"
+newPassword = "Nieuw wachtwoord"
+confirmPassword = "Wachtwoord bevestigen"
+placeholder = "Voer een nieuw wachtwoord in"
+confirmPlaceholder = "Voer het nieuwe wachtwoord opnieuw in"
+passwordRequired = "Voer een nieuw wachtwoord in"
+passwordMismatch = "Wachtwoorden komen niet overeen"
+generateRandom = "Beveiligd wachtwoord genereren"
+generatedPreview = "Gegenereerd wachtwoord:"
+copyTooltip = "Kopiëren naar klembord"
+copiedToClipboard = "Wachtwoord gekopieerd naar klembord"
+copyFailed = "Kopiëren van wachtwoord mislukt"
+sendEmail = "Gebruiker per e-mail informeren over deze wijziging"
+includePassword = "Nieuw wachtwoord in de e-mail opnemen"
+forcePasswordChange = "Gebruiker dwingen het wachtwoord bij de volgende aanmelding te wijzigen"
+emailUnavailable = "Het e-mailadres van deze gebruiker is ongeldig. Meldingen zijn uitgeschakeld."
+smtpDisabled = "E-mailmeldingen vereisen dat SMTP is ingeschakeld in de instellingen."
+notifyOnly = "Er wordt een e-mail verzonden zonder het wachtwoord, om de gebruiker te laten weten dat een beheerder het heeft gewijzigd."
+submit = "Wachtwoord bijwerken"
+success = "Wachtwoord succesvol bijgewerkt"
+error = "Bijwerken van wachtwoord mislukt"
+
 [workspace.people.emailInvite]
 tab = "E-mailuitnodiging"
 description = "Typ of plak hieronder e-mailadressen, gescheiden door komma's. Gebruikers ontvangen inloggegevens via e-mail."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Er is minstens één e-mailadres vereist"
 submit = "Uitnodigingen verzenden"
 success = "Gebruiker(s) succesvol uitgenodigd"
-partialSuccess = "Sommige uitnodigingen zijn mislukt"
+partialFailure = "Sommige uitnodigingen zijn mislukt"
 allFailed = "Uitnodigen van gebruikers is mislukt"
 error = "Uitnodigingen verzenden is mislukt"
 
@@ -5709,7 +5864,7 @@ title = "Grafiek van endpointgebruik"
 
 [usage.table]
 title = "Gedetailleerde statistieken"
-endpoint = "Endpoint"
+endpoint = "Eindpunt"
 visits = "Bezoeken"
 percentage = "Percentage"
 noData = "Geen gegevens beschikbaar"
@@ -5770,6 +5925,7 @@ subtitle = "Log in met je Stirling-account"
 [setup.selfhosted]
 title = "Inloggen bij server"
 subtitle = "Vul je servergegevens in"
+link = "of maak verbinding met een zelfgehost account"
 
 [setup.server]
 title = "Verbinden met server"
@@ -5788,6 +5944,14 @@ description = "Voer de volledige URL van je self-hosted Stirling PDF-server in"
 emptyUrl = "Voer een server-URL in"
 unreachable = "Kan geen verbinding maken met server"
 testFailed = "Verbindingstest mislukt"
+configFetch = "Ophalen van serverconfiguratie mislukt. Controleer de URL en probeer het opnieuw."
+
+[setup.server.error.securityDisabled]
+title = "Inloggen niet ingeschakeld"
+body = "Op deze server is inloggen niet ingeschakeld. Om verbinding te maken met deze server moet u authenticatie inschakelen:"
+step1 = "Stel DOCKER_ENABLE_SECURITY=true in in uw omgeving"
+step2 = "Of stel security.enableLogin=true in in settings.yml"
+step3 = "Start de server opnieuw"
 
 [setup.login]
 title = "Inloggen"
@@ -5797,6 +5961,13 @@ submit = "Inloggen"
 signInWith = "Inloggen met"
 oauthPending = "Browser wordt geopend voor authenticatie..."
 orContinueWith = "Of ga verder met e-mail"
+serverRequirement = "Let op: op de server moet inloggen zijn ingeschakeld."
+showInstructions = "Hoe inschakelen?"
+hideInstructions = "Instructies verbergen"
+instructions = "Om inloggen op uw Stirling PDF-server in te schakelen:"
+instructionsEnvVar = "Stel de omgevingsvariabele in:"
+instructionsOrYml = "Of in settings.yml:"
+instructionsRestart = "Start vervolgens uw server opnieuw zodat de wijzigingen van kracht worden."
 
 [setup.login.username]
 label = "Gebruikersnaam"
@@ -5853,6 +6024,7 @@ earlyAccess = "Vroege toegang"
 reset = "Wijzigingen resetten"
 downloadJson = "JSON downloaden"
 generatePdf = "PDF genereren"
+saveChanges = "Wijzigingen opslaan"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Tekst automatisch schalen zodat deze in vakken past"
@@ -5890,6 +6062,8 @@ alpha = "Deze alpha-viewer is nog in ontwikkeling—bepaalde lettertypen, kleure
 [pdfTextEditor.empty]
 title = "Geen document geladen"
 subtitle = "Laad een PDF- of JSON-bestand om tekst te bewerken."
+dropzone = "Sleep hier een PDF- of JSON-bestand naartoe, of klik om te bladeren"
+dropzoneWithFiles = "Selecteer een bestand op het tabblad Bestanden, of sleep hier een PDF- of JSON-bestand naartoe, of klik om te bladeren"
 
 [pdfTextEditor.welcomeBanner]
 title = "Welkom bij PDF-teksteditor (Early Access)"
diff --git a/frontend/public/locales/no-NB/translation.toml b/frontend/public/locales/no-NB/translation.toml
index 21b873f01..c60238acf 100644
--- a/frontend/public/locales/no-NB/translation.toml
+++ b/frontend/public/locales/no-NB/translation.toml
@@ -131,7 +131,7 @@ unsupported = "Ikke støttet"
 
 [toolPanel]
 placeholder = "Velg et verktøy for å komme i gang"
-alpha = "Alpha"
+alpha = "Alfa"
 premiumFeature = "Premium-funksjon:"
 comingSoon = "Kommer snart:"
 
@@ -163,6 +163,11 @@ unfavorite = "Fjern fra favoritter"
 fullscreen = "Bytt til fullskjerm-modus"
 sidebar = "Bytt til sidepanel-modus"
 
+[backendStartup]
+notFoundTitle = "Backend ikke funnet"
+retry = "Prøv igjen"
+unreachable = "Programmet kan for øyeblikket ikke koble til backend. Kontroller backend-status og nettverkstilkobling, og prøv igjen."
+
 [zipWarning]
 title = "Stor ZIP-fil"
 message = "Denne ZIP-en inneholder {{count}} filer. Pakk ut likevel?"
@@ -912,6 +917,9 @@ desc = "Bygg flertrinns arbeidsflyter ved å lenke sammen PDF-handlinger. Ideelt
 desc = "Legger PDF-er over hverandre"
 title = "Overlay PDF-er"
 
+[home.pdfTextEditor]
+title = "PDF-teksteditor"
+desc = "Rediger eksisterende tekst og bilder i PDF-filer"
 
 [home.addText]
 tags = "tekst,merknad,etikett"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Tegnet signatur"
 defaultImageLabel = "Opplastet signatur"
 defaultTextLabel = "Tekstsignatur"
 saveButton = "Lagre signatur"
+savePersonal = "Lagre personlig"
+saveShared = "Lagre delt"
 saveUnavailable = "Opprett en signatur først for å lagre den."
 noChanges = "Gjeldende signatur er allerede lagret."
+tempStorageTitle = "Midlertidig nettleserlagring"
+tempStorageDescription = "Signaturer lagres bare i nettleseren din. De går tapt hvis du sletter nettleserdata eller bytter nettleser."
+personalHeading = "Personlige signaturer"
+sharedHeading = "Delte signaturer"
+personalDescription = "Bare du kan se disse signaturene."
+sharedDescription = "Alle brukere kan se og bruke disse signaturene."
 
 [sign.saved.type]
 canvas = "Tegning"
@@ -3020,6 +3036,91 @@ title = "Få Info om PDF"
 header = "Få Info om PDF"
 submit = "Få Info"
 downloadJson = "Last ned JSON"
+processing = "Henter ut informasjon..."
+results = "Resultater"
+noResults = "Kjør verktøyet for å generere en rapport."
+downloads = "Nedlastinger"
+noneDetected = "Ingen funnet"
+indexTitle = "Indeks"
+
+[getPdfInfo.report]
+entryLabel = "Fullstendig informasjonsoppsummering"
+shortTitle = "PDF-informasjon"
+
+[getPdfInfo.sections]
+metadata = "Metadata"
+formFields = "Skjemafelt"
+basicInfo = "Grunnleggende info"
+documentInfo = "Dokumentinformasjon"
+compliance = "Samsvar"
+encryption = "Kryptering"
+permissions = "Tillatelser"
+other = "Annet"
+perPageInfo = "Informasjon per side"
+tableOfContents = "Innholdsfortegnelse"
+
+[getPdfInfo.other]
+attachments = "Vedlegg"
+embeddedFiles = "Innebygde filer"
+javaScript = "JavaScript"
+layers = "Lag"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Størrelse"
+annotations = "Merknader"
+images = "Bilder"
+links = "Lenker"
+fonts = "Skrifter"
+xobjects = "XObject-antall"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Sider"
+fileSize = "Filstørrelse"
+pdfVersion = "PDF-versjon"
+language = "Språk"
+title = "PDF-sammendrag"
+author = "Forfatter"
+created = "Opprettet"
+modified = "Endret"
+permsAll = "Alle tillatelser tillatt"
+permsRestricted = "{{count}} begrensninger"
+permsMixed = "Noen tillatelser begrenset"
+hasCompliance = "Har samsvarsstandarder"
+noCompliance = "Ingen samsvarsstandarder"
+basic = "Grunnleggende informasjon"
+documentInfo = "Dokumentinformasjon"
+securityTitle = "Sikkerhetsstatus"
+technical = "Teknisk"
+overviewTitle = "PDF-oversikt"
+
+[getPdfInfo.summary.security]
+encrypted = "Kryptert PDF - passordbeskyttelse er aktiv"
+unencrypted = "Ukryptert PDF - ingen passordbeskyttelse"
+
+[getPdfInfo.summary.tech]
+images = "Bilder"
+fonts = "Skrifter"
+formFields = "Skjemafelt"
+embeddedFiles = "Innebygde filer"
+javaScript = "JavaScript"
+layers = "Lag"
+bookmarks = "Bokmerker"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "et navnløst dokument"
+unknown = "Ukjent forfatter"
+text = "Dette er en PDF på {{pages}} sider med tittelen {{title}}, opprettet av {{author}} (PDF-versjon {{version}})."
+
+[getPdfInfo.error]
+partial = "Noen filer kunne ikke behandles."
+unexpected = "Uventet feil under uttrekk."
+
+[getPdfInfo.status]
+complete = "Uttrekk fullført"
 
 [extractPage]
 tags = "ekstrahere"
@@ -3438,6 +3539,9 @@ signinTitle = "Vennligst logg inn"
 ssoSignIn = "Logg inn via Enkel Pålogging"
 oAuth2AutoCreateDisabled = "OAUTH2 Auto-Opretting av bruker deaktivert"
 oAuth2AdminBlockedUser = "Registrering eller pålogging for ikke-registrerte brukere er for øyeblikket blokkert. Vennligst kontakt administrator"
+oAuth2RequiresLicense = "OAuth/SSO-pålogging krever en betalt lisens (Server eller Enterprise). Kontakt administratoren for å oppgradere planen din."
+saml2RequiresLicense = "SAML-pålogging krever en betalt lisens (Server eller Enterprise). Kontakt administratoren for å oppgradere planen din."
+maxUsersReached = "Maksimalt antall brukere er nådd for din nåværende lisens. Kontakt administratoren for å oppgradere planen din eller legge til flere brukerplasser."
 oauth2RequestNotFound = "Autentiseringsforespørsel ikke funnet"
 oauth2InvalidUserInfoResponse = "Ugyldig brukerinforespons"
 oauth2invalidRequest = "Ugyldig forespørsel"
@@ -3846,14 +3950,17 @@ fitToWidth = "Tilpass til bredde"
 actualSize = "Faktisk størrelse"
 
 [viewer]
+cannotPreviewFile = "Kan ikke forhåndsvise fil"
+dualPageView = "Dobbelsidevisning"
 firstPage = "Første side"
 lastPage = "Siste side"
-previousPage = "Forrige side"
 nextPage = "Neste side"
+onlyPdfSupported = "Visningsprogrammet støtter bare PDF-filer. Denne filen ser ut til å ha et annet format."
+previousPage = "Forrige side"
+singlePageView = "Enkeltsidevisning"
+unknownFile = "Ukjent fil"
 zoomIn = "Zoom inn"
 zoomOut = "Zoom ut"
-singlePageView = "Enkeltsidevisning"
-dualPageView = "Dobbelsidevisning"
 
 [rightRail]
 closeSelected = "Lukk valgte filer"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Vis/skjul sidepanel"
 exportSelected = "Eksporter valgte sider"
 toggleAnnotations = "Vis/skjul merknader"
 annotationMode = "Veksle merknadsmodus"
+print = "Skriv ut PDF"
 draw = "Tegn"
 save = "Lagre"
 saveChanges = "Lagre endringer"
@@ -4153,7 +4261,7 @@ description = "Spor brukerhandlinger og systemhendelser for etterlevelse og sikk
 
 [admin.settings.security.audit.level]
 label = "Revisjonsnivå"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=AV, 1=GRUNNLEGGENDE, 2=STANDARD, 3=DETALJERT"
 
 [admin.settings.security.audit.retentionDays]
 label = "Bevaring av revisjon (dager)"
@@ -4494,6 +4602,7 @@ description = "URL eller filnavn til impressum (påkrevd i noen jurisdiksjoner)"
 title = "Premium og Enterprise"
 description = "Konfigurer din premium- eller enterprise-lisensnøkkel."
 license = "Lisenskonfigurasjon"
+noInput = "Oppgi en lisensnøkkel eller fil"
 
 [admin.settings.premium.licenseKey]
 toggle = "Har du en lisensnøkkel eller sertifikatfil?"
@@ -4511,6 +4620,25 @@ line1 = "Å overskrive gjeldende lisensnøkkel kan ikke angres."
 line2 = "Den forrige lisensen vil gå tapt permanent med mindre du har sikkerhetskopiert den et annet sted."
 line3 = "Viktig: Hold lisensnøkler private og sikre. Del dem aldri offentlig."
 
+[admin.settings.premium.inputMethod]
+text = "Lisensnøkkel"
+file = "Sertifikatfil"
+
+[admin.settings.premium.file]
+label = "Lisenssertifikatfil"
+description = "Last opp .lic- eller .cert-lisensfilen din fra offline-kjøp"
+choose = "Velg lisensfil"
+selected = "Valgt: {{filename}} ({{size}})"
+successMessage = "Lisensfilen ble lastet opp og aktivert. Omstart er ikke nødvendig."
+
+[admin.settings.premium.currentLicense]
+title = "Aktiv lisens"
+file = "Kilde: Lisensfil ({{path}})"
+key = "Kilde: Lisensnøkkel"
+type = "Type: {{type}}"
+noInput = "Oppgi en lisensnøkkel eller last opp en sertifikatfil"
+success = "Vellykket"
+
 [admin.settings.premium.enabled]
 label = "Aktiver premiumfunksjoner"
 description = "Aktiver lisensnøkkelkontroller for pro-/enterprise-funksjoner"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} valgt"
 download = "Last ned"
 delete = "Slett"
 unsupported = "Ikke støttet"
+active = "Aktiv"
 addToUpload = "Legg til i opplasting"
+closeFile = "Lukk fil"
 deleteAll = "Slett alt"
 loadingFiles = "Laster filer..."
 noFiles = "Ingen filer tilgjengelig"
@@ -5059,7 +5189,7 @@ title = "Erstatt-Inverter-Farge"
 
 [replace-color.options]
 fill = "Fyllfarge"
-gradient = "Gradient"
+gradient = "Fargeovergang"
 
 [replace-color.selectText]
 1 = "Erstatt eller Inverter farge alternativer"
@@ -5132,7 +5262,7 @@ upgrade = "Oppgrader nå →"
 freeTitle = "Serverlisens"
 overLimitTitle = "Serverlisens kreves"
 overLimitBody = "Lisensieringen vår tillater opptil <strong>{{freeTierLimit}}</strong> brukere gratis per server. Du har <strong>{{overLimitUserCopy}}</strong> Stirling-brukere. For å fortsette uten avbrudd, oppgrader til Stirling Server-planen – <strong>ubegrensede plasser</strong>, PDF-tekstredigering og full admin-kontroll for $99/server/mnd."
-freeBody = "Vår <strong>Open-Core</strong>-lisensiering tillater opptil <strong>{{freeTierLimit}}</strong> brukere gratis per server. For å skalere uten avbrudd og få tidlig tilgang til vårt nye <strong>PDF-tekstredigeringsverktøy</strong>, anbefaler vi Stirling Server-planen – full redigering og <strong>ubegrensede plasser</strong> for $99/server/mnd."
+freeBody = "Vår <strong>Open-Core</strong>-lisensiering tillater opptil <strong>{{freeTierLimit}}</strong> brukere gratis per server. For å skalere uten avbrudd anbefaler vi Stirling Server-planen - <strong>ubegrensede plasser</strong> og <strong>SSO-støtte</strong> for $99/server/mnd."
 
 [onboarding.desktopInstall]
 title = "Last ned"
@@ -5237,6 +5367,31 @@ error = "Kunne ikke oppdatere brukerstatus"
 success = "Bruker slettet"
 error = "Kunne ikke slette bruker"
 
+[workspace.people.changePassword]
+action = "Endre passord"
+title = "Endre passord"
+subtitle = "Oppdater passordet for"
+newPassword = "Nytt passord"
+confirmPassword = "Bekreft passord"
+placeholder = "Angi et nytt passord"
+confirmPlaceholder = "Skriv inn det nye passordet på nytt"
+passwordRequired = "Angi et nytt passord"
+passwordMismatch = "Passordene samsvarer ikke"
+generateRandom = "Generer sikkert passord"
+generatedPreview = "Generert passord:"
+copyTooltip = "Kopier til utklippstavle"
+copiedToClipboard = "Passord kopiert til utklippstavle"
+copyFailed = "Kunne ikke kopiere passord"
+sendEmail = "Send e-post til brukeren om denne endringen"
+includePassword = "Inkluder det nye passordet i e-posten"
+forcePasswordChange = "Tving brukeren til å endre passord ved neste innlogging"
+emailUnavailable = "Denne brukerens e-post er ikke en gyldig e-postadresse. Varsler er deaktivert."
+smtpDisabled = "E-postvarsler krever at SMTP er aktivert i innstillingene."
+notifyOnly = "Det sendes en e-post uten passordet som informerer brukeren om at en admin har endret det."
+submit = "Oppdater passord"
+success = "Passord oppdatert"
+error = "Kunne ikke oppdatere passord"
+
 [workspace.people.emailInvite]
 tab = "E-postinvitasjon"
 description = "Skriv eller lim inn e-poster nedenfor, separert med komma. Brukere vil motta innloggingsdetaljer via e-post."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Minst én e-postadresse er påkrevd"
 submit = "Send invitasjoner"
 success = "bruker(e) invitert"
-partialSuccess = "Noen invitasjoner mislyktes"
+partialFailure = "Noen invitasjoner mislyktes"
 allFailed = "Kunne ikke invitere brukere"
 error = "Kunne ikke sende invitasjoner"
 
@@ -5770,6 +5925,7 @@ subtitle = "Logg inn med Stirling-kontoen din"
 [setup.selfhosted]
 title = "Logg inn på server"
 subtitle = "Oppgi serverlegitimasjonen din"
+link = "eller koble til en selvhostet konto"
 
 [setup.server]
 title = "Koble til server"
@@ -5788,6 +5944,14 @@ description = "Skriv inn full URL til din selvhostede Stirling PDF-server"
 emptyUrl = "Skriv inn en server-URL"
 unreachable = "Kunne ikke koble til server"
 testFailed = "Tilkoblingstest mislyktes"
+configFetch = "Kunne ikke hente serverkonfigurasjon. Kontroller URL-en og prøv igjen."
+
+[setup.server.error.securityDisabled]
+title = "Innlogging ikke aktivert"
+body = "Denne serveren har ikke innlogging aktivert. For å koble til denne serveren må du aktivere autentisering:"
+step1 = "Angi DOCKER_ENABLE_SECURITY=true i miljøet ditt"
+step2 = "Eller angi security.enableLogin=true i settings.yml"
+step3 = "Start serveren på nytt"
 
 [setup.login]
 title = "Logg inn"
@@ -5797,6 +5961,13 @@ submit = "Logg inn"
 signInWith = "Logg inn med"
 oauthPending = "Åpner nettleser for autentisering..."
 orContinueWith = "Eller fortsett med e-post"
+serverRequirement = "Merk: Serveren må ha pålogging aktivert."
+showInstructions = "Hvordan aktivere?"
+hideInstructions = "Skjul instruksjoner"
+instructions = "Slik aktiverer du pålogging på din Stirling PDF-server:"
+instructionsEnvVar = "Sett miljøvariabelen:"
+instructionsOrYml = "Eller i settings.yml:"
+instructionsRestart = "Start deretter serveren på nytt for at endringene skal tre i kraft."
 
 [setup.login.username]
 label = "Brukernavn"
@@ -5840,7 +6011,7 @@ paragraph = "Avsnittsside"
 sparse = "Sparsom tekst"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automatisk"
 paragraph = "Avsnitt"
 singleLine = "Én linje"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Tidlig tilgang"
 reset = "Tilbakestill endringer"
 downloadJson = "Last ned JSON"
 generatePdf = "Generer PDF"
+saveChanges = "Lagre endringer"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Autoskalere tekst til å passe i bokser"
@@ -5890,6 +6062,8 @@ alpha = "Denne alfa-visningen er fortsatt under utvikling—visse skrifttyper, f
 [pdfTextEditor.empty]
 title = "Ingen dokument lastet inn"
 subtitle = "Last inn en PDF- eller JSON-fil for å begynne å redigere tekstinnhold."
+dropzone = "Dra og slipp en PDF- eller JSON-fil her, eller klikk for å bla gjennom"
+dropzoneWithFiles = "Velg en fil fra fanen Filer, eller dra og slipp en PDF- eller JSON-fil her, eller klikk for å bla gjennom"
 
 [pdfTextEditor.welcomeBanner]
 title = "Velkommen til PDF Text Editor (Tidlig tilgang)"
diff --git a/frontend/public/locales/pl-PL/translation.toml b/frontend/public/locales/pl-PL/translation.toml
index bbde87022..c066d1384 100644
--- a/frontend/public/locales/pl-PL/translation.toml
+++ b/frontend/public/locales/pl-PL/translation.toml
@@ -131,7 +131,7 @@ unsupported = "Nieobsługiwane"
 
 [toolPanel]
 placeholder = "Wybierz narzędzie, aby zacząć"
-alpha = "Alpha"
+alpha = "Alfa"
 premiumFeature = "Funkcja premium:"
 comingSoon = "Wkrótce:"
 
@@ -163,6 +163,11 @@ unfavorite = "Usuń z ulubionych"
 fullscreen = "Przełącz na tryb pełnoekranowy"
 sidebar = "Przełącz na tryb paska bocznego"
 
+[backendStartup]
+notFoundTitle = "Nie znaleziono backendu"
+retry = "Spróbuj ponownie"
+unreachable = "Aplikacja nie może obecnie połączyć się z backendem. Sprawdź stan backendu i łączność sieciową, a następnie spróbuj ponownie."
+
 [zipWarning]
 title = "Duży plik ZIP"
 message = "Ten ZIP zawiera {{count}} plików. Mimo to rozpakować?"
@@ -563,7 +568,7 @@ loading = "Ładowanie..."
 failedToLoad = "Nie udało się załadować danych punktów końcowych. Spróbuj odświeżyć."
 home = "Strona główna"
 login = "Logowanie"
-top = "Top"
+top = "Najlepsze"
 numberOfVisits = "Liczba wizyt"
 visitsTooltip = "Wizyty: {0} ({1}% całości)"
 retry = "Spróbuj ponownie"
@@ -912,6 +917,9 @@ desc = "Buduj wieloetapowe przepływy, łącząc akcje PDF. Idealne do powtarzaj
 desc = "Nakłada dokumenty PDF na siebie"
 title = "Nałóż PDFa"
 
+[home.pdfTextEditor]
+title = "Edytor tekstu PDF"
+desc = "Edytuj istniejący tekst i obrazy w plikach PDF"
 
 [home.addText]
 tags = "tekst,adnotacja,etykieta"
@@ -1217,7 +1225,7 @@ odtExt = "Tekst OpenDocument (.odt)"
 pptExt = "PowerPoint (.pptx)"
 odpExt = "Prezentacja OpenDocument (.odp)"
 txtExt = "Tekst niesformatowany (.txt)"
-rtfExt = "Rich Text Format (.rtf)"
+rtfExt = "Format RTF (.rtf)"
 selectedFiles = "Wybrane pliki"
 noFileSelected = "Nie wybrano pliku. Użyj panelu plików, aby dodać pliki."
 convertFiles = "Konwertuj pliki"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Podpis rysowany"
 defaultImageLabel = "Przesłany podpis"
 defaultTextLabel = "Podpis wpisany"
 saveButton = "Zapisz podpis"
+savePersonal = "Zapisz osobiste"
+saveShared = "Zapisz udostępnione"
 saveUnavailable = "Najpierw utwórz podpis, aby go zapisać."
 noChanges = "Bieżący podpis jest już zapisany."
+tempStorageTitle = "Tymczasowe przechowywanie w przeglądarce"
+tempStorageDescription = "Podpisy są przechowywane tylko w Twojej przeglądarce. Zostaną utracone po wyczyszczeniu danych przeglądarki lub zmianie przeglądarki."
+personalHeading = "Osobiste podpisy"
+sharedHeading = "Udostępnione podpisy"
+personalDescription = "Tylko Ty widzisz te podpisy."
+sharedDescription = "Wszyscy użytkownicy mogą widzieć i używać tych podpisów."
 
 [sign.saved.type]
 canvas = "Rysunek"
@@ -3020,6 +3036,91 @@ title = "Pobierz informacje o pliku PDF"
 header = "Pobierz informacje o pliku PDF"
 submit = "Pobierz informacje"
 downloadJson = "Pobierz JSON z zawartością"
+processing = "Wyodrębnianie informacji..."
+results = "Wyniki"
+noResults = "Uruchom narzędzie, aby wygenerować raport."
+downloads = "Pobrania"
+noneDetected = "Nic nie wykryto"
+indexTitle = "Indeks"
+
+[getPdfInfo.report]
+entryLabel = "Pełne podsumowanie informacji"
+shortTitle = "Informacje o PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadane"
+formFields = "Pola formularza"
+basicInfo = "Informacje podstawowe"
+documentInfo = "Informacje o dokumencie"
+compliance = "Zgodność"
+encryption = "Szyfrowanie"
+permissions = "Uprawnienia"
+other = "Inne"
+perPageInfo = "Informacje dla każdej strony"
+tableOfContents = "Spis treści"
+
+[getPdfInfo.other]
+attachments = "Załączniki"
+embeddedFiles = "Osadzone pliki"
+javaScript = "JavaScript"
+layers = "Warstwy"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Rozmiar"
+annotations = "Adnotacje"
+images = "Obrazy"
+links = "Linki"
+fonts = "Czcionki"
+xobjects = "Liczba XObject"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Strony"
+fileSize = "Rozmiar pliku"
+pdfVersion = "Wersja PDF"
+language = "Język"
+title = "Podsumowanie PDF"
+author = "Autor"
+created = "Utworzono"
+modified = "Zmodyfikowano"
+permsAll = "Wszystkie uprawnienia dozwolone"
+permsRestricted = "{{count}} ograniczeń"
+permsMixed = "Niektóre uprawnienia ograniczone"
+hasCompliance = "Spełnia standardy zgodności"
+noCompliance = "Brak standardów zgodności"
+basic = "Informacje podstawowe"
+documentInfo = "Informacje o dokumencie"
+securityTitle = "Stan zabezpieczeń"
+technical = "Techniczne"
+overviewTitle = "Przegląd PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "Zaszyfrowany PDF - obecne zabezpieczenie hasłem"
+unencrypted = "Niezaszyfrowany PDF - brak zabezpieczenia hasłem"
+
+[getPdfInfo.summary.tech]
+images = "Obrazy"
+fonts = "Czcionki"
+formFields = "Pola formularza"
+embeddedFiles = "Osadzone pliki"
+javaScript = "JavaScript"
+layers = "Warstwy"
+bookmarks = "Zakładki"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "niezatytułowany dokument"
+unknown = "Nieznany autor"
+text = "To jest {{pages}}-stronicowy plik PDF zatytułowany {{title}}, utworzony przez {{author}} (wersja PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Niektórych plików nie udało się przetworzyć."
+unexpected = "Nieoczekiwany błąd podczas wyodrębniania."
+
+[getPdfInfo.status]
+complete = "Zakończono wyodrębnianie"
 
 [extractPage]
 tags = "wydobycie,separacja,wyciaganie"
@@ -3438,6 +3539,9 @@ signinTitle = "Zaloguj się"
 ssoSignIn = "Zaloguj się za pomocą logowania jednokrotnego"
 oAuth2AutoCreateDisabled = "Wyłączono automatyczne tworzenie użytkownika OAUTH2"
 oAuth2AdminBlockedUser = "Rejestracja lub logowanie niezarejestrowanych użytkowników jest obecnie zablokowane. Prosimy o kontakt z administratorem."
+oAuth2RequiresLicense = "Logowanie OAuth/SSO wymaga płatnej licencji (Server lub Enterprise). Skontaktuj się z administratorem, aby uaktualnić swój plan."
+saml2RequiresLicense = "Logowanie SAML wymaga płatnej licencji (Server lub Enterprise). Skontaktuj się z administratorem, aby uaktualnić swój plan."
+maxUsersReached = "Osiągnięto maksymalną liczbę użytkowników dla Twojej obecnej licencji. Skontaktuj się z administratorem, aby uaktualnić plan lub dodać więcej miejsc."
 oauth2RequestNotFound = "Błąd logowania OAuth2"
 oauth2InvalidUserInfoResponse = "Niewłaściwe dane logowania"
 oauth2invalidRequest = "Nieprawidłowe żądanie"
@@ -3533,7 +3637,7 @@ title = "PDF do pojedyńczej strony"
 header = "PDF do pojedyńczej strony"
 submit = "Zapisz dokument jako PDF z jedną stroną"
 description = "To narzędzie scali wszystkie strony Twojego PDF w jedną dużą stronę. Szerokość pozostanie taka jak w oryginalnych stronach, a wysokość będzie sumą wysokości wszystkich stron."
-filenamePrefix = "single_page"
+filenamePrefix = "pojedyncza_strona"
 
 [pdfToSinglePage.files]
 placeholder = "Wybierz plik PDF w widoku głównym, aby rozpocząć"
@@ -3846,14 +3950,17 @@ fitToWidth = "Dopasuj do szerokości"
 actualSize = "Rzeczywisty rozmiar"
 
 [viewer]
+cannotPreviewFile = "Nie można wyświetlić podglądu pliku"
+dualPageView = "Widok dwóch stron"
 firstPage = "Pierwsza strona"
 lastPage = "Ostatnia strona"
-previousPage = "Poprzednia strona"
 nextPage = "Następna strona"
+onlyPdfSupported = "Przeglądarka obsługuje tylko pliki PDF. Ten plik wydaje się mieć inny format."
+previousPage = "Poprzednia strona"
+singlePageView = "Widok pojedynczej strony"
+unknownFile = "Nieznany plik"
 zoomIn = "Powiększ"
 zoomOut = "Pomniejsz"
-singlePageView = "Widok pojedynczej strony"
-dualPageView = "Widok dwóch stron"
 
 [rightRail]
 closeSelected = "Zamknij wybrane pliki"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Przełącz panel boczny"
 exportSelected = "Eksportuj wybrane strony"
 toggleAnnotations = "Przełącz widoczność adnotacji"
 annotationMode = "Przełącz tryb adnotacji"
+print = "Drukuj PDF"
 draw = "Rysuj"
 save = "Zapisz"
 saveChanges = "Zapisz zmiany"
@@ -4153,7 +4261,7 @@ description = "Śledź działania użytkowników i zdarzenia systemowe na potrze
 
 [admin.settings.security.audit.level]
 label = "Poziom audytu"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=WYŁ., 1=PODSTAWOWY, 2=STANDARDOWY, 3=SZCZEGÓŁOWY"
 
 [admin.settings.security.audit.retentionDays]
 label = "Przechowywanie audytu (dni)"
@@ -4494,6 +4602,7 @@ description = "URL lub nazwa pliku do impressum (wymagane w niektórych jurysdyk
 title = "Premium i Enterprise"
 description = "Skonfiguruj swój klucz licencyjny premium lub enterprise."
 license = "Konfiguracja licencji"
+noInput = "Podaj klucz licencyjny lub plik"
 
 [admin.settings.premium.licenseKey]
 toggle = "Masz klucz licencyjny lub plik certyfikatu?"
@@ -4511,6 +4620,25 @@ line1 = "Nadpisania bieżącego klucza licencyjnego nie można cofnąć."
 line2 = "Poprzednia licencja zostanie trwale utracona, jeśli nie masz jej kopii zapasowej."
 line3 = "Ważne: przechowuj klucze licencyjne prywatnie i bezpiecznie. Nigdy nie udostępniaj ich publicznie."
 
+[admin.settings.premium.inputMethod]
+text = "Klucz licencyjny"
+file = "Plik certyfikatu"
+
+[admin.settings.premium.file]
+label = "Plik certyfikatu licencji"
+description = "Prześlij swój plik licencji .lic lub .cert z zakupów offline"
+choose = "Wybierz plik licencji"
+selected = "Wybrano: {{filename}} ({{size}})"
+successMessage = "Plik licencji przesłano i pomyślnie aktywowano. Ponowne uruchomienie nie jest wymagane."
+
+[admin.settings.premium.currentLicense]
+title = "Aktywna licencja"
+file = "Źródło: plik licencji ({{path}})"
+key = "Źródło: klucz licencyjny"
+type = "Typ: {{type}}"
+noInput = "Podaj klucz licencyjny lub prześlij plik certyfikatu"
+success = "Sukces"
+
 [admin.settings.premium.enabled]
 label = "Włącz funkcje premium"
 description = "Włącz weryfikację klucza licencyjnego dla funkcji pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} wybrane"
 download = "Pobierz"
 delete = "usuń"
 unsupported = "Nieobsługiwane"
+active = "Aktywny"
 addToUpload = "Dodaj do przesyłania"
+closeFile = "Zamknij plik"
 deleteAll = "Usuń wszystko"
 loadingFiles = "Ładowanie plików..."
 noFiles = "Brak dostępnych plików"
@@ -5132,7 +5262,7 @@ upgrade = "Ulepsz teraz →"
 freeTitle = "Licencja serwera"
 overLimitTitle = "Wymagana licencja serwera"
 overLimitBody = "Nasza licencja pozwala na maks. <strong>{{freeTierLimit}}</strong> użytkowników bez opłat na serwer. Masz <strong>{{overLimitUserCopy}}</strong> użytkowników Stirling. Aby kontynuować bez przerw, przejdź na plan Stirling Server – <strong>nielimitowane miejsca</strong>, edycja tekstu PDF i pełna kontrola administracyjna za 99 USD/serwer/mies."
-freeBody = "Nasza licencja <strong>Open-Core</strong> pozwala na maks. <strong>{{freeTierLimit}}</strong> użytkowników bez opłat na serwer. Aby skalować bez przerw i uzyskać wczesny dostęp do nowego <strong>narzędzia edycji tekstu PDF</strong>, polecamy plan Stirling Server – pełna edycja i <strong>nielimitowane miejsca</strong> za 99 USD/serwer/mies."
+freeBody = "Nasza licencja <strong>Open-Core</strong> pozwala na maksymalnie <strong>{{freeTierLimit}}</strong> użytkowników bezpłatnie na serwer. Aby skalować bez zakłóceń, zalecamy plan Stirling Server - <strong>nielimitowana liczba miejsc</strong> i <strong>obsługa SSO</strong> za $99/serwer/mies."
 
 [onboarding.desktopInstall]
 title = "Pobierz"
@@ -5237,6 +5367,31 @@ error = "Nie udało się zaktualizować statusu użytkownika"
 success = "Użytkownik usunięty pomyślnie"
 error = "Nie udało się usunąć użytkownika"
 
+[workspace.people.changePassword]
+action = "Zmień hasło"
+title = "Zmień hasło"
+subtitle = "Zaktualizuj hasło dla"
+newPassword = "Nowe hasło"
+confirmPassword = "Potwierdź hasło"
+placeholder = "Wprowadź nowe hasło"
+confirmPlaceholder = "Wprowadź ponownie nowe hasło"
+passwordRequired = "Wprowadź nowe hasło"
+passwordMismatch = "Hasła nie są zgodne"
+generateRandom = "Wygeneruj bezpieczne hasło"
+generatedPreview = "Wygenerowane hasło:"
+copyTooltip = "Kopiuj do schowka"
+copiedToClipboard = "Hasło skopiowano do schowka"
+copyFailed = "Nie udało się skopiować hasła"
+sendEmail = "Wyślij użytkownikowi e-mail o tej zmianie"
+includePassword = "Dołącz nowe hasło do e-maila"
+forcePasswordChange = "Wymuś zmianę hasła przy następnym logowaniu"
+emailUnavailable = "E-mail tego użytkownika nie jest prawidłowym adresem. Powiadomienia są wyłączone."
+smtpDisabled = "Powiadomienia e-mail wymagają włączenia SMTP w ustawieniach."
+notifyOnly = "Zostanie wysłany e-mail bez hasła, informujący użytkownika, że administrator je zmienił."
+submit = "Zaktualizuj hasło"
+success = "Hasło zaktualizowano pomyślnie"
+error = "Nie udało się zaktualizować hasła"
+
 [workspace.people.emailInvite]
 tab = "Zaproszenie e‑mail"
 description = "Wpisz lub wklej e‑maile poniżej, rozdzielone przecinkami. Użytkownicy otrzymają dane logowania e‑mailem."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Wymagany jest co najmniej jeden adres e‑mail"
 submit = "Wyślij zaproszenia"
 success = "Pomyślnie zaproszono użytkowników"
-partialSuccess = "Niektóre zaproszenia nie powiodły się"
+partialFailure = "Niektóre zaproszenia nie powiodły się"
 allFailed = "Nie udało się zaprosić użytkowników"
 error = "Nie udało się wysłać zaproszeń"
 
@@ -5541,7 +5696,7 @@ emailInvalid = "Wpisz poprawny adres e‑mail"
 title = "Podaj e‑mail"
 description = "Użyjemy go do wysłania klucza licencyjnego i rachunków."
 emailLabel = "Adres e‑mail"
-emailPlaceholder = "your@email.com"
+emailPlaceholder = "twoj@email.com"
 continue = "Kontynuuj"
 modalTitle = "Zaczynamy – {{planName}}"
 
@@ -5770,6 +5925,7 @@ subtitle = "Zaloguj się na konto Stirling"
 [setup.selfhosted]
 title = "Zaloguj się do serwera"
 subtitle = "Wprowadź dane logowania do serwera"
+link = "lub połącz się z kontem hostowanym samodzielnie"
 
 [setup.server]
 title = "Połącz z serwerem"
@@ -5788,6 +5944,14 @@ description = "Wpisz pełny URL własnego serwera Stirling PDF"
 emptyUrl = "Wpisz URL serwera"
 unreachable = "Nie można połączyć z serwerem"
 testFailed = "Test połączenia nie powiódł się"
+configFetch = "Nie udało się pobrać konfiguracji serwera. Sprawdź URL i spróbuj ponownie."
+
+[setup.server.error.securityDisabled]
+title = "Logowanie nie jest włączone"
+body = "Na tym serwerze logowanie nie jest włączone. Aby się połączyć, musisz włączyć uwierzytelnianie:"
+step1 = "Ustaw w środowisku DOCKER_ENABLE_SECURITY=true"
+step2 = "Lub ustaw security.enableLogin=true w pliku settings.yml"
+step3 = "Uruchom ponownie serwer"
 
 [setup.login]
 title = "Zaloguj się"
@@ -5797,6 +5961,13 @@ submit = "Zaloguj"
 signInWith = "Zaloguj przez"
 oauthPending = "Otwieranie przeglądarki do uwierzytelnienia..."
 orContinueWith = "Lub kontynuuj e‑mailem"
+serverRequirement = "Uwaga: Na serwerze musi być włączone logowanie."
+showInstructions = "Jak włączyć?"
+hideInstructions = "Ukryj instrukcje"
+instructions = "Aby włączyć logowanie na swoim serwerze Stirling PDF:"
+instructionsEnvVar = "Ustaw zmienną środowiskową:"
+instructionsOrYml = "Lub w settings.yml:"
+instructionsRestart = "Następnie uruchom ponownie serwer, aby zmiany zaczęły obowiązywać."
 
 [setup.login.username]
 label = "Nazwa użytkownika"
@@ -5840,7 +6011,7 @@ paragraph = "Strona akapitowa"
 sparse = "Rzadki tekst"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automatycznie"
 paragraph = "Akapit"
 singleLine = "Pojedyncza linia"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Wczesny dostęp"
 reset = "Resetuj zmiany"
 downloadJson = "Pobierz JSON"
 generatePdf = "Generuj PDF"
+saveChanges = "Zapisz zmiany"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Automatycznie skaluj tekst do pól"
@@ -5890,6 +6062,8 @@ alpha = "Ten podgląd alfa jest wciąż rozwijany — niektóre czcionki, kolory
 [pdfTextEditor.empty]
 title = "Nie wczytano dokumentu"
 subtitle = "Wczytaj plik PDF lub JSON, aby rozpocząć edycję treści tekstowych."
+dropzone = "Przeciągnij i upuść tutaj plik PDF lub JSON albo kliknij, aby przeglądać"
+dropzoneWithFiles = "Wybierz plik z karty Pliki, przeciągnij i upuść tutaj plik PDF lub JSON albo kliknij, aby przeglądać"
 
 [pdfTextEditor.welcomeBanner]
 title = "Witamy w edytorze tekstu PDF (wczesny dostęp)"
diff --git a/frontend/public/locales/pt-BR/translation.toml b/frontend/public/locales/pt-BR/translation.toml
index 76dff8f2d..f146113a2 100644
--- a/frontend/public/locales/pt-BR/translation.toml
+++ b/frontend/public/locales/pt-BR/translation.toml
@@ -131,7 +131,7 @@ unsupported = "Não suportado"
 
 [toolPanel]
 placeholder = "Escolha uma ferramenta para começar"
-alpha = "Alpha"
+alpha = "Alfa"
 premiumFeature = "Recurso premium:"
 comingSoon = "Em breve:"
 
@@ -163,6 +163,11 @@ unfavorite = "Remover dos favoritos"
 fullscreen = "Alternar para modo tela cheia"
 sidebar = "Alternar para modo barra lateral"
 
+[backendStartup]
+notFoundTitle = "Backend não encontrado"
+retry = "Tentar novamente"
+unreachable = "No momento, o aplicativo não consegue se conectar ao backend. Verifique o status do backend e a conectividade de rede e tente novamente."
+
 [zipWarning]
 title = "Arquivo ZIP grande"
 message = "Este ZIP contém {{count}} arquivos. Extrair mesmo assim?"
@@ -912,6 +917,9 @@ desc = "Crie fluxos de trabalho de várias etapas encadeando ações de PDF. Ide
 desc = "Sobrepor um PDF sobre outro"
 title = "Sobrepor PDFs"
 
+[home.pdfTextEditor]
+title = "Editor de Texto em PDF"
+desc = "Edite texto e imagens existentes em PDFs"
 
 [home.addText]
 tags = "texto,anotação,rótulo"
@@ -1217,7 +1225,7 @@ odtExt = "Texto OpenDocument (.odt)"
 pptExt = "PowerPoint (.pptx)"
 odpExt = "Apresentação OpenDocument (.odp)"
 txtExt = "Texto simples (.txt)"
-rtfExt = "Rich Text Format (.rtf)"
+rtfExt = "Formato Rich Text (.rtf)"
 selectedFiles = "Arquivos selecionados"
 noFileSelected = "Nenhum arquivo selecionado. Use o painel de arquivos para adicionar arquivos."
 convertFiles = "Converter arquivos"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Assinatura desenhada"
 defaultImageLabel = "Assinatura enviada"
 defaultTextLabel = "Assinatura digitada"
 saveButton = "Salvar assinatura"
+savePersonal = "Salvar pessoal"
+saveShared = "Salvar compartilhado"
 saveUnavailable = "Crie uma assinatura primeiro para salvá-la."
 noChanges = "A assinatura atual já está salva."
+tempStorageTitle = "Armazenamento temporário do navegador"
+tempStorageDescription = "As assinaturas são armazenadas apenas no seu navegador. Elas serão perdidas se você limpar os dados do navegador ou trocar de navegador."
+personalHeading = "Assinaturas pessoais"
+sharedHeading = "Assinaturas compartilhadas"
+personalDescription = "Somente você pode ver essas assinaturas."
+sharedDescription = "Todos os usuários podem ver e usar essas assinaturas."
 
 [sign.saved.type]
 canvas = "Desenho"
@@ -3020,6 +3036,91 @@ title = "Obter Informações do PDF"
 header = "Obter Informações do PDF"
 submit = "Obter Informações"
 downloadJson = "Baixar JSON"
+processing = "Extraindo informações..."
+results = "Resultados"
+noResults = "Execute a ferramenta para gerar um relatório."
+downloads = "Downloads"
+noneDetected = "Nenhum detectado"
+indexTitle = "Índice"
+
+[getPdfInfo.report]
+entryLabel = "Resumo completo das informações"
+shortTitle = "Informações do PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadados"
+formFields = "Campos de formulário"
+basicInfo = "Informações básicas"
+documentInfo = "Informações do documento"
+compliance = "Conformidade"
+encryption = "Criptografia"
+permissions = "Permissões"
+other = "Outros"
+perPageInfo = "Informações por página"
+tableOfContents = "Sumário"
+
+[getPdfInfo.other]
+attachments = "Anexos"
+embeddedFiles = "Arquivos incorporados"
+javaScript = "JavaScript"
+layers = "Camadas"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Tamanho"
+annotations = "Anotações"
+images = "Imagens"
+links = "Links"
+fonts = "Fontes"
+xobjects = "Contagem de XObjects"
+multimedia = "Multimídia"
+
+[getPdfInfo.summary]
+pages = "Páginas"
+fileSize = "Tamanho do arquivo"
+pdfVersion = "Versão do PDF"
+language = "Idioma"
+title = "Resumo do PDF"
+author = "Autor"
+created = "Criado"
+modified = "Modificado"
+permsAll = "Todas as permissões permitidas"
+permsRestricted = "{{count}} restrições"
+permsMixed = "Algumas permissões restritas"
+hasCompliance = "Possui padrões de conformidade"
+noCompliance = "Sem padrões de conformidade"
+basic = "Informações básicas"
+documentInfo = "Informações do documento"
+securityTitle = "Status de segurança"
+technical = "Técnico"
+overviewTitle = "Visão geral do PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF criptografado - Proteção por senha ativada"
+unencrypted = "PDF não criptografado - Sem proteção por senha"
+
+[getPdfInfo.summary.tech]
+images = "Imagens"
+fonts = "Fontes"
+formFields = "Campos de formulário"
+embeddedFiles = "Arquivos incorporados"
+javaScript = "JavaScript"
+layers = "Camadas"
+bookmarks = "Marcadores"
+multimedia = "Multimídia"
+
+[getPdfInfo.summary.overview]
+untitled = "um documento sem título"
+unknown = "Autor desconhecido"
+text = "Este é um PDF de {{pages}} páginas intitulado {{title}} criado por {{author}} (versão do PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Alguns arquivos não puderam ser processados."
+unexpected = "Erro inesperado durante a extração."
+
+[getPdfInfo.status]
+complete = "Extração concluída"
 
 [extractPage]
 tags = "extrair"
@@ -3438,6 +3539,9 @@ signinTitle = "Por favor, inicie a sessão"
 ssoSignIn = "Iniciar sessão através de login único (SSO)"
 oAuth2AutoCreateDisabled = "Auto-Criar Usuário OAUTH2 Desativado"
 oAuth2AdminBlockedUser = "O registro ou login de usuários não registrados está atualmente bloqueado. Entre em contato com o administrador."
+oAuth2RequiresLicense = "O login via OAuth/SSO requer uma licença paga (Server ou Enterprise). Entre em contato com o administrador para atualizar seu plano."
+saml2RequiresLicense = "O login via SAML requer uma licença paga (Server ou Enterprise). Entre em contato com o administrador para atualizar seu plano."
+maxUsersReached = "Número máximo de usuários atingido para sua licença atual. Entre em contato com o administrador para atualizar seu plano ou adicionar mais assentos."
 oauth2RequestNotFound = "Solicitação de autorização não encontrada"
 oauth2InvalidUserInfoResponse = "Resposta de informação de usuário inválida"
 oauth2invalidRequest = "Requisição Inválida"
@@ -3846,14 +3950,17 @@ fitToWidth = "Ajustar à largura"
 actualSize = "Tamanho real"
 
 [viewer]
+cannotPreviewFile = "Não é possível visualizar o arquivo"
+dualPageView = "Visualização de duas páginas"
 firstPage = "Primeira página"
 lastPage = "Última página"
-previousPage = "Página anterior"
 nextPage = "Próxima página"
+onlyPdfSupported = "O visualizador oferece suporte apenas a arquivos PDF. Este arquivo parece estar em um formato diferente."
+previousPage = "Página anterior"
+singlePageView = "Visualização de página única"
+unknownFile = "Arquivo desconhecido"
 zoomIn = "Ampliar"
 zoomOut = "Reduzir"
-singlePageView = "Visualização de página única"
-dualPageView = "Visualização de duas páginas"
 
 [rightRail]
 closeSelected = "Fechar arquivos selecionados"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Alternar barra lateral"
 exportSelected = "Exportar páginas selecionadas"
 toggleAnnotations = "Alternar visibilidade das anotações"
 annotationMode = "Alternar modo de anotação"
+print = "Imprimir PDF"
 draw = "Desenhar"
 save = "Salvar"
 saveChanges = "Salvar alterações"
@@ -3925,7 +4033,7 @@ files = "Arquivos"
 activity = "Ativ."
 help = "Ajuda"
 account = "Conta"
-config = "Config"
+config = "Configurações"
 settings = "Ajustes"
 adminSettings = "Ajustes admin"
 allTools = "Ferram."
@@ -4153,7 +4261,7 @@ description = "Rastrear ações do usuário e eventos do sistema para conformida
 
 [admin.settings.security.audit.level]
 label = "Nível de auditoria"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=DESLIGADO, 1=BÁSICO, 2=PADRÃO, 3=DETALHADO"
 
 [admin.settings.security.audit.retentionDays]
 label = "Retenção de auditoria (dias)"
@@ -4235,11 +4343,11 @@ label = "URL do emissor"
 description = "A URL do emissor do provedor OAuth2"
 
 [admin.settings.connections.oauth2.clientId]
-label = "Client ID"
+label = "ID do cliente"
 description = "O Client ID do OAuth2 do seu provedor"
 
 [admin.settings.connections.oauth2.clientSecret]
-label = "Client Secret"
+label = "Segredo do cliente"
 description = "O Client Secret do OAuth2 do seu provedor"
 
 [admin.settings.connections.oauth2.useAsUsername]
@@ -4494,6 +4602,7 @@ description = "URL ou nome de arquivo do impressum (exigido em algumas jurisdiç
 title = "Premium e Enterprise"
 description = "Configurar sua chave de licença premium ou enterprise."
 license = "Configuração de licença"
+noInput = "Forneça uma chave ou arquivo de licença"
 
 [admin.settings.premium.licenseKey]
 toggle = "Tem uma chave de licença ou arquivo de certificado?"
@@ -4511,6 +4620,25 @@ line1 = "Substituir sua chave de licença atual não pode ser desfeito."
 line2 = "Sua licença anterior será perdida permanentemente, a menos que você tenha um backup em outro lugar."
 line3 = "Importante: mantenha chaves de licença privadas e seguras. Nunca as compartilhe publicamente."
 
+[admin.settings.premium.inputMethod]
+text = "Chave de licença"
+file = "Arquivo de certificado"
+
+[admin.settings.premium.file]
+label = "Arquivo de certificado de licença"
+description = "Faça upload do seu arquivo de licença .lic ou .cert de compras offline"
+choose = "Escolher arquivo de licença"
+selected = "Selecionado: {{filename}} ({{size}})"
+successMessage = "Arquivo de licença enviado e ativado com sucesso. Não é necessário reiniciar."
+
+[admin.settings.premium.currentLicense]
+title = "Licença ativa"
+file = "Origem: arquivo de licença ({{path}})"
+key = "Origem: chave de licença"
+type = "Tipo: {{type}}"
+noInput = "Forneça uma chave de licença ou envie um arquivo de certificado"
+success = "Sucesso"
+
 [admin.settings.premium.enabled]
 label = "Habilitar recursos Premium"
 description = "Habilitar verificação de chave de licença para recursos pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} selecionado(s)"
 download = "Baixar (JSON)"
 delete = "Apagar"
 unsupported = "Não suportado"
+active = "Ativo"
 addToUpload = "Adicionar ao upload"
+closeFile = "Fechar arquivo"
 deleteAll = "Excluir tudo"
 loadingFiles = "Carregando arquivos..."
 noFiles = "Nenhum arquivo disponível"
@@ -5132,7 +5262,7 @@ upgrade = "Fazer upgrade agora →"
 freeTitle = "Licença do servidor"
 overLimitTitle = "Necessária licença do servidor"
 overLimitBody = "Nossa licença permite até <strong>{{freeTierLimit}}</strong> usuários grátis por servidor. Você tem <strong>{{overLimitUserCopy}}</strong> usuários do Stirling. Para continuar sem interrupções, faça upgrade para o plano Stirling Server - <strong>assentos ilimitados</strong>, edição de texto em PDF e controle total de admin por US$ 99/servidor/mês."
-freeBody = "Nossa licença <strong>Open-Core</strong> permite até <strong>{{freeTierLimit}}</strong> usuários grátis por servidor. Para escalar sem interrupções e ter acesso antecipado à nova <strong>ferramenta de edição de texto em PDF</strong>, recomendamos o plano Stirling Server - edição completa e <strong>assentos ilimitados</strong> por US$ 99/servidor/mês."
+freeBody = "Nossa licença <strong>Open-Core</strong> permite até <strong>{{freeTierLimit}}</strong> usuários gratuitos por servidor. Para escalar sem interrupções, recomendamos o plano Stirling Server - <strong>assentos ilimitados</strong> e <strong>suporte a SSO</strong> por US$ 99/servidor/mês."
 
 [onboarding.desktopInstall]
 title = "Download"
@@ -5178,7 +5308,7 @@ active = "Ativo"
 disabled = "Desativado"
 activeSession = "Sessão ativa"
 member = "Membro"
-admin = "Admin"
+admin = "Administrador"
 editRole = "Editar função"
 enable = "Ativar"
 disable = "Desativar"
@@ -5237,6 +5367,31 @@ error = "Falha ao atualizar o status do usuário"
 success = "Usuário excluído com sucesso"
 error = "Falha ao excluir usuário"
 
+[workspace.people.changePassword]
+action = "Alterar senha"
+title = "Alterar senha"
+subtitle = "Atualizar a senha de"
+newPassword = "Nova senha"
+confirmPassword = "Confirmar senha"
+placeholder = "Insira uma nova senha"
+confirmPlaceholder = "Digite novamente a nova senha"
+passwordRequired = "Por favor, insira uma nova senha"
+passwordMismatch = "As senhas não coincidem"
+generateRandom = "Gerar senha segura"
+generatedPreview = "Senha gerada:"
+copyTooltip = "Copiar para a área de transferência"
+copiedToClipboard = "Senha copiada para a área de transferência"
+copyFailed = "Falha ao copiar a senha"
+sendEmail = "Enviar email ao usuário sobre esta alteração"
+includePassword = "Incluir a nova senha no email"
+forcePasswordChange = "Exigir que o usuário altere a senha no próximo login"
+emailUnavailable = "O email deste usuário não é um endereço válido. As notificações estão desativadas."
+smtpDisabled = "As notificações por email exigem que o SMTP esteja habilitado nas configurações."
+notifyOnly = "Um email será enviado sem a senha, informando ao usuário que um administrador a alterou."
+submit = "Atualizar senha"
+success = "Senha atualizada com sucesso"
+error = "Falha ao atualizar a senha"
+
 [workspace.people.emailInvite]
 tab = "Convite por email"
 description = "Digite ou cole emails abaixo, separados por vírgulas. Os usuários receberão credenciais de login por email."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Ao menos um endereço de email é obrigatório"
 submit = "Enviar convites"
 success = "usuário(s) convidado(s) com sucesso"
-partialSuccess = "Alguns convites falharam"
+partialFailure = "Alguns convites falharam"
 allFailed = "Falha ao convidar usuários"
 error = "Falha ao enviar convites"
 
@@ -5541,7 +5696,7 @@ emailInvalid = "Digite um endereço de e-mail válido"
 title = "Informe seu e-mail"
 description = "Usaremos isso para enviar sua chave de licença e recibos."
 emailLabel = "Endereço de e-mail"
-emailPlaceholder = "your@email.com"
+emailPlaceholder = "seu@email.com"
 continue = "Continuar"
 modalTitle = "Começar - {{planName}}"
 
@@ -5770,6 +5925,7 @@ subtitle = "Entre com sua conta do Stirling"
 [setup.selfhosted]
 title = "Entrar no servidor"
 subtitle = "Informe suas credenciais do servidor"
+link = "ou conecte-se a uma conta auto-hospedada"
 
 [setup.server]
 title = "Conectar ao servidor"
@@ -5788,6 +5944,14 @@ description = "Informe a URL completa do seu servidor self-hosted Stirling PDF"
 emptyUrl = "Informe uma URL de servidor"
 unreachable = "Não foi possível conectar ao servidor"
 testFailed = "Falha no teste de conexão"
+configFetch = "Falha ao buscar a configuração do servidor. Verifique a URL e tente novamente."
+
+[setup.server.error.securityDisabled]
+title = "Login não habilitado"
+body = "Este servidor não tem o login habilitado. Para conectar-se a este servidor, você deve habilitar a autenticação:"
+step1 = "Defina DOCKER_ENABLE_SECURITY=true no seu ambiente"
+step2 = "Ou defina security.enableLogin=true em settings.yml"
+step3 = "Reinicie o servidor"
 
 [setup.login]
 title = "Entrar"
@@ -5797,13 +5961,20 @@ submit = "Login"
 signInWith = "Entrar com"
 oauthPending = "Abrindo o navegador para autenticação..."
 orContinueWith = "Ou continue com e-mail"
+serverRequirement = "Observação: o servidor deve ter o login ativado."
+showInstructions = "Como ativar?"
+hideInstructions = "Ocultar instruções"
+instructions = "Para ativar o login no seu servidor Stirling PDF:"
+instructionsEnvVar = "Defina a variável de ambiente:"
+instructionsOrYml = "Ou em settings.yml:"
+instructionsRestart = "Em seguida, reinicie o servidor para que as alterações entrem em vigor."
 
 [setup.login.username]
 label = "Usuário"
 placeholder = "Digite seu usuário"
 
 [setup.login.email]
-label = "Email"
+label = "E-mail"
 placeholder = "Digite seu e-mail"
 
 [setup.login.password]
@@ -5840,7 +6011,7 @@ paragraph = "Página de parágrafos"
 sparse = "Texto esparso"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automático"
 paragraph = "Parágrafo"
 singleLine = "Linha única"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Acesso antecipado"
 reset = "Reverter alterações"
 downloadJson = "Baixar JSON"
 generatePdf = "Gerar PDF"
+saveChanges = "Salvar alterações"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Dimensionar texto automaticamente para caber nas caixas"
@@ -5890,6 +6062,8 @@ alpha = "Este visualizador alpha ainda está evoluindo—certas fontes, cores, e
 [pdfTextEditor.empty]
 title = "Nenhum documento carregado"
 subtitle = "Carregue um PDF ou JSON para começar a editar texto."
+dropzone = "Arraste e solte um arquivo PDF ou JSON aqui, ou clique para procurar"
+dropzoneWithFiles = "Selecione um arquivo na aba Arquivos ou arraste e solte um arquivo PDF ou JSON aqui, ou clique para procurar"
 
 [pdfTextEditor.welcomeBanner]
 title = "Bem-vindo ao Editor de Texto PDF (Acesso antecipado)"
diff --git a/frontend/public/locales/pt-PT/translation.toml b/frontend/public/locales/pt-PT/translation.toml
index e530345e6..5e89a9612 100644
--- a/frontend/public/locales/pt-PT/translation.toml
+++ b/frontend/public/locales/pt-PT/translation.toml
@@ -131,7 +131,7 @@ unsupported = "Não suportado"
 
 [toolPanel]
 placeholder = "Escolha uma ferramenta para começar"
-alpha = "Alpha"
+alpha = "Alfa"
 premiumFeature = "Funcionalidade premium:"
 comingSoon = "Em breve:"
 
@@ -163,6 +163,11 @@ unfavorite = "Remover dos favoritos"
 fullscreen = "Mudar para modo de ecrã inteiro"
 sidebar = "Mudar para modo de barra lateral"
 
+[backendStartup]
+notFoundTitle = "Backend não encontrado"
+retry = "Tentar novamente"
+unreachable = "A aplicação não consegue ligar-se ao backend neste momento. Verifique o estado do backend e a conectividade de rede e tente novamente."
+
 [zipWarning]
 title = "Ficheiro ZIP grande"
 message = "Este ZIP contém {{count}} ficheiros. Extrair mesmo assim?"
@@ -364,12 +369,12 @@ usageAnalytics = "Análise de utilização"
 
 [settings.policiesPrivacy]
 title = "Políticas e Privacidade"
-legal = "Legal"
+legal = "Jurídico"
 privacy = "Privacidade"
 
 [settings.developer]
 title = "Programador"
-apiKeys = "API Keys"
+apiKeys = "Chaves de API"
 
 [settings.tooltips]
 enableLoginFirst = "Ative primeiro o modo de login"
@@ -912,6 +917,9 @@ desc = "Crie fluxos de trabalho de vários passos encadeando ações de PDF. Ide
 desc = "Sobrepõe PDFs em cima de outro PDF"
 title = "Sobrepor PDFs"
 
+[home.pdfTextEditor]
+title = "Editor de texto de PDF"
+desc = "Edite texto e imagens existentes dentro de PDFs"
 
 [home.addText]
 tags = "texto,anotação,etiqueta"
@@ -1217,7 +1225,7 @@ odtExt = "Texto OpenDocument (.odt)"
 pptExt = "PowerPoint (.pptx)"
 odpExt = "Apresentação OpenDocument (.odp)"
 txtExt = "Texto simples (.txt)"
-rtfExt = "Rich Text Format (.rtf)"
+rtfExt = "Formato de Texto Enriquecido (.rtf)"
 selectedFiles = "Ficheiros selecionados"
 noFileSelected = "Nenhum ficheiro selecionado. Use o painel de ficheiros para adicionar ficheiros."
 convertFiles = "Converter ficheiros"
@@ -1360,7 +1368,7 @@ title = "Adicionar Marca de Água"
 desc = "Adicionar marcas de água de texto ou imagem a ficheiros PDF"
 completed = "Marca de água adicionada"
 submit = "Adicionar Marca de Água"
-filenamePrefix = "watermarked"
+filenamePrefix = "com-marca-de-água"
 
 [watermark.error]
 failed = "Ocorreu um erro ao adicionar a marca de água ao PDF."
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Assinatura desenhada"
 defaultImageLabel = "Assinatura carregada"
 defaultTextLabel = "Assinatura digitada"
 saveButton = "Guardar assinatura"
+savePersonal = "Guardar como pessoal"
+saveShared = "Guardar como partilhada"
 saveUnavailable = "Crie primeiro uma assinatura para a guardar."
 noChanges = "A assinatura atual já está guardada."
+tempStorageTitle = "Armazenamento temporário do navegador"
+tempStorageDescription = "As assinaturas são armazenadas apenas no seu navegador. Serão perdidas se limpar os dados do navegador ou mudar de navegador."
+personalHeading = "Assinaturas pessoais"
+sharedHeading = "Assinaturas partilhadas"
+personalDescription = "Apenas você pode ver estas assinaturas."
+sharedDescription = "Todos os utilizadores podem ver e usar estas assinaturas."
 
 [sign.saved.type]
 canvas = "Desenho"
@@ -2841,7 +2857,7 @@ label = "Fator de escala"
 [adjustPageScale.pageSize]
 label = "Tamanho da página de destino"
 keep = "Manter tamanho original"
-letter = "Letter"
+letter = "Carta"
 legal = "Legal"
 
 [adjustPageScale.error]
@@ -3020,6 +3036,91 @@ title = "Obter Informação do PDF"
 header = "Obter Informação do PDF"
 submit = "Obter Informação"
 downloadJson = "Transferir JSON"
+processing = "A extrair informações..."
+results = "Resultados"
+noResults = "Execute a ferramenta para gerar um relatório."
+downloads = "Transferências"
+noneDetected = "Nenhum detetado"
+indexTitle = "Índice"
+
+[getPdfInfo.report]
+entryLabel = "Resumo completo das informações"
+shortTitle = "Informações do PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadados"
+formFields = "Campos do formulário"
+basicInfo = "Informações básicas"
+documentInfo = "Informações do documento"
+compliance = "Conformidade"
+encryption = "Encriptação"
+permissions = "Permissões"
+other = "Outros"
+perPageInfo = "Informações por página"
+tableOfContents = "Índice"
+
+[getPdfInfo.other]
+attachments = "Anexos"
+embeddedFiles = "Ficheiros incorporados"
+javaScript = "JavaScript"
+layers = "Camadas"
+structureTree = "Árvore de estrutura"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Tamanho"
+annotations = "Anotações"
+images = "Imagens"
+links = "Ligações"
+fonts = "Tipos de letra"
+xobjects = "Contagens de XObject"
+multimedia = "Multimédia"
+
+[getPdfInfo.summary]
+pages = "Páginas"
+fileSize = "Tamanho do ficheiro"
+pdfVersion = "Versão do PDF"
+language = "Idioma"
+title = "Resumo do PDF"
+author = "Autor"
+created = "Criado"
+modified = "Modificado"
+permsAll = "Todas as permissões autorizadas"
+permsRestricted = "{{count}} restrições"
+permsMixed = "Algumas permissões restritas"
+hasCompliance = "Tem normas de conformidade"
+noCompliance = "Sem normas de conformidade"
+basic = "Informações básicas"
+documentInfo = "Informações do documento"
+securityTitle = "Estado de segurança"
+technical = "Técnico"
+overviewTitle = "Visão geral do PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF encriptado - Proteção por palavra-passe presente"
+unencrypted = "PDF não encriptado - Sem proteção por palavra-passe"
+
+[getPdfInfo.summary.tech]
+images = "Imagens"
+fonts = "Tipos de letra"
+formFields = "Campos do formulário"
+embeddedFiles = "Ficheiros incorporados"
+javaScript = "JavaScript"
+layers = "Camadas"
+bookmarks = "Marcadores"
+multimedia = "Multimédia"
+
+[getPdfInfo.summary.overview]
+untitled = "um documento sem título"
+unknown = "Autor desconhecido"
+text = "Este é um PDF de {{pages}} páginas intitulado {{title}}, criado por {{author}} (versão do PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Alguns ficheiros não puderam ser processados."
+unexpected = "Erro inesperado durante a extração."
+
+[getPdfInfo.status]
+complete = "Extração concluída"
 
 [extractPage]
 tags = "extrair"
@@ -3438,6 +3539,9 @@ signinTitle = "Por favor inicie sessão"
 ssoSignIn = "Iniciar sessão via Single Sign-On"
 oAuth2AutoCreateDisabled = "Criação Automática de Utilizador OAUTH2 Desativada"
 oAuth2AdminBlockedUser = "O registo ou login de utilizadores não registados está atualmente bloqueado. Por favor contacte o administrador."
+oAuth2RequiresLicense = "O início de sessão via OAuth/SSO requer uma licença paga (Server ou Enterprise). Contacte o administrador para atualizar o seu plano."
+saml2RequiresLicense = "O início de sessão SAML requer uma licença paga (Server ou Enterprise). Contacte o administrador para atualizar o seu plano."
+maxUsersReached = "Foi atingido o número máximo de utilizadores da sua licença atual. Contacte o administrador para atualizar o seu plano ou adicionar mais lugares."
 oauth2RequestNotFound = "Pedido de autorização não encontrado"
 oauth2InvalidUserInfoResponse = "Resposta de Informação de Utilizador Inválida"
 oauth2invalidRequest = "Pedido Inválido"
@@ -3846,14 +3950,17 @@ fitToWidth = "Ajustar à largura"
 actualSize = "Tamanho real"
 
 [viewer]
+cannotPreviewFile = "Não é possível pré-visualizar o ficheiro"
+dualPageView = "Vista de duas páginas"
 firstPage = "Primeira página"
 lastPage = "Última página"
-previousPage = "Página anterior"
 nextPage = "Página seguinte"
+onlyPdfSupported = "O visualizador só suporta ficheiros PDF. Este ficheiro parece ter um formato diferente."
+previousPage = "Página anterior"
+singlePageView = "Vista de página única"
+unknownFile = "Ficheiro desconhecido"
 zoomIn = "Ampliar"
 zoomOut = "Reduzir"
-singlePageView = "Vista de página única"
-dualPageView = "Vista de duas páginas"
 
 [rightRail]
 closeSelected = "Fechar ficheiros selecionados"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Alternar barra lateral"
 exportSelected = "Exportar páginas selecionadas"
 toggleAnnotations = "Alternar visibilidade das anotações"
 annotationMode = "Alternar modo de anotação"
+print = "Imprimir PDF"
 draw = "Desenhar"
 save = "Guardar"
 saveChanges = "Guardar alterações"
@@ -4494,6 +4602,7 @@ description = "URL ou nome de ficheiro para o impressum (obrigatório em algumas
 title = "Premium e Enterprise"
 description = "Configurar a sua chave de licença premium ou enterprise."
 license = "Configuração de licença"
+noInput = "Forneça uma chave ou ficheiro de licença"
 
 [admin.settings.premium.licenseKey]
 toggle = "Tem uma chave de licença ou ficheiro de certificado?"
@@ -4511,6 +4620,25 @@ line1 = "Sobrescrever a sua chave de licença atual não pode ser anulado."
 line2 = "A sua licença anterior será perdida permanentemente, a menos que a tenha guardado noutro local."
 line3 = "Importante: mantenha as chaves de licença privadas e seguras. Nunca as partilhe publicamente."
 
+[admin.settings.premium.inputMethod]
+text = "Chave de licença"
+file = "Ficheiro de certificado"
+
+[admin.settings.premium.file]
+label = "Ficheiro de certificado de licença"
+description = "Carregue o seu ficheiro de licença .lic ou .cert de compras offline"
+choose = "Escolher ficheiro de licença"
+selected = "Selecionado: {{filename}} ({{size}})"
+successMessage = "Ficheiro de licença carregado e ativado com sucesso. Não é necessário reiniciar."
+
+[admin.settings.premium.currentLicense]
+title = "Licença ativa"
+file = "Origem: ficheiro de licença ({{path}})"
+key = "Origem: chave de licença"
+type = "Tipo: {{type}}"
+noInput = "Forneça uma chave de licença ou carregue um ficheiro de certificado"
+success = "Sucesso"
+
 [admin.settings.premium.enabled]
 label = "Ativar funcionalidades premium"
 description = "Ativar verificações de chave de licença para funcionalidades pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} selecionado(s)"
 download = "Transferir"
 delete = "Eliminar"
 unsupported = "Não suportado"
+active = "Ativo"
 addToUpload = "Adicionar ao carregamento"
+closeFile = "Fechar ficheiro"
 deleteAll = "Eliminar tudo"
 loadingFiles = "A carregar ficheiros..."
 noFiles = "Não há ficheiros disponíveis"
@@ -5132,7 +5262,7 @@ upgrade = "Atualizar agora →"
 freeTitle = "Licença do servidor"
 overLimitTitle = "É necessária licença de servidor"
 overLimitBody = "A nossa licença permite até <strong>{{freeTierLimit}}</strong> utilizadores gratuitos por servidor. Tem <strong>{{overLimitUserCopy}}</strong> utilizadores Stirling. Para continuar sem interrupções, atualize para o plano Stirling Server - <strong>lugares ilimitados</strong>, edição de texto em PDF e controlo total de administração por $99/servidor/mês."
-freeBody = "A nossa licença <strong>Open-Core</strong> permite até <strong>{{freeTierLimit}}</strong> utilizadores gratuitos por servidor. Para escalar sem interrupções e obter acesso antecipado à nossa nova <strong>ferramenta de edição de texto PDF</strong>, recomendamos o plano Stirling Server - edição completa e <strong>lugares ilimitados</strong> por $99/servidor/mês."
+freeBody = "O nosso licenciamento <strong>Open-Core</strong> permite até <strong>{{freeTierLimit}}</strong> utilizadores gratuitos por servidor. Para escalar sem interrupções, recomendamos o plano Stirling Server - <strong>lugares ilimitados</strong> e <strong>suporte SSO</strong> por $99/servidor/mês."
 
 [onboarding.desktopInstall]
 title = "Transferir"
@@ -5237,6 +5367,31 @@ error = "Falha ao atualizar o estado do utilizador"
 success = "Utilizador eliminado com sucesso"
 error = "Falha ao eliminar utilizador"
 
+[workspace.people.changePassword]
+action = "Alterar palavra-passe"
+title = "Alterar palavra-passe"
+subtitle = "Atualizar a palavra-passe de"
+newPassword = "Nova palavra-passe"
+confirmPassword = "Confirmar palavra-passe"
+placeholder = "Introduza uma nova palavra-passe"
+confirmPlaceholder = "Introduza novamente a nova palavra-passe"
+passwordRequired = "Por favor, introduza uma nova palavra-passe"
+passwordMismatch = "As palavras-passe não coincidem"
+generateRandom = "Gerar palavra-passe segura"
+generatedPreview = "Palavra-passe gerada:"
+copyTooltip = "Copiar para a área de transferência"
+copiedToClipboard = "Palavra-passe copiada para a área de transferência"
+copyFailed = "Falha ao copiar a palavra-passe"
+sendEmail = "Enviar email ao utilizador sobre esta alteração"
+includePassword = "Incluir a nova palavra-passe no email"
+forcePasswordChange = "Obrigar o utilizador a alterar a palavra-passe no próximo início de sessão"
+emailUnavailable = "O email deste utilizador não é um endereço válido. As notificações estão desativadas."
+smtpDisabled = "As notificações por email requerem que o SMTP esteja ativado nas definições."
+notifyOnly = "Será enviado um email sem a palavra-passe, informando o utilizador de que um administrador a alterou."
+submit = "Guardar palavra-passe"
+success = "Palavra-passe atualizada com sucesso"
+error = "Falha ao atualizar a palavra-passe"
+
 [workspace.people.emailInvite]
 tab = "Convite por email"
 description = "Escreva ou cole emails abaixo, separados por vírgulas. Os utilizadores receberão credenciais de login por email."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "É necessário pelo menos um endereço de email"
 submit = "Enviar convites"
 success = "utilizador(es) convidado(s) com sucesso"
-partialSuccess = "Alguns convites falharam"
+partialFailure = "Alguns convites falharam"
 allFailed = "Falha ao convidar utilizadores"
 error = "Falha ao enviar convites"
 
@@ -5282,7 +5437,7 @@ submit = "Gerar link de convite"
 [workspace.people.inviteMode]
 username = "Nome de utilizador"
 email = "Email"
-link = "Link"
+link = "Ligação"
 emailDisabled = "Convites por email requerem configuração de SMTP e mail.enableInvites=true nas definições"
 
 [workspace.people.license]
@@ -5770,6 +5925,7 @@ subtitle = "Inicie sessão com a sua conta Stirling"
 [setup.selfhosted]
 title = "Iniciar sessão no servidor"
 subtitle = "Introduza as credenciais do seu servidor"
+link = "ou ligue-se a uma conta autoalojada"
 
 [setup.server]
 title = "Ligar ao servidor"
@@ -5788,6 +5944,14 @@ description = "Introduza o URL completo do seu servidor Stirling PDF autoalojado
 emptyUrl = "Introduza um URL de servidor"
 unreachable = "Não foi possível ligar ao servidor"
 testFailed = "Falha no teste de ligação"
+configFetch = "Falha ao obter a configuração do servidor. Verifique o URL e tente novamente."
+
+[setup.server.error.securityDisabled]
+title = "Início de sessão não ativado"
+body = "Este servidor não tem o início de sessão ativado. Para se ligar a este servidor, tem de ativar a autenticação:"
+step1 = "Defina DOCKER_ENABLE_SECURITY=true no seu ambiente"
+step2 = "Ou defina security.enableLogin=true no settings.yml"
+step3 = "Reinicie o servidor"
 
 [setup.login]
 title = "Iniciar sessão"
@@ -5797,6 +5961,13 @@ submit = "Iniciar sessão"
 signInWith = "Iniciar sessão com"
 oauthPending = "A abrir o navegador para autenticação..."
 orContinueWith = "Ou continuar com email"
+serverRequirement = "Nota: O servidor deve ter o início de sessão ativado."
+showInstructions = "Como ativar?"
+hideInstructions = "Ocultar instruções"
+instructions = "Para ativar o início de sessão no seu servidor Stirling PDF:"
+instructionsEnvVar = "Defina a variável de ambiente:"
+instructionsOrYml = "Ou em settings.yml:"
+instructionsRestart = "Em seguida, reinicie o servidor para que as alterações tenham efeito."
 
 [setup.login.username]
 label = "Nome de utilizador"
@@ -5840,7 +6011,7 @@ paragraph = "Página de parágrafos"
 sparse = "Texto disperso"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automático"
 paragraph = "Parágrafo"
 singleLine = "Linha única"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Acesso antecipado"
 reset = "Repor alterações"
 downloadJson = "Transferir JSON"
 generatePdf = "Gerar PDF"
+saveChanges = "Guardar alterações"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Dimensionar texto automaticamente para caber nas caixas"
@@ -5890,6 +6062,8 @@ alpha = "Este visualizador alpha ainda está a evoluir—certas fontes, cores, e
 [pdfTextEditor.empty]
 title = "Nenhum documento carregado"
 subtitle = "Carregue um ficheiro PDF ou JSON para começar a editar o conteúdo de texto."
+dropzone = "Arraste e largue aqui um ficheiro PDF ou JSON, ou clique para procurar"
+dropzoneWithFiles = "Selecione um ficheiro no separador Ficheiros, ou arraste e largue aqui um ficheiro PDF ou JSON, ou clique para procurar"
 
 [pdfTextEditor.welcomeBanner]
 title = "Bem-vindo ao PDF Text Editor (Acesso Antecipado)"
@@ -5932,7 +6106,7 @@ warnings = "Avisos"
 suggestions = "Notas"
 currentPageFonts = "Fontes nesta página"
 allFonts = "Todas as fontes"
-fallback = "fallback"
+fallback = "alternativa"
 missing = "em falta"
 perfectMessage = "Todas as fontes podem ser reproduzidas na perfeição."
 warningMessage = "Algumas fontes podem não ser renderizadas corretamente."
diff --git a/frontend/public/locales/ro-RO/translation.toml b/frontend/public/locales/ro-RO/translation.toml
index 57c2ce481..927a10c5a 100644
--- a/frontend/public/locales/ro-RO/translation.toml
+++ b/frontend/public/locales/ro-RO/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Eliminați din favorite"
 fullscreen = "Comutați la modul ecran complet"
 sidebar = "Comutați la modul bară laterală"
 
+[backendStartup]
+notFoundTitle = "Backend negăsit"
+retry = "Reîncearcă"
+unreachable = "Aplicația nu se poate conecta în prezent la backend. Verificați starea backend-ului și conexiunea la rețea, apoi încercați din nou."
+
 [zipWarning]
 title = "Fișier ZIP mare"
 message = "Acest ZIP conține {{count}} fișiere. Extrageți oricum?"
@@ -912,6 +917,9 @@ desc = "Construiți fluxuri cu mai mulți pași legând acțiuni PDF. Ideal pent
 desc = "Suprapune PDF-uri peste alt PDF"
 title = "Suprapune PDF-uri"
 
+[home.pdfTextEditor]
+title = "Editor de text PDF"
+desc = "Editați textul și imaginile existente în PDF-uri"
 
 [home.addText]
 tags = "text,anotare,etichetă"
@@ -1213,11 +1221,11 @@ pdfaDigitalSignatureWarning = "PDF-ul conține o semnătură digitală. Aceasta
 fileFormat = "Format fișier"
 wordDoc = "Document Word"
 wordDocExt = "Document Word (.docx)"
-odtExt = "OpenDocument Text (.odt)"
+odtExt = "Text OpenDocument (.odt)"
 pptExt = "PowerPoint (.pptx)"
-odpExt = "OpenDocument Presentation (.odp)"
+odpExt = "Prezentare OpenDocument (.odp)"
 txtExt = "Text simplu (.txt)"
-rtfExt = "Rich Text Format (.rtf)"
+rtfExt = "Format Rich Text (.rtf)"
 selectedFiles = "Fișiere selectate"
 noFileSelected = "Niciun fișier selectat. Folosiți panoul de fișiere pentru a adăuga fișiere."
 convertFiles = "Convertiți fișiere"
@@ -1395,7 +1403,7 @@ height = "Spațiere pe înălțime"
 width = "Spațiere pe lățime"
 
 [watermark.alphabet]
-roman = "Roman/Latin"
+roman = "Romano/Latin"
 arabic = "Arabă"
 japanese = "Japoneză"
 korean = "Coreeană"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Semnătură desenată"
 defaultImageLabel = "Semnătură încărcată"
 defaultTextLabel = "Semnătură tastată"
 saveButton = "Salvează semnătura"
+savePersonal = "Salvați ca personal"
+saveShared = "Salvați ca partajat"
 saveUnavailable = "Creează mai întâi o semnătură pentru a o salva."
 noChanges = "Semnătura curentă este deja salvată."
+tempStorageTitle = "Stocare temporară în browser"
+tempStorageDescription = "Semnăturile sunt stocate doar în browserul dvs. Vor fi pierdute dacă ștergeți datele browserului sau schimbați browserul."
+personalHeading = "Semnături personale"
+sharedHeading = "Semnături partajate"
+personalDescription = "Doar dvs. puteți vedea aceste semnături."
+sharedDescription = "Toți utilizatorii pot vedea și utiliza aceste semnături."
 
 [sign.saved.type]
 canvas = "Desen"
@@ -3020,6 +3036,91 @@ title = "Obține Informații despre PDF"
 header = "Obține Informații despre PDF"
 submit = "Obține Informații"
 downloadJson = "Descarcă JSON"
+processing = "Se extrag informațiile..."
+results = "Rezultate"
+noResults = "Rulați instrumentul pentru a genera un raport."
+downloads = "Descărcări"
+noneDetected = "Nu s-a detectat nimic"
+indexTitle = "Index"
+
+[getPdfInfo.report]
+entryLabel = "Rezumat complet al informațiilor"
+shortTitle = "Informații PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadate"
+formFields = "Câmpuri de formular"
+basicInfo = "Informații de bază"
+documentInfo = "Informații despre document"
+compliance = "Conformitate"
+encryption = "Criptare"
+permissions = "Permisiuni"
+other = "Altele"
+perPageInfo = "Informații pe pagină"
+tableOfContents = "Cuprins"
+
+[getPdfInfo.other]
+attachments = "Atașamente"
+embeddedFiles = "Fișiere încorporate"
+javaScript = "JavaScript"
+layers = "Straturi"
+structureTree = "Arbore de structură"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Dimensiune"
+annotations = "Adnotări"
+images = "Imagini"
+links = "Linkuri"
+fonts = "Fonturi"
+xobjects = "Număr de XObject-uri"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Pagini"
+fileSize = "Dimensiune fișier"
+pdfVersion = "Versiune PDF"
+language = "Limbă"
+title = "Rezumat PDF"
+author = "Autor"
+created = "Creat"
+modified = "Modificat"
+permsAll = "Toate permisiunile sunt acordate"
+permsRestricted = "{{count}} restricții"
+permsMixed = "Unele permisiuni sunt restricționate"
+hasCompliance = "Are standarde de conformitate"
+noCompliance = "Fără standarde de conformitate"
+basic = "Informații de bază"
+documentInfo = "Informații despre document"
+securityTitle = "Starea securității"
+technical = "Tehnic"
+overviewTitle = "Prezentare generală PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF criptat - Protejat cu parolă"
+unencrypted = "PDF necriptat - Fără protecție prin parolă"
+
+[getPdfInfo.summary.tech]
+images = "Imagini"
+fonts = "Fonturi"
+formFields = "Câmpuri de formular"
+embeddedFiles = "Fișiere încorporate"
+javaScript = "JavaScript"
+layers = "Straturi"
+bookmarks = "Marcaje"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "un document fără titlu"
+unknown = "Autor necunoscut"
+text = "Acesta este un PDF de {{pages}} pagini, intitulat {{title}}, creat de {{author}} (versiune PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Unele fișiere nu au putut fi procesate."
+unexpected = "Eroare neașteptată în timpul extragerii."
+
+[getPdfInfo.status]
+complete = "Extragere finalizată"
 
 [extractPage]
 tags = "extrage"
@@ -3438,6 +3539,9 @@ signinTitle = "Te rugăm să te autentifici"
 ssoSignIn = "Conectare prin conectare unică"
 oAuth2AutoCreateDisabled = "OAUTH2 Creare automată utilizator dezactivată"
 oAuth2AdminBlockedUser = "Înregistrarea sau conectarea utilizatorilor neînregistrați este în prezent blocată. Te rugăm să contactezi administratorul."
+oAuth2RequiresLicense = "Autentificarea OAuth/SSO necesită o licență plătită (Server sau Enterprise). Contactați administratorul pentru a vă actualiza planul."
+saml2RequiresLicense = "Autentificarea SAML necesită o licență plătită (Server sau Enterprise). Contactați administratorul pentru a vă actualiza planul."
+maxUsersReached = "Numărul maxim de utilizatori a fost atins pentru licența curentă. Contactați administratorul pentru a vă actualiza planul sau pentru a adăuga mai multe locuri."
 oauth2RequestNotFound = "Cererea de autorizare nu a fost găsită"
 oauth2InvalidUserInfoResponse = "Răspuns Invalid la Informațiile Utilizatorului"
 oauth2invalidRequest = "Cerere Invalidă"
@@ -3846,14 +3950,17 @@ fitToWidth = "Potriviți la lățime"
 actualSize = "Dimensiune reală"
 
 [viewer]
+cannotPreviewFile = "Nu se poate previzualiza fișierul"
+dualPageView = "Vizualizare cu două pagini"
 firstPage = "Prima pagină"
 lastPage = "Ultima pagină"
-previousPage = "Pagina anterioară"
 nextPage = "Pagina următoare"
+onlyPdfSupported = "Vizualizatorul acceptă doar fișiere PDF. Acest fișier pare a fi într-un format diferit."
+previousPage = "Pagina anterioară"
+singlePageView = "Vizualizare cu o singură pagină"
+unknownFile = "Fișier necunoscut"
 zoomIn = "Măriți"
 zoomOut = "Micșorați"
-singlePageView = "Vizualizare cu o singură pagină"
-dualPageView = "Vizualizare cu două pagini"
 
 [rightRail]
 closeSelected = "Închideți fișierele selectate"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Comutați bara laterală"
 exportSelected = "Exportați paginile selectate"
 toggleAnnotations = "Comutați vizibilitatea adnotărilor"
 annotationMode = "Comutați modul de adnotare"
+print = "Imprimați PDF"
 draw = "Desenați"
 save = "Salvați"
 saveChanges = "Salvați modificările"
@@ -3925,7 +4033,7 @@ files = "Fișiere"
 activity = "Jurnal"
 help = "Ajutor"
 account = "Cont"
-config = "Config"
+config = "Configurare"
 settings = "Setări"
 adminSettings = "Setări admin"
 allTools = "All Tools"
@@ -4153,7 +4261,7 @@ description = "Urmărește acțiunile utilizatorilor și evenimentele de sistem
 
 [admin.settings.security.audit.level]
 label = "Nivel audit"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=OPRIT, 1=DE BAZĂ, 2=STANDARD, 3=DETALIAT"
 
 [admin.settings.security.audit.retentionDays]
 label = "Păstrare audit (zile)"
@@ -4494,6 +4602,7 @@ description = "URL sau nume de fișier către impressum (necesar în unele juris
 title = "Premium și Enterprise"
 description = "Configurați cheia de licență premium sau enterprise."
 license = "Configurare licență"
+noInput = "Vă rugăm să furnizați o cheie sau un fișier de licență"
 
 [admin.settings.premium.licenseKey]
 toggle = "Ai o cheie de licență sau un fișier certificat?"
@@ -4511,6 +4620,25 @@ line1 = "Suprascrierea cheii de licență curente nu poate fi anulată."
 line2 = "Licența anterioară va fi pierdută definitiv dacă nu ai o copie de rezervă."
 line3 = "Important: Păstrează cheile de licență private și în siguranță. Nu le distribui public."
 
+[admin.settings.premium.inputMethod]
+text = "Cheie de licență"
+file = "Fișier de certificat"
+
+[admin.settings.premium.file]
+label = "Fișier certificat de licență"
+description = "Încărcați fișierul de licență .lic sau .cert din achizițiile offline"
+choose = "Alegeți fișierul de licență"
+selected = "Selectat: {{filename}} ({{size}})"
+successMessage = "Fișierul de licență a fost încărcat și activat cu succes. Nu este necesară repornirea."
+
+[admin.settings.premium.currentLicense]
+title = "Licență activă"
+file = "Sursă: Fișier de licență ({{path}})"
+key = "Sursă: Cheie de licență"
+type = "Tip: {{type}}"
+noInput = "Vă rugăm să furnizați o cheie de licență sau să încărcați un fișier de certificat"
+success = "Succes"
+
 [admin.settings.premium.enabled]
 label = "Activează funcțiile Premium"
 description = "Activează verificările cheii de licență pentru funcțiile pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} selectate"
 download = "Descarcă"
 delete = "Șterge"
 unsupported = "Nesuportat"
+active = "Activ"
 addToUpload = "Adăugați la încărcare"
+closeFile = "Închide fișierul"
 deleteAll = "Ștergeți tot"
 loadingFiles = "Se încarcă fișierele..."
 noFiles = "Nu există fișiere disponibile"
@@ -5132,7 +5262,7 @@ upgrade = "Fă upgrade acum →"
 freeTitle = "Licență server"
 overLimitTitle = "Necesită licență de server"
 overLimitBody = "Politica noastră de licențiere permite până la <strong>{{freeTierLimit}}</strong> utilizatori gratuit per server. Ai <strong>{{overLimitUserCopy}}</strong> utilizatori Stirling. Pentru a continua fără întreruperi, fă upgrade la planul Stirling Server - <strong>locuri nelimitate</strong>, editare text PDF și control complet de admin pentru $99/server/lună."
-freeBody = "Licențierea noastră <strong>Open-Core</strong> permite până la <strong>{{freeTierLimit}}</strong> utilizatori gratuit per server. Pentru a scala fără întreruperi și a primi acces timpuriu la noul nostru <strong>instrument de editare text PDF</strong>, recomandăm planul Stirling Server - editare completă și <strong>locuri nelimitate</strong> pentru $99/server/lună."
+freeBody = "Licențierea noastră <strong>Open-Core</strong> permite până la <strong>{{freeTierLimit}}</strong> utilizatori gratuit per server. Pentru scalare fără întreruperi, recomandăm planul Stirling Server - <strong>locuri nelimitate</strong> și <strong>suport SSO</strong> pentru $99/server/lună."
 
 [onboarding.desktopInstall]
 title = "Descărcare"
@@ -5237,6 +5367,31 @@ error = "Actualizarea stării utilizatorului a eșuat"
 success = "Utilizator șters cu succes"
 error = "Ștergerea utilizatorului a eșuat"
 
+[workspace.people.changePassword]
+action = "Schimbă parola"
+title = "Schimbă parola"
+subtitle = "Actualizați parola pentru"
+newPassword = "Parolă nouă"
+confirmPassword = "Confirmă parola"
+placeholder = "Introduceți o parolă nouă"
+confirmPlaceholder = "Reintroduceți parola nouă"
+passwordRequired = "Introduceți o parolă nouă"
+passwordMismatch = "Parolele nu coincid"
+generateRandom = "Generează o parolă sigură"
+generatedPreview = "Parolă generată:"
+copyTooltip = "Copiază în clipboard"
+copiedToClipboard = "Parola a fost copiată în clipboard"
+copyFailed = "Copierea parolei a eșuat"
+sendEmail = "Trimite un email utilizatorului despre această modificare"
+includePassword = "Include parola nouă în email"
+forcePasswordChange = "Forțează utilizatorul să schimbe parola la următoarea autentificare"
+emailUnavailable = "Emailul acestui utilizator nu este o adresă de email validă. Notificările sunt dezactivate."
+smtpDisabled = "Notificările prin email necesită activarea SMTP în setări."
+notifyOnly = "Se va trimite un email fără parolă, informând utilizatorul că un administrator a schimbat-o."
+submit = "Actualizează parola"
+success = "Parola a fost actualizată cu succes"
+error = "Actualizarea parolei a eșuat"
+
 [workspace.people.emailInvite]
 tab = "Invitație prin email"
 description = "Tastați sau lipiți emailuri mai jos, separate prin virgule. Utilizatorii vor primi datele de conectare prin email."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Este necesară cel puțin o adresă de email"
 submit = "Trimiteți invitații"
 success = "utilizator(i) invitați cu succes"
-partialSuccess = "Unele invitații au eșuat"
+partialFailure = "Unele invitații au eșuat"
 allFailed = "Invitarea utilizatorilor a eșuat"
 error = "Trimiterea invitațiilor a eșuat"
 
@@ -5380,7 +5535,7 @@ submit = "Schimbă echipa"
 currency = "Monedă"
 popular = "Popular"
 current = "Plan curent"
-upgrade = "Upgrade"
+upgrade = "Actualizează"
 contact = "Contactează-ne"
 customPricing = "Personalizat"
 showComparison = "Compară toate funcțiile"
@@ -5770,6 +5925,7 @@ subtitle = "Autentifică-te cu contul tău Stirling"
 [setup.selfhosted]
 title = "Autentifică-te pe server"
 subtitle = "Introdu acreditările serverului tău"
+link = "sau conectați-vă la un cont self-hosted"
 
 [setup.server]
 title = "Conectează-te la server"
@@ -5788,6 +5944,14 @@ description = "Introdu URL-ul complet al serverului tău Stirling PDF găzduit l
 emptyUrl = "Te rugăm să introduci un URL de server"
 unreachable = "Nu s-a putut conecta la server"
 testFailed = "Testul de conexiune a eșuat"
+configFetch = "Nu s-a putut prelua configurația serverului. Verificați URL-ul și încercați din nou."
+
+[setup.server.error.securityDisabled]
+title = "Autentificarea nu este activată"
+body = "Acest server nu are autentificarea activată. Pentru a vă conecta la acest server, trebuie să activați autentificarea:"
+step1 = "Setați DOCKER_ENABLE_SECURITY=true în mediul dvs."
+step2 = "Sau setați security.enableLogin=true în settings.yml"
+step3 = "Reporniți serverul"
 
 [setup.login]
 title = "Autentificare"
@@ -5797,6 +5961,13 @@ submit = "Autentificare"
 signInWith = "Autentifică-te cu"
 oauthPending = "Se deschide browserul pentru autentificare..."
 orContinueWith = "Sau continuă cu email"
+serverRequirement = "Notă: Serverul trebuie să aibă autentificarea activată."
+showInstructions = "Cum se activează?"
+hideInstructions = "Ascunde instrucțiunile"
+instructions = "Pentru a activa autentificarea pe serverul dvs. Stirling PDF:"
+instructionsEnvVar = "Setați variabila de mediu:"
+instructionsOrYml = "Sau în settings.yml:"
+instructionsRestart = "Apoi reporniți serverul pentru ca modificările să intre în vigoare."
 
 [setup.login.username]
 label = "Utilizator"
@@ -5853,6 +6024,7 @@ earlyAccess = "Acces timpuriu"
 reset = "Resetați modificările"
 downloadJson = "Descărcați JSON"
 generatePdf = "Generați PDF"
+saveChanges = "Salvează modificările"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Scalare automată a textului pentru a se potrivi în casete"
@@ -5890,6 +6062,8 @@ alpha = "Acest vizualizator alpha este încă în dezvoltare — anumite fonturi
 [pdfTextEditor.empty]
 title = "Niciun document încărcat"
 subtitle = "Încărcați un fișier PDF sau JSON pentru a începe editarea conținutului text."
+dropzone = "Glisați și fixați aici un fișier PDF sau JSON, sau faceți clic pentru a răsfoi"
+dropzoneWithFiles = "Selectați un fișier din fila Fișiere sau glisați și fixați aici un fișier PDF sau JSON, sau faceți clic pentru a răsfoi"
 
 [pdfTextEditor.welcomeBanner]
 title = "Bine ați venit la Editor text PDF (Acces timpuriu)"
@@ -5932,7 +6106,7 @@ warnings = "Avertizări"
 suggestions = "Note"
 currentPageFonts = "Fonturi pe această pagină"
 allFonts = "Toate fonturile"
-fallback = "fallback"
+fallback = "rezervă"
 missing = "lipsește"
 perfectMessage = "Toate fonturile pot fi redate perfect."
 warningMessage = "Unele fonturi pot să nu fie redate corect."
diff --git a/frontend/public/locales/ru-RU/translation.toml b/frontend/public/locales/ru-RU/translation.toml
index 359bb5783..600c7dfc0 100644
--- a/frontend/public/locales/ru-RU/translation.toml
+++ b/frontend/public/locales/ru-RU/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Удалить из избранного"
 fullscreen = "Переключиться в полноэкранный режим"
 sidebar = "Переключиться в режим боковой панели"
 
+[backendStartup]
+notFoundTitle = "Серверная часть не найдена"
+retry = "Повторить"
+unreachable = "Приложение сейчас не может подключиться к серверной части. Проверьте состояние серверной части и подключение к сети, затем повторите попытку."
+
 [zipWarning]
 title = "Большой ZIP-файл"
 message = "Этот ZIP содержит {{count}} файлов. Все равно извлечь?"
@@ -912,6 +917,9 @@ desc = "Создавайте многошаговые процессы, связ
 desc = "Наложить один PDF поверх другого"
 title = "Наложение PDF"
 
+[home.pdfTextEditor]
+title = "Редактор текста PDF"
+desc = "Редактируйте существующий текст и изображения внутри PDF-файлов"
 
 [home.addText]
 tags = "текст,аннотация,ярлык"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Рисованная подпись"
 defaultImageLabel = "Загруженная подпись"
 defaultTextLabel = "Введённая подпись"
 saveButton = "Сохранить подпись"
+savePersonal = "Сохранить как личную"
+saveShared = "Сохранить как общую"
 saveUnavailable = "Сначала создайте подпись, чтобы сохранить её."
 noChanges = "Текущая подпись уже сохранена."
+tempStorageTitle = "Временное хранилище браузера"
+tempStorageDescription = "Подписи сохраняются только в вашем браузере. Они будут потеряны, если вы очистите данные браузера или смените браузер."
+personalHeading = "Личные подписи"
+sharedHeading = "Общие подписи"
+personalDescription = "Эти подписи видны только вам."
+sharedDescription = "Все пользователи могут видеть и использовать эти подписи."
 
 [sign.saved.type]
 canvas = "Рисунок"
@@ -3020,6 +3036,91 @@ title = "Получить информацию о PDF"
 header = "Получить информацию о PDF"
 submit = "Получить информацию"
 downloadJson = "Скачать JSON"
+processing = "Извлечение информации..."
+results = "Результаты"
+noResults = "Запустите инструмент, чтобы создать отчет."
+downloads = "Загрузки"
+noneDetected = "Ничего не обнаружено"
+indexTitle = "Индекс"
+
+[getPdfInfo.report]
+entryLabel = "Полная сводка информации"
+shortTitle = "Информация о PDF"
+
+[getPdfInfo.sections]
+metadata = "Метаданные"
+formFields = "Поля формы"
+basicInfo = "Основная информация"
+documentInfo = "Сведения о документе"
+compliance = "Соответствие"
+encryption = "Шифрование"
+permissions = "Разрешения"
+other = "Другое"
+perPageInfo = "Информация по страницам"
+tableOfContents = "Оглавление"
+
+[getPdfInfo.other]
+attachments = "Вложения"
+embeddedFiles = "Встроенные файлы"
+javaScript = "JavaScript"
+layers = "Слои"
+structureTree = "Дерево структуры"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Размер"
+annotations = "Аннотации"
+images = "Изображения"
+links = "Ссылки"
+fonts = "Шрифты"
+xobjects = "Количество XObject"
+multimedia = "Мультимедиа"
+
+[getPdfInfo.summary]
+pages = "Страницы"
+fileSize = "Размер файла"
+pdfVersion = "Версия PDF"
+language = "Язык"
+title = "Сводка по PDF"
+author = "Автор"
+created = "Создано"
+modified = "Изменено"
+permsAll = "Все разрешения доступны"
+permsRestricted = "{{count}} ограничений"
+permsMixed = "Некоторые разрешения ограничены"
+hasCompliance = "Есть стандарты соответствия"
+noCompliance = "Нет стандартов соответствия"
+basic = "Основная информация"
+documentInfo = "Сведения о документе"
+securityTitle = "Статус безопасности"
+technical = "Технические сведения"
+overviewTitle = "Обзор PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "Зашифрованный PDF — используется защита паролем"
+unencrypted = "Нешифрованный PDF — защита паролем отсутствует"
+
+[getPdfInfo.summary.tech]
+images = "Изображения"
+fonts = "Шрифты"
+formFields = "Поля формы"
+embeddedFiles = "Встроенные файлы"
+javaScript = "JavaScript"
+layers = "Слои"
+bookmarks = "Закладки"
+multimedia = "Мультимедиа"
+
+[getPdfInfo.summary.overview]
+untitled = "документ без названия"
+unknown = "Неизвестный автор"
+text = "Это PDF из {{pages}} страниц под названием {{title}}, создан {{author}} (версия PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Некоторые файлы не удалось обработать."
+unexpected = "Непредвиденная ошибка при извлечении."
+
+[getPdfInfo.status]
+complete = "Извлечение завершено"
 
 [extractPage]
 tags = "извлечение"
@@ -3438,6 +3539,9 @@ signinTitle = "Пожалуйста, войдите"
 ssoSignIn = "Вход через единый вход"
 oAuth2AutoCreateDisabled = "Автоматическое создание пользователей OAuth2 отключено"
 oAuth2AdminBlockedUser = "Регистрация или вход незарегистрированных пользователей в настоящее время заблокированы. Обратитесь к администратору."
+oAuth2RequiresLicense = "Вход через OAuth/SSO требует платную лицензию (Server или Enterprise). Пожалуйста, свяжитесь с администратором, чтобы обновить ваш план."
+saml2RequiresLicense = "Вход через SAML требует платную лицензию (Server или Enterprise). Пожалуйста, свяжитесь с администратором, чтобы обновить ваш план."
+maxUsersReached = "Достигнуто максимальное количество пользователей для вашей текущей лицензии. Пожалуйста, свяжитесь с администратором, чтобы обновить ваш план или добавить места."
 oauth2RequestNotFound = "Запрос авторизации не найден"
 oauth2InvalidUserInfoResponse = "Недействительный ответ с информацией о пользователе"
 oauth2invalidRequest = "Недействительный запрос"
@@ -3846,14 +3950,17 @@ fitToWidth = "По ширине"
 actualSize = "Фактический размер"
 
 [viewer]
+cannotPreviewFile = "Не удаётся просмотреть файл"
+dualPageView = "Двухстраничный вид"
 firstPage = "Первая страница"
 lastPage = "Последняя страница"
-previousPage = "Предыдущая страница"
 nextPage = "Следующая страница"
+onlyPdfSupported = "Просмотрщик поддерживает только PDF-файлы. Похоже, этот файл другого формата."
+previousPage = "Предыдущая страница"
+singlePageView = "Одностраничный вид"
+unknownFile = "Неизвестный файл"
 zoomIn = "Увеличить"
 zoomOut = "Уменьшить"
-singlePageView = "Одностраничный вид"
-dualPageView = "Двухстраничный вид"
 
 [rightRail]
 closeSelected = "Закрыть выбранные файлы"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Показать/скрыть боковую панель"
 exportSelected = "Экспортировать выбранные страницы"
 toggleAnnotations = "Показать/скрыть аннотации"
 annotationMode = "Переключить режим аннотаций"
+print = "Печать PDF"
 draw = "Рисовать"
 save = "Сохранить"
 saveChanges = "Сохранить изменения"
@@ -4487,13 +4595,14 @@ label = "Политика cookie"
 description = "URL или имя файла для политики cookie"
 
 [admin.settings.legal.impressum]
-label = "Impressum"
+label = "Юридическая информация"
 description = "URL или имя файла для impressum (требуется в некоторых юрисдикциях)"
 
 [admin.settings.premium]
 title = "Премиум и Enterprise"
 description = "Настройте ключ лицензии премиум или enterprise."
 license = "Конфигурация лицензии"
+noInput = "Укажите лицензионный ключ или файл"
 
 [admin.settings.premium.licenseKey]
 toggle = "Есть лицензионный ключ или файл сертификата?"
@@ -4511,6 +4620,25 @@ line1 = "Перезапись текущего лицензионного клю
 line2 = "Предыдущая лицензия будет безвозвратно утеряна, если вы не сделали резервную копию где‑то ещё."
 line3 = "Важно: храните лицензионные ключи в секрете и безопасности. Никогда не публикуйте их."
 
+[admin.settings.premium.inputMethod]
+text = "Лицензионный ключ"
+file = "Файл сертификата"
+
+[admin.settings.premium.file]
+label = "Файл лицензионного сертификата"
+description = "Загрузите файл лицензии .lic или .cert из офлайн-покупки"
+choose = "Выберите файл лицензии"
+selected = "Выбрано: {{filename}} ({{size}})"
+successMessage = "Файл лицензии успешно загружен и активирован. Перезапуск не требуется."
+
+[admin.settings.premium.currentLicense]
+title = "Активная лицензия"
+file = "Источник: файл лицензии ({{path}})"
+key = "Источник: лицензионный ключ"
+type = "Тип: {{type}}"
+noInput = "Укажите лицензионный ключ или загрузите файл сертификата"
+success = "Успешно"
+
 [admin.settings.premium.enabled]
 label = "Включить премиум-функции"
 description = "Включить проверку лицензии для pro/enterprise функций"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} выбрано"
 download = "Скачать"
 delete = "Удалить"
 unsupported = "Не поддерживается"
+active = "Активный"
 addToUpload = "Добавить к загрузке"
+closeFile = "Закрыть файл"
 deleteAll = "Удалить все"
 loadingFiles = "Загрузка файлов..."
 noFiles = "Нет доступных файлов"
@@ -4964,7 +5094,7 @@ description = "Привяжите аккаунт, чтобы сохранить
 socialLogin = "Обновить через соцсеть"
 linkWith = "Привязать к"
 emailPassword = "или введите email и пароль"
-email = "Email"
+email = "Эл. почта"
 emailPlaceholder = "Введите ваш email"
 password = "Пароль (необязательно)"
 passwordPlaceholder = "Задайте пароль"
@@ -5132,7 +5262,7 @@ upgrade = "Обновить сейчас →"
 freeTitle = "Серверная лицензия"
 overLimitTitle = "Требуется серверная лицензия"
 overLimitBody = "Наша лицензия допускает до <strong>{{freeTierLimit}}</strong> пользователей бесплатно на сервер. У вас <strong>{{overLimitUserCopy}}</strong> пользователей Stirling. Чтобы продолжить без перебоев, перейдите на тариф Stirling Server — <strong>неограниченные места</strong>, редактирование текста в PDF и полный админ‑контроль за $99/server/mo."
-freeBody = "Наша лицензия <strong>Open-Core</strong> допускает до <strong>{{freeTierLimit}}</strong> пользователей бесплатно на сервер. Чтобы масштабироваться без ограничений и раньше получить доступ к новому <strong>инструменту редактирования текста в PDF</strong>, рекомендуем тариф Stirling Server — полный редактор и <strong>неограниченные места</strong> за $99/server/mo."
+freeBody = "Наша лицензия <strong>Open-Core</strong> позволяет бесплатно использовать до <strong>{{freeTierLimit}}</strong> пользователей на сервер. Для бесшовного масштабирования мы рекомендуем план Stirling Server - <strong>неограниченное число мест</strong> и <strong>поддержка SSO</strong> за $99/сервер/мес."
 
 [onboarding.desktopInstall]
 title = "Скачать"
@@ -5237,6 +5367,31 @@ error = "Не удалось обновить статус пользовате
 success = "Пользователь успешно удален"
 error = "Не удалось удалить пользователя"
 
+[workspace.people.changePassword]
+action = "Изменить пароль"
+title = "Изменить пароль"
+subtitle = "Обновить пароль для"
+newPassword = "Новый пароль"
+confirmPassword = "Подтвердите пароль"
+placeholder = "Введите новый пароль"
+confirmPlaceholder = "Повторно введите новый пароль"
+passwordRequired = "Пожалуйста, введите новый пароль"
+passwordMismatch = "Пароли не совпадают"
+generateRandom = "Сгенерировать безопасный пароль"
+generatedPreview = "Сгенерированный пароль:"
+copyTooltip = "Копировать в буфер обмена"
+copiedToClipboard = "Пароль скопирован в буфер обмена"
+copyFailed = "Не удалось скопировать пароль"
+sendEmail = "Отправить пользователю письмо об этом изменении"
+includePassword = "Включить новый пароль в письмо"
+forcePasswordChange = "Потребовать смену пароля при следующем входе"
+emailUnavailable = "Адрес электронной почты этого пользователя недействителен. Уведомления отключены."
+smtpDisabled = "Для уведомлений по электронной почте необходимо включить SMTP в настройках."
+notifyOnly = "Будет отправлено письмо без пароля с уведомлением, что администратор его изменил."
+submit = "Обновить пароль"
+success = "Пароль успешно обновлён"
+error = "Не удалось обновить пароль"
+
 [workspace.people.emailInvite]
 tab = "Приглашение по email"
 description = "Введите или вставьте ниже адреса email, разделяя их запятыми. Пользователи получат учетные данные для входа по email."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Требуется хотя бы один адрес email"
 submit = "Отправить приглашения"
 success = "Пользователи успешно приглашены"
-partialSuccess = "Некоторые приглашения не отправлены"
+partialFailure = "Некоторые приглашения не удалось отправить"
 allFailed = "Не удалось пригласить пользователей"
 error = "Не удалось отправить приглашения"
 
@@ -5770,6 +5925,7 @@ subtitle = "Войдите в аккаунт Stirling"
 [setup.selfhosted]
 title = "Вход на сервер"
 subtitle = "Введите учётные данные сервера"
+link = "или подключитесь к самохостируемой учётной записи"
 
 [setup.server]
 title = "Подключение к серверу"
@@ -5788,6 +5944,14 @@ description = "Введите полный URL вашего self-hosted серв
 emptyUrl = "Введите URL сервера"
 unreachable = "Не удалось подключиться к серверу"
 testFailed = "Тест подключения не пройден"
+configFetch = "Не удалось получить конфигурацию сервера. Проверьте URL и попробуйте ещё раз."
+
+[setup.server.error.securityDisabled]
+title = "Вход не включён"
+body = "На этом сервере вход не включён. Чтобы подключиться к этому серверу, необходимо включить аутентификацию:"
+step1 = "Установите DOCKER_ENABLE_SECURITY=true в вашей среде"
+step2 = "Или установите security.enableLogin=true в settings.yml"
+step3 = "Перезапустите сервер"
 
 [setup.login]
 title = "Вход"
@@ -5797,13 +5961,20 @@ submit = "Войти"
 signInWith = "Войти через"
 oauthPending = "Открываем браузер для аутентификации..."
 orContinueWith = "Или продолжить по email"
+serverRequirement = "Примечание: на сервере должен быть включён вход в систему."
+showInstructions = "Как включить?"
+hideInstructions = "Скрыть инструкции"
+instructions = "Чтобы включить вход в систему на вашем сервере Stirling PDF:"
+instructionsEnvVar = "Установите переменную окружения:"
+instructionsOrYml = "Или в settings.yml:"
+instructionsRestart = "Затем перезапустите сервер, чтобы изменения вступили в силу."
 
 [setup.login.username]
 label = "Имя пользователя"
 placeholder = "Введите имя пользователя"
 
 [setup.login.email]
-label = "Email"
+label = "Эл. почта"
 placeholder = "Введите email"
 
 [setup.login.password]
@@ -5853,6 +6024,7 @@ earlyAccess = "Ранний доступ"
 reset = "Сбросить изменения"
 downloadJson = "Скачать JSON"
 generatePdf = "Сформировать PDF"
+saveChanges = "Сохранить изменения"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Автоматически подгонять текст по рамке"
@@ -5890,6 +6062,8 @@ alpha = "Этот альфа‑просмотрщик ещё развивает
 [pdfTextEditor.empty]
 title = "Документ не загружен"
 subtitle = "Загрузите файл PDF или JSON, чтобы начать редактирование текста."
+dropzone = "Перетащите сюда файл PDF или JSON, или нажмите, чтобы выбрать"
+dropzoneWithFiles = "Выберите файл на вкладке «Файлы» или перетащите сюда файл PDF или JSON, или нажмите, чтобы выбрать"
 
 [pdfTextEditor.welcomeBanner]
 title = "Добро пожаловать в редактор текста PDF (ранний доступ)"
diff --git a/frontend/public/locales/sk-SK/translation.toml b/frontend/public/locales/sk-SK/translation.toml
index 0b6633ff2..64d3da204 100644
--- a/frontend/public/locales/sk-SK/translation.toml
+++ b/frontend/public/locales/sk-SK/translation.toml
@@ -99,7 +99,7 @@ visitGithub = "Navštíviť GitHub repozitár"
 donate = "Darovať"
 color = "Farba"
 sponsor = "Sponzorovať"
-info = "Info"
+info = "Informácie"
 pro = "Pro"
 page = "Strana"
 pages = "Strany"
@@ -163,6 +163,11 @@ unfavorite = "Odstrániť z obľúbených"
 fullscreen = "Prepnúť na režim celej obrazovky"
 sidebar = "Prepnúť na režim bočného panela"
 
+[backendStartup]
+notFoundTitle = "Backend sa nenašiel"
+retry = "Skúsiť znova"
+unreachable = "Aplikácia sa momentálne nedokáže pripojiť k backendu. Overte stav backendu a sieťové pripojenie, potom to skúste znova."
+
 [zipWarning]
 title = "Veľký ZIP súbor"
 message = "Tento ZIP obsahuje {{count}} súborov. Aj tak rozbaliť?"
@@ -274,7 +279,7 @@ iAgreeToThe = "Súhlasím so všetkými"
 terms = "Podmienkami používania"
 accessibility = "Prístupnosť"
 cookie = "Zásady používania súborov cookie"
-impressum = "Impressum"
+impressum = "Impresum"
 showCookieBanner = "Predvoľby súborov cookie"
 
 [pipeline]
@@ -513,7 +518,7 @@ syncToAccount = "Synchronizovať účet <- Prehliadač"
 [adminUserSettings]
 title = "Nastavenia kontroly používateľov"
 header = "Admin nastavenia kontroly používateľov"
-admin = "Admin"
+admin = "Administrátor"
 user = "Používateľ"
 addUser = "Pridať nového používateľa"
 deleteUser = "Odstrániť používateľa"
@@ -912,6 +917,9 @@ desc = "Stavať viacstupňové pracovné postupy spájaním akcií PDF. Ideálne
 desc = "Prekrýva PDF súbory na iný PDF"
 title = "Prekrývanie PDF"
 
+[home.pdfTextEditor]
+title = "Editor textu PDF"
+desc = "Upravujte existujúci text a obrázky v PDF"
 
 [home.addText]
 tags = "text,anotácia,štítok"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Kreslený podpis"
 defaultImageLabel = "Nahraný podpis"
 defaultTextLabel = "Napísaný podpis"
 saveButton = "Uložiť podpis"
+savePersonal = "Uložiť osobné"
+saveShared = "Uložiť zdieľané"
 saveUnavailable = "Najprv vytvorte podpis, aby ste ho mohli uložiť."
 noChanges = "Aktuálny podpis je už uložený."
+tempStorageTitle = "Dočasné úložisko prehliadača"
+tempStorageDescription = "Podpisy sú uložené iba vo vašom prehliadači. Pri vymazaní údajov prehliadača alebo pri zmene prehliadača sa stratia."
+personalHeading = "Osobné podpisy"
+sharedHeading = "Zdieľané podpisy"
+personalDescription = "Tieto podpisy vidíte iba vy."
+sharedDescription = "Všetci používatelia môžu tieto podpisy vidieť a používať."
 
 [sign.saved.type]
 canvas = "Kresba"
@@ -3020,6 +3036,91 @@ title = "Získať informácie o PDF"
 header = "Získať informácie o PDF"
 submit = "Získať info"
 downloadJson = "Stiahnuť JSON"
+processing = "Extrahujú sa informácie..."
+results = "Výsledky"
+noResults = "Spustite nástroj na vygenerovanie prehľadu."
+downloads = "Sťahovania"
+noneDetected = "Nič nebolo zistené"
+indexTitle = "Index"
+
+[getPdfInfo.report]
+entryLabel = "Úplné zhrnutie informácií"
+shortTitle = "Informácie o PDF"
+
+[getPdfInfo.sections]
+metadata = "Metadáta"
+formFields = "Polia formulára"
+basicInfo = "Základné informácie"
+documentInfo = "Informácie o dokumente"
+compliance = "Súlad"
+encryption = "Šifrovanie"
+permissions = "Oprávnenia"
+other = "Iné"
+perPageInfo = "Informácie pre strany"
+tableOfContents = "Obsah"
+
+[getPdfInfo.other]
+attachments = "Prílohy"
+embeddedFiles = "Vložené súbory"
+javaScript = "JavaScript"
+layers = "Vrstvy"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Veľkosť"
+annotations = "Anotácie"
+images = "Obrázky"
+links = "Odkazy"
+fonts = "Písma"
+xobjects = "Počty XObjectov"
+multimedia = "Multimédiá"
+
+[getPdfInfo.summary]
+pages = "Strany"
+fileSize = "Veľkosť súboru"
+pdfVersion = "Verzia PDF"
+language = "Jazyk"
+title = "Súhrn PDF"
+author = "Autor"
+created = "Vytvorené"
+modified = "Upravené"
+permsAll = "Všetky oprávnenia povolené"
+permsRestricted = "{{count}} obmedzení"
+permsMixed = "Niektoré oprávnenia obmedzené"
+hasCompliance = "Spĺňa štandardy súladu"
+noCompliance = "Žiadne štandardy súladu"
+basic = "Základné informácie"
+documentInfo = "Informácie o dokumente"
+securityTitle = "Stav zabezpečenia"
+technical = "Technické"
+overviewTitle = "Prehľad PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "Šifrované PDF - prítomná ochrana heslom"
+unencrypted = "Nešifrované PDF - Bez ochrany heslom"
+
+[getPdfInfo.summary.tech]
+images = "Obrázky"
+fonts = "Písma"
+formFields = "Polia formulára"
+embeddedFiles = "Vložené súbory"
+javaScript = "JavaScript"
+layers = "Vrstvy"
+bookmarks = "Záložky"
+multimedia = "Multimédiá"
+
+[getPdfInfo.summary.overview]
+untitled = "nepomenovaný dokument"
+unknown = "Neznámy autor"
+text = "Toto je {{pages}}-stranové PDF s názvom {{title}} od autora {{author}} (verzia PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Niektoré súbory sa nepodarilo spracovať."
+unexpected = "Počas extrahovania došlo k neočakávanej chybe."
+
+[getPdfInfo.status]
+complete = "Extrahovanie dokončené"
 
 [extractPage]
 tags = "extrahovať"
@@ -3438,6 +3539,9 @@ signinTitle = "Prosím, prihláste sa"
 ssoSignIn = "Prihlásiť sa cez Single Sign-on"
 oAuth2AutoCreateDisabled = "Vytváranie používateľa cez OAUTH2 je zakázané"
 oAuth2AdminBlockedUser = "Registrácia alebo prihlasovanie neregistrovaných používateľov je momentálne blokované. Kontaktujte administrátora."
+oAuth2RequiresLicense = "Prihlásenie cez OAuth/SSO vyžaduje platenú licenciu (Server alebo Enterprise). Obráťte sa na administrátora, aby aktualizoval váš plán."
+saml2RequiresLicense = "Prihlásenie cez SAML vyžaduje platenú licenciu (Server alebo Enterprise). Obráťte sa na administrátora, aby aktualizoval váš plán."
+maxUsersReached = "Bol dosiahnutý maximálny počet používateľov pre vašu aktuálnu licenciu. Obráťte sa na administrátora, aby aktualizoval váš plán alebo pridal ďalšie miesta."
 oauth2RequestNotFound = "Požiadavka na autorizáciu sa nenašla"
 oauth2InvalidUserInfoResponse = "Neplatná odpoveď User Info"
 oauth2invalidRequest = "Neplatná požiadavka"
@@ -3533,7 +3637,7 @@ title = "PDF na jednu stránku"
 header = "PDF na jednu stránku"
 submit = "Konvertovať na jednu stránku"
 description = "Tento nástroj zlúči všetky strany vášho PDF do jednej veľkej stránky. Šírka zostane rovnaká ako pri pôvodných stranách, výška bude súčtom výšok všetkých strán."
-filenamePrefix = "single_page"
+filenamePrefix = "jedna_strana"
 
 [pdfToSinglePage.files]
 placeholder = "Vyberte súbor PDF v hlavnom zobrazení, aby ste začali"
@@ -3771,7 +3875,7 @@ version = "Aktuálne vydanie"
 title = "Dokumentácia API"
 header = "Dokumentácia API"
 desc = "Zobraziť a testovať API endpointy Stirling PDF"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,dokumentácia,swagger,endpointy,vývoj"
 
 [cookieBanner.popUp]
 title = "Ako používame súbory cookie"
@@ -3846,14 +3950,17 @@ fitToWidth = "Prispôsobiť šírke"
 actualSize = "Skutočná veľkosť"
 
 [viewer]
+cannotPreviewFile = "Nedá sa zobraziť náhľad súboru"
+dualPageView = "Dvojstranové zobrazenie"
 firstPage = "Prvá strana"
 lastPage = "Posledná strana"
-previousPage = "Predchádzajúca strana"
 nextPage = "Nasledujúca strana"
+onlyPdfSupported = "Prehliadač podporuje iba súbory PDF. Tento súbor sa zdá byť iného formátu."
+previousPage = "Predchádzajúca strana"
+singlePageView = "Zobrazenie jednej strany"
+unknownFile = "Neznámy súbor"
 zoomIn = "Priblížiť"
 zoomOut = "Oddialiť"
-singlePageView = "Zobrazenie jednej strany"
-dualPageView = "Dvojstranové zobrazenie"
 
 [rightRail]
 closeSelected = "Zavrieť vybrané súbory"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Prepnúť bočný panel"
 exportSelected = "Exportovať vybrané strany"
 toggleAnnotations = "Prepnúť zobrazenie anotácií"
 annotationMode = "Prepnúť režim anotácií"
+print = "Vytlačiť PDF"
 draw = "Kresliť"
 save = "Uložiť"
 saveChanges = "Uložiť zmeny"
@@ -4487,13 +4595,14 @@ label = "Zásady používania súborov cookie"
 description = "URL alebo názov súboru so zásadami používania súborov cookie"
 
 [admin.settings.legal.impressum]
-label = "Impressum"
+label = "Impresum"
 description = "URL alebo názov súboru k Impressu (požadované v niektorých jurisdikciách)"
 
 [admin.settings.premium]
 title = "Premium a Enterprise"
 description = "Nakonfigurujte svoj Premium alebo Enterprise licenčný kľúč."
 license = "Konfigurácia licencie"
+noInput = "Zadajte licenčný kľúč alebo súbor"
 
 [admin.settings.premium.licenseKey]
 toggle = "Máte licenčný kľúč alebo súbor certifikátu?"
@@ -4511,6 +4620,25 @@ line1 = "Prepísanie aktuálneho licenčného kľúča nemožno vrátiť späť.
 line2 = "Vaša predchádzajúca licencia bude natrvalo stratená, pokiaľ ju nemáte zálohovanú inde."
 line3 = "Dôležité: Licenčné kľúče uchovávajte súkromné a v bezpečí. Nikdy ich nezdieľajte verejne."
 
+[admin.settings.premium.inputMethod]
+text = "Licenčný kľúč"
+file = "Súbor certifikátu"
+
+[admin.settings.premium.file]
+label = "Súbor licenčného certifikátu"
+description = "Nahrajte svoj licenčný súbor .lic alebo .cert z offline nákupu"
+choose = "Vybrať licenčný súbor"
+selected = "Vybrané: {{filename}} ({{size}})"
+successMessage = "Licenčný súbor bol úspešne nahraný a aktivovaný. Reštart nie je potrebný."
+
+[admin.settings.premium.currentLicense]
+title = "Aktívna licencia"
+file = "Zdroj: Licenčný súbor ({{path}})"
+key = "Zdroj: Licenčný kľúč"
+type = "Typ: {{type}}"
+noInput = "Zadajte licenčný kľúč alebo nahrajte súbor certifikátu"
+success = "Úspech"
+
 [admin.settings.premium.enabled]
 label = "Povoliť Premium funkcie"
 description = "Povoliť kontrolu licenčného kľúča pre pro/enterprise funkcie"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} vybraných"
 download = "Stiahnuť"
 delete = "Vymazať"
 unsupported = "Nepodporované"
+active = "Aktívne"
 addToUpload = "Pridať na nahratie"
+closeFile = "Zatvoriť súbor"
 deleteAll = "Odstrániť všetko"
 loadingFiles = "Načítavajú sa súbory..."
 noFiles = "Nie sú dostupné žiadne súbory"
@@ -5132,7 +5262,7 @@ upgrade = "Upgradovať teraz →"
 freeTitle = "Serverová licencia"
 overLimitTitle = "Potrebná serverová licencia"
 overLimitBody = "Naše licencovanie povoľuje až <strong>{{freeTierLimit}}</strong> používateľov zdarma na server. Máte <strong>{{overLimitUserCopy}}</strong> používateľov Stirling. Ak chcete pokračovať bez prerušenia, prejdite na plán Stirling Server - <strong>neobmedzené miesta</strong>, úpravy textu PDF a plná správa pre $99/server/mo."
-freeBody = "Naše licencovanie <strong>Open-Core</strong> povoľuje až <strong>{{freeTierLimit}}</strong> používateľov zdarma na server. Ak chcete škálovať bez prerušenia a získať skorý prístup k nášmu novému <strong>nástroju na úpravu textu PDF</strong>, odporúčame plán Stirling Server - plné úpravy a <strong>neobmedzené miesta</strong> za $99/server/mo."
+freeBody = "Naše licencovanie <strong>Open-Core</strong> umožňuje až <strong>{{freeTierLimit}}</strong> používateľov zadarmo na server. Na plynulé škálovanie odporúčame plán Stirling Server - <strong>neobmedzený počet používateľov</strong> a <strong>podporu SSO</strong> za $99/server/mes."
 
 [onboarding.desktopInstall]
 title = "Stiahnuť"
@@ -5178,7 +5308,7 @@ active = "Aktívny"
 disabled = "Zakázaný"
 activeSession = "Aktívna relácia"
 member = "Člen"
-admin = "Admin"
+admin = "Administrátor"
 editRole = "Upraviť rolu"
 enable = "Povoliť"
 disable = "Zakázať"
@@ -5237,6 +5367,31 @@ error = "Nepodarilo sa aktualizovať stav používateľa"
 success = "Používateľ bol úspešne odstránený"
 error = "Nepodarilo sa odstrániť používateľa"
 
+[workspace.people.changePassword]
+action = "Zmeniť heslo"
+title = "Zmeniť heslo"
+subtitle = "Aktualizovať heslo pre"
+newPassword = "Nové heslo"
+confirmPassword = "Potvrdiť heslo"
+placeholder = "Zadajte nové heslo"
+confirmPlaceholder = "Zadajte nové heslo ešte raz"
+passwordRequired = "Zadajte nové heslo"
+passwordMismatch = "Heslá sa nezhodujú"
+generateRandom = "Vygenerovať bezpečné heslo"
+generatedPreview = "Vygenerované heslo:"
+copyTooltip = "Kopírovať do schránky"
+copiedToClipboard = "Heslo skopírované do schránky"
+copyFailed = "Heslo sa nepodarilo skopírovať"
+sendEmail = "Odoslať používateľovi e-mail o tejto zmene"
+includePassword = "Zahrnúť nové heslo do e-mailu"
+forcePasswordChange = "Vynútiť zmenu hesla pri najbližšom prihlásení"
+emailUnavailable = "E-mailová adresa tohto používateľa nie je platná. Upozornenia sú vypnuté."
+smtpDisabled = "E-mailové upozornenia vyžadujú, aby bolo v nastaveniach povolené SMTP."
+notifyOnly = "Odošle sa e-mail bez hesla, ktorý používateľa informuje, že ho zmenil administrátor."
+submit = "Aktualizovať heslo"
+success = "Heslo bolo úspešne aktualizované"
+error = "Heslo sa nepodarilo aktualizovať"
+
 [workspace.people.emailInvite]
 tab = "Pozvánka e-mailom"
 description = "Nižšie napíšte alebo vložte e-mailové adresy oddelené čiarkami. Používatelia dostanú prihlasovacie údaje e-mailom."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Vyžaduje sa aspoň jedna e-mailová adresa"
 submit = "Odoslať pozvánky"
 success = "Používatelia boli úspešne pozvaní"
-partialSuccess = "Niektoré pozvánky zlyhali"
+partialFailure = "Niektoré pozvánky zlyhali"
 allFailed = "Nepodarilo sa pozvať používateľov"
 error = "Nepodarilo sa odoslať pozvánky"
 
@@ -5770,6 +5925,7 @@ subtitle = "Prihláste sa pomocou svojho účtu Stirling"
 [setup.selfhosted]
 title = "Prihlásiť sa na server"
 subtitle = "Zadajte prihlasovacie údaje k serveru"
+link = "alebo sa pripojte k self-hosted účtu"
 
 [setup.server]
 title = "Pripojiť sa na server"
@@ -5788,6 +5944,14 @@ description = "Zadajte úplnú URL svojho self-hostovaného servera Stirling PDF
 emptyUrl = "Zadajte URL servera"
 unreachable = "Nedá sa pripojiť k serveru"
 testFailed = "Test pripojenia zlyhal"
+configFetch = "Nepodarilo sa načítať konfiguráciu servera. Skontrolujte URL a skúste to znova."
+
+[setup.server.error.securityDisabled]
+title = "Prihlásenie nie je povolené"
+body = "Na tomto serveri nie je povolené prihlásenie. Ak sa chcete pripojiť k tomuto serveru, musíte povoliť overenie:"
+step1 = "Nastavte DOCKER_ENABLE_SECURITY=true vo svojom prostredí"
+step2 = "Alebo nastavte security.enableLogin=true v súbore settings.yml"
+step3 = "Reštartujte server"
 
 [setup.login]
 title = "Prihlásiť sa"
@@ -5797,13 +5961,20 @@ submit = "Prihlásiť sa"
 signInWith = "Prihlásiť sa cez"
 oauthPending = "Otvára sa prehliadač na overenie..."
 orContinueWith = "Alebo pokračujte emailom"
+serverRequirement = "Poznámka: Na serveri musí byť povolené prihlásenie."
+showInstructions = "Ako povoliť?"
+hideInstructions = "Skryť pokyny"
+instructions = "Na povolenie prihlásenia na vašom serveri Stirling PDF:"
+instructionsEnvVar = "Nastavte premennú prostredia:"
+instructionsOrYml = "Alebo v súbore settings.yml:"
+instructionsRestart = "Potom reštartujte server, aby sa zmeny prejavili."
 
 [setup.login.username]
 label = "Používateľské meno"
 placeholder = "Zadajte používateľské meno"
 
 [setup.login.email]
-label = "Email"
+label = "E-mail"
 placeholder = "Zadajte svoj email"
 
 [setup.login.password]
@@ -5840,7 +6011,7 @@ paragraph = "Strana s odsekmi"
 sparse = "Riedky text"
 
 [pdfTextEditor.groupingMode]
-auto = "Auto"
+auto = "Automaticky"
 paragraph = "Odsek"
 singleLine = "Jeden riadok"
 
@@ -5853,6 +6024,7 @@ earlyAccess = "Skorý prístup"
 reset = "Resetovať zmeny"
 downloadJson = "Stiahnuť JSON"
 generatePdf = "Vygenerovať PDF"
+saveChanges = "Uložiť zmeny"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Automaticky prispôsobiť text do boxov"
@@ -5890,6 +6062,8 @@ alpha = "Tento alfa prehliadač sa stále vyvíja—niektoré písma, farby, efe
 [pdfTextEditor.empty]
 title = "Žiadny dokument nie je načítaný"
 subtitle = "Načítajte súbor PDF alebo JSON a začnite upravovať textový obsah."
+dropzone = "Pretiahnite sem súbor PDF alebo JSON, alebo kliknite pre prehľadanie"
+dropzoneWithFiles = "Vyberte súbor na karte Súbory, alebo sem presuňte súbor PDF alebo JSON, prípadne kliknite pre prehľadanie"
 
 [pdfTextEditor.welcomeBanner]
 title = "Vitajte v PDF Text Editore (Early Access)"
diff --git a/frontend/public/locales/sl-SI/translation.toml b/frontend/public/locales/sl-SI/translation.toml
index 36497b6a9..4d80264fb 100644
--- a/frontend/public/locales/sl-SI/translation.toml
+++ b/frontend/public/locales/sl-SI/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Odstrani iz priljubljenih"
 fullscreen = "Preklopi na celozaslonski način"
 sidebar = "Preklopi na način stranske vrstice"
 
+[backendStartup]
+notFoundTitle = "Zaledje ni najdeno"
+retry = "Poskusi znova"
+unreachable = "Aplikacija se trenutno ne more povezati z zaledjem. Preverite stanje zaledja in omrežno povezavo, nato poskusite znova."
+
 [zipWarning]
 title = "Velika datoteka ZIP"
 message = "Ta ZIP vsebuje {{count}} datotek. Vseeno razpakiram?"
@@ -912,6 +917,9 @@ desc = "Sestavite večkorakovne poteke z veriženjem dejanj PDF. Idealno za pona
 desc = "Prekriva PDF-je na vrhu drugega PDF-ja"
 title = "Prekrivanje PDF-jev"
 
+[home.pdfTextEditor]
+title = "Urejevalnik besedila PDF"
+desc = "Urejajte obstoječe besedilo in slike v PDF-jih"
 
 [home.addText]
 tags = "besedilo,pripomba,oznaka"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Narisan podpis"
 defaultImageLabel = "Naložen podpis"
 defaultTextLabel = "Vpisan podpis"
 saveButton = "Shrani podpis"
+savePersonal = "Shrani osebno"
+saveShared = "Shrani deljeno"
 saveUnavailable = "Najprej ustvarite podpis, da ga lahko shranite."
 noChanges = "Trenutni podpis je že shranjen."
+tempStorageTitle = "Začasno shranjevanje v brskalniku"
+tempStorageDescription = "Podpisi so shranjeni samo v vašem brskalniku. Izgubite jih, če počistite podatke brskalnika ali zamenjate brskalnik."
+personalHeading = "Osebni podpisi"
+sharedHeading = "Deljeni podpisi"
+personalDescription = "Te podpise vidite samo vi."
+sharedDescription = "Vsi uporabniki lahko te podpise vidijo in uporabljajo."
 
 [sign.saved.type]
 canvas = "Risba"
@@ -3020,6 +3036,91 @@ title = "Pridobite informacije o PDF-ju"
 header = "Pridobite informacije o PDF-ju"
 submit = "Pridobi informacije"
 downloadJson = "Prenesite JSON"
+processing = "Pridobivanje informacij..."
+results = "Rezultati"
+noResults = "Za ustvarjanje poročila zaženite orodje."
+downloads = "Prenosi"
+noneDetected = "Ni zaznanih"
+indexTitle = "Kazalo"
+
+[getPdfInfo.report]
+entryLabel = "Celoviti povzetek informacij"
+shortTitle = "Informacije o PDF"
+
+[getPdfInfo.sections]
+metadata = "Metapodatki"
+formFields = "Polja obrazca"
+basicInfo = "Osnovne informacije"
+documentInfo = "Informacije o dokumentu"
+compliance = "Skladnost"
+encryption = "Šifriranje"
+permissions = "Dovoljenja"
+other = "Drugo"
+perPageInfo = "Informacije po strani"
+tableOfContents = "Kazalo vsebine"
+
+[getPdfInfo.other]
+attachments = "Priloge"
+embeddedFiles = "Vdelane datoteke"
+javaScript = "JavaScript"
+layers = "Plasti"
+structureTree = "Drevo strukture"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Velikost"
+annotations = "Opombe"
+images = "Slike"
+links = "Povezave"
+fonts = "Pisave"
+xobjects = "Število XObject"
+multimedia = "Večpredstavnost"
+
+[getPdfInfo.summary]
+pages = "Strani"
+fileSize = "Velikost datoteke"
+pdfVersion = "Različica PDF"
+language = "Jezik"
+title = "Povzetek PDF"
+author = "Avtor"
+created = "Ustvarjeno"
+modified = "Spremenjeno"
+permsAll = "Vsa dovoljenja so dovoljena"
+permsRestricted = "{{count}} omejitev"
+permsMixed = "Nekatera dovoljenja omejena"
+hasCompliance = "Ima standarde skladnosti"
+noCompliance = "Brez standardov skladnosti"
+basic = "Osnovne informacije"
+documentInfo = "Informacije o dokumentu"
+securityTitle = "Varnostno stanje"
+technical = "Tehnično"
+overviewTitle = "Pregled PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "Šifriran PDF - prisotna zaščita z geslom"
+unencrypted = "Nešifriran PDF - brez zaščite z geslom"
+
+[getPdfInfo.summary.tech]
+images = "Slike"
+fonts = "Pisave"
+formFields = "Polja obrazca"
+embeddedFiles = "Vdelane datoteke"
+javaScript = "JavaScript"
+layers = "Plasti"
+bookmarks = "Zaznamki"
+multimedia = "Večpredstavnost"
+
+[getPdfInfo.summary.overview]
+untitled = "neimenovan dokument"
+unknown = "Neznani avtor"
+text = "To je {{pages}}-stranski PDF z naslovom {{title}}, ki ga je ustvaril {{author}} (različica PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Nekaterih datotek ni bilo mogoče obdelati."
+unexpected = "Nepričakovana napaka med pridobivanjem."
+
+[getPdfInfo.status]
+complete = "Pridobivanje zaključeno"
 
 [extractPage]
 tags = "izvleček"
@@ -3438,6 +3539,9 @@ signinTitle = "Prosim prijavite se"
 ssoSignIn = "Prijava prek enotne prijave"
 oAuth2AutoCreateDisabled = "OAUTH2 Samodejno ustvarjanje uporabnika onemogočeno"
 oAuth2AdminBlockedUser = "Registracija ali prijava neregistriranih uporabnikov je trenutno blokirana. Prosimo kontaktirajte skrbnika."
+oAuth2RequiresLicense = "Prijava prek OAuth/SSO zahteva plačljivo licenco (Server ali Enterprise). Obrnite se na skrbnika, da nadgradi vaš načrt."
+saml2RequiresLicense = "Prijava prek SAML zahteva plačljivo licenco (Server ali Enterprise). Obrnite se na skrbnika, da nadgradi vaš načrt."
+maxUsersReached = "Doseženo je največje število uporabnikov za vašo trenutno licenco. Obrnite se na skrbnika, da nadgradi vaš načrt ali doda več mest."
 oauth2RequestNotFound = "Zahteva za avtorizacijo ni bila najdena"
 oauth2InvalidUserInfoResponse = "Neveljaven odgovor z informacijami o uporabniku"
 oauth2invalidRequest = "Neveljavna zahteva"
@@ -3846,14 +3950,17 @@ fitToWidth = "Prilagodi širini"
 actualSize = "Dejanska velikost"
 
 [viewer]
+cannotPreviewFile = "Predogled datoteke ni mogoč"
+dualPageView = "Dvo-stranski pogled"
 firstPage = "Prva stran"
 lastPage = "Zadnja stran"
-previousPage = "Prejšnja stran"
 nextPage = "Naslednja stran"
+onlyPdfSupported = "Pregledovalnik podpira samo PDF datoteke. Ta datoteka je videti v drugačnem formatu."
+previousPage = "Prejšnja stran"
+singlePageView = "Enostranski pogled"
+unknownFile = "Neznana datoteka"
 zoomIn = "Povečaj"
 zoomOut = "Pomanjšaj"
-singlePageView = "Enostranski pogled"
-dualPageView = "Dvo-stranski pogled"
 
 [rightRail]
 closeSelected = "Zapri izbrane datoteke"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Preklopi stransko vrstico"
 exportSelected = "Izvozi izbrane strani"
 toggleAnnotations = "Preklopi vidnost opomb"
 annotationMode = "Preklopi način opomb"
+print = "Natisni PDF"
 draw = "Riši"
 save = "Shrani"
 saveChanges = "Shrani spremembe"
@@ -4494,6 +4602,7 @@ description = "URL ali ime datoteke do impressuma (zahtevano v nekaterih jurisdi
 title = "Premium in Enterprise"
 description = "Konfigurirajte svoj ključ licence Premium ali Enterprise."
 license = "Konfiguracija licence"
+noInput = "Navedite licenčni ključ ali datoteko"
 
 [admin.settings.premium.licenseKey]
 toggle = "Imate licenčni ključ ali potrdilno datoteko?"
@@ -4511,6 +4620,25 @@ line1 = "Prepis trenutnega licenčnega ključa ni mogoče razveljaviti."
 line2 = "Prejšnja licenca bo trajno izgubljena, razen če ste jo varnostno kopirali drugje."
 line3 = "Pomembno: Licenčne ključe hranite zasebno in varno. Nikoli jih ne delite javno."
 
+[admin.settings.premium.inputMethod]
+text = "Licenčni ključ"
+file = "Datoteka potrdila"
+
+[admin.settings.premium.file]
+label = "Datoteka licenčnega potrdila"
+description = "Naložite svojo licenčno datoteko .lic ali .cert iz nakupov brez povezave"
+choose = "Izberite licenčno datoteko"
+selected = "Izbrano: {{filename}} ({{size}})"
+successMessage = "Licenčna datoteka je bila uspešno naložena in aktivirana. Ponovni zagon ni potreben."
+
+[admin.settings.premium.currentLicense]
+title = "Aktivna licenca"
+file = "Vir: licenčna datoteka ({{path}})"
+key = "Vir: licenčni ključ"
+type = "Vrsta: {{type}}"
+noInput = "Navedite licenčni ključ ali naložite datoteko potrdila"
+success = "Uspešno"
+
 [admin.settings.premium.enabled]
 label = "Omogoči funkcije Premium"
 description = "Omogoči preverjanje licenčnega ključa za funkcije pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} izbranih"
 download = "Prenos"
 delete = "Izbriši"
 unsupported = "Nepodprto"
+active = "Aktivno"
 addToUpload = "Dodaj k nalaganju"
+closeFile = "Zapri datoteko"
 deleteAll = "Izbriši vse"
 loadingFiles = "Nalaganje datotek..."
 noFiles = "Ni razpoložljivih datotek"
@@ -5132,7 +5262,7 @@ upgrade = "Nadgradi zdaj →"
 freeTitle = "Licenca strežnika"
 overLimitTitle = "Potrebna licenca strežnika"
 overLimitBody = "Naše licenciranje brezplačno omogoča do <strong>{{freeTierLimit}}</strong> uporabnikov na strežnik. Imate <strong>{{overLimitUserCopy}}</strong> uporabnikov Stirling. Za nemoteno uporabo nadgradite na načrt Stirling Server – <strong>neomejena mesta</strong>, urejanje besedila PDF in popoln skrbniški nadzor za $99/strežnik/mesec."
-freeBody = "Naše licenciranje <strong>Open-Core</strong> brezplačno omogoča do <strong>{{freeTierLimit}}</strong> uporabnikov na strežnik. Za nemoteno rast in zgodnji dostop do našega novega <strong>orodja za urejanje besedila PDF</strong> priporočamo načrt Stirling Server – polno urejanje in <strong>neomejena mesta</strong> za $99/strežnik/mesec."
+freeBody = "Naše licenciranje <strong>Open-Core</strong> omogoča do <strong>{{freeTierLimit}}</strong> uporabnikov brezplačno na strežnik. Za nemoteno skaliranje priporočamo načrt Stirling Server - <strong>neomejena mesta</strong> in <strong>podpora za SSO</strong> za $99/strežnik/mesec."
 
 [onboarding.desktopInstall]
 title = "Prenesi"
@@ -5237,6 +5367,31 @@ error = "Stanja uporabnika ni bilo mogoče posodobiti"
 success = "Uporabnik uspešno izbrisan"
 error = "Uporabnika ni bilo mogoče izbrisati"
 
+[workspace.people.changePassword]
+action = "Spremeni geslo"
+title = "Spremeni geslo"
+subtitle = "Posodobite geslo za"
+newPassword = "Novo geslo"
+confirmPassword = "Potrdi geslo"
+placeholder = "Vnesite novo geslo"
+confirmPlaceholder = "Znova vnesite novo geslo"
+passwordRequired = "Prosimo, vnesite novo geslo"
+passwordMismatch = "Gesli se ne ujemata"
+generateRandom = "Ustvari varno geslo"
+generatedPreview = "Ustvarjeno geslo:"
+copyTooltip = "Kopiraj v odložišče"
+copiedToClipboard = "Geslo je kopirano v odložišče"
+copyFailed = "Kopiranje gesla ni uspelo"
+sendEmail = "Uporabniku pošlji e-pošto o tej spremembi"
+includePassword = "V e-pošto vključi novo geslo"
+forcePasswordChange = "Prisili uporabnika, da ob naslednji prijavi spremeni geslo"
+emailUnavailable = "E-poštni naslov tega uporabnika ni veljaven. Obvestila so onemogočena."
+smtpDisabled = "Za e-poštna obvestila mora biti v nastavitvah omogočen SMTP."
+notifyOnly = "Poslano bo e-poštno sporočilo brez gesla, ki bo uporabnika obvestilo, da ga je skrbnik spremenil."
+submit = "Posodobi geslo"
+success = "Geslo je bilo uspešno posodobljeno"
+error = "Posodobitev gesla ni uspela"
+
 [workspace.people.emailInvite]
 tab = "E-poštno povabilo"
 description = "Spodaj vnesite ali prilepite e-poštne naslove, ločene z vejicami. Uporabniki bodo prejeli prijavne podatke po e-pošti."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Zahtevan je vsaj en e-poštni naslov"
 submit = "Pošlji povabila"
 success = "uporabnik(i) uspešno povabljen(i)"
-partialSuccess = "Nekatera povabila niso uspela"
+partialFailure = "Nekatera povabila niso uspela"
 allFailed = "Uporabnikov ni bilo mogoče povabiti"
 error = "Pošiljanje povabil ni uspelo"
 
@@ -5770,6 +5925,7 @@ subtitle = "Prijavite se s svojim računom Stirling"
 [setup.selfhosted]
 title = "Prijavite se v strežnik"
 subtitle = "Vnesite poverilnice strežnika"
+link = "ali se povežite z računom na lastnem strežniku"
 
 [setup.server]
 title = "Poveži se s strežnikom"
@@ -5788,6 +5944,14 @@ description = "Vnesite celoten URL svojega samogostovanega strežnika Stirling P
 emptyUrl = "Vnesite URL strežnika"
 unreachable = "Povezava s strežnikom ni uspela"
 testFailed = "Preizkus povezave ni uspel"
+configFetch = "Pridobitev konfiguracije strežnika ni uspela. Preverite URL in poskusite znova."
+
+[setup.server.error.securityDisabled]
+title = "Prijava ni omogočena"
+body = "Na tem strežniku prijava ni omogočena. Za povezavo s tem strežnikom morate omogočiti overjanje:"
+step1 = "V svojem okolju nastavite DOCKER_ENABLE_SECURITY=true"
+step2 = "Ali nastavite security.enableLogin=true v settings.yml"
+step3 = "Znova zaženite strežnik"
 
 [setup.login]
 title = "Prijava"
@@ -5797,6 +5961,13 @@ submit = "Prijava"
 signInWith = "Prijavite se z"
 oauthPending = "Odpiranje brskalnika za overjanje..."
 orContinueWith = "Ali nadaljujte z e-pošto"
+serverRequirement = "Opomba: Strežnik mora imeti omogočeno prijavo."
+showInstructions = "Kako omogočiti?"
+hideInstructions = "Skrij navodila"
+instructions = "Za omogočanje prijave na vašem strežniku Stirling PDF:"
+instructionsEnvVar = "Nastavite okoljsko spremenljivko:"
+instructionsOrYml = "Ali v settings.yml:"
+instructionsRestart = "Nato znova zaženite strežnik, da spremembe začnejo veljati."
 
 [setup.login.username]
 label = "Uporabniško ime"
@@ -5853,6 +6024,7 @@ earlyAccess = "Zgodnji dostop"
 reset = "Ponastavi spremembe"
 downloadJson = "Prenesi JSON"
 generatePdf = "Ustvari PDF"
+saveChanges = "Shrani spremembe"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Samodejno prilagodi besedilo okvirjem"
@@ -5890,6 +6062,8 @@ alpha = "Ta alfa pregledovalnik se še razvija — nekatere pisave, barve, učin
 [pdfTextEditor.empty]
 title = "Ni naloženega dokumenta"
 subtitle = "Naložite datoteko PDF ali JSON, da začnete urejati besedilo."
+dropzone = "Sem povlecite in spustite datoteko PDF ali JSON ali kliknite za brskanje"
+dropzoneWithFiles = "Izberite datoteko na zavihku Datoteke ali sem povlecite in spustite datoteko PDF ali JSON oziroma kliknite za brskanje"
 
 [pdfTextEditor.welcomeBanner]
 title = "Dobrodošli v PDF Text Editor (zgodnji dostop)"
diff --git a/frontend/public/locales/sr-LATN-RS/translation.toml b/frontend/public/locales/sr-LATN-RS/translation.toml
index a24113123..9404bc001 100644
--- a/frontend/public/locales/sr-LATN-RS/translation.toml
+++ b/frontend/public/locales/sr-LATN-RS/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Ukloni iz omiljenog"
 fullscreen = "Prebaci na režim celog ekrana"
 sidebar = "Prebaci na režim bočne trake"
 
+[backendStartup]
+notFoundTitle = "Bekend nije pronađen"
+retry = "Pokušaj ponovo"
+unreachable = "Aplikacija trenutno ne može da se poveže sa bekendom. Proverite status bekenda i mrežnu povezanost, pa pokušajte ponovo."
+
 [zipWarning]
 title = "Velika ZIP datoteka"
 message = "Ovaj ZIP sadrži {{count}} datoteka. Ipak raspakovati?"
@@ -912,6 +917,9 @@ desc = "Gradite višekorake tokove rada povezivanjem PDF akcija. Idealno za pona
 desc = "Preklapa PDF-ove jedan preko drugog"
 title = "Preklapanje PDF-ova"
 
+[home.pdfTextEditor]
+title = "PDF uređivač teksta"
+desc = "Uređujte postojeći tekst i slike unutar PDF-ova"
 
 [home.addText]
 tags = "tekst,anotacija,oznaka"
@@ -1213,11 +1221,11 @@ pdfaDigitalSignatureWarning = "PDF sadrži digitalni potpis. Biće uklonjen u sl
 fileFormat = "Format datoteke"
 wordDoc = "Word dokument"
 wordDocExt = "Word dokument (.docx)"
-odtExt = "OpenDocument Text (.odt)"
+odtExt = "OpenDocument tekst (.odt)"
 pptExt = "PowerPoint (.pptx)"
-odpExt = "OpenDocument Presentation (.odp)"
+odpExt = "OpenDocument prezentacija (.odp)"
 txtExt = "Običan tekst (.txt)"
-rtfExt = "Rich Text Format (.rtf)"
+rtfExt = "Format obogaćenog teksta (.rtf)"
 selectedFiles = "Izabrane datoteke"
 noFileSelected = "Nije izabrana nijedna datoteka. Koristite panel datoteka da dodate datoteke."
 convertFiles = "Konvertuj datoteke"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Crtani potpis"
 defaultImageLabel = "Otpremljeni potpis"
 defaultTextLabel = "Ukucani potpis"
 saveButton = "Sačuvaj potpis"
+savePersonal = "Sačuvaj lično"
+saveShared = "Sačuvaj deljeno"
 saveUnavailable = "Prvo napravite potpis da biste ga sačuvali."
 noChanges = "Trenutni potpis je već sačuvan."
+tempStorageTitle = "Privremeno skladište pregledača"
+tempStorageDescription = "Potpisi se čuvaju samo u vašem pregledaču. Biće izgubljeni ako obrišete podatke pregledača ili promenite pregledač."
+personalHeading = "Lični potpisi"
+sharedHeading = "Deljeni potpisi"
+personalDescription = "Samo vi možete da vidite ove potpise."
+sharedDescription = "Svi korisnici mogu da vide i koriste ove potpise."
 
 [sign.saved.type]
 canvas = "Crtanje"
@@ -2318,7 +2334,7 @@ title = "Ravnanje"
 header = "Ravnanje PDF fajlova"
 flattenOnlyForms = "Izravnaj samo forme"
 submit = "Ravnanje"
-filenamePrefix = "flattened"
+filenamePrefix = "spljošteno"
 
 [flatten.files]
 placeholder = "Izaberite PDF datoteku u glavnom prikazu da biste započeli"
@@ -3020,6 +3036,91 @@ title = "Informacije o PDF-u"
 header = "Informacije o PDF-u"
 submit = "Informacije"
 downloadJson = "Preuzmi JSON"
+processing = "Izdvajanje informacija..."
+results = "Rezultati"
+noResults = "Pokrenite alat da generišete izveštaj."
+downloads = "Preuzimanja"
+noneDetected = "Nije otkriveno ništa"
+indexTitle = "Indeks"
+
+[getPdfInfo.report]
+entryLabel = "Potpuni sažetak informacija"
+shortTitle = "Informacije o PDF-u"
+
+[getPdfInfo.sections]
+metadata = "Metapodaci"
+formFields = "Polja obrasca"
+basicInfo = "Osnovne informacije"
+documentInfo = "Informacije o dokumentu"
+compliance = "Usklađenost"
+encryption = "Šifrovanje"
+permissions = "Dozvole"
+other = "Ostalo"
+perPageInfo = "Informacije po stranici"
+tableOfContents = "Sadržaj"
+
+[getPdfInfo.other]
+attachments = "Prilozi"
+embeddedFiles = "Ugrađene datoteke"
+javaScript = "JavaScript"
+layers = "Slojevi"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Veličina"
+annotations = "Anotacije"
+images = "Slike"
+links = "Linkovi"
+fonts = "Fontovi"
+xobjects = "Broj XObject-ova"
+multimedia = "Multimedija"
+
+[getPdfInfo.summary]
+pages = "Stranice"
+fileSize = "Veličina datoteke"
+pdfVersion = "PDF verzija"
+language = "Jezik"
+title = "PDF sažetak"
+author = "Autor"
+created = "Kreirano"
+modified = "Izmenjeno"
+permsAll = "Sve dozvole su omogućene"
+permsRestricted = "{{count}} ograničenja"
+permsMixed = "Neke dozvole su ograničene"
+hasCompliance = "Ima standarde usklađenosti"
+noCompliance = "Nema standarda usklađenosti"
+basic = "Osnovne informacije"
+documentInfo = "Informacije o dokumentu"
+securityTitle = "Status bezbednosti"
+technical = "Tehničko"
+overviewTitle = "Pregled PDF-a"
+
+[getPdfInfo.summary.security]
+encrypted = "Šifrovan PDF - prisutna zaštita lozinkom"
+unencrypted = "Nešifrovan PDF - bez zaštite lozinkom"
+
+[getPdfInfo.summary.tech]
+images = "Slike"
+fonts = "Fontovi"
+formFields = "Polja obrasca"
+embeddedFiles = "Ugrađene datoteke"
+javaScript = "JavaScript"
+layers = "Slojevi"
+bookmarks = "Obeleživači"
+multimedia = "Multimedija"
+
+[getPdfInfo.summary.overview]
+untitled = "neimenovani dokument"
+unknown = "Nepoznat autor"
+text = "Ovo je PDF od {{pages}} stranica pod nazivom {{title}} koji je kreirao {{author}} (PDF verzija {{version}})."
+
+[getPdfInfo.error]
+partial = "Neke datoteke nije bilo moguće obraditi."
+unexpected = "Neočekivana greška tokom izdvajanja."
+
+[getPdfInfo.status]
+complete = "Izdvajanje završeno"
 
 [extractPage]
 tags = "izdvajanje"
@@ -3438,6 +3539,9 @@ signinTitle = "Molimo vas da se prijavite"
 ssoSignIn = "Prijavite se putem jedinstvene prijave"
 oAuth2AutoCreateDisabled = "OAUTH2 automatsko kreiranje korisnika je onemogućeno"
 oAuth2AdminBlockedUser = "Registracija ili prijava neregistrovanog korisnika je trenutno onemogućeno. Kontaktirajte administratora."
+oAuth2RequiresLicense = "Prijava putem OAuth/SSO zahteva plaćenu licencu (Server ili Enterprise). Kontaktirajte administratora da unapredi vaš plan."
+saml2RequiresLicense = "Prijava putem SAML zahteva plaćenu licencu (Server ili Enterprise). Kontaktirajte administratora da unapredi vaš plan."
+maxUsersReached = "Dostignut je maksimalni broj korisnika za vašu trenutnu licencu. Kontaktirajte administratora da unapredi vaš plan ili doda više mesta."
 oauth2RequestNotFound = "Zahtev za autorizaciju nije pronađen"
 oauth2InvalidUserInfoResponse = "Neispravan odgovor sa korisničkim informacijama"
 oauth2invalidRequest = "Neispravan zahtev"
@@ -3771,7 +3875,7 @@ version = "Aktuelno izdanje"
 title = "API dokumentacija"
 header = "API dokumentacija"
 desc = "Pregledajte i testirajte Stirling PDF API endpoints"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,dokumentacija,swagger,krajnje tačke,razvoj"
 
 [cookieBanner.popUp]
 title = "Kako koristimo kolačiće"
@@ -3846,14 +3950,17 @@ fitToWidth = "Uklopi po širini"
 actualSize = "Stvarna veličina"
 
 [viewer]
+cannotPreviewFile = "Nije moguće pregledati datoteku"
+dualPageView = "Prikaz dve stranice"
 firstPage = "Prva stranica"
 lastPage = "Poslednja stranica"
-previousPage = "Prethodna stranica"
 nextPage = "Sledeća stranica"
+onlyPdfSupported = "Prikazivač podržava samo PDF datoteke. Izgleda da je ova datoteka drugačijeg formata."
+previousPage = "Prethodna stranica"
+singlePageView = "Prikaz jedne stranice"
+unknownFile = "Nepoznata datoteka"
 zoomIn = "Uvećaj"
 zoomOut = "Umanji"
-singlePageView = "Prikaz jedne stranice"
-dualPageView = "Prikaz dve stranice"
 
 [rightRail]
 closeSelected = "Zatvori izabrane fajlove"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Uključi/isključi bočnu traku"
 exportSelected = "Izvezi izabrane stranice"
 toggleAnnotations = "Uključi/isključi vidljivost anotacija"
 annotationMode = "Uključi/isključi režim anotacija"
+print = "Štampaj PDF"
 draw = "Crtaj"
 save = "Sačuvaj"
 saveChanges = "Sačuvaj izmene"
@@ -4494,6 +4602,7 @@ description = "URL ili naziv datoteke do impresuma (obavezno u nekim jurisdikcij
 title = "Premium i Enterprise"
 description = "Podesite svoj premium ili enterprise licencni ključ."
 license = "Konfiguracija licence"
+noInput = "Navedite licencni ključ ili fajl"
 
 [admin.settings.premium.licenseKey]
 toggle = "Imate licencni ključ ili datoteku sertifikata?"
@@ -4511,6 +4620,25 @@ line1 = "Prepisivanje vašeg trenutnog licencnog ključa ne može se opozvati."
 line2 = "Prethodna licenca će biti trajno izgubljena osim ako je niste sačuvali na drugom mestu."
 line3 = "Važno: Čuvajte licencne ključeve privatnim i bezbednim. Nikada ih javno ne delite."
 
+[admin.settings.premium.inputMethod]
+text = "Licencni ključ"
+file = "Fajl sertifikata"
+
+[admin.settings.premium.file]
+label = "Fajl licencnog sertifikata"
+description = "Otpremite svoj .lic ili .cert licencni fajl iz offline kupovina"
+choose = "Izaberite licencni fajl"
+selected = "Izabrano: {{filename}} ({{size}})"
+successMessage = "Licencni fajl je uspešno otpremljen i aktiviran. Restart nije potreban."
+
+[admin.settings.premium.currentLicense]
+title = "Aktivna licenca"
+file = "Izvor: licencni fajl ({{path}})"
+key = "Izvor: licencni ključ"
+type = "Tip: {{type}}"
+noInput = "Navedite licencni ključ ili otpremite fajl sertifikata"
+success = "Uspeh"
+
 [admin.settings.premium.enabled]
 label = "Omogući premium funkcije"
 description = "Omogući provere licencnog ključa za pro/enterprise funkcije"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} izabrano"
 download = "Preuzmi"
 delete = "Obriši"
 unsupported = "Nepodržano"
+active = "Aktivno"
 addToUpload = "Dodaj za otpremanje"
+closeFile = "Zatvori datoteku"
 deleteAll = "Obriši sve"
 loadingFiles = "Učitavanje datoteka..."
 noFiles = "Nema dostupnih datoteka"
@@ -5132,7 +5262,7 @@ upgrade = "Nadogradite sada →"
 freeTitle = "Serverska licenca"
 overLimitTitle = "Potrebna serverska licenca"
 overLimitBody = "Naše licenciranje dozvoljava do <strong>{{freeTierLimit}}</strong> korisnika besplatno po serveru. Imate <strong>{{overLimitUserCopy}}</strong> Stirling korisnika. Da nastavite bez prekida, pređite na Stirling Server plan - <strong>neograničena mesta</strong>, uređivanje PDF teksta i puna admin kontrola za $99/server/mes."
-freeBody = "Naše <strong>Open-Core</strong> licenciranje dozvoljava do <strong>{{freeTierLimit}}</strong> korisnika besplatno po serveru. Da se bez prekida skalirate i dobijete rani pristup našem novom <strong>alatu za uređivanje PDF teksta</strong>, preporučujemo Stirling Server plan - puno uređivanje i <strong>neograničena mesta</strong> za $99/server/mes."
+freeBody = "Naše licenciranje <strong>Open-Core</strong> dozvoljava do <strong>{{freeTierLimit}}</strong> korisnika besplatno po serveru. Za neometano skaliranje, preporučujemo plan Stirling Server - <strong>neograničena mesta</strong> i <strong>SSO podrška</strong> za $99/server/mo."
 
 [onboarding.desktopInstall]
 title = "Preuzmi"
@@ -5237,6 +5367,31 @@ error = "Ažuriranje statusa korisnika nije uspelo"
 success = "Korisnik uspešno obrisan"
 error = "Brisanje korisnika nije uspelo"
 
+[workspace.people.changePassword]
+action = "Promenite lozinku"
+title = "Promenite lozinku"
+subtitle = "Ažurirajte lozinku za"
+newPassword = "Nova lozinka"
+confirmPassword = "Potvrdite lozinku"
+placeholder = "Unesite novu lozinku"
+confirmPlaceholder = "Ponovo unesite novu lozinku"
+passwordRequired = "Unesite novu lozinku"
+passwordMismatch = "Lozinke se ne poklapaju"
+generateRandom = "Generišite bezbednu lozinku"
+generatedPreview = "Generisana lozinka:"
+copyTooltip = "Kopirajte u privremenu memoriju"
+copiedToClipboard = "Lozinka je kopirana u privremenu memoriju"
+copyFailed = "Nije uspelo kopiranje lozinke"
+sendEmail = "Pošaljite korisniku email o ovoj promeni"
+includePassword = "Uključite novu lozinku u email"
+forcePasswordChange = "Naterajte korisnika da promeni lozinku pri sledećoj prijavi"
+emailUnavailable = "Email ovog korisnika nije važeća email adresa. Obaveštenja su onemogućena."
+smtpDisabled = "Email obaveštenja zahtevaju da SMTP bude omogućen u podešavanjima."
+notifyOnly = "Biće poslat email bez lozinke, kako bi korisnik znao da je administrator promenio lozinku."
+submit = "Ažurirajte lozinku"
+success = "Lozinka je uspešno ažurirana"
+error = "Ažuriranje lozinke nije uspelo"
+
 [workspace.people.emailInvite]
 tab = "Poziv emailom"
 description = "Ukucajte ili nalepite email adrese ispod, odvojene zarezima. Korisnici će dobiti pristupne podatke putem emaila."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Potrebna je bar jedna email adresa"
 submit = "Pošalji pozive"
 success = "Korisnik(ci) uspešno pozvan(i)"
-partialSuccess = "Neki pozivi nisu uspeli"
+partialFailure = "Neki pozivi nisu uspeli"
 allFailed = "Pozivanje korisnika nije uspelo"
 error = "Slanje poziva nije uspelo"
 
@@ -5770,6 +5925,7 @@ subtitle = "Prijavite se svojim Stirling nalogom"
 [setup.selfhosted]
 title = "Prijava na server"
 subtitle = "Unesite kredencijale servera"
+link = "ili se povežite na samohostovani nalog"
 
 [setup.server]
 title = "Poveži se na server"
@@ -5788,6 +5944,14 @@ description = "Unesite puni URL vašeg samohostovanog Stirling PDF servera"
 emptyUrl = "Unesite URL servera"
 unreachable = "Nije moguće povezati se sa serverom"
 testFailed = "Test veze nije uspeo"
+configFetch = "Nije uspelo preuzimanje konfiguracije servera. Proverite URL i pokušajte ponovo."
+
+[setup.server.error.securityDisabled]
+title = "Prijavljivanje nije omogućeno"
+body = "Na ovom serveru prijavljivanje nije omogućeno. Da biste se povezali na ovaj server, morate omogućiti autentikaciju:"
+step1 = "Postavite DOCKER_ENABLE_SECURITY=true u svom okruženju"
+step2 = "Ili postavite security.enableLogin=true u settings.yml"
+step3 = "Restartujte server"
 
 [setup.login]
 title = "Prijava"
@@ -5797,6 +5961,13 @@ submit = "Prijavi se"
 signInWith = "Prijavite se sa"
 oauthPending = "Otvaranje pregledača za autentikaciju..."
 orContinueWith = "Ili nastavite uz email"
+serverRequirement = "Napomena: Server mora imati omogućenu prijavu."
+showInstructions = "Kako omogućiti?"
+hideInstructions = "Sakrij uputstva"
+instructions = "Da biste omogućili prijavu na svom Stirling PDF serveru:"
+instructionsEnvVar = "Podesite promenljivu okruženja:"
+instructionsOrYml = "Ili u settings.yml:"
+instructionsRestart = "Zatim restartujte server da bi izmene stupile na snagu."
 
 [setup.login.username]
 label = "Korisničko ime"
@@ -5853,6 +6024,7 @@ earlyAccess = "Rani pristup"
 reset = "Poništi izmene"
 downloadJson = "Preuzmi JSON"
 generatePdf = "Generiši PDF"
+saveChanges = "Sačuvajte izmene"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Automatski prilagodi tekst okvirima"
@@ -5890,6 +6062,8 @@ alpha = "Ovaj alfa pregledač je i dalje u razvoju—određeni fontovi, boje, ef
 [pdfTextEditor.empty]
 title = "Nijedan dokument nije učitan"
 subtitle = "Učitajte PDF ili JSON datoteku da biste počeli sa uređivanjem teksta."
+dropzone = "Prevucite i otpustite PDF ili JSON datoteku ovde ili kliknite da izaberete"
+dropzoneWithFiles = "Izaberite datoteku sa kartice Datoteke, ili prevucite i otpustite PDF ili JSON datoteku ovde, ili kliknite da izaberete"
 
 [pdfTextEditor.welcomeBanner]
 title = "Dobrodošli u Uređivač teksta za PDF (rani pristup)"
diff --git a/frontend/public/locales/sv-SE/translation.toml b/frontend/public/locales/sv-SE/translation.toml
index 3cf3913ca..ac154f141 100644
--- a/frontend/public/locales/sv-SE/translation.toml
+++ b/frontend/public/locales/sv-SE/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Ta bort från favoriter"
 fullscreen = "Byt till helskärmsläge"
 sidebar = "Byt till sidopanelläge"
 
+[backendStartup]
+notFoundTitle = "Backend hittades inte"
+retry = "Försök igen"
+unreachable = "Applikationen kan för närvarande inte ansluta till backend. Kontrollera backendens status och nätverksanslutningen och försök sedan igen."
+
 [zipWarning]
 title = "Stor ZIP-fil"
 message = "Denna ZIP innehåller {{count}} filer. Extrahera ändå?"
@@ -912,6 +917,9 @@ desc = "Skapa flerstegade arbetsflöden genom att kedja ihop PDF‑åtgärder. P
 desc = "Överlagrar PDF:er ovanpå en annan PDF"
 title = "Överlagra PDF:er"
 
+[home.pdfTextEditor]
+title = "PDF-textredigerare"
+desc = "Redigera befintlig text och bilder i PDF-filer"
 
 [home.addText]
 tags = "text,kommentar,etikett"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Ritad signatur"
 defaultImageLabel = "Uppladdad signatur"
 defaultTextLabel = "Skriven signatur"
 saveButton = "Spara signatur"
+savePersonal = "Spara som personlig"
+saveShared = "Spara som delad"
 saveUnavailable = "Skapa en signatur först för att kunna spara."
 noChanges = "Aktuell signatur är redan sparad."
+tempStorageTitle = "Tillfällig lagring i webbläsaren"
+tempStorageDescription = "Signaturer lagras endast i din webbläsare. De går förlorade om du rensar webbläsardata eller byter webbläsare."
+personalHeading = "Personliga signaturer"
+sharedHeading = "Delade signaturer"
+personalDescription = "Endast du kan se dessa signaturer."
+sharedDescription = "Alla användare kan se och använda dessa signaturer."
 
 [sign.saved.type]
 canvas = "Ritning"
@@ -2281,7 +2297,7 @@ placeDesc = "Placera signaturen på din PDF"
 [sign.type]
 title = "Signaturtyp"
 draw = "Rita"
-canvas = "Canvas"
+canvas = "Rityta"
 image = "Bild"
 text = "Text"
 saved = "Sparad"
@@ -3020,6 +3036,91 @@ title = "Hämta information om PDF"
 header = "Hämta information om PDF"
 submit = "Hämta information"
 downloadJson = "Ladda ner JSON"
+processing = "Extraherar information..."
+results = "Resultat"
+noResults = "Kör verktyget för att skapa en rapport."
+downloads = "Nedladdningar"
+noneDetected = "Inget upptäckt"
+indexTitle = "Index"
+
+[getPdfInfo.report]
+entryLabel = "Fullständig informationssammanfattning"
+shortTitle = "PDF-information"
+
+[getPdfInfo.sections]
+metadata = "Metadata"
+formFields = "Formulärfält"
+basicInfo = "Grundläggande info"
+documentInfo = "Dokumentinformation"
+compliance = "Efterlevnad"
+encryption = "Kryptering"
+permissions = "Behörigheter"
+other = "Övrigt"
+perPageInfo = "Information per sida"
+tableOfContents = "Innehållsförteckning"
+
+[getPdfInfo.other]
+attachments = "Bilagor"
+embeddedFiles = "Inbäddade filer"
+javaScript = "JavaScript"
+layers = "Lager"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Storlek"
+annotations = "Anteckningar"
+images = "Bilder"
+links = "Länkar"
+fonts = "Typsnitt"
+xobjects = "Antal XObject"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary]
+pages = "Sidor"
+fileSize = "Filstorlek"
+pdfVersion = "PDF-version"
+language = "Språk"
+title = "PDF-sammanfattning"
+author = "Författare"
+created = "Skapad"
+modified = "Ändrad"
+permsAll = "Alla behörigheter tillåtna"
+permsRestricted = "{{count}} begränsningar"
+permsMixed = "Vissa behörigheter begränsade"
+hasCompliance = "Har efterlevnadsstandarder"
+noCompliance = "Inga efterlevnadsstandarder"
+basic = "Grundläggande information"
+documentInfo = "Dokumentinformation"
+securityTitle = "Säkerhetsstatus"
+technical = "Tekniskt"
+overviewTitle = "PDF-översikt"
+
+[getPdfInfo.summary.security]
+encrypted = "Krypterad PDF - Lösenordsskydd finns"
+unencrypted = "Okrypterad PDF - Inget lösenordsskydd"
+
+[getPdfInfo.summary.tech]
+images = "Bilder"
+fonts = "Typsnitt"
+formFields = "Formulärfält"
+embeddedFiles = "Inbäddade filer"
+javaScript = "JavaScript"
+layers = "Lager"
+bookmarks = "Bokmärken"
+multimedia = "Multimedia"
+
+[getPdfInfo.summary.overview]
+untitled = "ett namnlöst dokument"
+unknown = "Okänd författare"
+text = "Detta är en PDF på {{pages}} sidor med titeln {{title}}, skapad av {{author}} (PDF-version {{version}})."
+
+[getPdfInfo.error]
+partial = "Vissa filer kunde inte bearbetas."
+unexpected = "Oväntat fel under extrahering."
+
+[getPdfInfo.status]
+complete = "Extrahering klar"
 
 [extractPage]
 tags = "extrahera"
@@ -3438,6 +3539,9 @@ signinTitle = "Vänligen logga in"
 ssoSignIn = "Logga in via enkel inloggning"
 oAuth2AutoCreateDisabled = "OAUTH2 Auto-skapa användare inaktiverad"
 oAuth2AdminBlockedUser = "Registrering eller inloggning av icke-registrerade användare är för närvarande blockerad. Kontakta administratören."
+oAuth2RequiresLicense = "OAuth/SSO-inloggning kräver en betald licens (Server eller Enterprise). Kontakta administratören för att uppgradera din plan."
+saml2RequiresLicense = "SAML-inloggning kräver en betald licens (Server eller Enterprise). Kontakta administratören för att uppgradera din plan."
+maxUsersReached = "Maximalt antal användare har uppnåtts för din nuvarande licens. Kontakta administratören för att uppgradera din plan eller lägga till fler användarplatser."
 oauth2RequestNotFound = "Auktoriseringsbegäran hittades inte"
 oauth2InvalidUserInfoResponse = "Ogiltigt svar på användarinformation"
 oauth2invalidRequest = "Ogiltig begäran"
@@ -3846,14 +3950,17 @@ fitToWidth = "Anpassa till bredd"
 actualSize = "Faktisk storlek"
 
 [viewer]
+cannotPreviewFile = "Kan inte förhandsgranska filen"
+dualPageView = "Dubbelsidig vy"
 firstPage = "Första sidan"
 lastPage = "Sista sidan"
-previousPage = "Föregående sida"
 nextPage = "Nästa sida"
+onlyPdfSupported = "Visaren stöder endast PDF-filer. Den här filen verkar vara i ett annat format."
+previousPage = "Föregående sida"
+singlePageView = "Ensidig vy"
+unknownFile = "Okänd fil"
 zoomIn = "Zooma in"
 zoomOut = "Zooma ut"
-singlePageView = "Ensidig vy"
-dualPageView = "Dubbelsidig vy"
 
 [rightRail]
 closeSelected = "Stäng markerade filer"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Växla sidofält"
 exportSelected = "Exportera markerade sidor"
 toggleAnnotations = "Växla synlighet för anteckningar"
 annotationMode = "Växla anteckningsläge"
+print = "Skriv ut PDF"
 draw = "Rita"
 save = "Spara"
 saveChanges = "Spara ändringar"
@@ -4494,6 +4602,7 @@ description = "URL eller filnamn till impressum (krävs i vissa jurisdiktioner)"
 title = "Premium och Enterprise"
 description = "Konfigurera din premium- eller enterprise-licensnyckel."
 license = "Licenskonfiguration"
+noInput = "Ange en licensnyckel eller fil"
 
 [admin.settings.premium.licenseKey]
 toggle = "Har du en licensnyckel eller certifikatfil?"
@@ -4511,6 +4620,25 @@ line1 = "Att skriva över din nuvarande licensnyckel kan inte ångras."
 line2 = "Din tidigare licens går förlorad permanent om du inte har säkerhetskopierat den någon annanstans."
 line3 = "Viktigt: Håll licensnycklar privata och säkra. Dela dem aldrig offentligt."
 
+[admin.settings.premium.inputMethod]
+text = "Licensnyckel"
+file = "Certifikatfil"
+
+[admin.settings.premium.file]
+label = "Licenscertifikatfil"
+description = "Ladda upp din .lic- eller .cert-licensfil från offlineköp"
+choose = "Välj licensfil"
+selected = "Vald: {{filename}} ({{size}})"
+successMessage = "Licensfilen har laddats upp och aktiverats. Ingen omstart krävs."
+
+[admin.settings.premium.currentLicense]
+title = "Aktiv licens"
+file = "Källa: Licensfil ({{path}})"
+key = "Källa: Licensnyckel"
+type = "Typ: {{type}}"
+noInput = "Ange en licensnyckel eller ladda upp en certifikatfil"
+success = "Lyckat"
+
 [admin.settings.premium.enabled]
 label = "Aktivera premiumfunktioner"
 description = "Aktivera licensnyckelkontroller för pro-/enterprise-funktioner"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} markerade"
 download = "Ladda ner"
 delete = "Radera"
 unsupported = "Stöds inte"
+active = "Aktiv"
 addToUpload = "Lägg till i uppladdning"
+closeFile = "Stäng fil"
 deleteAll = "Ta bort alla"
 loadingFiles = "Läser in filer..."
 noFiles = "Inga filer tillgängliga"
@@ -5132,7 +5262,7 @@ upgrade = "Uppgradera nu →"
 freeTitle = "Serverlicens"
 overLimitTitle = "Serverlicens krävs"
 overLimitBody = "Vår licensiering tillåter upp till <strong>{{freeTierLimit}}</strong> användare gratis per server. Du har <strong>{{overLimitUserCopy}}</strong> Stirling-användare. För att fortsätta utan avbrott, uppgradera till Stirling Server-planen - <strong>obegränsade platser</strong>, PDF-textredigering och full adminkontroll för $99/server/mån."
-freeBody = "Vår <strong>Open-Core</strong>-licens tillåter upp till <strong>{{freeTierLimit}}</strong> användare gratis per server. För att skala utan avbrott och få tidig åtkomst till vårt nya <strong>PDF-textredigeringsverktyg</strong> rekommenderar vi Stirling Server-planen - full redigering och <strong>obegränsade platser</strong> för $99/server/mån."
+freeBody = "Vår <strong>Open-Core</strong>-licens tillåter upp till <strong>{{freeTierLimit}}</strong> användare gratis per server. För att skala utan avbrott rekommenderar vi Stirling Server plan - <strong>obegränsat antal platser</strong> och <strong>SSO-stöd</strong> för $99/server/månad."
 
 [onboarding.desktopInstall]
 title = "Ladda ner"
@@ -5237,6 +5367,31 @@ error = "Misslyckades med att uppdatera användarstatus"
 success = "Användare borttagen"
 error = "Misslyckades med att ta bort användare"
 
+[workspace.people.changePassword]
+action = "Byt lösenord"
+title = "Byt lösenord"
+subtitle = "Uppdatera lösenordet för"
+newPassword = "Nytt lösenord"
+confirmPassword = "Bekräfta lösenord"
+placeholder = "Ange ett nytt lösenord"
+confirmPlaceholder = "Ange det nya lösenordet igen"
+passwordRequired = "Ange ett nytt lösenord"
+passwordMismatch = "Lösenorden matchar inte"
+generateRandom = "Generera säkert lösenord"
+generatedPreview = "Genererat lösenord:"
+copyTooltip = "Kopiera till urklipp"
+copiedToClipboard = "Lösenord kopierat till urklipp"
+copyFailed = "Det gick inte att kopiera lösenordet"
+sendEmail = "Skicka e-post till användaren om denna ändring"
+includePassword = "Inkludera det nya lösenordet i e-postmeddelandet"
+forcePasswordChange = "Tvinga användaren att byta lösenord vid nästa inloggning"
+emailUnavailable = "Den här användarens e-postadress är inte giltig. Aviseringar är inaktiverade."
+smtpDisabled = "E-postaviseringar kräver att SMTP är aktiverat i inställningarna."
+notifyOnly = "Ett e-postmeddelande skickas utan lösenordet och informerar användaren om att en admin har ändrat det."
+submit = "Uppdatera lösenord"
+success = "Lösenordet har uppdaterats"
+error = "Det gick inte att uppdatera lösenordet"
+
 [workspace.people.emailInvite]
 tab = "E-postinbjudan"
 description = "Skriv eller klistra in e-postadresser nedan, separerade med kommatecken. Användare får inloggningsuppgifter via e-post."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Minst en e-postadress krävs"
 submit = "Skicka inbjudningar"
 success = "Användare inbjudna"
-partialSuccess = "Vissa inbjudningar misslyckades"
+partialFailure = "Vissa inbjudningar misslyckades"
 allFailed = "Misslyckades med att bjuda in användare"
 error = "Misslyckades med att skicka inbjudningar"
 
@@ -5770,6 +5925,7 @@ subtitle = "Logga in med ditt Stirling-konto"
 [setup.selfhosted]
 title = "Logga in på server"
 subtitle = "Ange dina serveruppgifter"
+link = "eller anslut till ett självhostat konto"
 
 [setup.server]
 title = "Anslut till server"
@@ -5788,6 +5944,14 @@ description = "Ange den fullständiga URL:en till din självhostade Stirling PDF
 emptyUrl = "Ange en server-URL"
 unreachable = "Kunde inte ansluta till servern"
 testFailed = "Anslutningstest misslyckades"
+configFetch = "Det gick inte att hämta serverkonfigurationen. Kontrollera URL:en och försök igen."
+
+[setup.server.error.securityDisabled]
+title = "Inloggning inte aktiverad"
+body = "Den här servern har inte inloggning aktiverad. För att ansluta till den här servern måste du aktivera autentisering:"
+step1 = "Ställ in DOCKER_ENABLE_SECURITY=true i din miljö"
+step2 = "Eller ställ in security.enableLogin=true i settings.yml"
+step3 = "Starta om servern"
 
 [setup.login]
 title = "Logga in"
@@ -5797,6 +5961,13 @@ submit = "Logga in"
 signInWith = "Logga in med"
 oauthPending = "Öppnar webbläsaren för autentisering..."
 orContinueWith = "Eller fortsätt med e-post"
+serverRequirement = "Observera: Servern måste ha inloggning aktiverad."
+showInstructions = "Hur aktiverar man?"
+hideInstructions = "Dölj instruktioner"
+instructions = "För att aktivera inloggning på din Stirling PDF-server:"
+instructionsEnvVar = "Ställ in miljövariabeln:"
+instructionsOrYml = "Eller i settings.yml:"
+instructionsRestart = "Starta sedan om servern för att ändringarna ska börja gälla."
 
 [setup.login.username]
 label = "Användarnamn"
@@ -5853,6 +6024,7 @@ earlyAccess = "Tidig åtkomst"
 reset = "Återställ ändringar"
 downloadJson = "Ladda ner JSON"
 generatePdf = "Skapa PDF"
+saveChanges = "Spara ändringar"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Skala text automatiskt för att passa rutor"
@@ -5890,6 +6062,8 @@ alpha = "Denna alfa-visare utvecklas fortfarande—vissa typsnitt, färger, tran
 [pdfTextEditor.empty]
 title = "Inget dokument inläst"
 subtitle = "Ladda en PDF- eller JSON-fil för att börja redigera textinnehåll."
+dropzone = "Dra och släpp en PDF- eller JSON-fil här, eller klicka för att bläddra"
+dropzoneWithFiles = "Välj en fil från fliken Filer, eller dra och släpp en PDF- eller JSON-fil här, eller klicka för att bläddra"
 
 [pdfTextEditor.welcomeBanner]
 title = "Välkommen till PDF Text Editor (Tidig åtkomst)"
diff --git a/frontend/public/locales/th-TH/translation.toml b/frontend/public/locales/th-TH/translation.toml
index bfd0077b2..eea7ee0d6 100644
--- a/frontend/public/locales/th-TH/translation.toml
+++ b/frontend/public/locales/th-TH/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "นำออกจากรายการโปรด"
 fullscreen = "สลับเป็นโหมดเต็มหน้าจอ"
 sidebar = "สลับเป็นโหมดแถบด้านข้าง"
 
+[backendStartup]
+notFoundTitle = "ไม่พบ Backend"
+retry = "ลองอีกครั้ง"
+unreachable = "ขณะนี้แอปพลิเคชันไม่สามารถเชื่อมต่อกับ Backend ได้ โปรดตรวจสอบสถานะของ Backend และการเชื่อมต่อเครือข่าย จากนั้นลองอีกครั้ง"
+
 [zipWarning]
 title = "ไฟล์ ZIP ขนาดใหญ่"
 message = "ZIP นี้มี {{count}} ไฟล์ ต้องการแตกไฟล์ต่อหรือไม่?"
@@ -347,7 +352,7 @@ teams = "ทีม"
 title = "การกำหนดค่า"
 systemSettings = "การตั้งค่าระบบ"
 features = "ฟีเจอร์"
-endpoints = "Endpoints"
+endpoints = "ปลายทาง"
 database = "ฐานข้อมูล"
 advanced = "ขั้นสูง"
 
@@ -369,7 +374,7 @@ privacy = "ความเป็นส่วนตัว"
 
 [settings.developer]
 title = "นักพัฒนา"
-apiKeys = "API Keys"
+apiKeys = "คีย์ API"
 
 [settings.tooltips]
 enableLoginFirst = "เปิดใช้งานโหมดเข้าสู่ระบบก่อน"
@@ -556,7 +561,7 @@ totalEndpoints = "จำนวน Endpoint ทั้งหมด"
 totalVisits = "จำนวนการเข้าชมทั้งหมด"
 showing = "กำลังแสดง"
 selectedVisits = "การเข้าชมที่เลือก"
-endpoint = "Endpoint"
+endpoint = "ปลายทาง"
 visits = "การเข้าชม"
 percentage = "เปอร์เซ็นต์"
 loading = "กำลังโหลด..."
@@ -794,7 +799,7 @@ title = "รวมเป็น หน้าเดียว"
 desc = "รวมหน้าทั้งหมดของ PDF เป็นหน้าเดียวขนาดใหญ่"
 
 [home.showJS]
-tags = "javascript,code,script"
+tags = "javascript,โค้ด,สคริปต์"
 title = "แสดง Javascript"
 desc = "ค้นหาและแสดง Javascript ที่ฝังใน PDF"
 
@@ -829,7 +834,7 @@ title = "ตรวจสอบลายเซ็น PDF"
 desc = "ตรวจสอบลายเซ็นดิจิทัลและใบรับรองในเอกสาร PDF"
 
 [home.swagger]
-tags = "API,documentation,test"
+tags = "API,เอกสารประกอบ,ทดสอบ"
 title = "เอกสาร API"
 desc = "ดูเอกสาร API และทดสอบเอ็นด์พอยต์"
 
@@ -878,7 +883,7 @@ title = "แทนที่และกลับสี"
 desc = "แทนที่หรือกลับสีในเอกสาร PDF"
 
 [home.devApi]
-tags = "API,development,documentation"
+tags = "API,การพัฒนา,เอกสารประกอบ"
 title = "API"
 desc = "ลิงก์ไปยังเอกสาร API"
 
@@ -912,9 +917,12 @@ desc = "สร้างเวิร์กโฟลว์หลายขั้น
 desc = "ซ้อนทับ PDF บน PDF อีกไฟล์หนึ่ง"
 title = "ซ้อนทับ PDF"
 
+[home.pdfTextEditor]
+title = "ตัวแก้ไขข้อความ PDF"
+desc = "แก้ไขข้อความและรูปภาพที่มีอยู่ภายในไฟล์ PDF"
 
 [home.addText]
-tags = "text,annotation,label"
+tags = "ข้อความ,คำอธิบายประกอบ,ป้ายกำกับ"
 title = "เพิ่มข้อความ"
 desc = "เพิ่มข้อความที่กำหนดเองที่ใดก็ได้ใน PDF ของคุณ"
 
@@ -1213,9 +1221,9 @@ pdfaDigitalSignatureWarning = "PDF มีลายเซ็นดิจิทั
 fileFormat = "รูปแบบไฟล์"
 wordDoc = "เอกสาร Word"
 wordDocExt = "เอกสาร Word (.docx)"
-odtExt = "OpenDocument Text (.odt)"
+odtExt = "ข้อความ OpenDocument (.odt)"
 pptExt = "PowerPoint (.pptx)"
-odpExt = "OpenDocument Presentation (.odp)"
+odpExt = "งานนำเสนอ OpenDocument (.odp)"
 txtExt = "ข้อความล้วน (.txt)"
 rtfExt = "Rich Text Format (.rtf)"
 selectedFiles = "ไฟล์ที่เลือก"
@@ -1832,7 +1840,7 @@ title = "ขั้นสูง"
 tags = "ย่อ, เล็ก, จิ๋ว"
 
 [unlockPDFForms]
-tags = "remove,delete,form,field,readonly"
+tags = "เอาออก,ลบ,ฟอร์ม,ฟิลด์,อ่านอย่างเดียว"
 title = "ลบสถานะอ่านอย่างเดียวออกจากช่องฟอร์ม"
 header = "ปลดล็อกฟอร์ม PDF"
 submit = "Remove"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "ลายเซ็นแบบวาด"
 defaultImageLabel = "ลายเซ็นที่อัปโหลด"
 defaultTextLabel = "ลายเซ็นแบบพิมพ์"
 saveButton = "บันทึกลายเซ็น"
+savePersonal = "บันทึกส่วนตัว"
+saveShared = "บันทึกแบบใช้ร่วมกัน"
 saveUnavailable = "สร้างลายเซ็นก่อนเพื่อบันทึก"
 noChanges = "ลายเซ็นปัจจุบันถูกบันทึกไว้แล้ว"
+tempStorageTitle = "พื้นที่จัดเก็บชั่วคราวบนเบราว์เซอร์"
+tempStorageDescription = "ลายเซ็นจะถูกจัดเก็บไว้ในเบราว์เซอร์ของคุณเท่านั้น และจะหายไปหากคุณล้างข้อมูลเบราว์เซอร์หรือสลับไปใช้เบราว์เซอร์อื่น"
+personalHeading = "ลายเซ็นส่วนตัว"
+sharedHeading = "ลายเซ็นที่ใช้ร่วมกัน"
+personalDescription = "มีเพียงคุณเท่านั้นที่มองเห็นลายเซ็นเหล่านี้"
+sharedDescription = "ผู้ใช้ทุกคนสามารถเห็นและใช้ลายเซ็นเหล่านี้ได้"
 
 [sign.saved.type]
 canvas = "การวาด"
@@ -2731,7 +2747,7 @@ submit = "ส่ง"
 failed = "เกิดข้อผิดพลาดขณะสร้างเลย์เอาต์หลายหน้า"
 
 [bookletImposition]
-tags = "booklet,imposition,printing,binding,folding,signature"
+tags = "หนังสือเย็บเล่ม,การจัดหน้า,การพิมพ์,การเข้าเล่ม,การพับ,ชุดพิมพ์"
 title = "การจัดหน้าสมุด"
 header = "การจัดหน้าสมุด"
 submit = "สร้างสมุด"
@@ -2830,7 +2846,7 @@ scaleFactor = "ระดับการซูม (ครอบตัด) ขอ
 submit = "ส่ง"
 
 [adjustPageScale]
-tags = "resize,modify,dimension,adapt"
+tags = "ปรับขนาด,แก้ไข,ขนาด,ปรับให้เหมาะสม"
 title = "ปรับสเกลหน้า"
 header = "ปรับสเกลหน้า"
 submit = "ปรับสเกลหน้า"
@@ -3020,6 +3036,91 @@ title = "รับข้อมูลเกี่ยวกับ PDF"
 header = "รับข้อมูลเกี่ยวกับ PDF"
 submit = "รับข้อมูล"
 downloadJson = "ดาวน์โหลด JSON"
+processing = "กำลังแยกข้อมูล..."
+results = "ผลลัพธ์"
+noResults = "เรียกใช้เครื่องมือนี้เพื่อสร้างรายงาน"
+downloads = "ดาวน์โหลด"
+noneDetected = "ไม่พบ"
+indexTitle = "ดัชนี"
+
+[getPdfInfo.report]
+entryLabel = "สรุปข้อมูลทั้งหมด"
+shortTitle = "ข้อมูล PDF"
+
+[getPdfInfo.sections]
+metadata = "ข้อมูลเมตา"
+formFields = "เขตข้อมูลฟอร์ม"
+basicInfo = "ข้อมูลพื้นฐาน"
+documentInfo = "ข้อมูลเอกสาร"
+compliance = "การปฏิบัติตามมาตรฐาน"
+encryption = "การเข้ารหัส"
+permissions = "สิทธิ์"
+other = "อื่นๆ"
+perPageInfo = "ข้อมูลรายหน้า"
+tableOfContents = "สารบัญ"
+
+[getPdfInfo.other]
+attachments = "ไฟล์แนบ"
+embeddedFiles = "ไฟล์ฝัง"
+javaScript = "JavaScript"
+layers = "เลเยอร์"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "ขนาด"
+annotations = "คำอธิบายประกอบ"
+images = "รูปภาพ"
+links = "ลิงก์"
+fonts = "ฟอนต์"
+xobjects = "จำนวน XObject"
+multimedia = "มัลติมีเดีย"
+
+[getPdfInfo.summary]
+pages = "หน้า"
+fileSize = "ขนาดไฟล์"
+pdfVersion = "เวอร์ชัน PDF"
+language = "ภาษา"
+title = "สรุป PDF"
+author = "ผู้เขียน"
+created = "สร้างเมื่อ"
+modified = "แก้ไขเมื่อ"
+permsAll = "อนุญาตสิทธิ์ทั้งหมด"
+permsRestricted = "ข้อจำกัด {{count}} รายการ"
+permsMixed = "มีการจำกัดสิทธิ์บางอย่าง"
+hasCompliance = "มีมาตรฐานการปฏิบัติตาม"
+noCompliance = "ไม่มีมาตรฐานการปฏิบัติตาม"
+basic = "ข้อมูลพื้นฐาน"
+documentInfo = "ข้อมูลเอกสาร"
+securityTitle = "สถานะความปลอดภัย"
+technical = "เชิงเทคนิค"
+overviewTitle = "ภาพรวมของ PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF เข้ารหัส - มีการป้องกันด้วยรหัสผ่าน"
+unencrypted = "PDF ไม่เข้ารหัส - ไม่มีการป้องกันรหัสผ่าน"
+
+[getPdfInfo.summary.tech]
+images = "รูปภาพ"
+fonts = "ฟอนต์"
+formFields = "เขตข้อมูลฟอร์ม"
+embeddedFiles = "ไฟล์ฝัง"
+javaScript = "JavaScript"
+layers = "เลเยอร์"
+bookmarks = "ที่คั่นหน้า"
+multimedia = "มัลติมีเดีย"
+
+[getPdfInfo.summary.overview]
+untitled = "เอกสารที่ไม่มีชื่อ"
+unknown = "ผู้เขียนไม่ทราบ"
+text = "นี่คือไฟล์ PDF จำนวน {{pages}} หน้า ชื่อ {{title}} สร้างโดย {{author}} (เวอร์ชัน PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "ไม่สามารถประมวลผลไฟล์บางไฟล์ได้"
+unexpected = "เกิดข้อผิดพลาดที่ไม่คาดคิดระหว่างการแยกข้อมูล"
+
+[getPdfInfo.status]
+complete = "การแยกข้อมูลเสร็จสิ้น"
 
 [extractPage]
 tags = "แยก"
@@ -3438,6 +3539,9 @@ signinTitle = "กรุณาลงชื่อเข้าใช้"
 ssoSignIn = "เข้าสู่ระบบด้วย Single Sign-on"
 oAuth2AutoCreateDisabled = "การสร้างผู้ใช้ OAuth2 อัตโนมัติถูกปิดใช้งาน"
 oAuth2AdminBlockedUser = "ขณะนี้มีการบล็อกการลงทะเบียนหรือการเข้าสู่ระบบของผู้ใช้ที่ไม่ได้ลงทะเบียน โปรดติดต่อผู้ดูแลระบบ"
+oAuth2RequiresLicense = "การเข้าสู่ระบบด้วย OAuth/SSO ต้องมีไลเซนส์แบบชำระเงิน (Server หรือ Enterprise) โปรดติดต่อผู้ดูแลระบบเพื่ออัปเกรดแผนของคุณ"
+saml2RequiresLicense = "การเข้าสู่ระบบด้วย SAML ต้องมีไลเซนส์แบบชำระเงิน (Server หรือ Enterprise) โปรดติดต่อผู้ดูแลระบบเพื่ออัปเกรดแผนของคุณ"
+maxUsersReached = "จำนวนผู้ใช้ถึงขีดสูงสุดสำหรับไลเซนส์ปัจจุบันของคุณ โปรดติดต่อผู้ดูแลระบบเพื่ออัปเกรดแผนหรือเพิ่มจำนวนที่นั่ง"
 oauth2RequestNotFound = "ไม่พบคำขอการอนุญาต"
 oauth2InvalidUserInfoResponse = "การตอบกลับข้อมูลผู้ใช้ไม่ถูกต้อง"
 oauth2invalidRequest = "คำขอไม่ถูกต้อง"
@@ -3771,7 +3875,7 @@ version = "รุ่นปัจจุบัน"
 title = "เอกสาร API"
 header = "เอกสาร API"
 desc = "ดูและทดสอบจุดปลายทาง API ของ Stirling PDF"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,เอกสารประกอบ,swagger,ปลายทาง,การพัฒนา"
 
 [cookieBanner.popUp]
 title = "เราใช้คุกกี้อย่างไร"
@@ -3846,14 +3950,17 @@ fitToWidth = "พอดีกับความกว้าง"
 actualSize = "ขนาดจริง"
 
 [viewer]
+cannotPreviewFile = "ไม่สามารถแสดงตัวอย่างไฟล์ได้"
+dualPageView = "มุมมองสองหน้า"
 firstPage = "หน้าแรก"
 lastPage = "หน้าสุดท้าย"
-previousPage = "หน้าก่อนหน้า"
 nextPage = "หน้าถัดไป"
+onlyPdfSupported = "ตัวแสดงผลรองรับเฉพาะไฟล์ PDF ไฟล์นี้ดูเหมือนจะเป็นรูปแบบอื่น"
+previousPage = "หน้าก่อนหน้า"
+singlePageView = "มุมมองหน้าเดียว"
+unknownFile = "ไฟล์ไม่รู้จัก"
 zoomIn = "ซูมเข้า"
 zoomOut = "ซูมออก"
-singlePageView = "มุมมองหน้าเดียว"
-dualPageView = "มุมมองสองหน้า"
 
 [rightRail]
 closeSelected = "ปิดไฟล์ที่เลือก"
@@ -3877,6 +3984,7 @@ toggleSidebar = "สลับแถบข้าง"
 exportSelected = "ส่งออกหน้าที่เลือก"
 toggleAnnotations = "สลับการแสดงคำอธิบายประกอบ"
 annotationMode = "สลับโหมดคำอธิบายประกอบ"
+print = "พิมพ์ PDF"
 draw = "วาด"
 save = "บันทึก"
 saveChanges = "บันทึกการเปลี่ยนแปลง"
@@ -4270,7 +4378,7 @@ label = "ผู้ให้บริการ"
 description = "ชื่อผู้ให้บริการ SAML2"
 
 [admin.settings.connections.saml2.registrationId]
-label = "Registration ID"
+label = "รหัสการลงทะเบียน"
 description = "ตัวระบุการลงทะเบียนของ SAML2"
 
 [admin.settings.connections.saml2.autoCreateUser]
@@ -4343,7 +4451,7 @@ features = "แฟลกฟีเจอร์"
 processing = "การประมวลผล"
 
 [admin.settings.advanced.endpoints]
-label = "Endpoints"
+label = "ปลายทาง"
 manage = "จัดการ API Endpoints"
 description = "การจัดการ Endpoint กำหนดค่าผ่าน YAML ดูเอกสารประกอบสำหรับรายละเอียดการเปิด/ปิดใช้งาน Endpoint เฉพาะ"
 
@@ -4407,7 +4515,7 @@ description = "จะทำความสะอาดไดเรกทอร
 label = "ข้อจำกัดของตัวประมวลผลกระบวนการ"
 description = "กำหนดขีดจำกัดเซสชันและระยะหมดเวลาสำหรับตัวประมวลผลแต่ละตัว"
 libreOffice = "LibreOffice"
-pdfToHtml = "PDF to HTML"
+pdfToHtml = "PDF เป็น HTML"
 qpdf = "QPDF"
 tesseract = "Tesseract OCR"
 pythonOpenCv = "Python OpenCV"
@@ -4494,6 +4602,7 @@ description = "URL หรือชื่อไฟล์ไปยัง Impressum
 title = "พรีเมียมและเอนเตอร์ไพรส์"
 description = "กำหนดค่าคีย์ไลเซนส์พรีเมียมหรือเอนเตอร์ไพรส์ของคุณ"
 license = "การกำหนดค่าไลเซนส์"
+noInput = "โปรดระบุคีย์หรือไฟล์ไลเซนส์"
 
 [admin.settings.premium.licenseKey]
 toggle = "มี license key หรือไฟล์ certificate ไหม?"
@@ -4511,6 +4620,25 @@ line1 = "การเขียนทับ license key ปัจจุบัน
 line2 = "ไลเซนส์ก่อนหน้าของคุณจะสูญหายถาวร เว้นแต่คุณได้สำรองไว้ที่อื่น"
 line3 = "สำคัญ: เก็บ license keys ให้เป็นส่วนตัวและปลอดภัย ห้ามแชร์สาธารณะ"
 
+[admin.settings.premium.inputMethod]
+text = "คีย์ไลเซนส์"
+file = "ไฟล์ใบรับรอง"
+
+[admin.settings.premium.file]
+label = "ไฟล์ใบรับรองไลเซนส์"
+description = "อัปโหลดไฟล์ไลเซนส์ .lic หรือ .cert จากการสั่งซื้อแบบออฟไลน์ของคุณ"
+choose = "เลือกไฟล์ไลเซนส์"
+selected = "ที่เลือก: {{filename}} ({{size}})"
+successMessage = "อัปโหลดและเปิดใช้งานไฟล์ไลเซนส์สำเร็จ ไม่จำเป็นต้องเริ่มระบบใหม่"
+
+[admin.settings.premium.currentLicense]
+title = "ไลเซนส์ที่ใช้งานอยู่"
+file = "แหล่งที่มา: ไฟล์ไลเซนส์ ({{path}})"
+key = "แหล่งที่มา: คีย์ไลเซนส์"
+type = "ประเภท: {{type}}"
+noInput = "โปรดระบุคีย์ไลเซนส์หรืออัปโหลดไฟล์ใบรับรอง"
+success = "สำเร็จ"
+
 [admin.settings.premium.enabled]
 label = "เปิดใช้งานฟีเจอร์พรีเมียม"
 description = "เปิดการตรวจสอบคีย์ไลเซนส์สำหรับฟีเจอร์แบบ Pro/Enterprise"
@@ -4544,7 +4672,7 @@ label = "สร้างใหม่เมื่อเริ่มต้น"
 description = "สร้างใบรับรองใหม่ทุกครั้งที่แอปพลิเคชันเริ่มต้น"
 
 [admin.settings.endpoints]
-title = "API Endpoints"
+title = "ปลายทาง API"
 description = "ควบคุมว่า API Endpoints และกลุ่ม Endpoint ใดที่ใช้งานได้"
 management = "การจัดการ Endpoint"
 note = "หมายเหตุ: การปิดการใช้งาน endpoints จะจำกัดการเข้าถึง API แต่จะไม่ลบส่วนติดต่อผู้ใช้ ต้องรีสตาร์ทจึงจะมีผล"
@@ -4644,7 +4772,9 @@ selectedCount = "เลือกแล้ว {{count}} รายการ"
 download = "ดาวน์โหลด"
 delete = "ลบ"
 unsupported = "ไม่รองรับ"
+active = "ใช้งานอยู่"
 addToUpload = "เพิ่มไปยังอัปโหลด"
+closeFile = "ปิดไฟล์"
 deleteAll = "ลบทั้งหมด"
 loadingFiles = "กำลังโหลดไฟล์..."
 noFiles = "ไม่มีไฟล์"
@@ -4989,7 +5119,7 @@ chartAriaLabel = "การใช้เครดิต: ใช้แบบรว
 nextReset = "รีเซ็ตครั้งถัดไป"
 lastApiUse = "การใช้งาน API ล่าสุด"
 overlayMessage = "สร้างคีย์เพื่อดูเครดิตและเครดิตที่มีอยู่"
-label = "API Key"
+label = "คีย์ API"
 guestInfo = "ผู้ใช้แบบแขกจะไม่ได้รับ API key สร้างบัญชีเพื่อรับ API key สำหรับใช้งานในแอปพลิเคชันของคุณ"
 goToAccount = "ไปที่บัญชี"
 generateError = "ไม่สามารถสร้าง API key ของคุณได้"
@@ -5132,7 +5262,7 @@ upgrade = "อัปเกรดเลย →"
 freeTitle = "ไลเซนส์เซิร์ฟเวอร์"
 overLimitTitle = "ต้องใช้ไลเซนส์เซิร์ฟเวอร์"
 overLimitBody = "สิทธิ์การใช้งานของเรารองรับผู้ใช้ได้ฟรีสูงสุด <strong>{{freeTierLimit}}</strong> คนต่อเซิร์ฟเวอร์ ขณะนี้คุณมีผู้ใช้ Stirling <strong>{{overLimitUserCopy}}</strong> คน เพื่อใช้งานต่อเนื่อง โปรดอัปเกรดเป็นแพ็กเกจ Stirling Server - <strong>ที่นั่งไม่จำกัด</strong> แก้ไขข้อความ PDF และควบคุมแอดมินเต็มรูปแบบ ราคา $99/ต่อเซิร์ฟเวอร์/เดือน"
-freeBody = "ไลเซนส์แบบ <strong>Open-Core</strong> ของเรารองรับผู้ใช้ได้ฟรีสูงสุด <strong>{{freeTierLimit}}</strong> คนต่อเซิร์ฟเวอร์ เพื่อขยายการใช้งานได้ต่อเนื่องและเข้าถึง <strong>เครื่องมือแก้ไขข้อความ PDF</strong> ล่วงหน้า เราแนะนำแพ็กเกจ Stirling Server - แก้ไขได้เต็มรูปแบบและ <strong>ที่นั่งไม่จำกัด</strong> ราคา $99/ต่อเซิร์ฟเวอร์/เดือน"
+freeBody = "สัญญาอนุญาตแบบ <strong>Open-Core</strong> ของเราอนุญาตให้ใช้งานฟรีได้สูงสุด <strong>{{freeTierLimit}}</strong> ผู้ใช้ต่อเซิร์ฟเวอร์หนึ่งเครื่อง เพื่อขยายการใช้งานอย่างต่อเนื่อง เราขอแนะนำแผน Stirling Server - <strong>ที่นั่งไม่จำกัด</strong> และ <strong>รองรับ SSO</strong> ในราคา $99/เซิร์ฟเวอร์/เดือน"
 
 [onboarding.desktopInstall]
 title = "ดาวน์โหลด"
@@ -5237,6 +5367,31 @@ error = "อัปเดตสถานะผู้ใช้ไม่สำเ
 success = "ลบผู้ใช้เรียบร้อยแล้ว"
 error = "ลบผู้ใช้ไม่สำเร็จ"
 
+[workspace.people.changePassword]
+action = "เปลี่ยนรหัสผ่าน"
+title = "เปลี่ยนรหัสผ่าน"
+subtitle = "อัปเดตรหัสผ่านสำหรับ"
+newPassword = "รหัสผ่านใหม่"
+confirmPassword = "ยืนยันรหัสผ่าน"
+placeholder = "ป้อนรหัสผ่านใหม่"
+confirmPlaceholder = "ป้อนรหัสผ่านใหม่อีกครั้ง"
+passwordRequired = "โปรดป้อนรหัสผ่านใหม่"
+passwordMismatch = "รหัสผ่านไม่ตรงกัน"
+generateRandom = "สร้างรหัสผ่านที่ปลอดภัย"
+generatedPreview = "รหัสผ่านที่สร้างขึ้น:"
+copyTooltip = "คัดลอกไปยังคลิปบอร์ด"
+copiedToClipboard = "คัดลอกรหัสผ่านไปยังคลิปบอร์ดแล้ว"
+copyFailed = "คัดลอกรหัสผ่านไม่สำเร็จ"
+sendEmail = "ส่งอีเมลแจ้งผู้ใช้เกี่ยวกับการเปลี่ยนแปลงนี้"
+includePassword = "รวมรหัสผ่านใหม่ในอีเมล"
+forcePasswordChange = "บังคับให้ผู้ใช้เปลี่ยนรหัสผ่านในการเข้าสู่ระบบครั้งถัดไป"
+emailUnavailable = "อีเมลของผู้ใช้นี้ไม่ใช่ที่อยู่อีเมลที่ถูกต้อง การแจ้งเตือนถูกปิดใช้งาน"
+smtpDisabled = "การแจ้งเตือนทางอีเมลต้องเปิดใช้งาน SMTP ในการตั้งค่า"
+notifyOnly = "จะมีการส่งอีเมลโดยไม่รวมรหัสผ่าน เพื่อแจ้งให้ผู้ใช้ทราบว่าผู้ดูแลระบบได้เปลี่ยนรหัสผ่านแล้ว"
+submit = "อัปเดตรหัสผ่าน"
+success = "อัปเดตรหัสผ่านสำเร็จ"
+error = "อัปเดตรหัสผ่านไม่สำเร็จ"
+
 [workspace.people.emailInvite]
 tab = "เชิญทางอีเมล"
 description = "พิมพ์หรือวางอีเมลด้านล่าง คั่นด้วยเครื่องหมายจุลภาค ผู้ใช้จะได้รับข้อมูลเข้าสู่ระบบทางอีเมล"
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "ต้องมีอย่างน้อยหนึ่งที่อยู่อีเมล"
 submit = "ส่งคำเชิญ"
 success = "เชิญผู้ใช้สำเร็จ"
-partialSuccess = "บางคำเชิญล้มเหลว"
+partialFailure = "คำเชิญบางรายการไม่สำเร็จ"
 allFailed = "เชิญผู้ใช้ไม่สำเร็จ"
 error = "ส่งคำเชิญไม่สำเร็จ"
 
@@ -5709,7 +5864,7 @@ title = "แผนภูมิการใช้งาน Endpoint"
 
 [usage.table]
 title = "สถิติแบบละเอียด"
-endpoint = "Endpoint"
+endpoint = "ปลายทาง"
 visits = "การเข้าชม"
 percentage = "เปอร์เซ็นต์"
 noData = "ไม่มีข้อมูล"
@@ -5770,6 +5925,7 @@ subtitle = "ลงชื่อเข้าใช้ด้วยบัญชี S
 [setup.selfhosted]
 title = "ลงชื่อเข้าใช้เซิร์ฟเวอร์"
 subtitle = "ป้อนข้อมูลรับรองของเซิร์ฟเวอร์ของคุณ"
+link = "หรือเชื่อมต่อกับบัญชีแบบ self-hosted"
 
 [setup.server]
 title = "เชื่อมต่อกับเซิร์ฟเวอร์"
@@ -5788,6 +5944,14 @@ description = "ป้อน URL แบบเต็มของเซิร์ฟ
 emptyUrl = "โปรดป้อน URL เซิร์ฟเวอร์"
 unreachable = "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์"
 testFailed = "การทดสอบการเชื่อมต่อล้มเหลว"
+configFetch = "ไม่สามารถดึงการกำหนดค่าของเซิร์ฟเวอร์ได้ โปรดตรวจสอบ URL แล้วลองอีกครั้ง"
+
+[setup.server.error.securityDisabled]
+title = "ไม่ได้เปิดใช้งานการเข้าสู่ระบบ"
+body = "เซิร์ฟเวอร์นี้ไม่ได้เปิดใช้งานการเข้าสู่ระบบ เพื่อเชื่อมต่อกับเซิร์ฟเวอร์นี้ คุณต้องเปิดใช้งานการยืนยันตัวตน:"
+step1 = "กำหนดค่า DOCKER_ENABLE_SECURITY=true ในสภาพแวดล้อมของคุณ"
+step2 = "หรือกำหนดค่า security.enableLogin=true ใน settings.yml"
+step3 = "เริ่มเซิร์ฟเวอร์ใหม่"
 
 [setup.login]
 title = "เข้าสู่ระบบ"
@@ -5797,6 +5961,13 @@ submit = "เข้าสู่ระบบ"
 signInWith = "ลงชื่อเข้าใช้ด้วย"
 oauthPending = "กำลังเปิดเบราว์เซอร์เพื่อยืนยันตัวตน..."
 orContinueWith = "หรือดำเนินการต่อด้วยอีเมล"
+serverRequirement = "หมายเหตุ: เซิร์ฟเวอร์ต้องเปิดใช้งานการเข้าสู่ระบบ"
+showInstructions = "เปิดใช้งานอย่างไร?"
+hideInstructions = "ซ่อนคำแนะนำ"
+instructions = "วิธีเปิดใช้งานการเข้าสู่ระบบบนเซิร์ฟเวอร์ Stirling PDF ของคุณ:"
+instructionsEnvVar = "ตั้งค่าตัวแปรสภาพแวดล้อม:"
+instructionsOrYml = "หรือใน settings.yml:"
+instructionsRestart = "จากนั้นรีสตาร์ทเซิร์ฟเวอร์ของคุณเพื่อให้การเปลี่ยนแปลงมีผล"
 
 [setup.login.username]
 label = "ชื่อผู้ใช้"
@@ -5853,6 +6024,7 @@ earlyAccess = "เข้าถึงล่วงหน้า"
 reset = "รีเซ็ตการเปลี่ยนแปลง"
 downloadJson = "ดาวน์โหลด JSON"
 generatePdf = "สร้าง PDF"
+saveChanges = "บันทึกการเปลี่ยนแปลง"
 
 [pdfTextEditor.options.autoScaleText]
 title = "ปรับขนาดข้อความอัตโนมัติให้พอดีกล่อง"
@@ -5890,6 +6062,8 @@ alpha = "ตัวดูแบบ alpha นี้ยังพัฒนาอย
 [pdfTextEditor.empty]
 title = "ยังไม่ได้โหลดเอกสาร"
 subtitle = "โหลดไฟล์ PDF หรือ JSON เพื่อเริ่มแก้ไขข้อความ"
+dropzone = "ลากและวางไฟล์ PDF หรือ JSON ที่นี่ หรือคลิกเพื่อเรียกดู"
+dropzoneWithFiles = "เลือกไฟล์จากแท็บไฟล์ หรือลากและวางไฟล์ PDF หรือ JSON ที่นี่ หรือคลิกเพื่อเรียกดู"
 
 [pdfTextEditor.welcomeBanner]
 title = "ยินดีต้อนรับสู่ PDF Text Editor (Early Access)"
@@ -5932,13 +6106,13 @@ warnings = "คำเตือน"
 suggestions = "หมายเหตุ"
 currentPageFonts = "ฟอนต์บนหน้านี้"
 allFonts = "ฟอนต์ทั้งหมด"
-fallback = "fallback"
+fallback = "สำรอง"
 missing = "หายไป"
 perfectMessage = "สามารถทำซ้ำฟอนต์ทั้งหมดได้อย่างสมบูรณ์แบบ"
 warningMessage = "บางฟอนต์อาจแสดงผลไม่ถูกต้อง"
 infoMessage = "มีข้อมูลการทำซ้ำฟอนต์"
 perfect = "สมบูรณ์แบบ"
-subset = "subset"
+subset = "ซับเซ็ต"
 
 [pdfTextEditor.errors]
 invalidJson = "ไม่สามารถอ่านไฟล์ JSON โปรดตรวจสอบว่าไฟล์ถูกสร้างโดยเครื่องมือ PDF to JSON"
@@ -5953,7 +6127,7 @@ insufficientPermissions = "คุณไม่มีสิทธิ์ในก
 [addText]
 title = "เพิ่มข้อความ"
 header = "เพิ่มข้อความลงใน PDF"
-tags = "text,annotation,label"
+tags = "ข้อความ,คำอธิบายประกอบ,ป้ายกำกับ"
 applySignatures = "ใช้ข้อความ"
 
 [addText.text]
diff --git a/frontend/public/locales/tr-TR/translation.toml b/frontend/public/locales/tr-TR/translation.toml
index a5bee2af7..43d9eb0cd 100644
--- a/frontend/public/locales/tr-TR/translation.toml
+++ b/frontend/public/locales/tr-TR/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Favorilerden kaldır"
 fullscreen = "Tam ekran moduna geç"
 sidebar = "Kenar çubuğu moduna geç"
 
+[backendStartup]
+notFoundTitle = "Arka uç bulunamadı"
+retry = "Yeniden dene"
+unreachable = "Uygulama şu anda arka uca bağlanamıyor. Lütfen arka uç durumunu ve ağ bağlantısını doğrulayın, ardından tekrar deneyin."
+
 [zipWarning]
 title = "Büyük ZIP Dosyası"
 message = "Bu ZIP {{count}} dosya içeriyor. Yine de çıkartılsın mı?"
@@ -912,6 +917,9 @@ desc = "PDF eylemlerini birbirine bağlayarak çok adımlı iş akışları olu
 desc = "PDF'leri başka bir PDF'nin üzerine bindirir"
 title = "PDF'leri Bindirme"
 
+[home.pdfTextEditor]
+title = "PDF Metin Düzenleyici"
+desc = "PDF'lerin içindeki mevcut metinleri ve görselleri düzenleyin"
 
 [home.addText]
 tags = "metin,ek açıklama,etiket"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Çizim imzası"
 defaultImageLabel = "Yüklenen imza"
 defaultTextLabel = "Yazılmış imza"
 saveButton = "İmzayı kaydet"
+savePersonal = "Kişisel Olarak Kaydet"
+saveShared = "Paylaşılan Olarak Kaydet"
 saveUnavailable = "Kaydetmek için önce bir imza oluşturun."
 noChanges = "Geçerli imza zaten kaydedildi."
+tempStorageTitle = "Geçici tarayıcı depolaması"
+tempStorageDescription = "İmzalar yalnızca tarayıcınızda saklanır. Tarayıcı verilerini temizlerseniz veya tarayıcı değiştirirseniz kaybolurlar."
+personalHeading = "Kişisel İmzalar"
+sharedHeading = "Paylaşılan İmzalar"
+personalDescription = "Bu imzaları yalnızca siz görebilirsiniz."
+sharedDescription = "Tüm kullanıcılar bu imzaları görebilir ve kullanabilir."
 
 [sign.saved.type]
 canvas = "Çizim"
@@ -3020,6 +3036,91 @@ title = "PDF Hakkında Bilgi Al"
 header = "PDF Hakkında Bilgi Al"
 submit = "Bilgi Al"
 downloadJson = "JSON İndir"
+processing = "Bilgi çıkarılıyor..."
+results = "Sonuçlar"
+noResults = "Bir rapor oluşturmak için aracı çalıştırın."
+downloads = "İndirmeler"
+noneDetected = "Hiçbiri tespit edilmedi"
+indexTitle = "Dizin"
+
+[getPdfInfo.report]
+entryLabel = "Tam bilgi özeti"
+shortTitle = "PDF Bilgileri"
+
+[getPdfInfo.sections]
+metadata = "Meta veriler"
+formFields = "Form Alanları"
+basicInfo = "Temel Bilgiler"
+documentInfo = "Belge Bilgileri"
+compliance = "Uyumluluk"
+encryption = "Şifreleme"
+permissions = "İzinler"
+other = "Diğer"
+perPageInfo = "Sayfa Başına Bilgi"
+tableOfContents = "İçindekiler"
+
+[getPdfInfo.other]
+attachments = "Ekler"
+embeddedFiles = "Gömülü Dosyalar"
+javaScript = "JavaScript"
+layers = "Katmanlar"
+structureTree = "Yapı Ağacı"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Boyut"
+annotations = "Açıklamalar"
+images = "Görüntüler"
+links = "Bağlantılar"
+fonts = "Yazı Tipleri"
+xobjects = "XObject Sayıları"
+multimedia = "Multimedya"
+
+[getPdfInfo.summary]
+pages = "Sayfalar"
+fileSize = "Dosya Boyutu"
+pdfVersion = "PDF Sürümü"
+language = "Dil"
+title = "PDF Özeti"
+author = "Yazar"
+created = "Oluşturulma"
+modified = "Değiştirilme"
+permsAll = "Tüm izinlere izin verildi"
+permsRestricted = "{{count}} kısıtlama"
+permsMixed = "Bazı izinler kısıtlandı"
+hasCompliance = "Uyumluluk standartlarına sahip"
+noCompliance = "Uyumluluk standardı yok"
+basic = "Temel Bilgiler"
+documentInfo = "Belge Bilgileri"
+securityTitle = "Güvenlik Durumu"
+technical = "Teknik"
+overviewTitle = "PDF Genel Bakış"
+
+[getPdfInfo.summary.security]
+encrypted = "Şifrelenmiş PDF - Parola koruması var"
+unencrypted = "Şifrelenmemiş PDF - Parola koruması yok"
+
+[getPdfInfo.summary.tech]
+images = "Görüntüler"
+fonts = "Yazı Tipleri"
+formFields = "Form Alanları"
+embeddedFiles = "Gömülü Dosyalar"
+javaScript = "JavaScript"
+layers = "Katmanlar"
+bookmarks = "Yer İmleri"
+multimedia = "Multimedya"
+
+[getPdfInfo.summary.overview]
+untitled = "başlıksız bir belge"
+unknown = "Bilinmeyen Yazar"
+text = "Bu, {{author}} tarafından oluşturulan, {{title}} başlıklı {{pages}} sayfalık bir PDF'dir (PDF sürümü {{version}})."
+
+[getPdfInfo.error]
+partial = "Bazı dosyalar işlenemedi."
+unexpected = "Çıkarma sırasında beklenmeyen bir hata oluştu."
+
+[getPdfInfo.status]
+complete = "Çıkarma tamamlandı"
 
 [extractPage]
 tags = "çıkar"
@@ -3438,6 +3539,9 @@ signinTitle = "Lütfen giriş yapınız."
 ssoSignIn = "Tek Oturum Açma ile Giriş Yap"
 oAuth2AutoCreateDisabled = "OAUTH2 Otomatik Oluşturma Kullanıcı Devre Dışı Bırakıldı"
 oAuth2AdminBlockedUser = "Kayıtlı olmayan kullanıcıların kayıt veya giriş yapması şu anda engellenmiştir. Lütfen yöneticiyle iletişime geçin."
+oAuth2RequiresLicense = "OAuth/SSO ile oturum açma ücretli bir lisans (Server veya Enterprise) gerektirir. Planınızı yükseltmek için lütfen yöneticiyle iletişime geçin."
+saml2RequiresLicense = "SAML ile oturum açma ücretli bir lisans (Server veya Enterprise) gerektirir. Planınızı yükseltmek için lütfen yöneticiyle iletişime geçin."
+maxUsersReached = "Mevcut lisansınız için azami kullanıcı sayısına ulaşıldı. Planınızı yükseltmek veya daha fazla koltuk eklemek için lütfen yöneticiyle iletişime geçin."
 oauth2RequestNotFound = "Yetkilendirme isteği bulunamadı"
 oauth2InvalidUserInfoResponse = "Geçersiz Kullanıcı Bilgisi Yanıtı"
 oauth2invalidRequest = "Geçersiz İstek"
@@ -3846,14 +3950,17 @@ fitToWidth = "Genişliğe Sığdır"
 actualSize = "Gerçek Boyut"
 
 [viewer]
+cannotPreviewFile = "Dosya önizlenemiyor"
+dualPageView = "Çift Sayfa Görünümü"
 firstPage = "İlk Sayfa"
 lastPage = "Son Sayfa"
-previousPage = "Önceki Sayfa"
 nextPage = "Sonraki Sayfa"
+onlyPdfSupported = "Görüntüleyici yalnızca PDF dosyalarını destekler. Bu dosya farklı bir biçimde görünüyor."
+previousPage = "Önceki Sayfa"
+singlePageView = "Tek Sayfa Görünümü"
+unknownFile = "Bilinmeyen dosya"
 zoomIn = "Yakınlaştır"
 zoomOut = "Uzaklaştır"
-singlePageView = "Tek Sayfa Görünümü"
-dualPageView = "Çift Sayfa Görünümü"
 
 [rightRail]
 closeSelected = "Seçilen Dosyaları Kapat"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Kenar Çubuğunu Aç/Kapat"
 exportSelected = "Seçilen Sayfaları Dışa Aktar"
 toggleAnnotations = "Açıklamaların Görünürlüğünü Değiştir"
 annotationMode = "Açıklama Modunu Değiştir"
+print = "PDF'yi Yazdır"
 draw = "Çiz"
 save = "Kaydet"
 saveChanges = "Değişiklikleri Kaydet"
@@ -4494,6 +4602,7 @@ description = "Impressum için URL veya dosya adı (bazı yargı bölgelerinde g
 title = "Premium ve Kurumsal"
 description = "Premium veya kurumsal lisans anahtarınızı yapılandırın."
 license = "Lisans Yapılandırması"
+noInput = "Lütfen bir lisans anahtarı veya dosyası sağlayın"
 
 [admin.settings.premium.licenseKey]
 toggle = "Lisans anahtarınız veya sertifika dosyanız mı var?"
@@ -4511,6 +4620,25 @@ line1 = "Mevcut lisans anahtarınızın üzerine yazma işlemi geri alınamaz."
 line2 = "Başka yerde yedeğiniz yoksa önceki lisansınız kalıcı olarak kaybolacaktır."
 line3 = "Önemli: Lisans anahtarlarını gizli ve güvenli tutun. Asla herkese açık şekilde paylaşmayın."
 
+[admin.settings.premium.inputMethod]
+text = "Lisans Anahtarı"
+file = "Sertifika Dosyası"
+
+[admin.settings.premium.file]
+label = "Lisans Sertifika Dosyası"
+description = "Çevrimdışı satın alımlardan aldığınız .lic veya .cert lisans dosyanızı yükleyin"
+choose = "Lisans Dosyası Seç"
+selected = "Seçildi: {{filename}} ({{size}})"
+successMessage = "Lisans dosyası başarıyla yüklendi ve etkinleştirildi. Yeniden başlatma gerekmez."
+
+[admin.settings.premium.currentLicense]
+title = "Etkin Lisans"
+file = "Kaynak: Lisans dosyası ({{path}})"
+key = "Kaynak: Lisans anahtarı"
+type = "Tür: {{type}}"
+noInput = "Lütfen bir lisans anahtarı girin veya bir sertifika dosyası yükleyin"
+success = "Başarılı"
+
 [admin.settings.premium.enabled]
 label = "Premium Özellikleri Etkinleştir"
 description = "Pro/kurumsal özellikler için lisans anahtarı kontrollerini etkinleştir"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} seçildi"
 download = "İndir"
 delete = "Sil"
 unsupported = "Desteklenmiyor"
+active = "Aktif"
 addToUpload = "Yüklemeye Ekle"
+closeFile = "Dosyayı Kapat"
 deleteAll = "Tümünü Sil"
 loadingFiles = "Dosyalar yükleniyor..."
 noFiles = "Kullanılabilir dosya yok"
@@ -5132,7 +5262,7 @@ upgrade = "Şimdi yükselt →"
 freeTitle = "Sunucu Lisansı"
 overLimitTitle = "Sunucu Lisansı Gerekli"
 overLimitBody = "Lisansımız, sunucu başına ücretsiz olarak en fazla <strong>{{freeTierLimit}}</strong> kullanıcıya izin verir. <strong>{{overLimitUserCopy}}</strong> Stirling kullanıcınız var. Kesintisiz devam etmek için Stirling Server planına yükseltin - <strong>sınırsız koltuk</strong>, PDF metin düzenleme ve tam yönetici kontrolü $99/server/ay."
-freeBody = "<strong>Open-Core</strong> lisansımız, sunucu başına ücretsiz olarak en fazla <strong>{{freeTierLimit}}</strong> kullanıcıya izin verir. Kesintisiz ölçeklemek ve yeni <strong>PDF metin düzenleme aracımıza</strong> erken erişim almak için Stirling Server planını öneririz - tam düzenleme ve <strong>sınırsız koltuk</strong> $99/server/ay."
+freeBody = "<strong>Open-Core</strong> lisanslamamız, sunucu başına en fazla <strong>{{freeTierLimit}}</strong> kullanıcıya ücretsiz izin verir. Kesintisiz ölçeklendirme için Stirling Server planını öneririz - <strong>sınırsız kullanıcı</strong> ve <strong>SSO desteği</strong> için $99/sunucu/ay."
 
 [onboarding.desktopInstall]
 title = "İndir"
@@ -5237,6 +5367,31 @@ error = "Kullanıcı durumu güncellenemedi"
 success = "Kullanıcı başarıyla silindi"
 error = "Kullanıcı silinemedi"
 
+[workspace.people.changePassword]
+action = "Parolayı değiştir"
+title = "Parolayı değiştir"
+subtitle = "Şunun için parolayı güncelle"
+newPassword = "Yeni parola"
+confirmPassword = "Parolayı onayla"
+placeholder = "Yeni bir parola girin"
+confirmPlaceholder = "Yeni parolayı tekrar girin"
+passwordRequired = "Lütfen yeni bir parola girin"
+passwordMismatch = "Parolalar eşleşmiyor"
+generateRandom = "Güvenli parola oluştur"
+generatedPreview = "Oluşturulan parola:"
+copyTooltip = "Panoya kopyala"
+copiedToClipboard = "Parola panoya kopyalandı"
+copyFailed = "Parola kopyalanamadı"
+sendEmail = "Kullanıcıya bu değişiklik hakkında e-posta gönder"
+includePassword = "E-postaya yeni parolayı dahil et"
+forcePasswordChange = "Kullanıcının bir sonraki girişte parolasını değiştirmesini zorunlu kıl"
+emailUnavailable = "Bu kullanıcının e-posta adresi geçerli değil. Bildirimler devre dışı."
+smtpDisabled = "E-posta bildirimleri için ayarlarda SMTP'nin etkinleştirilmesi gerekir."
+notifyOnly = "Parola olmadan bir e-posta gönderilecek ve kullanıcıya bir yöneticinin parolayı değiştirdiği bildirilecek."
+submit = "Parolayı güncelle"
+success = "Parola başarıyla güncellendi"
+error = "Parola güncellenemedi"
+
 [workspace.people.emailInvite]
 tab = "E-posta Daveti"
 description = "Aşağıya e-postaları virgülle ayırarak yazın veya yapıştırın. Kullanıcılar giriş bilgilerini e-posta ile alacaktır."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "En az bir e-posta adresi gereklidir"
 submit = "Davetleri Gönder"
 success = "kullanıcı(lar) başarıyla davet edildi"
-partialSuccess = "Bazı davetler başarısız oldu"
+partialFailure = "Bazı davetler başarısız oldu"
 allFailed = "Kullanıcılar davet edilemedi"
 error = "Davetler gönderilemedi"
 
@@ -5770,6 +5925,7 @@ subtitle = "Stirling hesabınızla oturum açın"
 [setup.selfhosted]
 title = "Sunucuda Oturum Açın"
 subtitle = "Sunucu kimlik bilgilerinizi girin"
+link = "veya kendi barındırdığınız bir hesaba bağlanın"
 
 [setup.server]
 title = "Sunucuya Bağlan"
@@ -5788,6 +5944,14 @@ description = "Öz barındırılan Stirling PDF sunucunuzun tam URL'sini girin"
 emptyUrl = "Lütfen bir sunucu URL'si girin"
 unreachable = "Sunucuya bağlanılamadı"
 testFailed = "Bağlantı testi başarısız"
+configFetch = "Sunucu yapılandırması alınamadı. Lütfen URL'yi kontrol edip tekrar deneyin."
+
+[setup.server.error.securityDisabled]
+title = "Giriş Etkin Değil"
+body = "Bu sunucuda giriş etkin değil. Bu sunucuya bağlanmak için kimlik doğrulamayı etkinleştirmelisiniz:"
+step1 = "Ortamınızda DOCKER_ENABLE_SECURITY=true olarak ayarlayın"
+step2 = "Ya da settings.yml içinde security.enableLogin=true olarak ayarlayın"
+step3 = "Sunucuyu yeniden başlatın"
 
 [setup.login]
 title = "Oturum Aç"
@@ -5797,6 +5961,13 @@ submit = "Oturum Aç"
 signInWith = "Şununla oturum aç"
 oauthPending = "Kimlik doğrulama için tarayıcı açılıyor..."
 orContinueWith = "Veya e-postayla devam edin"
+serverRequirement = "Not: Sunucuda oturum açma etkin olmalıdır."
+showInstructions = "Nasıl etkinleştirilir?"
+hideInstructions = "Yönergeleri gizle"
+instructions = "Stirling PDF sunucunuzda oturum açmayı etkinleştirmek için:"
+instructionsEnvVar = "Ortam değişkenini ayarlayın:"
+instructionsOrYml = "Veya settings.yml içinde:"
+instructionsRestart = "Ardından değişikliklerin etkili olması için sunucunuzu yeniden başlatın."
 
 [setup.login.username]
 label = "Kullanıcı adı"
@@ -5853,6 +6024,7 @@ earlyAccess = "Erken Erişim"
 reset = "Değişiklikleri Sıfırla"
 downloadJson = "JSON'u İndir"
 generatePdf = "PDF Oluştur"
+saveChanges = "Değişiklikleri Kaydet"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Metni kutulara otomatik sığdır"
@@ -5890,6 +6062,8 @@ alpha = "Bu alfa görüntüleyici hâlâ gelişiyor—bazı yazı tipleri, renkl
 [pdfTextEditor.empty]
 title = "Belge yüklenmedi"
 subtitle = "Metin içeriğini düzenlemeye başlamak için bir PDF veya JSON dosyası yükleyin."
+dropzone = "Buraya bir PDF veya JSON dosyası sürükleyip bırakın veya göz atmak için tıklayın"
+dropzoneWithFiles = "Dosyalar sekmesinden bir dosya seçin veya buraya bir PDF veya JSON dosyası sürükleyip bırakın veya göz atmak için tıklayın"
 
 [pdfTextEditor.welcomeBanner]
 title = "PDF Metin Düzenleyiciye Hoş Geldiniz (Erken Erişim)"
diff --git a/frontend/public/locales/uk-UA/translation.toml b/frontend/public/locales/uk-UA/translation.toml
index dbb957a6a..7a21b1e65 100644
--- a/frontend/public/locales/uk-UA/translation.toml
+++ b/frontend/public/locales/uk-UA/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Видалити з вибраного"
 fullscreen = "Переключитися на повноекранний режим"
 sidebar = "Переключитися на режим бічної панелі"
 
+[backendStartup]
+notFoundTitle = "Серверну частину не знайдено"
+retry = "Повторити"
+unreachable = "Застосунок наразі не може під’єднатися до серверної частини. Перевірте стан серверної частини та мережеве з’єднання, потім спробуйте ще раз."
+
 [zipWarning]
 title = "Великий ZIP-файл"
 message = "Цей ZIP містить {{count}} файлів. Розпакувати попри це?"
@@ -912,6 +917,9 @@ desc = "Створюйте багатокрокові робочі процес
 desc = "Накладення одного PDF поверх іншого PDF"
 title = "Накладення PDF"
 
+[home.pdfTextEditor]
+title = "Редактор тексту PDF"
+desc = "Редагуйте наявний текст і зображення у PDF"
 
 [home.addText]
 tags = "текст,анотація,мітка"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Намальований підпис"
 defaultImageLabel = "Завантажений підпис"
 defaultTextLabel = "Набраний підпис"
 saveButton = "Зберегти підпис"
+savePersonal = "Зберегти як особистий"
+saveShared = "Зберегти як спільний"
 saveUnavailable = "Спочатку створіть підпис, щоб зберегти його."
 noChanges = "Поточний підпис вже збережено."
+tempStorageTitle = "Тимчасове сховище браузера"
+tempStorageDescription = "Підписи зберігаються лише у вашому браузері. Вони будуть втрачені, якщо ви очистите дані браузера або зміните браузер."
+personalHeading = "Особисті підписи"
+sharedHeading = "Спільні підписи"
+personalDescription = "Лише ви можете бачити ці підписи."
+sharedDescription = "Усі користувачі можуть бачити та використовувати ці підписи."
 
 [sign.saved.type]
 canvas = "Малювання"
@@ -3020,6 +3036,91 @@ title = "Отримати інформацію в PDF"
 header = "Отримати інформацію в PDF"
 submit = "Отримати інформацію"
 downloadJson = "Завантажити JSON"
+processing = "Вилучення інформації..."
+results = "Результати"
+noResults = "Запустіть інструмент, щоб сформувати звіт."
+downloads = "Завантаження"
+noneDetected = "Нічого не виявлено"
+indexTitle = "Покажчик"
+
+[getPdfInfo.report]
+entryLabel = "Повне зведення інформації"
+shortTitle = "Інформація про PDF"
+
+[getPdfInfo.sections]
+metadata = "Метадані"
+formFields = "Поля форми"
+basicInfo = "Базова інформація"
+documentInfo = "Інформація про документ"
+compliance = "Відповідність"
+encryption = "Шифрування"
+permissions = "Дозволи"
+other = "Інше"
+perPageInfo = "Інформація по сторінках"
+tableOfContents = "Зміст"
+
+[getPdfInfo.other]
+attachments = "Вкладення"
+embeddedFiles = "Вбудовані файли"
+javaScript = "JavaScript"
+layers = "Шари"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Розмір"
+annotations = "Анотації"
+images = "Зображення"
+links = "Посилання"
+fonts = "Шрифти"
+xobjects = "Кількість XObject"
+multimedia = "Мультимедіа"
+
+[getPdfInfo.summary]
+pages = "Сторінки"
+fileSize = "Розмір файлу"
+pdfVersion = "Версія PDF"
+language = "Мова"
+title = "Зведення PDF"
+author = "Автор"
+created = "Створено"
+modified = "Змінено"
+permsAll = "Усі дозволи надано"
+permsRestricted = "{{count}} обмежень"
+permsMixed = "Деякі дозволи обмежено"
+hasCompliance = "Відповідає стандартам відповідності"
+noCompliance = "Немає стандартів відповідності"
+basic = "Основна інформація"
+documentInfo = "Інформація про документ"
+securityTitle = "Стан безпеки"
+technical = "Технічна інформація"
+overviewTitle = "Огляд PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF зашифровано — встановлено захист паролем"
+unencrypted = "PDF не зашифровано — немає захисту паролем"
+
+[getPdfInfo.summary.tech]
+images = "Зображення"
+fonts = "Шрифти"
+formFields = "Поля форми"
+embeddedFiles = "Вбудовані файли"
+javaScript = "JavaScript"
+layers = "Шари"
+bookmarks = "Закладки"
+multimedia = "Мультимедіа"
+
+[getPdfInfo.summary.overview]
+untitled = "документ без назви"
+unknown = "Невідомий автор"
+text = "Це PDF на {{pages}} сторінок під назвою {{title}}, створений {{author}} (версія PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Деякі файли не вдалося обробити."
+unexpected = "Неочікувана помилка під час вилучення."
+
+[getPdfInfo.status]
+complete = "Вилучення завершено"
 
 [extractPage]
 tags = "екстракт"
@@ -3438,6 +3539,9 @@ signinTitle = "Будь ласка, увійдіть"
 ssoSignIn = "Увійти через єдиний вхід"
 oAuth2AutoCreateDisabled = "Автоматичне створення користувача OAUTH2 ВИМКНЕНО"
 oAuth2AdminBlockedUser = "Реєстрація або вхід незареєстрованих користувачів наразі заборонено. Будь ласка, зв'яжіться з адміністратором."
+oAuth2RequiresLicense = "Вхід через OAuth/SSO потребує платної ліцензії (Server або Enterprise). Зверніться до адміністратора, щоб оновити ваш план."
+saml2RequiresLicense = "Вхід через SAML потребує платної ліцензії (Server або Enterprise). Зверніться до адміністратора, щоб оновити ваш план."
+maxUsersReached = "Досягнуто максимальної кількості користувачів для вашої поточної ліцензії. Зверніться до адміністратора, щоб оновити план або додати місця."
 oauth2RequestNotFound = "Запит на авторизація не знайдено"
 oauth2InvalidUserInfoResponse = "Недійсна відповідь з інформацією користувача"
 oauth2invalidRequest = "Недійсний запит"
@@ -3771,7 +3875,7 @@ version = "Текущий релиз"
 title = "Документація API"
 header = "Документація API"
 desc = "Переглядайте та тестуйте кінцеві точки API Stirling PDF"
-tags = "api,documentation,swagger,endpoints,development"
+tags = "api,документація,swagger,кінцеві точки,розробка"
 
 [cookieBanner.popUp]
 title = "Як ми використовуємо файли cookie"
@@ -3846,14 +3950,17 @@ fitToWidth = "Підігнати за шириною"
 actualSize = "Фактичний розмір"
 
 [viewer]
+cannotPreviewFile = "Не вдається переглянути файл"
+dualPageView = "Парний перегляд"
 firstPage = "Перша сторінка"
 lastPage = "Остання сторінка"
-previousPage = "Попередня сторінка"
 nextPage = "Наступна сторінка"
+onlyPdfSupported = "Переглядач підтримує лише файли PDF. Схоже, цей файл має інший формат."
+previousPage = "Попередня сторінка"
+singlePageView = "Одинарний перегляд"
+unknownFile = "Невідомий файл"
 zoomIn = "Збільшити"
 zoomOut = "Зменшити"
-singlePageView = "Одинарний перегляд"
-dualPageView = "Парний перегляд"
 
 [rightRail]
 closeSelected = "Закрити вибрані файли"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Перемкнути бічну панель"
 exportSelected = "Експорт вибраних сторінок"
 toggleAnnotations = "Перемкнути видимість анотацій"
 annotationMode = "Перемкнути режим анотацій"
+print = "Надрукувати PDF"
 draw = "Малювати"
 save = "Зберегти"
 saveChanges = "Зберегти зміни"
@@ -4153,7 +4261,7 @@ description = "Відстежувати дії користувачів і си
 
 [admin.settings.security.audit.level]
 label = "Рівень аудиту"
-description = "0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE"
+description = "0=ВИМКНЕНО, 1=БАЗОВИЙ, 2=СТАНДАРТ, 3=ДОКЛАДНИЙ"
 
 [admin.settings.security.audit.retentionDays]
 label = "Зберігання аудиту (дні)"
@@ -4407,7 +4515,7 @@ description = "Чи очищати ширший системний тимчас
 label = "Обмеження виконавця процесів"
 description = "Налаштуйте ліміти сеансів і тайм-аути для кожного виконавця процесів"
 libreOffice = "LibreOffice"
-pdfToHtml = "PDF to HTML"
+pdfToHtml = "PDF у HTML"
 qpdf = "QPDF"
 tesseract = "Tesseract OCR"
 pythonOpenCv = "Python OpenCV"
@@ -4494,6 +4602,7 @@ description = "URL або назва файлу до імпресуму (пот
 title = "Преміум і Enterprise"
 description = "Налаштуйте свій преміум або корпоративний ліцензійний ключ."
 license = "Конфігурація ліцензії"
+noInput = "Надайте ліцензійний ключ або файл"
 
 [admin.settings.premium.licenseKey]
 toggle = "Є ліцензійний ключ або файл сертифіката?"
@@ -4511,6 +4620,25 @@ line1 = "Перезапис поточного ліцензійного ключ
 line2 = "Попередня ліцензія буде втрачена назавжди, якщо ви не маєте її резервної копії."
 line3 = "Важливо: зберігайте ліцензійні ключі приватними та безпечними. Ніколи не публікуйте їх."
 
+[admin.settings.premium.inputMethod]
+text = "Ліцензійний ключ"
+file = "Файл сертифіката"
+
+[admin.settings.premium.file]
+label = "Файл ліцензійного сертифіката"
+description = "Завантажте свій ліцензійний файл .lic або .cert з офлайн-покупок"
+choose = "Виберіть ліцензійний файл"
+selected = "Вибрано: {{filename}} ({{size}})"
+successMessage = "Ліцензійний файл успішно завантажено й активовано. Перезапуск не потрібен."
+
+[admin.settings.premium.currentLicense]
+title = "Активна ліцензія"
+file = "Джерело: ліцензійний файл ({{path}})"
+key = "Джерело: ліцензійний ключ"
+type = "Тип: {{type}}"
+noInput = "Надайте ліцензійний ключ або завантажте файл сертифіката"
+success = "Успішно"
+
 [admin.settings.premium.enabled]
 label = "Увімкнути преміум-функції"
 description = "Увімкнути перевірку ліцензійного ключа для pro/enterprise функцій"
@@ -4644,7 +4772,9 @@ selectedCount = "Вибрано {{count}}"
 download = "Завантажити"
 delete = "Видалити"
 unsupported = "Непідтримуваний"
+active = "Активний"
 addToUpload = "Додати до завантаження"
+closeFile = "Закрити файл"
 deleteAll = "Видалити все"
 loadingFiles = "Завантаження файлів..."
 noFiles = "Немає доступних файлів"
@@ -5132,7 +5262,7 @@ upgrade = "Оновити зараз →"
 freeTitle = "Ліцензія сервера"
 overLimitTitle = "Потрібна ліцензія сервера"
 overLimitBody = "Наша ліцензія дозволяє до <strong>{{freeTierLimit}}</strong> користувачів безкоштовно на сервер. У вас <strong>{{overLimitUserCopy}}</strong> користувачів Stirling. Щоб працювати без перерв, перейдіть на план Stirling Server — <strong>необмежена кількість місць</strong>, редагування тексту PDF та повний адмін-контроль за $99/server/mo."
-freeBody = "Наша <strong>Open-Core</strong> ліцензія дозволяє до <strong>{{freeTierLimit}}</strong> користувачів безкоштовно на сервер. Щоб масштабуватися безперервно та отримати ранній доступ до нового <strong>інструмента редагування тексту PDF</strong>, рекомендуємо план Stirling Server — повне редагування та <strong>необмежена кількість місць</strong> за $99/server/mo."
+freeBody = "Наша ліцензія <strong>Open-Core</strong> дозволяє до <strong>{{freeTierLimit}}</strong> користувачів безкоштовно на сервер. Щоб масштабуватися без перерв, рекомендуємо план Stirling Server — <strong>необмежена кількість місць</strong> і <strong>підтримка SSO</strong> за $99/сервер/міс."
 
 [onboarding.desktopInstall]
 title = "Завантажити"
@@ -5237,6 +5367,31 @@ error = "Не вдалося оновити статус користувача"
 success = "Користувача успішно видалено"
 error = "Не вдалося видалити користувача"
 
+[workspace.people.changePassword]
+action = "Змінити пароль"
+title = "Змінити пароль"
+subtitle = "Оновити пароль для"
+newPassword = "Новий пароль"
+confirmPassword = "Підтвердження пароля"
+placeholder = "Введіть новий пароль"
+confirmPlaceholder = "Повторно введіть новий пароль"
+passwordRequired = "Будь ласка, введіть новий пароль"
+passwordMismatch = "Паролі не збігаються"
+generateRandom = "Згенерувати надійний пароль"
+generatedPreview = "Згенерований пароль:"
+copyTooltip = "Копіювати в буфер обміну"
+copiedToClipboard = "Пароль скопійовано в буфер обміну"
+copyFailed = "Не вдалося скопіювати пароль"
+sendEmail = "Надіслати користувачу електронний лист про цю зміну"
+includePassword = "Додати новий пароль до листа"
+forcePasswordChange = "Примусити користувача змінити пароль під час наступного входу"
+emailUnavailable = "Електронна адреса цього користувача недійсна. Сповіщення вимкнено."
+smtpDisabled = "Для сповіщень електронною поштою потрібно ввімкнути SMTP у налаштуваннях."
+notifyOnly = "Буде надіслано лист без пароля, щоб повідомити користувача, що адміністратор його змінив."
+submit = "Оновити пароль"
+success = "Пароль успішно оновлено"
+error = "Не вдалося оновити пароль"
+
 [workspace.people.emailInvite]
 tab = "Запрошення електронною поштою"
 description = "Введіть або вставте адреси нижче, розділені комами. Користувачі отримають дані для входу електронною поштою."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Потрібна щонайменше одна електронна адреса"
 submit = "Надіслати запрошення"
 success = "Користувача(ів) успішно запрошено"
-partialSuccess = "Деякі запрошення не вдалося надіслати"
+partialFailure = "Деякі запрошення не вдалося надіслати"
 allFailed = "Не вдалося запросити користувачів"
 error = "Не вдалося надіслати запрошення"
 
@@ -5281,7 +5436,7 @@ submit = "Згенерувати посилання-запрошення"
 
 [workspace.people.inviteMode]
 username = "Ім’я користувача"
-email = "Email"
+email = "Електронна пошта"
 link = "Посилання"
 emailDisabled = "Запрошення електронною поштою потребують налаштування SMTP і mail.enableInvites=true в налаштуваннях"
 
@@ -5770,6 +5925,7 @@ subtitle = "Увійдіть через обліковий запис Stirling"
 [setup.selfhosted]
 title = "Увійдіть на сервер"
 subtitle = "Введіть облікові дані сервера"
+link = "або підключіться до самохостингового облікового запису"
 
 [setup.server]
 title = "Під’єднатися до сервера"
@@ -5788,6 +5944,14 @@ description = "Введіть повну URL-адресу вашого само
 emptyUrl = "Введіть URL сервера"
 unreachable = "Не вдалося під’єднатися до сервера"
 testFailed = "Тест підключення не вдався"
+configFetch = "Не вдалося отримати конфігурацію сервера. Перевірте URL і спробуйте ще раз."
+
+[setup.server.error.securityDisabled]
+title = "Вхід не ввімкнено"
+body = "На цьому сервері не ввімкнено вхід. Щоб підключитися до цього сервера, потрібно ввімкнути автентифікацію:"
+step1 = "Встановіть DOCKER_ENABLE_SECURITY=true у вашому середовищі"
+step2 = "Або встановіть security.enableLogin=true у settings.yml"
+step3 = "Перезапустіть сервер"
 
 [setup.login]
 title = "Вхід"
@@ -5797,13 +5961,20 @@ submit = "Увійти"
 signInWith = "Увійти через"
 oauthPending = "Відкриваємо браузер для автентифікації..."
 orContinueWith = "Або продовжити через email"
+serverRequirement = "Примітка: на сервері має бути увімкнено вхід."
+showInstructions = "Як увімкнути?"
+hideInstructions = "Приховати інструкції"
+instructions = "Щоб увімкнути вхід на вашому сервері Stirling PDF:"
+instructionsEnvVar = "Задайте змінну середовища:"
+instructionsOrYml = "Або у settings.yml:"
+instructionsRestart = "Потім перезапустіть сервер, щоб зміни набрали чинності."
 
 [setup.login.username]
 label = "Ім’я користувача"
 placeholder = "Введіть ім’я користувача"
 
 [setup.login.email]
-label = "Email"
+label = "Електронна пошта"
 placeholder = "Введіть свій email"
 
 [setup.login.password]
@@ -5853,6 +6024,7 @@ earlyAccess = "Ранній доступ"
 reset = "Скинути зміни"
 downloadJson = "Завантажити JSON"
 generatePdf = "Згенерувати PDF"
+saveChanges = "Зберегти зміни"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Автопідгін тексту під рамки"
@@ -5890,6 +6062,8 @@ alpha = "Цей альфа-переглядач ще розвивається 
 [pdfTextEditor.empty]
 title = "Документ не завантажено"
 subtitle = "Завантажте файл PDF або JSON, щоб почати редагувати текстовий вміст."
+dropzone = "Перетягніть і відпустіть файл PDF або JSON сюди, або натисніть, щоб вибрати"
+dropzoneWithFiles = "Виберіть файл на вкладці Файли або перетягніть і відпустіть файл PDF чи JSON сюди, або натисніть, щоб вибрати"
 
 [pdfTextEditor.welcomeBanner]
 title = "Вітаємо у Редакторі тексту PDF (ранній доступ)"
diff --git a/frontend/public/locales/vi-VN/translation.toml b/frontend/public/locales/vi-VN/translation.toml
index 464407a2a..9b21be6ef 100644
--- a/frontend/public/locales/vi-VN/translation.toml
+++ b/frontend/public/locales/vi-VN/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "Xóa khỏi Mục yêu thích"
 fullscreen = "Chuyển sang chế độ toàn màn hình"
 sidebar = "Chuyển sang chế độ thanh bên"
 
+[backendStartup]
+notFoundTitle = "Không tìm thấy Backend"
+retry = "Thử lại"
+unreachable = "Ứng dụng hiện không thể kết nối tới Backend. Hãy kiểm tra trạng thái Backend và kết nối mạng, sau đó thử lại."
+
 [zipWarning]
 title = "Tệp ZIP lớn"
 message = "ZIP này chứa {{count}} tệp. Vẫn giải nén?"
@@ -296,7 +301,7 @@ saveSettings = "Lưu cài đặt thao tác"
 pipelineNamePrompt = "Nhập tên pipeline tại đây"
 selectOperation = "Chọn thao tác"
 addOperationButton = "Thêm thao tác"
-pipelineHeader = "Pipeline:"
+pipelineHeader = "Chuỗi xử lý:"
 saveButton = "Tải xuống"
 validateButton = "Xác thực"
 
@@ -347,7 +352,7 @@ teams = "Nhóm"
 title = "Cấu hình"
 systemSettings = "Cài đặt hệ thống"
 features = "Tính năng"
-endpoints = "Endpoints"
+endpoints = "Điểm cuối"
 database = "Cơ sở dữ liệu"
 advanced = "Nâng cao"
 
@@ -359,7 +364,7 @@ connections = "Kết nối"
 [settings.licensingAnalytics]
 title = "Giấy phép & Phân tích"
 plan = "Gói"
-audit = "Audit"
+audit = "Kiểm toán"
 usageAnalytics = "Phân tích sử dụng"
 
 [settings.policiesPrivacy]
@@ -369,7 +374,7 @@ privacy = "Quyền riêng tư"
 
 [settings.developer]
 title = "Nhà phát triển"
-apiKeys = "API Keys"
+apiKeys = "Khóa API"
 
 [settings.tooltips]
 enableLoginFirst = "Bật chế độ đăng nhập trước"
@@ -912,6 +917,9 @@ desc = "Xây dựng quy trình nhiều bước bằng cách xâu chuỗi các th
 desc = "Chồng lớp PDF lên trên PDF khác"
 title = "Chồng lớp PDF"
 
+[home.pdfTextEditor]
+title = "Trình chỉnh sửa văn bản PDF"
+desc = "Chỉnh sửa văn bản và hình ảnh hiện có bên trong PDF"
 
 [home.addText]
 tags = "văn bản,chú thích,nhãn"
@@ -1173,7 +1181,7 @@ selectFilesPlaceholder = "Chọn tệp trong khung chính để bắt đầu"
 settings = "Cài đặt"
 conversionCompleted = "Hoàn tất chuyển đổi"
 results = "Kết quả"
-defaultFilename = "converted_file"
+defaultFilename = "tep_da_chuyen_doi"
 conversionResults = "Kết quả chuyển đổi"
 convertFrom = "Chuyển từ"
 convertTo = "Sang"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "Chữ ký vẽ"
 defaultImageLabel = "Chữ ký đã tải lên"
 defaultTextLabel = "Chữ ký nhập"
 saveButton = "Lưu chữ ký"
+savePersonal = "Lưu cá nhân"
+saveShared = "Lưu dùng chung"
 saveUnavailable = "Hãy tạo chữ ký trước để lưu."
 noChanges = "Chữ ký hiện tại đã được lưu."
+tempStorageTitle = "Bộ nhớ tạm của trình duyệt"
+tempStorageDescription = "Chữ ký chỉ được lưu trong trình duyệt của bạn. Chúng sẽ bị mất nếu bạn xóa dữ liệu trình duyệt hoặc đổi sang trình duyệt khác."
+personalHeading = "Chữ ký cá nhân"
+sharedHeading = "Chữ ký dùng chung"
+personalDescription = "Chỉ mình bạn có thể xem các chữ ký này."
+sharedDescription = "Tất cả người dùng đều có thể xem và sử dụng các chữ ký này."
 
 [sign.saved.type]
 canvas = "Vẽ"
@@ -2567,7 +2583,7 @@ stopButton = "Dừng so sánh"
 [certSign]
 tags = "xác thực,PEM,P12,chính thức,mã hóa"
 title = "Ký bằng chứng chỉ"
-filenamePrefix = "signed"
+filenamePrefix = "da_ky"
 chooseCertificate = "Chọn tệp chứng chỉ"
 chooseJksFile = "Chọn tệp JKS"
 chooseP12File = "Chọn tệp PKCS12"
@@ -2701,7 +2717,7 @@ header = "Xóa chứng chỉ số khỏi PDF"
 selectPDF = "Chọn một tệp PDF:"
 submit = "Xóa chữ ký"
 description = "Công cụ này sẽ xóa chữ ký chứng chỉ số khỏi tài liệu PDF của bạn."
-filenamePrefix = "unsigned"
+filenamePrefix = "chua_ky"
 
 [removeCertSign.files]
 placeholder = "Chọn một tệp PDF trong màn hình chính để bắt đầu"
@@ -3020,6 +3036,91 @@ title = "Lấy thông tin PDF"
 header = "Lấy thông tin PDF"
 submit = "Lấy thông tin"
 downloadJson = "Tải xuống JSON"
+processing = "Đang trích xuất thông tin..."
+results = "Kết quả"
+noResults = "Chạy công cụ để tạo báo cáo."
+downloads = "Tải xuống"
+noneDetected = "Không phát hiện"
+indexTitle = "Chỉ mục"
+
+[getPdfInfo.report]
+entryLabel = "Tóm tắt thông tin đầy đủ"
+shortTitle = "Thông tin PDF"
+
+[getPdfInfo.sections]
+metadata = "Siêu dữ liệu"
+formFields = "Trường biểu mẫu"
+basicInfo = "Thông tin cơ bản"
+documentInfo = "Thông tin tài liệu"
+compliance = "Tuân thủ"
+encryption = "Mã hóa"
+permissions = "Quyền"
+other = "Khác"
+perPageInfo = "Thông tin theo trang"
+tableOfContents = "Mục lục"
+
+[getPdfInfo.other]
+attachments = "Tệp đính kèm"
+embeddedFiles = "Tệp nhúng"
+javaScript = "JavaScript"
+layers = "Lớp"
+structureTree = "StructureTree"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "Kích thước"
+annotations = "Chú thích"
+images = "Hình ảnh"
+links = "Liên kết"
+fonts = "Phông chữ"
+xobjects = "Số lượng XObject"
+multimedia = "Đa phương tiện"
+
+[getPdfInfo.summary]
+pages = "Trang"
+fileSize = "Kích thước tệp"
+pdfVersion = "Phiên bản PDF"
+language = "Ngôn ngữ"
+title = "Tóm tắt PDF"
+author = "Tác giả"
+created = "Đã tạo"
+modified = "Đã sửa đổi"
+permsAll = "Tất cả quyền được cho phép"
+permsRestricted = "{{count}} giới hạn"
+permsMixed = "Một số quyền bị hạn chế"
+hasCompliance = "Có tiêu chuẩn tuân thủ"
+noCompliance = "Không có tiêu chuẩn tuân thủ"
+basic = "Thông tin cơ bản"
+documentInfo = "Thông tin tài liệu"
+securityTitle = "Trạng thái bảo mật"
+technical = "Kỹ thuật"
+overviewTitle = "Tổng quan PDF"
+
+[getPdfInfo.summary.security]
+encrypted = "PDF đã mã hóa - Có bảo vệ bằng mật khẩu"
+unencrypted = "PDF không mã hóa - Không có bảo vệ bằng mật khẩu"
+
+[getPdfInfo.summary.tech]
+images = "Hình ảnh"
+fonts = "Phông chữ"
+formFields = "Trường biểu mẫu"
+embeddedFiles = "Tệp nhúng"
+javaScript = "JavaScript"
+layers = "Lớp"
+bookmarks = "Dấu trang"
+multimedia = "Đa phương tiện"
+
+[getPdfInfo.summary.overview]
+untitled = "một tài liệu không tiêu đề"
+unknown = "Tác giả không xác định"
+text = "Đây là PDF {{pages}} trang có tiêu đề {{title}} do {{author}} tạo (phiên bản PDF {{version}})."
+
+[getPdfInfo.error]
+partial = "Một số tệp không thể xử lý."
+unexpected = "Lỗi không mong muốn trong quá trình trích xuất."
+
+[getPdfInfo.status]
+complete = "Hoàn tất trích xuất"
 
 [extractPage]
 tags = "trích xuất"
@@ -3438,6 +3539,9 @@ signinTitle = "Vui lòng đăng nhập"
 ssoSignIn = "Đăng nhập qua Single Sign-on"
 oAuth2AutoCreateDisabled = "Tự động tạo người dùng OAUTH2 bị vô hiệu hóa"
 oAuth2AdminBlockedUser = "Hiện đang chặn đăng ký hoặc đăng nhập người dùng chưa đăng ký. Vui lòng liên hệ quản trị viên."
+oAuth2RequiresLicense = "Đăng nhập OAuth/SSO cần giấy phép trả phí (Server hoặc Enterprise). Vui lòng liên hệ quản trị viên để nâng cấp gói của bạn."
+saml2RequiresLicense = "Đăng nhập SAML cần giấy phép trả phí (Server hoặc Enterprise). Vui lòng liên hệ quản trị viên để nâng cấp gói của bạn."
+maxUsersReached = "Đã đạt số lượng người dùng tối đa cho giấy phép hiện tại của bạn. Vui lòng liên hệ quản trị viên để nâng cấp gói hoặc thêm suất."
 oauth2RequestNotFound = "Không tìm thấy yêu cầu ủy quyền"
 oauth2InvalidUserInfoResponse = "Phản hồi thông tin người dùng không hợp lệ"
 oauth2invalidRequest = "Yêu cầu không hợp lệ"
@@ -3533,7 +3637,7 @@ title = "PDF thành một trang"
 header = "PDF thành một trang"
 submit = "Chuyển đổi thành một trang"
 description = "Công cụ này sẽ gộp tất cả các trang của PDF của bạn thành một trang đơn lớn. Chiều rộng giữ nguyên như các trang gốc, còn chiều cao sẽ bằng tổng chiều cao của tất cả các trang."
-filenamePrefix = "single_page"
+filenamePrefix = "mot_trang"
 
 [pdfToSinglePage.files]
 placeholder = "Chọn một tệp PDF ở màn hình chính để bắt đầu"
@@ -3846,14 +3950,17 @@ fitToWidth = "Vừa chiều rộng"
 actualSize = "Kích thước thật"
 
 [viewer]
+cannotPreviewFile = "Không thể xem trước tệp"
+dualPageView = "Chế độ xem hai trang"
 firstPage = "Trang đầu"
 lastPage = "Trang cuối"
-previousPage = "Trang trước"
 nextPage = "Trang tiếp"
+onlyPdfSupported = "Trình xem chỉ hỗ trợ tệp PDF. Tệp này có vẻ là định dạng khác."
+previousPage = "Trang trước"
+singlePageView = "Chế độ xem trang đơn"
+unknownFile = "Tệp không xác định"
 zoomIn = "Phóng to"
 zoomOut = "Thu nhỏ"
-singlePageView = "Chế độ xem trang đơn"
-dualPageView = "Chế độ xem hai trang"
 
 [rightRail]
 closeSelected = "Đóng các tệp đã chọn"
@@ -3877,6 +3984,7 @@ toggleSidebar = "Chuyển đổi thanh bên"
 exportSelected = "Xuất các trang đã chọn"
 toggleAnnotations = "Chuyển đổi hiển thị chú thích"
 annotationMode = "Chuyển đổi chế độ chú thích"
+print = "In PDF"
 draw = "Vẽ"
 save = "Lưu"
 saveChanges = "Lưu thay đổi"
@@ -4494,6 +4602,7 @@ description = "URL hoặc tên tệp cho impressum (bắt buộc ở một số
 title = "Premium & Enterprise"
 description = "Cấu hình khóa giấy phép premium hoặc enterprise của bạn."
 license = "Cấu hình giấy phép"
+noInput = "Vui lòng cung cấp khóa giấy phép hoặc tệp"
 
 [admin.settings.premium.licenseKey]
 toggle = "Có license key hoặc tệp chứng chỉ?"
@@ -4511,6 +4620,25 @@ line1 = "Ghi đè license key hiện tại không thể hoàn tác."
 line2 = "License trước đó sẽ bị mất vĩnh viễn trừ khi bạn đã sao lưu ở nơi khác."
 line3 = "Quan trọng: Giữ license key riêng tư và an toàn. Không bao giờ chia sẻ công khai."
 
+[admin.settings.premium.inputMethod]
+text = "Khóa giấy phép"
+file = "Tệp chứng chỉ"
+
+[admin.settings.premium.file]
+label = "Tệp chứng chỉ giấy phép"
+description = "Tải lên tệp giấy phép .lic hoặc .cert từ các lần mua ngoại tuyến của bạn"
+choose = "Chọn tệp giấy phép"
+selected = "Đã chọn: {{filename}} ({{size}})"
+successMessage = "Tệp giấy phép đã được tải lên và kích hoạt thành công. Không cần khởi động lại."
+
+[admin.settings.premium.currentLicense]
+title = "Giấy phép đang hoạt động"
+file = "Nguồn: Tệp giấy phép ({{path}})"
+key = "Nguồn: Khóa giấy phép"
+type = "Loại: {{type}}"
+noInput = "Vui lòng cung cấp khóa giấy phép hoặc tải lên tệp chứng chỉ"
+success = "Thành công"
+
 [admin.settings.premium.enabled]
 label = "Bật tính năng Premium"
 description = "Bật kiểm tra khóa giấy phép cho các tính năng pro/enterprise"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} đã chọn"
 download = "Tải xuống"
 delete = "Xóa"
 unsupported = "Không được hỗ trợ"
+active = "Hoạt động"
 addToUpload = "Thêm vào tải lên"
+closeFile = "Đóng tệp"
 deleteAll = "Xóa tất cả"
 loadingFiles = "Đang tải tệp..."
 noFiles = "Không có tệp nào"
@@ -5132,7 +5262,7 @@ upgrade = "Nâng cấp ngay →"
 freeTitle = "Giấy phép Server"
 overLimitTitle = "Cần giấy phép Server"
 overLimitBody = "Giấy phép của chúng tôi cho phép tối đa <strong>{{freeTierLimit}}</strong> người dùng miễn phí mỗi server. Bạn có <strong>{{overLimitUserCopy}}</strong> người dùng Stirling. Để tiếp tục không gián đoạn, hãy nâng cấp lên gói Stirling Server - <strong>số ghế không giới hạn</strong>, chỉnh sửa văn bản PDF và toàn quyền quản trị với $99/server/tháng."
-freeBody = "Giấy phép <strong>Open-Core</strong> của chúng tôi cho phép tối đa <strong>{{freeTierLimit}}</strong> người dùng miễn phí mỗi server. Để mở rộng không gián đoạn và truy cập sớm <strong>công cụ chỉnh sửa văn bản PDF</strong> mới, chúng tôi khuyến nghị gói Stirling Server - chỉnh sửa đầy đủ và <strong>số ghế không giới hạn</strong> với $99/server/tháng."
+freeBody = "Giấy phép <strong>Open-Core</strong> của chúng tôi cho phép tối đa <strong>{{freeTierLimit}}</strong> người dùng miễn phí cho mỗi máy chủ. Để mở rộng quy mô liền mạch, chúng tôi khuyến nghị gói Stirling Server - <strong>số lượng người dùng không giới hạn</strong> và <strong>hỗ trợ SSO</strong> với giá $99/máy chủ/tháng."
 
 [onboarding.desktopInstall]
 title = "Tải xuống"
@@ -5237,6 +5367,31 @@ error = "Cập nhật trạng thái người dùng thất bại"
 success = "Xóa người dùng thành công"
 error = "Xóa người dùng thất bại"
 
+[workspace.people.changePassword]
+action = "Đổi mật khẩu"
+title = "Đổi mật khẩu"
+subtitle = "Cập nhật mật khẩu cho"
+newPassword = "Mật khẩu mới"
+confirmPassword = "Xác nhận mật khẩu"
+placeholder = "Nhập mật khẩu mới"
+confirmPlaceholder = "Nhập lại mật khẩu mới"
+passwordRequired = "Vui lòng nhập mật khẩu mới"
+passwordMismatch = "Mật khẩu không khớp"
+generateRandom = "Tạo mật khẩu an toàn"
+generatedPreview = "Mật khẩu đã tạo:"
+copyTooltip = "Sao chép vào bộ nhớ tạm"
+copiedToClipboard = "Đã sao chép mật khẩu vào bộ nhớ tạm"
+copyFailed = "Không thể sao chép mật khẩu"
+sendEmail = "Gửi email cho người dùng về thay đổi này"
+includePassword = "Bao gồm mật khẩu mới trong email"
+forcePasswordChange = "Buộc người dùng đổi mật khẩu ở lần đăng nhập tiếp theo"
+emailUnavailable = "Email của người dùng này không phải là địa chỉ email hợp lệ. Đã tắt thông báo."
+smtpDisabled = "Thông báo email yêu cầu bật SMTP trong cài đặt."
+notifyOnly = "Sẽ gửi một email không kèm mật khẩu, cho người dùng biết quản trị viên đã thay đổi mật khẩu."
+submit = "Cập nhật mật khẩu"
+success = "Cập nhật mật khẩu thành công"
+error = "Không thể cập nhật mật khẩu"
+
 [workspace.people.emailInvite]
 tab = "Mời qua Email"
 description = "Nhập hoặc dán email bên dưới, phân tách bằng dấu phẩy. Người dùng sẽ nhận thông tin đăng nhập qua email."
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "Yêu cầu ít nhất một địa chỉ email"
 submit = "Gửi lời mời"
 success = "Mời người dùng thành công"
-partialSuccess = "Một số lời mời thất bại"
+partialFailure = "Một số lời mời không thành công"
 allFailed = "Mời người dùng thất bại"
 error = "Gửi lời mời thất bại"
 
@@ -5770,6 +5925,7 @@ subtitle = "Đăng nhập bằng tài khoản Stirling"
 [setup.selfhosted]
 title = "Đăng nhập vào server"
 subtitle = "Nhập thông tin đăng nhập server"
+link = "hoặc kết nối tới tài khoản tự lưu trữ"
 
 [setup.server]
 title = "Kết nối đến server"
@@ -5788,6 +5944,14 @@ description = "Nhập URL đầy đủ của server Stirling PDF tự lưu trữ
 emptyUrl = "Vui lòng nhập URL server"
 unreachable = "Không thể kết nối đến server"
 testFailed = "Kiểm tra kết nối thất bại"
+configFetch = "Không thể lấy cấu hình máy chủ. Vui lòng kiểm tra URL và thử lại."
+
+[setup.server.error.securityDisabled]
+title = "Chưa bật đăng nhập"
+body = "Máy chủ này chưa bật chức năng đăng nhập. Để kết nối tới máy chủ này, bạn phải bật xác thực:"
+step1 = "Đặt DOCKER_ENABLE_SECURITY=true trong môi trường của bạn"
+step2 = "Hoặc đặt security.enableLogin=true trong settings.yml"
+step3 = "Khởi động lại máy chủ"
 
 [setup.login]
 title = "Đăng nhập"
@@ -5797,6 +5961,13 @@ submit = "Đăng nhập"
 signInWith = "Đăng nhập với"
 oauthPending = "Đang mở trình duyệt để xác thực..."
 orContinueWith = "Hoặc tiếp tục bằng email"
+serverRequirement = "Lưu ý: Máy chủ phải bật đăng nhập."
+showInstructions = "Cách bật?"
+hideInstructions = "Ẩn hướng dẫn"
+instructions = "Để bật đăng nhập trên máy chủ Stirling PDF của bạn:"
+instructionsEnvVar = "Đặt biến môi trường:"
+instructionsOrYml = "Hoặc trong settings.yml:"
+instructionsRestart = "Sau đó khởi động lại máy chủ để các thay đổi có hiệu lực."
 
 [setup.login.username]
 label = "Tên người dùng"
@@ -5853,6 +6024,7 @@ earlyAccess = "Truy cập sớm"
 reset = "Đặt lại thay đổi"
 downloadJson = "Tải JSON"
 generatePdf = "Tạo PDF"
+saveChanges = "Lưu thay đổi"
 
 [pdfTextEditor.options.autoScaleText]
 title = "Tự căn chỉnh văn bản cho vừa hộp"
@@ -5890,6 +6062,8 @@ alpha = "Trình xem alpha này vẫn đang phát triển—một số font, màu
 [pdfTextEditor.empty]
 title = "Chưa tải tài liệu"
 subtitle = "Tải tệp PDF hoặc JSON để bắt đầu chỉnh sửa nội dung văn bản."
+dropzone = "Kéo và thả tệp PDF hoặc JSON vào đây, hoặc nhấp để duyệt"
+dropzoneWithFiles = "Chọn một tệp từ tab Tệp, hoặc kéo và thả tệp PDF hoặc JSON vào đây, hoặc nhấp để duyệt"
 
 [pdfTextEditor.welcomeBanner]
 title = "Chào mừng đến với PDF Text Editor (Truy cập sớm)"
diff --git a/frontend/public/locales/zh-BO/translation.toml b/frontend/public/locales/zh-BO/translation.toml
index efbc9cb91..8c05b4c5f 100644
--- a/frontend/public/locales/zh-BO/translation.toml
+++ b/frontend/public/locales/zh-BO/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "从收藏中移除"
 fullscreen = "切换到全屏模式"
 sidebar = "切换到侧边栏模式"
 
+[backendStartup]
+notFoundTitle = "未找到后端"
+retry = "重试"
+unreachable = "应用目前无法连接到后端。请检查后端状态和网络连接，然后重试。"
+
 [zipWarning]
 title = "大型 ZIP 文件"
 message = "此 ZIP 包含 {{count}} 个文件。仍要解压吗？"
@@ -912,6 +917,9 @@ desc = "通过串联 PDF 动作构建多步工作流。适合重复性任务。"
 desc = "PDF གཞན་ཞིག་གི་སྟེང་དུ་ PDF བརྩེགས་པ།"
 title = "PDF སྟེང་བརྩེགས།"
 
+[home.pdfTextEditor]
+title = "PDF 文本编辑器"
+desc = "编辑 PDF 中的现有文本和图像"
 
 [home.addText]
 tags = "文本,注释,标签"
@@ -1173,7 +1181,7 @@ selectFilesPlaceholder = "在主视图中选择文件以开始"
 settings = "设置"
 conversionCompleted = "转换完成"
 results = "结果"
-defaultFilename = "converted_file"
+defaultFilename = "已转换_文件"
 conversionResults = "转换结果"
 convertFrom = "从以下格式转换"
 convertTo = "转换为"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "手写签名"
 defaultImageLabel = "已上传的签名"
 defaultTextLabel = "键入的签名"
 saveButton = "保存签名"
+savePersonal = "保存为个人"
+saveShared = "保存为共享"
 saveUnavailable = "请先创建签名再保存。"
 noChanges = "当前签名已保存。"
+tempStorageTitle = "浏览器临时存储"
+tempStorageDescription = "签名仅存储在您的浏览器中。若清除浏览器数据或更换浏览器，这些签名将会丢失。"
+personalHeading = "个人签名"
+sharedHeading = "共享签名"
+personalDescription = "只有您可以看到这些签名。"
+sharedDescription = "所有用户都可以查看并使用这些签名。"
 
 [sign.saved.type]
 canvas = "绘制"
@@ -3020,6 +3036,91 @@ title = "PDF ཡི་གནས་ཚུལ་ལེན་པ།"
 header = "PDF ཡི་གནས་ཚུལ་ལེན་པ།"
 submit = "གནས་ཚུལ་ལེན་པ།"
 downloadJson = "JSON ཕབ་ལེན།"
+processing = "正在提取信息..."
+results = "结果"
+noResults = "运行此工具以生成报告。"
+downloads = "下载"
+noneDetected = "未检测到"
+indexTitle = "索引"
+
+[getPdfInfo.report]
+entryLabel = "完整信息摘要"
+shortTitle = "PDF 信息"
+
+[getPdfInfo.sections]
+metadata = "元数据"
+formFields = "表单字段"
+basicInfo = "基本信息"
+documentInfo = "文档信息"
+compliance = "合规性"
+encryption = "加密"
+permissions = "权限"
+other = "其他"
+perPageInfo = "每页信息"
+tableOfContents = "目录"
+
+[getPdfInfo.other]
+attachments = "附件"
+embeddedFiles = "嵌入文件"
+javaScript = "JavaScript"
+layers = "图层"
+structureTree = "结构树"
+xmp = "XMP 元数据"
+
+[getPdfInfo.perPage]
+size = "尺寸"
+annotations = "注释"
+images = "图像"
+links = "链接"
+fonts = "字体"
+xobjects = "XObject 数量"
+multimedia = "多媒体"
+
+[getPdfInfo.summary]
+pages = "页数"
+fileSize = "文件大小"
+pdfVersion = "PDF 版本"
+language = "语言"
+title = "PDF 摘要"
+author = "作者"
+created = "创建时间"
+modified = "修改时间"
+permsAll = "允许所有权限"
+permsRestricted = "{{count}} 项限制"
+permsMixed = "部分权限受限"
+hasCompliance = "符合合规标准"
+noCompliance = "无合规标准"
+basic = "基本信息"
+documentInfo = "文档信息"
+securityTitle = "安全状态"
+technical = "技术"
+overviewTitle = "PDF 概览"
+
+[getPdfInfo.summary.security]
+encrypted = "已加密的 PDF - 受密码保护"
+unencrypted = "未加密的 PDF - 无密码保护"
+
+[getPdfInfo.summary.tech]
+images = "图像"
+fonts = "字体"
+formFields = "表单字段"
+embeddedFiles = "嵌入文件"
+javaScript = "JavaScript"
+layers = "图层"
+bookmarks = "书签"
+multimedia = "多媒体"
+
+[getPdfInfo.summary.overview]
+untitled = "未命名文档"
+unknown = "作者未知"
+text = "这是一个 {{pages}} 页的 PDF，标题为 {{title}}，由 {{author}} 创建（PDF 版本 {{version}}）。"
+
+[getPdfInfo.error]
+partial = "部分文件无法处理。"
+unexpected = "提取过程中发生意外错误。"
+
+[getPdfInfo.status]
+complete = "提取完成"
 
 [extractPage]
 tags = "ཕྱིར་འདོན།"
@@ -3438,6 +3539,9 @@ signinTitle = "ནང་འཛུལ་གནང་རོགས།"
 ssoSignIn = "གཅིག་གྱུར་ནང་འཛུལ་བརྒྱུད་ནས་ནང་འཛུལ།"
 oAuth2AutoCreateDisabled = "OAUTH2 རང་འགུལ་སྤྱོད་མཁན་གསར་བཟོ་བཀག་སྡོམ་བྱས་ཟིན།"
 oAuth2AdminBlockedUser = "ད་ལྟ་ཐོ་འགོད་མ་བྱས་པའི་སྤྱོད་མཁན་གྱི་ཐོ་འགོད་དང་ནང་འཛུལ་བཀག་སྡོམ་བྱས་ཡོད། དོ་དམ་པར་འབྲེལ་བ་གནང་རོགས།"
+oAuth2RequiresLicense = "使用 OAuth/SSO 登录需要付费许可（Server 或 Enterprise）。请联系管理员升级您的方案。"
+saml2RequiresLicense = "使用 SAML 登录需要付费许可（Server 或 Enterprise）。请联系管理员升级您的方案。"
+maxUsersReached = "您当前的许可已达到最大用户数。请联系管理员升级您的方案或增加席位。"
 oauth2RequestNotFound = "དབང་སྤྲོད་རེ་ཞུ་རྙེད་མ་བྱུང་།"
 oauth2InvalidUserInfoResponse = "སྤྱོད་མཁན་གྱི་གནས་ཚུལ་ལན་འདེབས་ནོར་འཁྲུལ།"
 oauth2invalidRequest = "རེ་ཞུ་ནོར་འཁྲུལ།"
@@ -3846,14 +3950,17 @@ fitToWidth = "适应宽度"
 actualSize = "实际大小"
 
 [viewer]
+cannotPreviewFile = "无法预览文件"
+dualPageView = "双页视图"
 firstPage = "第一页"
 lastPage = "最后一页"
-previousPage = "上一页"
 nextPage = "下一页"
+onlyPdfSupported = "此查看器仅支持 PDF 文件。该文件似乎为其他格式。"
+previousPage = "上一页"
+singlePageView = "单页视图"
+unknownFile = "未知文件"
 zoomIn = "放大"
 zoomOut = "缩小"
-singlePageView = "单页视图"
-dualPageView = "双页视图"
 
 [rightRail]
 closeSelected = "关闭所选文件"
@@ -3877,6 +3984,7 @@ toggleSidebar = "切换侧边栏"
 exportSelected = "导出所选页面"
 toggleAnnotations = "切换注释可见性"
 annotationMode = "切换注释模式"
+print = "打印 PDF"
 draw = "绘制"
 save = "保存"
 saveChanges = "保存更改"
@@ -4494,6 +4602,7 @@ description = "Impressum 的 URL 或文件名（某些司法管辖区要求）"
 title = "高级与企业版"
 description = "配置你的高级或企业许可证密钥。"
 license = "许可证配置"
+noInput = "请提供许可证密钥或文件"
 
 [admin.settings.premium.licenseKey]
 toggle = "有许可证密钥或证书文件？"
@@ -4511,6 +4620,25 @@ line1 = "覆盖当前许可证密钥后将无法撤销。"
 line2 = "除非另有备份，否则之前的许可证将被永久丢失。"
 line3 = "重要：请妥善保管许可证密钥，切勿公开分享。"
 
+[admin.settings.premium.inputMethod]
+text = "许可证密钥"
+file = "证书文件"
+
+[admin.settings.premium.file]
+label = "许可证证书文件"
+description = "上传您线下购买的 .lic 或 .cert 许可证文件"
+choose = "选择许可证文件"
+selected = "已选择：{{filename}}（{{size}}）"
+successMessage = "许可证文件上传并激活成功。无需重启。"
+
+[admin.settings.premium.currentLicense]
+title = "已激活的许可证"
+file = "来源：许可证文件（{{path}}）"
+key = "来源：许可证密钥"
+type = "类型：{{type}}"
+noInput = "请提供许可证密钥或上传证书文件"
+success = "成功"
+
 [admin.settings.premium.enabled]
 label = "启用高级功能"
 description = "为专业/企业功能启用许可证密钥检查"
@@ -4644,7 +4772,9 @@ selectedCount = "已选 {{count}} 个"
 download = "下载"
 delete = "删除"
 unsupported = "不支持"
+active = "已启用"
 addToUpload = "添加到上传"
+closeFile = "关闭文件"
 deleteAll = "全部删除"
 loadingFiles = "正在加载文件..."
 noFiles = "暂无文件"
@@ -5132,7 +5262,7 @@ upgrade = "立即升级 →"
 freeTitle = "服务器许可证"
 overLimitTitle = "需要服务器许可证"
 overLimitBody = "我们的许可每台服务器最多允许 <strong>{{freeTierLimit}}</strong> 名用户免费使用。您共有 <strong>{{overLimitUserCopy}}</strong> 名 Stirling 用户。为避免中断，请升级到 Stirling Server 方案 - <strong>无限席位</strong>、PDF 文本编辑，以及每台服务器 $99/月 的完整管理员控制。"
-freeBody = "我们的 <strong>开源内核（Open-Core）</strong> 许可允许每台服务器最多 <strong>{{freeTierLimit}}</strong> 名用户免费使用。为顺畅扩展并抢先体验全新的 <strong>PDF 文本编辑工具</strong>，我们推荐 Stirling Server 方案 - 完整编辑与 <strong>无限席位</strong>，$99/服务器/月。"
+freeBody = "我们的<strong>Open-Core</strong>许可允许每台服务器最多<strong>{{freeTierLimit}}</strong>名用户免费使用。为实现不中断的扩展，我们推荐 Stirling Server 方案 - <strong>不限席位</strong>并提供<strong>SSO 支持</strong>，$99/服务器/月。"
 
 [onboarding.desktopInstall]
 title = "下载"
@@ -5237,6 +5367,31 @@ error = "用户状态更新失败"
 success = "用户删除成功"
 error = "删除用户失败"
 
+[workspace.people.changePassword]
+action = "更改密码"
+title = "更改密码"
+subtitle = "为其更新密码"
+newPassword = "新密码"
+confirmPassword = "确认密码"
+placeholder = "输入新密码"
+confirmPlaceholder = "再次输入新密码"
+passwordRequired = "请输入新密码"
+passwordMismatch = "两次输入的密码不一致"
+generateRandom = "生成安全密码"
+generatedPreview = "已生成的密码："
+copyTooltip = "复制到剪贴板"
+copiedToClipboard = "密码已复制到剪贴板"
+copyFailed = "复制密码失败"
+sendEmail = "通过电子邮件通知用户此更改"
+includePassword = "在邮件中包含新密码"
+forcePasswordChange = "强制用户下次登录时更改密码"
+emailUnavailable = "该用户的邮箱地址无效，已禁用通知。"
+smtpDisabled = "邮件通知需要在设置中启用 SMTP。"
+notifyOnly = "将发送不包含密码的邮件，告知用户管理员已更改其密码。"
+submit = "更新密码"
+success = "密码更新成功"
+error = "密码更新失败"
+
 [workspace.people.emailInvite]
 tab = "邮件邀请"
 description = "在下方输入或粘贴邮箱，使用逗号分隔。用户将通过邮件收到登录凭据。"
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "至少需要一个邮箱地址"
 submit = "发送邀请"
 success = "已成功邀请用户"
-partialSuccess = "部分邀请失败"
+partialFailure = "部分邀请发送失败"
 allFailed = "邀请用户失败"
 error = "发送邀请失败"
 
@@ -5770,6 +5925,7 @@ subtitle = "使用您的 Stirling 账户登录"
 [setup.selfhosted]
 title = "登录服务器"
 subtitle = "输入您的服务器凭据"
+link = "或连接到自托管账户"
 
 [setup.server]
 title = "连接到服务器"
@@ -5788,6 +5944,14 @@ description = "输入自托管 Stirling PDF 服务器的完整 URL"
 emptyUrl = "请输入服务器 URL"
 unreachable = "无法连接到服务器"
 testFailed = "连接测试失败"
+configFetch = "获取服务器配置失败。请检查 URL 后重试。"
+
+[setup.server.error.securityDisabled]
+title = "未启用登录"
+body = "此服务器未启用登录。要连接到该服务器，必须启用身份验证："
+step1 = "在环境中设置 DOCKER_ENABLE_SECURITY=true"
+step2 = "或在 settings.yml 中设置 security.enableLogin=true"
+step3 = "重启服务器"
 
 [setup.login]
 title = "登录"
@@ -5797,6 +5961,13 @@ submit = "登录"
 signInWith = "登录方式"
 oauthPending = "正在打开浏览器进行认证..."
 orContinueWith = "或使用邮箱继续"
+serverRequirement = "注意：服务器必须启用登录功能。"
+showInstructions = "如何启用？"
+hideInstructions = "隐藏说明"
+instructions = "在您的 Stirling PDF 服务器上启用登录功能："
+instructionsEnvVar = "设置环境变量："
+instructionsOrYml = "或在 settings.yml 中："
+instructionsRestart = "然后重启服务器以使更改生效。"
 
 [setup.login.username]
 label = "用户名"
@@ -5853,6 +6024,7 @@ earlyAccess = "抢先体验"
 reset = "重置更改"
 downloadJson = "下载 JSON"
 generatePdf = "生成 PDF"
+saveChanges = "保存更改"
 
 [pdfTextEditor.options.autoScaleText]
 title = "自动缩放文本以适配框"
@@ -5890,6 +6062,8 @@ alpha = "此 Alpha 预览器仍在演进中——某些字体、颜色、透明
 [pdfTextEditor.empty]
 title = "未加载文档"
 subtitle = "加载 PDF 或 JSON 文件以开始编辑文本内容。"
+dropzone = "将 PDF 或 JSON 文件拖放到此处，或点击浏览"
+dropzoneWithFiles = "从“文件”选项卡选择文件，或将 PDF 或 JSON 文件拖放到此处，或点击浏览"
 
 [pdfTextEditor.welcomeBanner]
 title = "欢迎使用 PDF 文本编辑器（抢先体验）"
diff --git a/frontend/public/locales/zh-CN/translation.toml b/frontend/public/locales/zh-CN/translation.toml
index 2d166272c..ba345187f 100644
--- a/frontend/public/locales/zh-CN/translation.toml
+++ b/frontend/public/locales/zh-CN/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "从收藏中移除"
 fullscreen = "切换到全屏模式"
 sidebar = "切换到侧边栏模式"
 
+[backendStartup]
+notFoundTitle = "未找到后端"
+retry = "重试"
+unreachable = "应用程序当前无法连接到后端。请检查后端状态和网络连接，然后重试。"
+
 [zipWarning]
 title = "大型 ZIP 文件"
 message = "此 ZIP 包含 {{count}} 个文件。仍要解压？"
@@ -912,6 +917,9 @@ desc = "通过串联 PDF 操作构建多步工作流。适合重复性任务。"
 desc = "将一个 PDF 叠加在另一个之上"
 title = "叠加 PDF"
 
+[home.pdfTextEditor]
+title = "PDF 文本编辑器"
+desc = "编辑 PDF 中的现有文本和图像"
 
 [home.addText]
 tags = "文本,注释,标签"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "手写签名"
 defaultImageLabel = "已上传签名"
 defaultTextLabel = "键入签名"
 saveButton = "保存签名"
+savePersonal = "保存到个人"
+saveShared = "保存到共享"
 saveUnavailable = "请先创建签名再保存。"
 noChanges = "当前签名已保存。"
+tempStorageTitle = "临时浏览器存储"
+tempStorageDescription = "签名仅存储在您的浏览器中。清除浏览器数据或更换浏览器后将会丢失。"
+personalHeading = "个人签名"
+sharedHeading = "共享签名"
+personalDescription = "只有您可以看到这些签名。"
+sharedDescription = "所有用户都可以查看并使用这些签名。"
 
 [sign.saved.type]
 canvas = "手写"
@@ -2574,7 +2590,7 @@ chooseP12File = "选择 PKCS12 文件"
 choosePfxFile = "选择 PFX 文件"
 choosePrivateKey = "选择私钥文件"
 location = "位置"
-logoTitle = "Logo"
+logoTitle = "徽标"
 name = "名称"
 noLogo = "无 Logo"
 pageNumber = "页码"
@@ -3020,6 +3036,91 @@ title = "获取 PDF 信息"
 header = "获取 PDF 信息"
 submit = "获取信息"
 downloadJson = "下载 JSON"
+processing = "正在提取信息..."
+results = "结果"
+noResults = "运行该工具以生成报告。"
+downloads = "下载"
+noneDetected = "未检测到"
+indexTitle = "索引"
+
+[getPdfInfo.report]
+entryLabel = "完整信息摘要"
+shortTitle = "PDF 信息"
+
+[getPdfInfo.sections]
+metadata = "元数据"
+formFields = "表单字段"
+basicInfo = "基本信息"
+documentInfo = "文档信息"
+compliance = "合规性"
+encryption = "加密"
+permissions = "权限"
+other = "其他"
+perPageInfo = "每页信息"
+tableOfContents = "目录"
+
+[getPdfInfo.other]
+attachments = "附件"
+embeddedFiles = "嵌入文件"
+javaScript = "JavaScript"
+layers = "图层"
+structureTree = "结构树"
+xmp = "XMP 元数据"
+
+[getPdfInfo.perPage]
+size = "尺寸"
+annotations = "注释"
+images = "图像"
+links = "链接"
+fonts = "字体"
+xobjects = "XObject 数量"
+multimedia = "多媒体"
+
+[getPdfInfo.summary]
+pages = "页数"
+fileSize = "文件大小"
+pdfVersion = "PDF 版本"
+language = "语言"
+title = "PDF 摘要"
+author = "作者"
+created = "创建时间"
+modified = "修改时间"
+permsAll = "已允许所有权限"
+permsRestricted = "{{count}} 项限制"
+permsMixed = "部分权限受限"
+hasCompliance = "符合合规标准"
+noCompliance = "无合规标准"
+basic = "基本信息"
+documentInfo = "文档信息"
+securityTitle = "安全状态"
+technical = "技术"
+overviewTitle = "PDF 概览"
+
+[getPdfInfo.summary.security]
+encrypted = "已加密 PDF - 存在密码保护"
+unencrypted = "未加密 PDF - 无密码保护"
+
+[getPdfInfo.summary.tech]
+images = "图像"
+fonts = "字体"
+formFields = "表单字段"
+embeddedFiles = "嵌入文件"
+javaScript = "JavaScript"
+layers = "图层"
+bookmarks = "书签"
+multimedia = "多媒体"
+
+[getPdfInfo.summary.overview]
+untitled = "未命名文档"
+unknown = "未知作者"
+text = "这是一个 {{pages}} 页的 PDF，标题为 {{title}}，作者为 {{author}}（PDF 版本 {{version}}）。"
+
+[getPdfInfo.error]
+partial = "部分文件无法处理。"
+unexpected = "提取过程中发生意外错误。"
+
+[getPdfInfo.status]
+complete = "提取完成"
 
 [extractPage]
 tags = "提取"
@@ -3438,6 +3539,9 @@ signinTitle = "请登录"
 ssoSignIn = "通过单点登录登录"
 oAuth2AutoCreateDisabled = "OAuth2 自动创建用户已禁用"
 oAuth2AdminBlockedUser = "目前已阻止未注册用户的注册或登录。请联系管理员。"
+oAuth2RequiresLicense = "OAuth/SSO 登录需要付费许可（Server 或 Enterprise）。请联系管理员以升级您的计划。"
+saml2RequiresLicense = "SAML 登录需要付费许可（Server 或 Enterprise）。请联系管理员以升级您的计划。"
+maxUsersReached = "您当前的许可已达到用户数量上限。请联系管理员以升级您的计划或增加席位。"
 oauth2RequestNotFound = "找不到验证请求"
 oauth2InvalidUserInfoResponse = "无效的用户信息响应"
 oauth2invalidRequest = "无效请求"
@@ -3846,14 +3950,17 @@ fitToWidth = "适配宽度"
 actualSize = "实际大小"
 
 [viewer]
+cannotPreviewFile = "无法预览文件"
+dualPageView = "双页视图"
 firstPage = "第一页"
 lastPage = "最后一页"
-previousPage = "上一页"
 nextPage = "下一页"
+onlyPdfSupported = "该查看器仅支持 PDF 文件。此文件似乎是其他格式。"
+previousPage = "上一页"
+singlePageView = "单页视图"
+unknownFile = "未知文件"
 zoomIn = "放大"
 zoomOut = "缩小"
-singlePageView = "单页视图"
-dualPageView = "双页视图"
 
 [rightRail]
 closeSelected = "关闭所选文件"
@@ -3877,6 +3984,7 @@ toggleSidebar = "切换侧边栏"
 exportSelected = "导出所选页面"
 toggleAnnotations = "切换注释可见性"
 annotationMode = "切换注释模式"
+print = "打印 PDF"
 draw = "绘制"
 save = "保存"
 saveChanges = "保存更改"
@@ -4494,6 +4602,7 @@ description = "Impressum 的 URL 或文件名（某些司法辖区要求）"
 title = "高级版与企业版"
 description = "配置您的高级版或企业版许可证密钥。"
 license = "许可证配置"
+noInput = "请提供许可证密钥或文件"
 
 [admin.settings.premium.licenseKey]
 toggle = "有许可证密钥或证书文件吗？"
@@ -4511,6 +4620,25 @@ line1 = "覆盖当前许可证密钥后将无法撤销。"
 line2 = "除非已在其他位置备份，否则您之前的许可证将被永久丢失。"
 line3 = "重要：请妥善保管许可证密钥，切勿公开分享。"
 
+[admin.settings.premium.inputMethod]
+text = "许可证密钥"
+file = "证书文件"
+
+[admin.settings.premium.file]
+label = "许可证证书文件"
+description = "上传您线下购买的 .lic 或 .cert 许可证文件"
+choose = "选择许可证文件"
+selected = "已选择：{{filename}}（{{size}}）"
+successMessage = "许可证文件已成功上传并激活。无需重启。"
+
+[admin.settings.premium.currentLicense]
+title = "已激活的许可证"
+file = "来源：许可证文件（{{path}}）"
+key = "来源：许可证密钥"
+type = "类型：{{type}}"
+noInput = "请提供许可证密钥或上传证书文件"
+success = "成功"
+
 [admin.settings.premium.enabled]
 label = "启用高级功能"
 description = "启用对专业/企业功能的许可证密钥检查"
@@ -4622,7 +4750,7 @@ searchFiles = "搜索文件…"
 recent = "最近"
 localFiles = "本地文件"
 googleDrive = "Google 云端硬盘"
-googleDriveShort = "Drive"
+googleDriveShort = "云端硬盘"
 myFiles = "我的文件"
 noRecentFiles = "未找到最近文件"
 googleDriveNotAvailable = "不可使用 Google 云端硬盘集成"
@@ -4644,7 +4772,9 @@ selectedCount = "已选 {{count}}"
 download = "下载"
 delete = "删除"
 unsupported = "不支持"
+active = "活跃"
 addToUpload = "添加至上传"
+closeFile = "关闭文件"
 deleteAll = "删除全部"
 loadingFiles = "正在加载文件..."
 noFiles = "没有可用的文件"
@@ -5132,7 +5262,7 @@ upgrade = "立即升级 →"
 freeTitle = "服务器许可证"
 overLimitTitle = "需要服务器许可证"
 overLimitBody = "我们的许可允许每台服务器最多免费 <strong>{{freeTierLimit}}</strong> 名用户。您有 <strong>{{overLimitUserCopy}}</strong> 名 Stirling 用户。为不间断使用，请升级至 Stirling Server 方案 - <strong>无限席位</strong>、PDF 文本编辑，以及 $99/server/mo 的完整管理员控制。"
-freeBody = "我们的 <strong>Open-Core</strong> 许可允许每台服务器最多免费 <strong>{{freeTierLimit}}</strong> 名用户。为无缝扩展并抢先体验全新的 <strong>PDF 文本编辑工具</strong>，推荐 Stirling Server 方案 - 完整编辑与 <strong>无限席位</strong>，$99/server/mo。"
+freeBody = "我们的 <strong>Open-Core</strong> 许可允许每台服务器最多 <strong>{{freeTierLimit}}</strong> 名用户免费使用。为实现不间断扩展，我们推荐 Stirling Server 方案 - <strong>无限席位</strong> 和 <strong>SSO 支持</strong>，$99/server/mo."
 
 [onboarding.desktopInstall]
 title = "下载"
@@ -5237,6 +5367,31 @@ error = "更新用户状态失败"
 success = "用户删除成功"
 error = "删除用户失败"
 
+[workspace.people.changePassword]
+action = "更改密码"
+title = "更改密码"
+subtitle = "为以下用户更新密码"
+newPassword = "新密码"
+confirmPassword = "确认密码"
+placeholder = "输入新密码"
+confirmPlaceholder = "再次输入新密码"
+passwordRequired = "请输入新密码"
+passwordMismatch = "两次输入的密码不一致"
+generateRandom = "生成安全密码"
+generatedPreview = "生成的密码："
+copyTooltip = "复制到剪贴板"
+copiedToClipboard = "密码已复制到剪贴板"
+copyFailed = "复制密码失败"
+sendEmail = "向用户发送有关此更改的邮件"
+includePassword = "在邮件中包含新密码"
+forcePasswordChange = "强制用户下次登录时更改密码"
+emailUnavailable = "该用户的邮箱地址无效。通知已禁用。"
+smtpDisabled = "邮件通知需要在设置中启用 SMTP。"
+notifyOnly = "将发送不含密码的邮件，告知用户管理员已更改了密码。"
+submit = "更新密码"
+success = "密码更新成功"
+error = "更新密码失败"
+
 [workspace.people.emailInvite]
 tab = "电子邮件邀请"
 description = "在下方输入或粘贴电子邮件地址，用逗号分隔。用户将通过电子邮件收到登录凭据。"
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "至少需要一个电子邮件地址"
 submit = "发送邀请"
 success = "已成功邀请用户"
-partialSuccess = "部分邀请失败"
+partialFailure = "部分邀请失败"
 allFailed = "邀请用户失败"
 error = "发送邀请失败"
 
@@ -5770,6 +5925,7 @@ subtitle = "使用您的 Stirling 账户登录"
 [setup.selfhosted]
 title = "登录到服务器"
 subtitle = "输入您的服务器凭据"
+link = "或连接到自托管账户"
 
 [setup.server]
 title = "连接到服务器"
@@ -5788,6 +5944,14 @@ description = "输入您自托管 Stirling PDF 服务器的完整 URL"
 emptyUrl = "请输入服务器 URL"
 unreachable = "无法连接到服务器"
 testFailed = "连接测试失败"
+configFetch = "获取服务器配置失败。请检查 URL 并重试。"
+
+[setup.server.error.securityDisabled]
+title = "未启用登录"
+body = "此服务器未启用登录。要连接到此服务器，必须启用身份验证："
+step1 = "在环境中设置 DOCKER_ENABLE_SECURITY=true"
+step2 = "或在 settings.yml 中设置 security.enableLogin=true"
+step3 = "重启服务器"
 
 [setup.login]
 title = "登录"
@@ -5797,6 +5961,13 @@ submit = "登录"
 signInWith = "使用以下方式登录"
 oauthPending = "正在打开浏览器进行认证..."
 orContinueWith = "或使用 Email 继续"
+serverRequirement = "注意：服务器必须启用登录功能。"
+showInstructions = "如何启用？"
+hideInstructions = "隐藏说明"
+instructions = "要在您的 Stirling PDF 服务器上启用登录："
+instructionsEnvVar = "设置环境变量："
+instructionsOrYml = "或在 settings.yml 中："
+instructionsRestart = "然后重启服务器以使更改生效。"
 
 [setup.login.username]
 label = "用户名"
@@ -5853,6 +6024,7 @@ earlyAccess = "抢先体验"
 reset = "重置更改"
 downloadJson = "下载 JSON"
 generatePdf = "生成 PDF"
+saveChanges = "保存更改"
 
 [pdfTextEditor.options.autoScaleText]
 title = "自动缩放文本以适配框体"
@@ -5890,6 +6062,8 @@ alpha = "此 Alpha 预览器仍在演进中——某些字体、颜色、透明
 [pdfTextEditor.empty]
 title = "未加载文档"
 subtitle = "加载 PDF 或 JSON 文件以开始编辑文本内容。"
+dropzone = "将 PDF 或 JSON 文件拖放到此处，或点击浏览"
+dropzoneWithFiles = "从“文件”选项卡选择文件，或将 PDF 或 JSON 文件拖放到此处，或点击浏览"
 
 [pdfTextEditor.welcomeBanner]
 title = "欢迎使用 PDF 文本编辑器（抢先体验）"
diff --git a/frontend/public/locales/zh-TW/translation.toml b/frontend/public/locales/zh-TW/translation.toml
index 55b4e6b52..a15298988 100644
--- a/frontend/public/locales/zh-TW/translation.toml
+++ b/frontend/public/locales/zh-TW/translation.toml
@@ -163,6 +163,11 @@ unfavorite = "從我的最愛移除"
 fullscreen = "切換至全螢幕模式"
 sidebar = "切換至側邊欄模式"
 
+[backendStartup]
+notFoundTitle = "找不到後端"
+retry = "重試"
+unreachable = "應用程式目前無法連線至後端。請確認後端狀態與網路連線，然後再試一次。"
+
 [zipWarning]
 title = "大型 ZIP 檔案"
 message = "此 ZIP 包含 {{count}} 個檔案。仍要解壓縮嗎？"
@@ -912,6 +917,9 @@ desc = "將多個 PDF 動作串接，建立多步驟工作流程。適合重複
 desc = "將 PDF 覆蓋在另一個 PDF 上"
 title = "覆蓋 PDF"
 
+[home.pdfTextEditor]
+title = "PDF 文字編輯器"
+desc = "編輯 PDF 中既有的文字與圖片"
 
 [home.addText]
 tags = "文字,註解,標籤"
@@ -1173,7 +1181,7 @@ selectFilesPlaceholder = "在主視圖選取檔案以開始"
 settings = "設定"
 conversionCompleted = "轉換完成"
 results = "結果"
-defaultFilename = "converted_file"
+defaultFilename = "已轉換_檔案"
 conversionResults = "轉換結果"
 convertFrom = "來源格式"
 convertTo = "目標格式"
@@ -1360,7 +1368,7 @@ title = "新增浮水印"
 desc = "將文字或影像浮水印加入 PDF 檔案"
 completed = "已加入浮水印"
 submit = "新增浮水印"
-filenamePrefix = "watermarked"
+filenamePrefix = "已加_浮水印"
 
 [watermark.error]
 failed = "為 PDF 新增浮水印時發生錯誤。"
@@ -2259,8 +2267,16 @@ defaultCanvasLabel = "手繪簽名"
 defaultImageLabel = "上傳的簽名"
 defaultTextLabel = "輸入的簽名"
 saveButton = "儲存簽名"
+savePersonal = "儲存為個人"
+saveShared = "儲存為共用"
 saveUnavailable = "請先建立簽名才能儲存。"
 noChanges = "目前簽名已儲存。"
+tempStorageTitle = "瀏覽器暫存"
+tempStorageDescription = "簽名僅儲存在您的瀏覽器中。若清除瀏覽資料或更換瀏覽器，將會遺失。"
+personalHeading = "個人簽名"
+sharedHeading = "共用簽名"
+personalDescription = "只有您能看到這些簽名。"
+sharedDescription = "所有使用者都可以查看並使用這些簽名。"
 
 [sign.saved.type]
 canvas = "手繪"
@@ -3020,6 +3036,91 @@ title = "取得 PDF 資訊"
 header = "取得 PDF 資訊"
 submit = "取得資訊"
 downloadJson = "下載 JSON"
+processing = "正在擷取資訊..."
+results = "結果"
+noResults = "執行此工具以產生報告。"
+downloads = "下載"
+noneDetected = "未偵測到"
+indexTitle = "索引"
+
+[getPdfInfo.report]
+entryLabel = "完整資訊摘要"
+shortTitle = "PDF 資訊"
+
+[getPdfInfo.sections]
+metadata = "中繼資料"
+formFields = "表單欄位"
+basicInfo = "基本資訊"
+documentInfo = "文件資訊"
+compliance = "符合性"
+encryption = "加密"
+permissions = "權限"
+other = "其他"
+perPageInfo = "每頁資訊"
+tableOfContents = "目錄"
+
+[getPdfInfo.other]
+attachments = "附件"
+embeddedFiles = "內嵌檔案"
+javaScript = "JavaScript"
+layers = "圖層"
+structureTree = "結構樹"
+xmp = "XMPMetadata"
+
+[getPdfInfo.perPage]
+size = "尺寸"
+annotations = "註解"
+images = "影像"
+links = "連結"
+fonts = "字型"
+xobjects = "XObject 數量"
+multimedia = "多媒體"
+
+[getPdfInfo.summary]
+pages = "頁數"
+fileSize = "檔案大小"
+pdfVersion = "PDF 版本"
+language = "語言"
+title = "PDF 摘要"
+author = "作者"
+created = "建立時間"
+modified = "修改時間"
+permsAll = "允許所有權限"
+permsRestricted = "{{count}} 個限制"
+permsMixed = "部分權限受限"
+hasCompliance = "具有符合性標準"
+noCompliance = "無符合性標準"
+basic = "基本資訊"
+documentInfo = "文件資訊"
+securityTitle = "安全性狀態"
+technical = "技術資訊"
+overviewTitle = "PDF 概覽"
+
+[getPdfInfo.summary.security]
+encrypted = "已加密的 PDF - 具有密碼保護"
+unencrypted = "未加密的 PDF - 無密碼保護"
+
+[getPdfInfo.summary.tech]
+images = "影像"
+fonts = "字型"
+formFields = "表單欄位"
+embeddedFiles = "內嵌檔案"
+javaScript = "JavaScript"
+layers = "圖層"
+bookmarks = "書籤"
+multimedia = "多媒體"
+
+[getPdfInfo.summary.overview]
+untitled = "未命名文件"
+unknown = "作者不詳"
+text = "這是一份 {{pages}} 頁的 PDF，標題為 {{title}}，作者 {{author}}（PDF 版本 {{version}}）。"
+
+[getPdfInfo.error]
+partial = "部分檔案無法處理。"
+unexpected = "擷取過程發生非預期錯誤。"
+
+[getPdfInfo.status]
+complete = "擷取完成"
 
 [extractPage]
 tags = "提取"
@@ -3438,6 +3539,9 @@ signinTitle = "請登入"
 ssoSignIn = "透過 SSO 單一登入"
 oAuth2AutoCreateDisabled = "OAuth 2.0 自動建立使用者功能已停用"
 oAuth2AdminBlockedUser = "目前不允許未註冊的使用者註冊或登入。請聯絡系統管理員。"
+oAuth2RequiresLicense = "OAuth/SSO 登入需要付費授權（Server 或 Enterprise）。請聯絡管理員升級您的方案。"
+saml2RequiresLicense = "SAML 登入需要付費授權（Server 或 Enterprise）。請聯絡管理員升級您的方案。"
+maxUsersReached = "您目前的授權已達使用者上限。請聯絡管理員以升級方案或新增席次。"
 oauth2RequestNotFound = "找不到驗證請求"
 oauth2InvalidUserInfoResponse = "使用者資訊回應無效"
 oauth2invalidRequest = "請求無效"
@@ -3533,7 +3637,7 @@ title = "PDF 轉為單一頁面"
 header = "PDF 轉為單一頁面"
 submit = "轉換為單一頁面"
 description = "此工具會將 PDF 的所有頁面合併成一個大型單頁。寬度將與原頁相同，但高度會是所有頁面高度之總和。"
-filenamePrefix = "single_page"
+filenamePrefix = "單一_頁面"
 
 [pdfToSinglePage.files]
 placeholder = "在主畫面選擇一個 PDF 檔開始使用"
@@ -3846,14 +3950,17 @@ fitToWidth = "適合寬度"
 actualSize = "實際大小"
 
 [viewer]
+cannotPreviewFile = "無法預覽檔案"
+dualPageView = "雙頁檢視"
 firstPage = "第一頁"
 lastPage = "最後一頁"
-previousPage = "上一頁"
 nextPage = "下一頁"
+onlyPdfSupported = "此檢視器僅支援 PDF 檔案。此檔案似乎是其他格式。"
+previousPage = "上一頁"
+singlePageView = "單頁檢視"
+unknownFile = "未知檔案"
 zoomIn = "放大"
 zoomOut = "縮小"
-singlePageView = "單頁檢視"
-dualPageView = "雙頁檢視"
 
 [rightRail]
 closeSelected = "關閉已選檔案"
@@ -3877,6 +3984,7 @@ toggleSidebar = "切換側邊欄"
 exportSelected = "匯出選取的頁面"
 toggleAnnotations = "切換註解可見度"
 annotationMode = "切換註解模式"
+print = "列印 PDF"
 draw = "繪圖"
 save = "儲存"
 saveChanges = "儲存變更"
@@ -4494,6 +4602,7 @@ description = "Impressum 的 URL 或檔名（某些司法管轄區要求提供
 title = "Premium 與 Enterprise"
 description = "設定您的 Premium 或 Enterprise 授權金鑰。"
 license = "擴充授權設定"
+noInput = "請提供授權金鑰或檔案"
 
 [admin.settings.premium.licenseKey]
 toggle = "有授權金鑰或憑證檔嗎？"
@@ -4511,6 +4620,25 @@ line1 = "覆寫目前的授權金鑰後將無法復原。"
 line2 = "除非你另有備份，否則先前的授權將永久遺失。"
 line3 = "重要：請妥善保管授權金鑰並保持私密，切勿公開分享。"
 
+[admin.settings.premium.inputMethod]
+text = "授權金鑰"
+file = "憑證檔案"
+
+[admin.settings.premium.file]
+label = "授權憑證檔案"
+description = "上傳您離線購買的 .lic 或 .cert 授權檔案"
+choose = "選擇授權檔案"
+selected = "已選取：{{filename}}（{{size}}）"
+successMessage = "授權檔案已成功上傳並啟用，無需重新啟動。"
+
+[admin.settings.premium.currentLicense]
+title = "使用中的授權"
+file = "來源：授權檔案（{{path}}）"
+key = "來源：授權金鑰"
+type = "類型：{{type}}"
+noInput = "請提供授權金鑰或上傳憑證檔案"
+success = "成功"
+
 [admin.settings.premium.enabled]
 label = "啟用 Premium 功能"
 description = "啟用對進階/企業功能的授權金鑰檢查"
@@ -4644,7 +4772,9 @@ selectedCount = "{{count}} 個已選"
 download = "下載"
 delete = "刪除"
 unsupported = "不支援"
+active = "啟用"
 addToUpload = "加入上傳"
+closeFile = "關閉檔案"
 deleteAll = "全部刪除"
 loadingFiles = "正在載入檔案..."
 noFiles = "沒有可用的檔案"
@@ -5132,7 +5262,7 @@ upgrade = "立即升級 →"
 freeTitle = "伺服器授權"
 overLimitTitle = "需要伺服器授權"
 overLimitBody = "我們的授權允許每台伺服器最多 <strong>{{freeTierLimit}}</strong> 位使用者免費使用。你有 <strong>{{overLimitUserCopy}}</strong> 位 Stirling 使用者。若要不中斷使用，請升級至 Stirling Server 方案 - <strong>不限席次</strong>、PDF 文字編輯，以及完整管理控制，每台伺服器 $99/月。"
-freeBody = "我們的 <strong>Open-Core</strong> 授權允許每台伺服器最多 <strong>{{freeTierLimit}}</strong> 位使用者免費使用。若要無縫擴充並搶先體驗全新的 <strong>PDF 文字編輯工具</strong>，建議升級至 Stirling Server 方案 - 完整編輯與 <strong>不限席次</strong>，每台伺服器 $99/月。"
+freeBody = "我們的 <strong>Open-Core</strong> 授權允許每台伺服器最多 <strong>{{freeTierLimit}}</strong> 位使用者免費使用。若要無縫擴充，我們建議選用 Stirling Server 方案 - <strong>不限席次</strong> 與 <strong>SSO 支援</strong>，每伺服器每月 $99。"
 
 [onboarding.desktopInstall]
 title = "下載"
@@ -5237,6 +5367,31 @@ error = "更新使用者狀態失敗"
 success = "已成功刪除使用者"
 error = "刪除使用者失敗"
 
+[workspace.people.changePassword]
+action = "變更密碼"
+title = "變更密碼"
+subtitle = "為使用者更新密碼"
+newPassword = "新密碼"
+confirmPassword = "確認密碼"
+placeholder = "輸入新密碼"
+confirmPlaceholder = "再次輸入新密碼"
+passwordRequired = "請輸入新密碼"
+passwordMismatch = "密碼不相符"
+generateRandom = "產生安全密碼"
+generatedPreview = "產生的密碼："
+copyTooltip = "複製到剪貼簿"
+copiedToClipboard = "已將密碼複製到剪貼簿"
+copyFailed = "無法複製密碼"
+sendEmail = "以 Email 通知使用者此變更"
+includePassword = "在 Email 中包含新密碼"
+forcePasswordChange = "強制使用者下次登入時變更密碼"
+emailUnavailable = "此使用者的 Email 不是有效的 Email 位址。已停用通知。"
+smtpDisabled = "Email 通知需要在設定中啟用 SMTP。"
+notifyOnly = "將傳送不含密碼的 Email，通知使用者管理員已變更其密碼。"
+submit = "更新密碼"
+success = "密碼已成功更新"
+error = "更新密碼失敗"
+
 [workspace.people.emailInvite]
 tab = "電子郵件邀請"
 description = "在下方輸入或貼上電子郵件，使用逗號分隔。使用者將透過電子郵件收到登入憑證。"
@@ -5245,7 +5400,7 @@ emailsPlaceholder = "user1@example.com, user2@example.com"
 emailsRequired = "至少需要一個電子郵件地址"
 submit = "發送邀請"
 success = "已成功邀請使用者"
-partialSuccess = "部分邀請失敗"
+partialFailure = "部分邀請失敗"
 allFailed = "邀請使用者失敗"
 error = "發送邀請失敗"
 
@@ -5770,6 +5925,7 @@ subtitle = "使用你的 Stirling 帳戶登入"
 [setup.selfhosted]
 title = "登入伺服器"
 subtitle = "輸入你的伺服器認證資訊"
+link = "或連線到自行託管的帳戶"
 
 [setup.server]
 title = "連線至伺服器"
@@ -5788,6 +5944,14 @@ description = "輸入你自託管 Stirling PDF 伺服器的完整 URL"
 emptyUrl = "請輸入伺服器 URL"
 unreachable = "無法連線至伺服器"
 testFailed = "連線測試失敗"
+configFetch = "無法擷取伺服器組態。請檢查 URL 後再試一次。"
+
+[setup.server.error.securityDisabled]
+title = "未啟用登入"
+body = "此伺服器未啟用登入。若要連線至此伺服器，您必須啟用驗證："
+step1 = "在您的環境中設定 DOCKER_ENABLE_SECURITY=true"
+step2 = "或在 settings.yml 中將 security.enableLogin 設為 true"
+step3 = "重新啟動伺服器"
 
 [setup.login]
 title = "登入"
@@ -5797,13 +5961,20 @@ submit = "登入"
 signInWith = "以此登入"
 oauthPending = "正在開啟瀏覽器進行驗證..."
 orContinueWith = "或改用 Email 繼續"
+serverRequirement = "注意：伺服器必須啟用登入功能。"
+showInstructions = "如何啟用？"
+hideInstructions = "隱藏說明"
+instructions = "在您的 Stirling PDF 伺服器上啟用登入功能："
+instructionsEnvVar = "設定環境變數："
+instructionsOrYml = "或在 settings.yml 中："
+instructionsRestart = "然後重新啟動伺服器以套用變更。"
 
 [setup.login.username]
 label = "使用者名稱"
 placeholder = "輸入你的使用者名稱"
 
 [setup.login.email]
-label = "Email"
+label = "電子郵件"
 placeholder = "輸入你的 Email"
 
 [setup.login.password]
@@ -5853,6 +6024,7 @@ earlyAccess = "搶先體驗"
 reset = "重設變更"
 downloadJson = "下載 JSON"
 generatePdf = "產生 PDF"
+saveChanges = "儲存變更"
 
 [pdfTextEditor.options.autoScaleText]
 title = "自動縮放文字以符合方框"
@@ -5890,6 +6062,8 @@ alpha = "此 Alpha 檢視器仍在演進中——部分字型、顏色、透明
 [pdfTextEditor.empty]
 title = "尚未載入文件"
 subtitle = "載入 PDF 或 JSON 檔以開始編輯文字內容。"
+dropzone = "將 PDF 或 JSON 檔案拖放到此處，或點擊以瀏覽"
+dropzoneWithFiles = "從「檔案」分頁選取檔案，或將 PDF 或 JSON 檔案拖放到此處，或點擊以瀏覽"
 
 [pdfTextEditor.welcomeBanner]
 title = "歡迎使用 PDF 文字編輯器（搶先體驗）"
diff --git a/frontend/src-tauri/Cargo.lock b/frontend/src-tauri/Cargo.lock
index 9d2395e2d..2689b6b98 100644
--- a/frontend/src-tauri/Cargo.lock
+++ b/frontend/src-tauri/Cargo.lock
@@ -589,6 +589,26 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.16",
+ "once_cell",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -716,6 +736,12 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -908,6 +934,15 @@ dependencies = [
  "syn 2.0.108",
 ]
 
+[[package]]
+name = "dlv-list"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+dependencies = [
+ "const-random",
+]
+
 [[package]]
 name = "document-features"
 version = "0.2.12"
@@ -1626,6 +1661,12 @@ dependencies = [
  "ahash",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
 [[package]]
 name = "hashbrown"
 version = "0.16.0"
@@ -2152,7 +2193,11 @@ version = "3.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eebcc3aff044e5944a8fbaf69eb277d11986064cba30c468730e8b9909fb551c"
 dependencies = [
+ "byteorder",
  "log",
+ "security-framework 2.11.1",
+ "security-framework 3.5.1",
+ "windows-sys 0.60.2",
  "zeroize",
 ]
 
@@ -2378,7 +2423,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework",
+ "security-framework 2.11.1",
  "security-framework-sys",
  "tempfile",
 ]
@@ -2816,6 +2861,16 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
+[[package]]
+name = "ordered-multimap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
+dependencies = [
+ "dlv-list",
+ "hashbrown 0.14.5",
+]
+
 [[package]]
 name = "ordered-stream"
 version = "0.2.0"
@@ -3647,6 +3702,16 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "rust-ini"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap",
+]
+
 [[package]]
 name = "rust_decimal"
 version = "1.39.0"
@@ -3841,6 +3906,19 @@ dependencies = [
  "security-framework-sys",
 ]
 
+[[package]]
+name = "security-framework"
+version = "3.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
+dependencies = [
+ "bitflags 2.10.0",
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
 [[package]]
 name = "security-framework-sys"
 version = "2.15.0"
@@ -4239,6 +4317,7 @@ dependencies = [
  "sha2",
  "tauri",
  "tauri-build",
+ "tauri-plugin-deep-link",
  "tauri-plugin-fs",
  "tauri-plugin-http",
  "tauri-plugin-log",
@@ -4598,6 +4677,27 @@ dependencies = [
  "walkdir",
 ]
 
+[[package]]
+name = "tauri-plugin-deep-link"
+version = "2.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e82759f7c7d51de3cbde51c04b3f2332de52436ed84541182cd8944b04e9e73"
+dependencies = [
+ "dunce",
+ "plist",
+ "rust-ini",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin",
+ "tauri-utils",
+ "thiserror 2.0.17",
+ "tracing",
+ "url",
+ "windows-registry",
+ "windows-result 0.3.4",
+]
+
 [[package]]
 name = "tauri-plugin-fs"
 version = "2.4.4"
@@ -4718,6 +4818,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tauri",
+ "tauri-plugin-deep-link",
  "thiserror 2.0.17",
  "tracing",
  "windows-sys 0.60.2",
@@ -4937,6 +5038,15 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "tiny_http"
 version = "0.12.0"
diff --git a/frontend/src-tauri/Cargo.toml b/frontend/src-tauri/Cargo.toml
index 6884bd178..455436cdf 100644
--- a/frontend/src-tauri/Cargo.toml
+++ b/frontend/src-tauri/Cargo.toml
@@ -29,10 +29,11 @@ tauri-plugin-log = "2.0.0-rc"
 tauri-plugin-shell = "2.1.0"
 tauri-plugin-fs = "2.4.4"
 tauri-plugin-http = "2.4.4"
-tauri-plugin-single-instance = "2.0.1"
+tauri-plugin-single-instance = { version = "2.3.6", features = ["deep-link"] }
 tauri-plugin-store = "2.1.0"
 tauri-plugin-opener = "2.0.0"
-keyring = "3.6.1"
+tauri-plugin-deep-link = "2.4.5"
+keyring = { version = "3.6.1", features = ["apple-native", "windows-native"] }
 tokio = { version = "1.0", features = ["time", "sync"] }
 reqwest = { version = "0.11", features = ["json"] }
 tiny_http = "0.12"
diff --git a/frontend/src-tauri/capabilities/default.json b/frontend/src-tauri/capabilities/default.json
index b992b3221..445e1d30a 100644
--- a/frontend/src-tauri/capabilities/default.json
+++ b/frontend/src-tauri/capabilities/default.json
@@ -19,6 +19,8 @@
     {
       "identifier": "fs:allow-read-file",
       "allow": [{ "path": "**" }]
-    }
+    },
+    "opener:default",
+    "shell:allow-open"
   ]
 }
diff --git a/frontend/src-tauri/src/commands/auth.rs b/frontend/src-tauri/src/commands/auth.rs
index 30ec0d6c4..3e75b452e 100644
--- a/frontend/src-tauri/src/commands/auth.rs
+++ b/frontend/src-tauri/src/commands/auth.rs
@@ -1,4 +1,4 @@
-use keyring::Entry;
+use keyring::{Entry};
 use serde::{Deserialize, Serialize};
 use std::sync::{Arc, Mutex};
 use tauri::AppHandle;
@@ -21,53 +21,70 @@ pub struct UserInfo {
 }
 
 fn get_keyring_entry() -> Result<Entry, String> {
-    Entry::new(KEYRING_SERVICE, KEYRING_TOKEN_KEY)
-        .map_err(|e| format!("Failed to access keyring: {}", e))
+    log::debug!("Creating keyring entry with service='{}' username='{}'", KEYRING_SERVICE, KEYRING_TOKEN_KEY);
+    let entry = Entry::new(KEYRING_SERVICE, KEYRING_TOKEN_KEY)
+        .map_err(|e| {
+            log::error!("Failed to create keyring entry: {}", e);
+            format!("Failed to access keyring: {}", e)
+        })?;
+    log::debug!("Keyring entry created successfully");
+    Ok(entry)
 }
 
 #[tauri::command]
 pub async fn save_auth_token(_app_handle: AppHandle, token: String) -> Result<(), String> {
-    log::info!("Saving auth token to keyring");
+    if token.is_empty() {
+        log::warn!("Attempted to save empty auth token");
+        return Err("Token cannot be empty".to_string());
+    }
 
     let entry = get_keyring_entry()?;
 
     entry
         .set_password(&token)
-        .map_err(|e| format!("Failed to save token to keyring: {}", e))?;
+        .map_err(|e| {
+            log::error!("Failed to set password in keyring: {}", e);
+            format!("Failed to save token to keyring: {}", e)
+        })?;
+
+    // Verify the save worked
+    match entry.get_password() {
+        Ok(retrieved_token) => {
+            if retrieved_token != token {
+                log::error!("Token verification failed: Retrieved token doesn't match");
+                return Err("Token verification failed after save".to_string());
+            }
+        }
+        Err(e) => {
+            log::error!("Token verification failed: {}", e);
+            return Err(format!("Token verification failed: {}", e));
+        }
+    }
 
-    log::info!("Auth token saved successfully");
     Ok(())
 }
 
 #[tauri::command]
 pub async fn get_auth_token(_app_handle: AppHandle) -> Result<Option<String>, String> {
-    log::debug!("Retrieving auth token from keyring");
-
     let entry = get_keyring_entry()?;
 
     match entry.get_password() {
         Ok(token) => Ok(Some(token)),
         Err(keyring::Error::NoEntry) => Ok(None),
-        Err(e) => Err(format!("Failed to retrieve token: {}", e)),
+        Err(e) => {
+            log::error!("Failed to retrieve token from keyring: {}", e);
+            Err(format!("Failed to retrieve token: {}", e))
+        },
     }
 }
 
 #[tauri::command]
 pub async fn clear_auth_token(_app_handle: AppHandle) -> Result<(), String> {
-    log::info!("Clearing auth token from keyring");
-
     let entry = get_keyring_entry()?;
 
     // Delete the token - ignore error if it doesn't exist
     match entry.delete_credential() {
-        Ok(_) => {
-            log::info!("Auth token cleared successfully");
-            Ok(())
-        }
-        Err(keyring::Error::NoEntry) => {
-            log::info!("Auth token was already cleared");
-            Ok(())
-        }
+        Ok(_) | Err(keyring::Error::NoEntry) => Ok(()),
         Err(e) => Err(format!("Failed to clear token: {}", e)),
     }
 }
@@ -78,8 +95,6 @@ pub async fn save_user_info(
     username: String,
     email: Option<String>,
 ) -> Result<(), String> {
-    log::info!("Saving user info for: {}", username);
-
     let user_info = UserInfo { username, email };
 
     let store = app_handle
@@ -96,7 +111,6 @@ pub async fn save_user_info(
         .save()
         .map_err(|e| format!("Failed to save store: {}", e))?;
 
-    log::info!("User info saved successfully");
     Ok(())
 }
 
@@ -117,8 +131,6 @@ pub async fn get_user_info(app_handle: AppHandle) -> Result<Option<UserInfo>, St
 
 #[tauri::command]
 pub async fn clear_user_info(app_handle: AppHandle) -> Result<(), String> {
-    log::info!("Clearing user info");
-
     let store = app_handle
         .store(STORE_FILE)
         .map_err(|e| format!("Failed to access store: {}", e))?;
@@ -129,7 +141,6 @@ pub async fn clear_user_info(app_handle: AppHandle) -> Result<(), String> {
         .save()
         .map_err(|e| format!("Failed to save store: {}", e))?;
 
-    log::info!("User info cleared successfully");
     Ok(())
 }
 
@@ -186,12 +197,8 @@ pub async fn login(
     supabase_key: String,
     saas_server_url: String,
 ) -> Result<LoginResponse, String> {
-    log::info!("Login attempt for user: {} to server: {}", username, server_url);
-
     // Detect if this is Supabase (SaaS) or Spring Boot (self-hosted)
-    // Compare against the configured SaaS server URL
     let is_supabase = server_url.trim_end_matches('/') == saas_server_url.trim_end_matches('/');
-    log::info!("Authentication type: {}", if is_supabase { "Supabase (SaaS)" } else { "Spring Boot (Self-hosted)" });
 
     // Create HTTP client
     let client = reqwest::Client::new();
@@ -248,8 +255,6 @@ pub async fn login(
             .or_else(|| email.clone())
             .unwrap_or_else(|| username);
 
-        log::info!("Supabase login successful for user: {}", username);
-
         Ok(LoginResponse {
             token: login_response.access_token,
             username,
diff --git a/frontend/src-tauri/src/lib.rs b/frontend/src-tauri/src/lib.rs
index cb8faf04b..61cbd6d43 100644
--- a/frontend/src-tauri/src/lib.rs
+++ b/frontend/src-tauri/src/lib.rs
@@ -1,4 +1,4 @@
-use tauri::{Manager, RunEvent, WindowEvent, Emitter};
+use tauri::{AppHandle, Emitter, Manager, RunEvent, WindowEvent};
 
 mod utils;
 mod commands;
@@ -28,6 +28,17 @@ use commands::{
 };
 use state::connection_state::AppConnectionState;
 use utils::{add_log, get_tauri_logs};
+use tauri_plugin_deep_link::DeepLinkExt;
+
+fn dispatch_deep_link(app: &AppHandle, url: &str) {
+  add_log(format!("🔗 Dispatching deep link: {}", url));
+  let _ = app.emit("deep-link", url.to_string());
+
+  if let Some(window) = app.get_webview_window("main") {
+    let _ = window.set_focus();
+    let _ = window.unminimize();
+  }
+}
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
@@ -42,6 +53,7 @@ pub fn run() {
     .plugin(tauri_plugin_fs::init())
     .plugin(tauri_plugin_http::init())
     .plugin(tauri_plugin_store::Builder::new().build())
+    .plugin(tauri_plugin_deep_link::init())
     .manage(AppConnectionState::default())
     .plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
       // This callback runs when a second instance tries to start
@@ -78,6 +90,29 @@ pub fn run() {
         }
       }
 
+      {
+        let app_handle = app.handle();
+        // On macOS the plugin registers schemes via bundle metadata, so runtime registration is required only on Windows/Linux
+        #[cfg(any(target_os = "linux", target_os = "windows"))]
+        if let Err(err) = app_handle.deep_link().register_all() {
+          add_log(format!("⚠️ Failed to register deep link handler: {}", err));
+        }
+
+        if let Ok(Some(urls)) = app_handle.deep_link().get_current() {
+          let initial_handle = app_handle.clone();
+          for url in urls {
+            dispatch_deep_link(&initial_handle, url.as_str());
+          }
+        }
+
+        let event_app_handle = app_handle.clone();
+        app_handle.deep_link().on_open_url(move |event| {
+          for url in event.urls() {
+            dispatch_deep_link(&event_app_handle, url.as_str());
+          }
+        });
+      }
+
       // Start backend immediately, non-blocking
       let app_handle = app.handle().clone();
 
@@ -152,15 +187,27 @@ pub fn run() {
         }
         #[cfg(target_os = "macos")]
         RunEvent::Opened { urls } => {
+          use urlencoding::decode;
+
           add_log(format!("📂 Tauri file opened event: {:?}", urls));
           let mut added_files = false;
 
           for url in urls {
             let url_str = url.as_str();
             if url_str.starts_with("file://") {
-              let file_path = url_str.strip_prefix("file://").unwrap_or(url_str);
+              let encoded_path = url_str.strip_prefix("file://").unwrap_or(url_str);
+
+              // Decode URL-encoded characters (%20 -> space, etc.)
+              let file_path = match decode(encoded_path) {
+                Ok(decoded) => decoded.into_owned(),
+                Err(e) => {
+                  add_log(format!("⚠️ Failed to decode file path: {} - {}", encoded_path, e));
+                  encoded_path.to_string() // Fallback to encoded path
+                }
+              };
+
               add_log(format!("📂 Processing opened file: {}", file_path));
-              add_opened_file(file_path.to_string());
+              add_opened_file(file_path);
               added_files = true;
             }
           }
diff --git a/frontend/src-tauri/tauri.conf.json b/frontend/src-tauri/tauri.conf.json
index a7c3355d8..43546413c 100644
--- a/frontend/src-tauri/tauri.conf.json
+++ b/frontend/src-tauri/tauri.conf.json
@@ -1,74 +1,89 @@
 {
-  "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
-  "productName": "Stirling-PDF",
-  "version": "2.0.0",
-  "identifier": "stirling.pdf.dev",
-  "build": {
-    "frontendDist": "../dist",
-    "devUrl": "http://localhost:5173",
-    "beforeDevCommand": "npm run dev -- --mode desktop",
-    "beforeBuildCommand": "npm run build -- --mode desktop"
-  },
-  "app": {
-    "windows": [
-      {
-        "title": "Stirling-PDF",
-        "width": 1280,
-        "height": 800,
-        "resizable": true,
-        "fullscreen": false
-      }
-    ]
-  },
-  "bundle": {
-    "active": true,
-    "targets": ["deb", "rpm", "dmg", "app", "msi"],
-    "icon": [
-      "icons/icon.png",
-      "icons/icon.icns",
-      "icons/icon.ico",
-      "icons/16x16.png",
-      "icons/32x32.png",
-      "icons/64x64.png",
-      "icons/128x128.png",
-      "icons/192x192.png"
-    ],
-    "resources": [
-      "libs/*.jar",
-      "runtime/jre/**/*"
-    ],
-    "fileAssociations": [
-      {
-        "ext": ["pdf"],
-        "name": "PDF Document",
-        "description": "Open PDF files with Stirling-PDF",
-        "role": "Editor",
-        "mimeType": "application/pdf"
-      }
-    ],
-    "linux": {
-      "deb": {
-        "desktopTemplate": "stirling-pdf.desktop"
-      }
+    "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
+    "productName": "Stirling-PDF",
+    "version": "2.1.3",
+    "identifier": "stirling.pdf.dev",
+    "build": {
+        "frontendDist": "../dist",
+        "devUrl": "http://localhost:5173",
+        "beforeDevCommand": "npm run dev -- --mode desktop",
+        "beforeBuildCommand": "npm run build -- --mode desktop"
     },
-    "windows": {
-      "certificateThumbprint": null,
-      "digestAlgorithm": "sha256",
-      "timestampUrl": "http://timestamp.digicert.com"
+    "app": {
+        "windows": [
+            {
+                "title": "Stirling-PDF",
+                "width": 1280,
+                "height": 800,
+                "resizable": true,
+                "fullscreen": false
+            }
+        ]
     },
-    "macOS": {
-      "minimumSystemVersion": "10.15",
-      "signingIdentity": null,
-      "entitlements": null,
-      "providerShortName": null
+    "bundle": {
+        "active": true,
+        "targets": [
+            "deb",
+            "rpm",
+            "dmg",
+            "app",
+            "msi"
+        ],
+        "icon": [
+            "icons/icon.png",
+            "icons/icon.icns",
+            "icons/icon.ico",
+            "icons/16x16.png",
+            "icons/32x32.png",
+            "icons/64x64.png",
+            "icons/128x128.png",
+            "icons/192x192.png"
+        ],
+        "resources": [
+            "libs/*.jar",
+            "runtime/jre/**/*"
+        ],
+        "fileAssociations": [
+            {
+                "ext": [
+                    "pdf"
+                ],
+                "name": "PDF Document",
+                "description": "Open PDF files with Stirling-PDF",
+                "role": "Editor",
+                "mimeType": "application/pdf"
+            }
+        ],
+        "linux": {
+            "deb": {
+                "desktopTemplate": "stirling-pdf.desktop"
+            }
+        },
+        "windows": {
+            "certificateThumbprint": null,
+            "digestAlgorithm": "sha256",
+            "timestampUrl": "http://timestamp.digicert.com"
+        },
+        "macOS": {
+            "minimumSystemVersion": "10.15",
+            "signingIdentity": null,
+            "entitlements": null,
+            "providerShortName": null
+        }
+    },
+    "plugins": {
+        "shell": {
+            "open": true
+        },
+        "fs": {
+            "requireLiteralLeadingDot": false
+        },
+        "deep-link": {
+            "desktop": {
+                "schemes": [
+                    "stirlingpdf"
+                ]
+            }
+        }
     }
-  },
-  "plugins": {
-    "shell": {
-      "open": true
-    },
-    "fs": {
-      "requireLiteralLeadingDot": false
-    }
-  }
 }
diff --git a/frontend/src/core/components/AppProviders.tsx b/frontend/src/core/components/AppProviders.tsx
index 0ad5bc0f0..f40bd7954 100644
--- a/frontend/src/core/components/AppProviders.tsx
+++ b/frontend/src/core/components/AppProviders.tsx
@@ -21,6 +21,7 @@ import ErrorBoundary from "@app/components/shared/ErrorBoundary";
 import { useScarfTracking } from "@app/hooks/useScarfTracking";
 import { useAppInitialization } from "@app/hooks/useAppInitialization";
 import { useLogoAssets } from '@app/hooks/useLogoAssets';
+import AppConfigLoader from '@app/components/shared/AppConfigLoader';
 
 // Component to initialize scarf tracking (must be inside AppConfigProvider)
 function ScarfTrackingInitializer() {
@@ -82,6 +83,7 @@ export function AppProviders({ children, appConfigRetryOptions, appConfigProvide
                 {...appConfigProviderProps}
               >
                 <ScarfTrackingInitializer />
+                <AppConfigLoader />
                 <FileContextProvider enableUrlSync={true} enablePersistence={true}>
                   <AppInitializer />
                   <BrandingAssetManager />
diff --git a/frontend/src/core/components/annotation/shared/TextInputWithFont.tsx b/frontend/src/core/components/annotation/shared/TextInputWithFont.tsx
index 4af2a6236..bc19a673c 100644
--- a/frontend/src/core/components/annotation/shared/TextInputWithFont.tsx
+++ b/frontend/src/core/components/annotation/shared/TextInputWithFont.tsx
@@ -1,6 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Stack, TextInput, Select, Combobox, useCombobox, Group, Box, SegmentedControl } from '@mantine/core';
-import { useTranslation } from 'react-i18next';
+import { Stack, TextInput, Select, Combobox, useCombobox, Group, Box } from '@mantine/core';
 import { ColorPicker } from '@app/components/annotation/shared/ColorPicker';
 
 interface TextInputWithFontProps {
@@ -15,8 +14,12 @@ interface TextInputWithFontProps {
   textAlign?: 'left' | 'center' | 'right';
   onTextAlignChange?: (align: 'left' | 'center' | 'right') => void;
   disabled?: boolean;
-  label?: string;
-  placeholder?: string;
+  label: string;
+  placeholder: string;
+  fontLabel: string;
+  fontSizeLabel: string;
+  fontSizePlaceholder: string;
+  colorLabel?: string;
   onAnyChange?: () => void;
 }
 
@@ -34,9 +37,12 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
   disabled = false,
   label,
   placeholder,
+  fontLabel,
+  fontSizeLabel,
+  fontSizePlaceholder,
+  colorLabel,
   onAnyChange
 }) => {
-  const { t } = useTranslation();
   const [fontSizeInput, setFontSizeInput] = useState(fontSize.toString());
   const fontSizeCombobox = useCombobox();
   const [isColorPickerOpen, setIsColorPickerOpen] = useState(false);
@@ -70,8 +76,8 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
   return (
     <Stack gap="sm">
       <TextInput
-        label={label || t('sign.text.name', 'Signer name')}
-        placeholder={placeholder || t('sign.text.placeholder', 'Enter your full name')}
+        label={label}
+        placeholder={placeholder}
         value={text}
         onChange={(e) => {
           onTextChange(e.target.value);
@@ -83,7 +89,7 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
 
       {/* Font Selection */}
       <Select
-        label={t('sign.text.fontLabel', 'Font')}
+        label={fontLabel}
         value={fontFamily}
         onChange={(value) => {
           onFontFamilyChange(value || 'Helvetica');
@@ -111,8 +117,8 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
         >
           <Combobox.Target>
             <TextInput
-              label={t('sign.text.fontSizeLabel', 'Font size')}
-              placeholder={t('sign.text.fontSizePlaceholder', 'Type or select font size (8-200)')}
+              label={fontSizeLabel}
+              placeholder={fontSizePlaceholder}
               value={fontSizeInput}
               onChange={(event) => {
                 const value = event.currentTarget.value;
@@ -159,7 +165,7 @@ export const TextInputWithFont: React.FC<TextInputWithFontProps> = ({
         {onTextColorChange && (
           <Box>
             <TextInput
-              label={t('sign.text.colorLabel', 'Text colour')}
+              label={colorLabel}
               value={colorInput}
               placeholder="#000000"
               disabled={disabled}
diff --git a/frontend/src/core/components/annotation/tools/TextTool.tsx b/frontend/src/core/components/annotation/tools/TextTool.tsx
deleted file mode 100644
index ae1f1f8ef..000000000
--- a/frontend/src/core/components/annotation/tools/TextTool.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Stack, Button } from '@mantine/core';
-import { TextInputWithFont } from '@app/components/annotation/shared/TextInputWithFont';
-import { useSignature } from '@app/contexts/SignatureContext';
-
-interface TextToolProps {
-  onTextChange?: (text: string) => void;
-  disabled?: boolean;
-}
-
-const textAlignToNumber = (align: 'left' | 'center' | 'right'): number => {
-  switch (align) {
-    case 'left': return 0;
-    case 'center': return 1;
-    case 'right': return 2;
-  }
-};
-
-export const TextTool: React.FC<TextToolProps> = ({
-  onTextChange,
-  disabled = false
-}) => {
-  const { signatureApiRef } = useSignature();
-  const [text, setText] = useState('');
-  const [fontSize, setFontSize] = useState(16);
-  const [fontFamily, setFontFamily] = useState('Helvetica');
-  const [textColor, setTextColor] = useState('#000000');
-  const [textAlign, setTextAlign] = useState<'left' | 'center' | 'right'>('left');
-
-  const handleTextChange = (newText: string) => {
-    setText(newText);
-    onTextChange?.(newText);
-  };
-
-  const handlePlaceText = () => {
-    const api = signatureApiRef?.current;
-    if (api && text) {
-      api.activateAnnotationTool?.('text', {
-        color: textColor,
-        fontSize,
-        fontFamily,
-        textAlign: textAlignToNumber(textAlign),
-        contents: text,
-      });
-    }
-  };
-
-  return (
-    <Stack gap="md">
-      <TextInputWithFont
-        text={text}
-        onTextChange={handleTextChange}
-        fontSize={fontSize}
-        onFontSizeChange={setFontSize}
-        fontFamily={fontFamily}
-        onFontFamilyChange={setFontFamily}
-        textColor={textColor}
-        onTextColorChange={setTextColor}
-        textAlign={textAlign}
-        onTextAlignChange={setTextAlign}
-        disabled={disabled}
-        label="Text Content"
-        placeholder="Enter text to place on the PDF"
-      />
-      <Button
-        onClick={handlePlaceText}
-        disabled={disabled || !text.trim()}
-        fullWidth
-      >
-        Place Text
-      </Button>
-    </Stack>
-  );
-};
\ No newline at end of file
diff --git a/frontend/src/core/components/layout/Workbench.tsx b/frontend/src/core/components/layout/Workbench.tsx
index f6477c67a..0fa31dd24 100644
--- a/frontend/src/core/components/layout/Workbench.tsx
+++ b/frontend/src/core/components/layout/Workbench.tsx
@@ -71,6 +71,20 @@ export default function Workbench() {
   };
 
   const renderMainContent = () => {
+    // Check for custom workbench views first
+    if (!isBaseWorkbench(currentView)) {
+      const customView = customWorkbenchViews.find((view) => view.workbenchId === currentView && view.data != null);
+      if (customView) {
+        // PDF text editor handles its own empty state (shows dropzone when no document)
+        const handlesOwnEmptyState = currentView === 'custom:pdfTextEditor';
+        if (handlesOwnEmptyState || activeFiles.length > 0) {
+          const CustomComponent = customView.component;
+          return <CustomComponent data={customView.data} />;
+        }
+      }
+    }
+
+    // For base workbenches (or custom views that don't handle empty state), show landing page when no files
     if (activeFiles.length === 0) {
       return (
         <LandingPage
@@ -143,15 +157,6 @@ export default function Workbench() {
         );
 
       default:
-        if (!isBaseWorkbench(currentView)) {
-          const customView = customWorkbenchViews.find((view) => view.workbenchId === currentView && view.data != null);
-            
-          
-          if (customView) {
-            const CustomComponent = customView.component;
-            return <CustomComponent data={customView.data} />;
-          }
-        }
         return <LandingPage />;
     }
   };
diff --git a/frontend/src/core/components/onboarding/InitialOnboardingModal/renderButtons.tsx b/frontend/src/core/components/onboarding/InitialOnboardingModal/renderButtons.tsx
index ae90c27da..c50ae7b43 100644
--- a/frontend/src/core/components/onboarding/InitialOnboardingModal/renderButtons.tsx
+++ b/frontend/src/core/components/onboarding/InitialOnboardingModal/renderButtons.tsx
@@ -47,11 +47,11 @@ export function SlideButtons({ slideDefinition, licenseNotice, flowState, onActi
     ) {
       return t('onboarding.serverLicense.upgrade', 'Upgrade now →');
     }
-    
+
     // Translate the label (it's a translation key)
     const label = button.label ?? '';
     if (!label) return '';
-    
+
     // Extract fallback text from translation key (e.g., 'onboarding.buttons.next' -> 'Next')
     const fallback = label.split('.').pop() || label;
     return t(label, fallback);
@@ -105,4 +105,4 @@ export function SlideButtons({ slideDefinition, licenseNotice, flowState, onActi
       <Group gap={12}>{rightButtons.map(renderButton)}</Group>
     </Group>
   );
-}
\ No newline at end of file
+}
diff --git a/frontend/src/core/components/onboarding/Onboarding.tsx b/frontend/src/core/components/onboarding/Onboarding.tsx
index eb752ec6a..bcfa449bf 100644
--- a/frontend/src/core/components/onboarding/Onboarding.tsx
+++ b/frontend/src/core/components/onboarding/Onboarding.tsx
@@ -5,7 +5,7 @@ import { useNavigate, useLocation } from 'react-router-dom';
 import { isAuthRoute } from '@app/constants/routes';
 import { dispatchTourState } from '@app/constants/events';
 import { useOnboardingOrchestrator } from '@app/components/onboarding/orchestrator/useOnboardingOrchestrator';
-import { markStepSeen } from '@app/components/onboarding/orchestrator/onboardingStorage';
+import { useBypassOnboarding } from '@app/components/onboarding/useBypassOnboarding';
 import OnboardingTour, { type AdvanceArgs, type CloseArgs } from '@app/components/onboarding/OnboardingTour';
 import OnboardingModalSlide from '@app/components/onboarding/OnboardingModalSlide';
 import {
@@ -19,16 +19,19 @@ import { useTourOrchestration } from '@app/contexts/TourOrchestrationContext';
 import { useAdminTourOrchestration } from '@app/contexts/AdminTourOrchestrationContext';
 import { createUserStepsConfig } from '@app/components/onboarding/userStepsConfig';
 import { createAdminStepsConfig } from '@app/components/onboarding/adminStepsConfig';
+import { createWhatsNewStepsConfig } from '@app/components/onboarding/whatsNewStepsConfig';
 import { removeAllGlows } from '@app/components/onboarding/tourGlow';
 import { useFilesModalContext } from '@app/contexts/FilesModalContext';
 import { useServerExperience } from '@app/hooks/useServerExperience';
-import AdminAnalyticsChoiceModal from '@app/components/shared/AdminAnalyticsChoiceModal';
+import { useAppConfig } from '@app/contexts/AppConfigContext';
+import apiClient from '@app/services/apiClient';
 import '@app/components/onboarding/OnboardingTour.css';
 
 export default function Onboarding() {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const location = useLocation();
+  const bypassOnboarding = useBypassOnboarding();
   const { state, actions } = useOnboardingOrchestrator();
   const serverExperience = useServerExperience();
   const onAuthRoute = isAuthRoute(location.pathname);
@@ -37,6 +40,11 @@ export default function Onboarding() {
   const { osInfo, osOptions, setSelectedDownloadUrl, handleDownloadSelected } = useOnboardingDownload();
   const { showLicenseSlide, licenseNotice: externalLicenseNotice, closeLicenseSlide } = useServerLicenseRequest();
   const { tourRequested: externalTourRequested, requestedTourType, clearTourRequest } = useTourRequest();
+  const { config, refetch: refetchConfig } = useAppConfig();
+  const [analyticsError, setAnalyticsError] = useState<string | null>(null);
+  const [analyticsLoading, setAnalyticsLoading] = useState(false);
+  const [showAnalyticsModal, setShowAnalyticsModal] = useState(false);
+  const [analyticsModalDismissed, setAnalyticsModalDismissed] = useState(false);
 
   const handleRoleSelect = useCallback((role: 'admin' | 'user' | null) => {
     actions.updateRuntimeState({ selectedRole: role });
@@ -48,7 +56,34 @@ export default function Onboarding() {
     window.location.href = '/login';
   }, [actions]);
 
-  const handleButtonAction = useCallback((action: ButtonAction) => {
+  // Check if we should show analytics modal before onboarding
+  useEffect(() => {
+    if (!isLoading && !analyticsModalDismissed && serverExperience.effectiveIsAdmin && config?.enableAnalytics == null) {
+      setShowAnalyticsModal(true);
+    }
+  }, [isLoading, analyticsModalDismissed, serverExperience.effectiveIsAdmin, config?.enableAnalytics]);
+
+  const handleAnalyticsChoice = useCallback(async (enableAnalytics: boolean) => {
+    if (analyticsLoading) return;
+    setAnalyticsLoading(true);
+    setAnalyticsError(null);
+
+    try {
+      const formData = new FormData();
+      formData.append('enabled', enableAnalytics.toString());
+
+      await apiClient.post('/api/v1/settings/update-enable-analytics', formData);
+      await refetchConfig();
+      setShowAnalyticsModal(false);
+      setAnalyticsModalDismissed(true);
+      setAnalyticsLoading(false);
+    } catch (error) {
+      setAnalyticsError(error instanceof Error ? error.message : 'Unknown error');
+      setAnalyticsLoading(false);
+    }
+  }, [analyticsLoading, refetchConfig]);
+
+  const handleButtonAction = useCallback(async (action: ButtonAction) => {
     switch (action) {
       case 'next':
       case 'complete-close':
@@ -67,35 +102,43 @@ export default function Onboarding() {
       case 'security-next':
         if (!runtimeState.selectedRole) return;
         if (runtimeState.selectedRole !== 'admin') {
-          actions.updateRuntimeState({ tourRequested: true, tourType: 'tools' });
+          actions.updateRuntimeState({ tourType: 'whatsnew' });
+          setIsTourOpen(true);
         }
         actions.complete();
         break;
       case 'launch-admin':
-        actions.updateRuntimeState({ tourRequested: true, tourType: 'admin' });
-        actions.complete();
+        actions.updateRuntimeState({ tourType: 'admin' });
+        setIsTourOpen(true);
         break;
       case 'launch-tools':
-        actions.updateRuntimeState({ tourRequested: true, tourType: 'tools' });
-        actions.complete();
+        actions.updateRuntimeState({ tourType: 'whatsnew' });
+        setIsTourOpen(true);
         break;
       case 'launch-auto': {
-        const tourType = serverExperience.effectiveIsAdmin || runtimeState.selectedRole === 'admin' ? 'admin' : 'tools';
-        actions.updateRuntimeState({ tourRequested: true, tourType });
-        actions.complete();
+        const tourType = serverExperience.effectiveIsAdmin || runtimeState.selectedRole === 'admin' ? 'admin' : 'whatsnew';
+        actions.updateRuntimeState({ tourType });
+        setIsTourOpen(true);
         break;
       }
       case 'skip-to-license':
-        markStepSeen('tour');
-        actions.updateRuntimeState({ tourRequested: false });
+        actions.complete();
+        break;
+      case 'skip-tour':
         actions.complete();
         break;
       case 'see-plans':
         actions.complete();
         navigate('/settings/adminPlan');
         break;
+      case 'enable-analytics':
+        await handleAnalyticsChoice(true);
+        break;
+      case 'disable-analytics':
+        await handleAnalyticsChoice(false);
+        break;
     }
-  }, [actions, handleDownloadSelected, navigate, runtimeState.selectedRole, serverExperience.effectiveIsAdmin]);
+  }, [actions, handleAnalyticsChoice, handleDownloadSelected, navigate, runtimeState.selectedRole, serverExperience.effectiveIsAdmin]);
 
   const isRTL = typeof document !== 'undefined' ? document.documentElement.dir === 'rtl' : false;
   const [isTourOpen, setIsTourOpen] = useState(false);
@@ -115,10 +158,7 @@ export default function Onboarding() {
         backToAllTools: tourOrch.backToAllTools,
         selectCropTool: tourOrch.selectCropTool,
         loadSampleFile: tourOrch.loadSampleFile,
-        switchToViewer: tourOrch.switchToViewer,
-        switchToPageEditor: tourOrch.switchToPageEditor,
         switchToActiveFiles: tourOrch.switchToActiveFiles,
-        selectFirstFile: tourOrch.selectFirstFile,
         pinFile: tourOrch.pinFile,
         modifyCropSettings: tourOrch.modifyCropSettings,
         executeTool: tourOrch.executeTool,
@@ -128,6 +168,24 @@ export default function Onboarding() {
     [t, tourOrch, closeFilesModal, openFilesModal]
   );
 
+  const whatsNewStepsConfig = useMemo(
+    () => createWhatsNewStepsConfig({
+      t,
+      actions: {
+        saveWorkbenchState: tourOrch.saveWorkbenchState,
+        closeFilesModal,
+        backToAllTools: tourOrch.backToAllTools,
+        openFilesModal,
+        loadSampleFile: tourOrch.loadSampleFile,
+        switchToViewer: tourOrch.switchToViewer,
+        switchToPageEditor: tourOrch.switchToPageEditor,
+        switchToActiveFiles: tourOrch.switchToActiveFiles,
+        selectFirstFile: tourOrch.selectFirstFile,
+      },
+    }),
+    [t, tourOrch, closeFilesModal, openFilesModal]
+  );
+
   const adminStepsConfig = useMemo(
     () => createAdminStepsConfig({
       t,
@@ -142,21 +200,19 @@ export default function Onboarding() {
   );
 
   const tourSteps = useMemo<StepType[]>(() => {
-    const config = runtimeState.tourType === 'admin' ? adminStepsConfig : userStepsConfig;
-    return Object.values(config);
-  }, [adminStepsConfig, runtimeState.tourType, userStepsConfig]);
-
-  useEffect(() => {
-    if (currentStep?.id === 'tour' && !isTourOpen) {
-      markStepSeen('tour');
-      setIsTourOpen(true);
+    switch (runtimeState.tourType) {
+      case 'admin':
+        return Object.values(adminStepsConfig);
+      case 'whatsnew':
+        return Object.values(whatsNewStepsConfig);
+      default:
+        return Object.values(userStepsConfig);
     }
-  }, [currentStep, isTourOpen, activeFlow]);
+  }, [adminStepsConfig, runtimeState.tourType, userStepsConfig, whatsNewStepsConfig]);
 
   useEffect(() => {
     if (externalTourRequested) {
-      actions.updateRuntimeState({ tourRequested: true, tourType: requestedTourType });
-      markStepSeen('tour');
+      actions.updateRuntimeState({ tourType: requestedTourType });
       setIsTourOpen(true);
       clearTourRequest();
     }
@@ -174,9 +230,9 @@ export default function Onboarding() {
     } else {
       tourOrch.restoreWorkbenchState();
     }
-    markStepSeen('tour');
-    if (currentStep?.id === 'tour') actions.complete();
-  }, [actions, adminTourOrch, currentStep?.id, runtimeState.tourType, tourOrch]);
+    // Advance to next onboarding step after tour completes
+    actions.complete();
+  }, [actions, adminTourOrch, runtimeState.tourType, tourOrch]);
 
   const handleAdvanceTour = useCallback((args: AdvanceArgs) => {
     const { setCurrentStep, currentStep: tourCurrentStep, steps, setIsOpen } = args;
@@ -214,8 +270,10 @@ export default function Onboarding() {
       firstLoginUsername: runtimeState.firstLoginUsername,
       onPasswordChanged: handlePasswordChanged,
       usingDefaultCredentials: runtimeState.usingDefaultCredentials,
+      analyticsError,
+      analyticsLoading,
     });
-  }, [currentSlideDefinition, osInfo, osOptions, runtimeState.selectedRole, runtimeState.licenseNotice, handleRoleSelect, serverExperience.loginEnabled, setSelectedDownloadUrl, runtimeState.firstLoginUsername, handlePasswordChanged]);
+  }, [analyticsError, analyticsLoading, currentSlideDefinition, osInfo, osOptions, runtimeState.selectedRole, runtimeState.licenseNotice, handleRoleSelect, serverExperience.loginEnabled, setSelectedDownloadUrl, runtimeState.firstLoginUsername, handlePasswordChanged]);
 
   const modalSlideCount = useMemo(() => {
     return activeFlow.filter((step) => step.type === 'modal-slide').length;
@@ -227,12 +285,53 @@ export default function Onboarding() {
     return modalSlides.findIndex((step) => step.id === currentStep.id);
   }, [activeFlow, currentStep]);
 
+  if (bypassOnboarding) {
+    return null;
+  }
+
   if (onAuthRoute) {
     return null;
   }
 
+  // Show analytics modal before onboarding if needed
+  if (showAnalyticsModal) {
+    const slideDefinition = SLIDE_DEFINITIONS['analytics-choice'];
+    const slideContent = slideDefinition.createSlide({
+      osLabel: '',
+      osUrl: '',
+      selectedRole: null,
+      onRoleSelect: () => {},
+      analyticsError,
+      analyticsLoading,
+    });
+
+    return (
+      <OnboardingModalSlide
+        slideDefinition={slideDefinition}
+        slideContent={slideContent}
+        runtimeState={runtimeState}
+        modalSlideCount={1}
+        currentModalSlideIndex={0}
+        onSkip={() => {}} // No skip allowed
+        onAction={async (action) => {
+          if (action === 'enable-analytics') {
+            await handleAnalyticsChoice(true);
+          } else if (action === 'disable-analytics') {
+            await handleAnalyticsChoice(false);
+          }
+        }}
+        allowDismiss={false}
+      />
+    );
+  }
+
   if (showLicenseSlide) {
-    const slideDefinition = SLIDE_DEFINITIONS['server-license'];
+    const baseSlideDefinition = SLIDE_DEFINITIONS['server-license'];
+    // Remove back button for external license notice
+    const slideDefinition = {
+      ...baseSlideDefinition,
+      buttons: baseSlideDefinition.buttons.filter(btn => btn.key !== 'license-back')
+    };
     const effectiveLicenseNotice = externalLicenseNotice || runtimeState.licenseNotice;
     const slideContent = slideDefinition.createSlide({
       osLabel: '',
@@ -244,7 +343,7 @@ export default function Onboarding() {
       licenseNotice: effectiveLicenseNotice,
       loginEnabled: serverExperience.loginEnabled,
     });
-    
+
     return (
       <OnboardingModalSlide
         slideDefinition={slideDefinition}
@@ -265,40 +364,34 @@ export default function Onboarding() {
     );
   }
 
+  // Always render the tour component (it controls its own visibility with isOpen)
+  const tourComponent = (
+    <OnboardingTour
+      isOpen={isTourOpen}
+      tourSteps={tourSteps}
+      tourType={runtimeState.tourType}
+      isRTL={isRTL}
+      t={t}
+      onAdvance={handleAdvanceTour}
+      onClose={handleCloseTour}
+    />
+  );
+
+  // If no active onboarding, just show the tour (which may or may not be open)
   if (isLoading || !isActive || !currentStep) {
-    return (
-      <OnboardingTour
-        isOpen={isTourOpen}
-        tourSteps={tourSteps}
-        tourType={runtimeState.tourType}
-        isRTL={isRTL}
-        t={t}
-        onAdvance={handleAdvanceTour}
-        onClose={handleCloseTour}
-      />
-    );
+    return tourComponent;
   }
 
+  // If tour is open, hide the onboarding modal and just show the tour
+  if (isTourOpen) {
+    return tourComponent;
+  }
+
+  // Render the current onboarding step
   switch (currentStep.type) {
     case 'tool-prompt':
       return <ToolPanelModePrompt forceOpen={true} onComplete={actions.complete} />;
 
-    case 'tour':
-      return (
-        <OnboardingTour
-          isOpen={true}
-          tourSteps={tourSteps}
-          tourType={runtimeState.tourType}
-          isRTL={isRTL}
-          t={t}
-          onAdvance={handleAdvanceTour}
-          onClose={handleCloseTour}
-        />
-      );
-
-    case 'analytics-modal':
-      return <AdminAnalyticsChoiceModal opened={true} onClose={actions.complete} />;
-
     case 'modal-slide':
       if (!currentSlideDefinition || !currentSlideContent) return null;
       return (
diff --git a/frontend/src/core/components/onboarding/OnboardingModalSlide.tsx b/frontend/src/core/components/onboarding/OnboardingModalSlide.tsx
index 381a608d8..60a930919 100644
--- a/frontend/src/core/components/onboarding/OnboardingModalSlide.tsx
+++ b/frontend/src/core/components/onboarding/OnboardingModalSlide.tsx
@@ -6,8 +6,9 @@
  */
 
 import React from 'react';
-import { Modal, Stack } from '@mantine/core';
+import { Modal, Stack, ActionIcon } from '@mantine/core';
 import DiamondOutlinedIcon from '@mui/icons-material/DiamondOutlined';
+import CloseIcon from '@mui/icons-material/Close';
 
 import type { SlideDefinition, ButtonAction } from '@app/components/onboarding/onboardingFlowConfig';
 import type { OnboardingRuntimeState } from '@app/components/onboarding/orchestrator/onboardingConfig';
@@ -28,6 +29,7 @@ interface OnboardingModalSlideProps {
   currentModalSlideIndex: number;
   onSkip: () => void;
   onAction: (action: ButtonAction) => void;
+  allowDismiss?: boolean;
 }
 
 export default function OnboardingModalSlide({
@@ -38,6 +40,7 @@ export default function OnboardingModalSlide({
   currentModalSlideIndex,
   onSkip,
   onAction,
+  allowDismiss = true,
 }: OnboardingModalSlideProps) {
 
   const renderHero = () => {
@@ -62,6 +65,9 @@ export default function OnboardingModalSlide({
         {slideDefinition.hero.type === 'lock' && (
           <LocalIcon icon="lock-outline" width={64} height={64} className={styles.heroIcon} />
         )}
+        {slideDefinition.hero.type === 'analytics' && (
+          <LocalIcon icon="analytics" width={64} height={64} className={styles.heroIcon} />
+        )}
         {slideDefinition.hero.type === 'diamond' && <DiamondOutlinedIcon sx={{ fontSize: 64, color: '#000000' }} />}
         {slideDefinition.hero.type === 'logo' && (
           <img src={`${BASE_PATH}/branding/StirlingPDFLogoNoTextLightHC.svg`} alt="Stirling logo" />
@@ -75,6 +81,7 @@ export default function OnboardingModalSlide({
       opened={true}
       onClose={onSkip}
       closeOnClickOutside={false}
+      closeOnEscape={allowDismiss}
       centered
       size="lg"
       radius="lg"
@@ -93,6 +100,31 @@ export default function OnboardingModalSlide({
             isActive
             slideKey={slideContent.key}
           />
+          {allowDismiss && (
+            <ActionIcon
+              onClick={onSkip}
+              radius="md"
+              size={36}
+              style={{
+                position: 'absolute',
+                top: 16,
+                right: 16,
+                backgroundColor: 'rgba(255, 255, 255, 0.2)',
+                color: 'white',
+                backdropFilter: 'blur(4px)',
+                zIndex: 10,
+              }}
+              styles={{
+                root: {
+                  '&:hover': {
+                    backgroundColor: 'rgba(255, 255, 255, 0.3)',
+                  },
+                },
+              }}
+            >
+              <CloseIcon fontSize="small" />
+            </ActionIcon>
+          )}
           <div className={styles.heroLogo} key={`logo-${slideContent.key}`}>
             {renderHero()}
           </div>
@@ -114,7 +146,9 @@ export default function OnboardingModalSlide({
               <style>{`div strong{color: var(--onboarding-title); font-weight: 600;}`}</style>
             </div>
 
-            <OnboardingStepper totalSteps={modalSlideCount} activeStep={currentModalSlideIndex} />
+            {modalSlideCount > 1 && (
+              <OnboardingStepper totalSteps={modalSlideCount} activeStep={currentModalSlideIndex} />
+            )}
 
             <div className={styles.buttonContainer}>
               <SlideButtons
diff --git a/frontend/src/core/components/onboarding/OnboardingTour.tsx b/frontend/src/core/components/onboarding/OnboardingTour.tsx
index 571596798..85df0a9fd 100644
--- a/frontend/src/core/components/onboarding/OnboardingTour.tsx
+++ b/frontend/src/core/components/onboarding/OnboardingTour.tsx
@@ -49,7 +49,7 @@ interface CloseArgs {
 
 interface OnboardingTourProps {
   tourSteps: StepType[];
-  tourType: 'admin' | 'tools';
+  tourType: 'admin' | 'tools' | 'whatsnew';
   isRTL: boolean;
   t: TFunction;
   isOpen: boolean;
diff --git a/frontend/src/core/components/onboarding/onboardingFlowConfig.ts b/frontend/src/core/components/onboarding/onboardingFlowConfig.ts
index ff8ef1ccc..0f9f5de02 100644
--- a/frontend/src/core/components/onboarding/onboardingFlowConfig.ts
+++ b/frontend/src/core/components/onboarding/onboardingFlowConfig.ts
@@ -4,6 +4,8 @@ import SecurityCheckSlide from '@app/components/onboarding/slides/SecurityCheckS
 import PlanOverviewSlide from '@app/components/onboarding/slides/PlanOverviewSlide';
 import ServerLicenseSlide from '@app/components/onboarding/slides/ServerLicenseSlide';
 import FirstLoginSlide from '@app/components/onboarding/slides/FirstLoginSlide';
+import TourOverviewSlide from '@app/components/onboarding/slides/TourOverviewSlide';
+import AnalyticsChoiceSlide from '@app/components/onboarding/slides/AnalyticsChoiceSlide';
 import { SlideConfig, LicenseNotice } from '@app/types/types';
 
 export type SlideId =
@@ -12,9 +14,11 @@ export type SlideId =
   | 'desktop-install'
   | 'security-check'
   | 'admin-overview'
-  | 'server-license';
+  | 'server-license'
+  | 'tour-overview'
+  | 'analytics-choice';
 
-export type HeroType = 'rocket' | 'dual-icon' | 'shield' | 'diamond' | 'logo' | 'lock';
+export type HeroType = 'rocket' | 'dual-icon' | 'shield' | 'diamond' | 'logo' | 'lock' | 'analytics';
 
 export type ButtonAction =
   | 'next'
@@ -27,7 +31,10 @@ export type ButtonAction =
   | 'launch-tools'
   | 'launch-auto'
   | 'see-plans'
-  | 'skip-to-license';
+  | 'skip-to-license'
+  | 'skip-tour'
+  | 'enable-analytics'
+  | 'disable-analytics';
 
 export interface FlowState {
   selectedRole: 'admin' | 'user' | null;
@@ -52,6 +59,8 @@ export interface SlideFactoryParams {
   firstLoginUsername?: string;
   onPasswordChanged?: () => void;
   usingDefaultCredentials?: boolean;
+  analyticsError?: string | null;
+  analyticsLoading?: boolean;
 }
 
 export interface HeroDefinition {
@@ -79,9 +88,9 @@ export interface SlideDefinition {
 export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
   'first-login': {
     id: 'first-login',
-    createSlide: ({ firstLoginUsername, onPasswordChanged, usingDefaultCredentials }) => 
-      FirstLoginSlide({ 
-        username: firstLoginUsername || '', 
+    createSlide: ({ firstLoginUsername, onPasswordChanged, usingDefaultCredentials }) =>
+      FirstLoginSlide({
+        username: firstLoginUsername || '',
         onPasswordChanged: onPasswordChanged || (() => {}),
         usingDefaultCredentials: usingDefaultCredentials || false,
       }),
@@ -194,6 +203,13 @@ export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
     createSlide: ({ licenseNotice }) => ServerLicenseSlide({ licenseNotice }),
     hero: { type: 'dual-icon' },
     buttons: [
+      {
+        key: 'license-back',
+        type: 'icon',
+        icon: 'chevron-left',
+        group: 'left',
+        action: 'prev',
+      },
       {
         key: 'license-close',
         type: 'button',
@@ -212,5 +228,58 @@ export const SLIDE_DEFINITIONS: Record<SlideId, SlideDefinition> = {
       },
     ],
   },
+  'tour-overview': {
+    id: 'tour-overview',
+    createSlide: () => TourOverviewSlide(),
+    hero: { type: 'rocket' },
+    buttons: [
+      {
+        key: 'tour-overview-back',
+        type: 'icon',
+        icon: 'chevron-left',
+        group: 'left',
+        action: 'prev',
+      },
+      {
+        key: 'tour-overview-skip',
+        type: 'button',
+        label: 'onboarding.buttons.skipForNow',
+        variant: 'secondary',
+        group: 'left',
+        action: 'skip-tour',
+      },
+      {
+        key: 'tour-overview-show',
+        type: 'button',
+        label: 'onboarding.buttons.showMeAround',
+        variant: 'primary',
+        group: 'right',
+        action: 'launch-tools',
+      },
+    ],
+  },
+  'analytics-choice': {
+    id: 'analytics-choice',
+    createSlide: ({ analyticsError }) => AnalyticsChoiceSlide({ analyticsError }),
+    hero: { type: 'analytics' },
+    buttons: [
+      {
+        key: 'analytics-disable',
+        type: 'button',
+        label: 'no',
+        variant: 'secondary',
+        group: 'left',
+        action: 'disable-analytics',
+      },
+      {
+        key: 'analytics-enable',
+        type: 'button',
+        label: 'yes',
+        variant: 'primary',
+        group: 'right',
+        action: 'enable-analytics',
+      },
+    ],
+  },
 };
 
diff --git a/frontend/src/core/components/onboarding/orchestrator/onboardingConfig.ts b/frontend/src/core/components/onboarding/orchestrator/onboardingConfig.ts
index 60843dea1..7c9431dc4 100644
--- a/frontend/src/core/components/onboarding/orchestrator/onboardingConfig.ts
+++ b/frontend/src/core/components/onboarding/orchestrator/onboardingConfig.ts
@@ -5,21 +5,20 @@ export type OnboardingStepId =
   | 'security-check'
   | 'admin-overview'
   | 'tool-layout'
-  | 'tour'
+  | 'tour-overview'
   | 'server-license'
   | 'analytics-choice';
 
 export type OnboardingStepType =
   | 'modal-slide'
-  | 'tool-prompt'
-  | 'tour'
-  | 'analytics-modal';
+  | 'tool-prompt';
 
 export interface OnboardingRuntimeState {
   selectedRole: 'admin' | 'user' | null;
   tourRequested: boolean;
-  tourType: 'admin' | 'tools';
+  tourType: 'admin' | 'tools' | 'whatsnew';
   isDesktopApp: boolean;
+  desktopSlideEnabled: boolean;
   analyticsNotConfigured: boolean;
   analyticsEnabled: boolean;
   licenseNotice: {
@@ -42,13 +41,13 @@ export interface OnboardingStep {
   id: OnboardingStepId;
   type: OnboardingStepType;
   condition: (ctx: OnboardingConditionContext) => boolean;
-  slideId?: 'first-login' | 'welcome' | 'desktop-install' | 'security-check' | 'admin-overview' | 'server-license';
+  slideId?: 'first-login' | 'welcome' | 'desktop-install' | 'security-check' | 'admin-overview' | 'server-license' | 'tour-overview' | 'analytics-choice';
 }
 
 export const DEFAULT_RUNTIME_STATE: OnboardingRuntimeState = {
   selectedRole: null,
   tourRequested: false,
-  tourType: 'tools',
+  tourType: 'whatsnew',
   isDesktopApp: false,
   analyticsNotConfigured: false,
   analyticsEnabled: false,
@@ -61,6 +60,7 @@ export const DEFAULT_RUNTIME_STATE: OnboardingRuntimeState = {
   requiresPasswordChange: false,
   firstLoginUsername: '',
   usingDefaultCredentials: false,
+  desktopSlideEnabled: true,
 };
 
 export const ONBOARDING_STEPS: OnboardingStep[] = [
@@ -76,18 +76,6 @@ export const ONBOARDING_STEPS: OnboardingStep[] = [
     slideId: 'welcome',
     condition: () => true,
   },
-  {
-    id: 'desktop-install',
-    type: 'modal-slide',
-    slideId: 'desktop-install',
-    condition: (ctx) => !ctx.isDesktopApp,
-  },
-  {
-    id: 'security-check',
-    type: 'modal-slide',
-    slideId: 'security-check',
-    condition: (ctx) => !ctx.loginEnabled && !ctx.isDesktopApp,
-  },
   {
     id: 'admin-overview',
     type: 'modal-slide',
@@ -95,14 +83,27 @@ export const ONBOARDING_STEPS: OnboardingStep[] = [
     condition: (ctx) => ctx.effectiveIsAdmin,
   },
   {
-    id: 'tool-layout',
-    type: 'tool-prompt',
-    condition: () => true,
+    id: 'desktop-install',
+    type: 'modal-slide',
+    slideId: 'desktop-install',
+    condition: (ctx) => !ctx.isDesktopApp && ctx.desktopSlideEnabled,
   },
   {
-    id: 'tour',
-    type: 'tour',
-    condition: (ctx) => ctx.tourRequested || !ctx.effectiveIsAdmin,
+    id: 'security-check',
+    type: 'modal-slide',
+    slideId: 'security-check',
+    condition: () => false,
+  },
+  {
+    id: 'tool-layout',
+    type: 'tool-prompt',
+    condition: () => false,
+  },
+  {
+    id: 'tour-overview',
+    type: 'modal-slide',
+    slideId: 'tour-overview',
+    condition: (ctx) => !ctx.effectiveIsAdmin && ctx.tourType !== 'admin',
   },
   {
     id: 'server-license',
@@ -110,11 +111,6 @@ export const ONBOARDING_STEPS: OnboardingStep[] = [
     slideId: 'server-license',
     condition: (ctx) => ctx.effectiveIsAdmin && ctx.licenseNotice.requiresLicense,
   },
-  {
-    id: 'analytics-choice',
-    type: 'analytics-modal',
-    condition: (ctx) => ctx.effectiveIsAdmin && ctx.analyticsNotConfigured,
-  },
 ];
 
 export function getStepById(id: OnboardingStepId): OnboardingStep | undefined {
diff --git a/frontend/src/core/components/onboarding/orchestrator/onboardingStorage.ts b/frontend/src/core/components/onboarding/orchestrator/onboardingStorage.ts
index ef9f51be1..9e3065614 100644
--- a/frontend/src/core/components/onboarding/orchestrator/onboardingStorage.ts
+++ b/frontend/src/core/components/onboarding/orchestrator/onboardingStorage.ts
@@ -1,94 +1,71 @@
-import { type OnboardingStepId, ONBOARDING_STEPS } from '@app/components/onboarding/orchestrator/onboardingConfig';
-
 const STORAGE_PREFIX = 'onboarding';
+const TOURS_TOOLTIP_KEY = `${STORAGE_PREFIX}::tours-tooltip-shown`;
+const ONBOARDING_COMPLETED_KEY = `${STORAGE_PREFIX}::completed`;
 
-export function getStorageKey(stepId: OnboardingStepId): string {
-  return `${STORAGE_PREFIX}::${stepId}`;
-}
-
-export function hasSeenStep(stepId: OnboardingStepId): boolean {
+export function isOnboardingCompleted(): boolean {
   if (typeof window === 'undefined') return false;
   try {
-    return localStorage.getItem(getStorageKey(stepId)) === 'true';
+    return localStorage.getItem(ONBOARDING_COMPLETED_KEY) === 'true';
   } catch {
     return false;
   }
 }
 
-export function markStepSeen(stepId: OnboardingStepId): void {
+export function markOnboardingCompleted(): void {
   if (typeof window === 'undefined') return;
   try {
-    localStorage.setItem(getStorageKey(stepId), 'true');
+    localStorage.setItem(ONBOARDING_COMPLETED_KEY, 'true');
   } catch (error) {
-    console.error('[onboardingStorage] Error marking step as seen:', error);
+    console.error('[onboardingStorage] Error marking onboarding as completed:', error);
   }
 }
 
-export function resetStepSeen(stepId: OnboardingStepId): void {
+export function resetOnboardingProgress(): void {
   if (typeof window === 'undefined') return;
   try {
-    localStorage.removeItem(getStorageKey(stepId));
+    localStorage.removeItem(ONBOARDING_COMPLETED_KEY);
   } catch (error) {
-    console.error('[onboardingStorage] Error resetting step seen:', error);
+    console.error('[onboardingStorage] Error resetting onboarding progress:', error);
   }
 }
 
-export function resetAllOnboardingProgress(): void {
-  if (typeof window === 'undefined') return;
+export function hasShownToursTooltip(): boolean {
+  if (typeof window === 'undefined') return false;
   try {
-    const prefix = `${STORAGE_PREFIX}::`;
-    const keysToRemove: string[] = [];
-    for (let i = 0; i < localStorage.length; i++) {
-      const key = localStorage.key(i);
-      if (key?.startsWith(prefix)) keysToRemove.push(key);
-    }
-    keysToRemove.forEach((key) => localStorage.removeItem(key));
-  } catch (error) {
-    console.error('[onboardingStorage] Error resetting all onboarding progress:', error);
+    return localStorage.getItem(TOURS_TOOLTIP_KEY) === 'true';
+  } catch {
+    return false;
   }
 }
 
-export function getOnboardingStorageState(): Record<string, boolean> {
-  const state: Record<string, boolean> = {};
-  ONBOARDING_STEPS.forEach((step) => {
-    state[step.id] = hasSeenStep(step.id);
-  });
-  return state;
+export function markToursTooltipShown(): void {
+  if (typeof window === 'undefined') return;
+  try {
+    localStorage.setItem(TOURS_TOOLTIP_KEY, 'true');
+  } catch (error) {
+    console.error('[onboardingStorage] Error marking tours tooltip as shown:', error);
+  }
 }
 
 export function migrateFromLegacyPreferences(): void {
   if (typeof window === 'undefined') return;
-  
+
   const migrationKey = `${STORAGE_PREFIX}::migrated`;
-  
+
   try {
     // Skip if already migrated
     if (localStorage.getItem(migrationKey) === 'true') return;
-    
+
     const prefsRaw = localStorage.getItem('stirlingpdf_preferences');
     if (prefsRaw) {
       const prefs = JSON.parse(prefsRaw) as Record<string, unknown>;
-      
-      // Migrate based on legacy flags
-      if (prefs.hasSeenIntroOnboarding === true) {
-        markStepSeen('welcome');
-        markStepSeen('desktop-install');
-        markStepSeen('security-check');
-        markStepSeen('admin-overview');
+
+      // If user had completed onboarding in old system, mark new system as complete
+      if (prefs.hasCompletedOnboarding === true || prefs.hasSeenIntroOnboarding === true) {
+        markOnboardingCompleted();
       }
-      
-      if (prefs.toolPanelModePromptSeen === true || prefs.hasSelectedToolPanelMode === true) {
-        markStepSeen('tool-layout');
-      }
-      
-      if (prefs.hasCompletedOnboarding === true) {
-        markStepSeen('tour');
-        markStepSeen('analytics-choice');
-        markStepSeen('server-license');
-      }
-      
     }
-    
+
     // Mark migration complete
     localStorage.setItem(migrationKey, 'true');
   } catch {
diff --git a/frontend/src/core/components/onboarding/orchestrator/useOnboardingOrchestrator.ts b/frontend/src/core/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
index 07888b7ce..eb3c5367e 100644
--- a/frontend/src/core/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
+++ b/frontend/src/core/components/onboarding/orchestrator/useOnboardingOrchestrator.ts
@@ -12,11 +12,12 @@ import {
   DEFAULT_RUNTIME_STATE,
 } from '@app/components/onboarding/orchestrator/onboardingConfig';
 import {
-  hasSeenStep,
-  markStepSeen,
+  isOnboardingCompleted,
+  markOnboardingCompleted,
   migrateFromLegacyPreferences,
 } from '@app/components/onboarding/orchestrator/onboardingStorage';
 import { accountService } from '@app/services/accountService';
+import { useBypassOnboarding } from '@app/components/onboarding/useBypassOnboarding';
 
 const AUTH_ROUTES = ['/login', '/signup', '/auth', '/invite'];
 const SESSION_TOUR_REQUESTED = 'onboarding::session::tour-requested';
@@ -34,12 +35,15 @@ function getInitialRuntimeState(baseState: OnboardingRuntimeState): OnboardingRu
   if (typeof window === 'undefined') {
     return baseState;
   }
-  
+
   try {
     const tourRequested = sessionStorage.getItem(SESSION_TOUR_REQUESTED) === 'true';
-    const tourType = (sessionStorage.getItem(SESSION_TOUR_TYPE) as 'admin' | 'tools') || 'tools';
+    const sessionTourType = sessionStorage.getItem(SESSION_TOUR_TYPE);
+    const tourType = (sessionTourType === 'admin' || sessionTourType === 'tools' || sessionTourType === 'whatsnew')
+      ? sessionTourType
+      : 'whatsnew';
     const selectedRole = sessionStorage.getItem(SESSION_SELECTED_ROLE) as 'admin' | 'user' | null;
-    
+
     return {
       ...baseState,
       tourRequested,
@@ -53,7 +57,7 @@ function getInitialRuntimeState(baseState: OnboardingRuntimeState): OnboardingRu
 
 function persistRuntimeState(state: Partial<OnboardingRuntimeState>): void {
   if (typeof window === 'undefined') return;
-  
+
   try {
     if (state.tourRequested !== undefined) {
       sessionStorage.setItem(SESSION_TOUR_REQUESTED, state.tourRequested ? 'true' : 'false');
@@ -75,7 +79,7 @@ function persistRuntimeState(state: Partial<OnboardingRuntimeState>): void {
 
 function clearRuntimeStateSession(): void {
   if (typeof window === 'undefined') return;
-  
+
   try {
     sessionStorage.removeItem(SESSION_TOUR_REQUESTED);
     sessionStorage.removeItem(SESSION_TOUR_TYPE);
@@ -142,8 +146,9 @@ export function useOnboardingOrchestrator(
   const serverExperience = useServerExperience();
   const { config, loading: configLoading } = useAppConfig();
   const location = useLocation();
+  const bypassOnboarding = useBypassOnboarding();
 
-  const [runtimeState, setRuntimeState] = useState<OnboardingRuntimeState>(() => 
+  const [runtimeState, setRuntimeState] = useState<OnboardingRuntimeState>(() =>
     getInitialRuntimeState(defaultState)
   );
   const [isPaused, setIsPaused] = useState(false);
@@ -164,6 +169,7 @@ export function useOnboardingOrchestrator(
       ...prev,
       analyticsEnabled: config?.enableAnalytics === true,
       analyticsNotConfigured: config?.enableAnalytics == null,
+      desktopSlideEnabled: config?.enableDesktopInstallSlide ?? true,
       licenseNotice: {
         totalUsers: serverExperience.totalUsers,
         freeTierLimit: serverExperience.freeTierLimit,
@@ -193,7 +199,7 @@ export function useOnboardingOrchestrator(
           accountService.getAccountData(),
           accountService.getLoginPageData(),
         ]);
-        
+
         setRuntimeState((prev) => ({
           ...prev,
           requiresPasswordChange: accountData.changeCredsFlag,
@@ -213,60 +219,64 @@ export function useOnboardingOrchestrator(
   const isOnAuthRoute = AUTH_ROUTES.some((route) => location.pathname.startsWith(route));
   const loginEnabled = config?.enableLogin === true;
   const isUnauthenticatedWithLoginEnabled = loginEnabled && !hasAuthToken();
-  const shouldBlockOnboarding = isOnAuthRoute || configLoading || isUnauthenticatedWithLoginEnabled;
+  const shouldBlockOnboarding =
+    bypassOnboarding || isOnAuthRoute || configLoading || isUnauthenticatedWithLoginEnabled;
 
   const conditionContext = useMemo<OnboardingConditionContext>(() => ({
     ...serverExperience,
     ...runtimeState,
-    effectiveIsAdmin: serverExperience.effectiveIsAdmin || 
+    effectiveIsAdmin: serverExperience.effectiveIsAdmin ||
       (!serverExperience.loginEnabled && runtimeState.selectedRole === 'admin'),
   }), [serverExperience, runtimeState]);
 
   const activeFlow = useMemo(() => {
+    // If password change is required, ONLY show the first-login step
+    if (runtimeState.requiresPasswordChange) {
+      return ONBOARDING_STEPS.filter((step) => step.id === 'first-login');
+    }
     return ONBOARDING_STEPS.filter((step) => step.condition(conditionContext));
-  }, [conditionContext]);
+  }, [conditionContext, runtimeState.requiresPasswordChange]);
 
   // Wait for config AND admin status before calculating initial step
   const adminStatusResolved = !configLoading && (
-    config?.enableLogin === false || 
-    config?.enableLogin === undefined || 
+    config?.enableLogin === false ||
+    config?.enableLogin === undefined ||
     config?.isAdmin !== undefined
   );
-  
+
   useEffect(() => {
-    if (configLoading || !adminStatusResolved || activeFlow.length === 0) return;
-    
-    let firstUnseenIndex = -1;
-    for (let i = 0; i < activeFlow.length; i++) {
-      if (!hasSeenStep(activeFlow[i].id)) {
-        firstUnseenIndex = i;
-        break;
-      }
+    if (configLoading || !adminStatusResolved) return;
+
+    // If there are no steps to show, mark initialized/completed baseline
+    if (activeFlow.length === 0) {
+      setCurrentStepIndex(0);
+      initialIndexSet.current = true;
+      return;
     }
-    
-    if (firstUnseenIndex === -1) {
+
+    // If onboarding has been completed, don't show it
+    if (isOnboardingCompleted() && !runtimeState.requiresPasswordChange) {
       setCurrentStepIndex(activeFlow.length);
       initialIndexSet.current = true;
-    } else if (!initialIndexSet.current) {
-      setCurrentStepIndex(firstUnseenIndex);
+      return;
+    }
+
+    // Start from the beginning
+    if (!initialIndexSet.current) {
+      setCurrentStepIndex(0);
       initialIndexSet.current = true;
     }
-  }, [activeFlow, configLoading, adminStatusResolved]);
+  }, [activeFlow, configLoading, adminStatusResolved, runtimeState.requiresPasswordChange]);
 
   const totalSteps = activeFlow.length;
-  
-  const allStepsAlreadySeen = useMemo(() => {
-    if (activeFlow.length === 0) return false;
-    return activeFlow.every(step => hasSeenStep(step.id));
-  }, [activeFlow]);
-  
-  const isComplete = isInitialized && initialIndexSet.current && 
-    (currentStepIndex >= totalSteps || allStepsAlreadySeen);
-  const currentStep = (currentStepIndex >= 0 && currentStepIndex < totalSteps && !allStepsAlreadySeen) 
-    ? activeFlow[currentStepIndex] 
+
+  const isComplete = isInitialized &&
+    (totalSteps === 0 || currentStepIndex >= totalSteps || isOnboardingCompleted());
+  const currentStep = (currentStepIndex >= 0 && currentStepIndex < totalSteps)
+    ? activeFlow[currentStepIndex]
     : null;
   const isActive = !shouldBlockOnboarding && !isPaused && !isComplete && isInitialized && currentStep !== null;
-  const isLoading = configLoading || !adminStatusResolved || !isInitialized || 
+  const isLoading = configLoading || !adminStatusResolved || !isInitialized ||
     !initialIndexSet.current || (currentStepIndex === -1 && activeFlow.length > 0);
 
   useEffect(() => {
@@ -278,32 +288,33 @@ export function useOnboardingOrchestrator(
   }, [isComplete]);
 
   const next = useCallback(() => {
-    if (currentStep) markStepSeen(currentStep.id);
-    setCurrentStepIndex((prev) => Math.min(prev + 1, totalSteps));
-  }, [currentStep, totalSteps]);
+    const nextIndex = currentStepIndex + 1;
+    if (nextIndex >= totalSteps) {
+      // Reached the end, mark onboarding as completed
+      markOnboardingCompleted();
+    }
+    setCurrentStepIndex(nextIndex);
+  }, [currentStepIndex, totalSteps]);
 
   const prev = useCallback(() => {
     setCurrentStepIndex((prev) => Math.max(prev - 1, 0));
   }, []);
 
   const skip = useCallback(() => {
-    if (currentStep) markStepSeen(currentStep.id);
-    setCurrentStepIndex((prev) => Math.min(prev + 1, totalSteps));
-  }, [currentStep, totalSteps]);
+    // Skip marks the entire onboarding as completed
+    markOnboardingCompleted();
+    setCurrentStepIndex(totalSteps);
+  }, [totalSteps]);
 
   const complete = useCallback(() => {
-    if (currentStep) markStepSeen(currentStep.id);
-    setCurrentStepIndex((prev) => Math.min(prev + 1, totalSteps));
-  }, [currentStep, totalSteps]);
+    const nextIndex = currentStepIndex + 1;
+    if (nextIndex >= totalSteps) {
+      // Reached the end, mark onboarding as completed
+      markOnboardingCompleted();
+    }
+    setCurrentStepIndex(nextIndex);
+  }, [currentStepIndex, totalSteps]);
 
-  useEffect(() => {
-    if (!currentStep || isLoading) {
-      return;
-    }
-    if (hasSeenStep(currentStep.id)) {
-      complete();
-    }
-  }, [currentStep, isLoading, complete]);
 
   const updateRuntimeState = useCallback((updates: Partial<OnboardingRuntimeState>) => {
     persistRuntimeState(updates);
diff --git a/frontend/src/core/components/onboarding/slides/AnalyticsChoiceSlide.tsx b/frontend/src/core/components/onboarding/slides/AnalyticsChoiceSlide.tsx
new file mode 100644
index 000000000..c04009ca4
--- /dev/null
+++ b/frontend/src/core/components/onboarding/slides/AnalyticsChoiceSlide.tsx
@@ -0,0 +1,55 @@
+import React from 'react';
+import { Trans } from 'react-i18next';
+import { Button } from '@mantine/core';
+import OpenInNewIcon from '@mui/icons-material/OpenInNew';
+import i18n from '@app/i18n';
+import { SlideConfig } from '@app/types/types';
+import { UNIFIED_CIRCLE_CONFIG } from '@app/components/onboarding/slides/unifiedBackgroundConfig';
+import styles from '@app/components/onboarding/InitialOnboardingModal/InitialOnboardingModal.module.css';
+
+interface AnalyticsChoiceSlideProps {
+  analyticsError?: string | null;
+}
+
+export default function AnalyticsChoiceSlide({ analyticsError }: AnalyticsChoiceSlideProps): SlideConfig {
+  return {
+    key: 'analytics-choice',
+    title: i18n.t('analytics.title', 'Do you want to help make Stirling PDF better?'),
+    body: (
+      <div className={styles.bodyCopyInner}>
+        <Trans
+          i18nKey="analytics.paragraph1"
+          defaults="Stirling PDF has opt-in analytics to help us improve the product. We do not track any personal information or file contents."
+          components={{ strong: <strong /> }}
+        />
+        <br />
+        <Trans
+          i18nKey="analytics.paragraph2"
+          defaults="Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better."
+          components={{ strong: <strong /> }}
+        />
+        <br />
+        <div style={{ textAlign: 'right', marginTop: 0 }}>
+          <Button
+            variant="default"
+            size="sm"
+            onClick={() => window.open('https://docs.stirlingpdf.com/analytics-telemetry/', '_blank')}
+            rightSection={<OpenInNewIcon style={{ fontSize: 16 }} />}
+          >
+            {i18n.t('analytics.learnMore', 'Learn more about our analytics')}
+          </Button>
+        </div>
+        {analyticsError && (
+          <div style={{ color: 'var(--mantine-color-red-6)', marginTop: 12 }}>
+            {analyticsError}
+          </div>
+        )}
+      </div>
+    ),
+    background: {
+      gradientStops: ['#0EA5E9', '#6366F1'],
+      circles: UNIFIED_CIRCLE_CONFIG,
+    },
+  };
+}
+
diff --git a/frontend/src/core/components/onboarding/slides/ServerLicenseSlide.tsx b/frontend/src/core/components/onboarding/slides/ServerLicenseSlide.tsx
index f118d2ac0..3da69103b 100644
--- a/frontend/src/core/components/onboarding/slides/ServerLicenseSlide.tsx
+++ b/frontend/src/core/components/onboarding/slides/ServerLicenseSlide.tsx
@@ -39,7 +39,7 @@ export default function ServerLicenseSlide({ licenseNotice }: ServerLicenseSlide
       components={{
         strong: <strong />,
       }}
-      defaults="Our <strong>Open-Core</strong> licensing permits up to <strong>{{freeTierLimit}}</strong> users for free per server. To scale uninterrupted and get early access to our new <strong>PDF text editing tool</strong>, we recommend the Stirling Server plan - full editing and <strong>unlimited seats</strong> for $99/server/mo."
+      defaults="Our <strong>Open-Core</strong> licensing permits up to <strong>{{freeTierLimit}}</strong> users for free per server. To scale uninterrupted, we recommend the Stirling Server plan - <strong>unlimited seats</strong> and <strong>SSO support</strong> for $99/server/mo."
     />
   );
 
diff --git a/frontend/src/core/components/onboarding/slides/TourOverviewSlide.tsx b/frontend/src/core/components/onboarding/slides/TourOverviewSlide.tsx
new file mode 100644
index 000000000..b76a10b7f
--- /dev/null
+++ b/frontend/src/core/components/onboarding/slides/TourOverviewSlide.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Trans } from 'react-i18next';
+import i18n from '@app/i18n';
+import { SlideConfig } from '@app/types/types';
+import { UNIFIED_CIRCLE_CONFIG } from '@app/components/onboarding/slides/unifiedBackgroundConfig';
+import styles from '@app/components/onboarding/InitialOnboardingModal/InitialOnboardingModal.module.css';
+
+export default function TourOverviewSlide(): SlideConfig {
+  return {
+    key: 'tour-overview',
+    title: i18n.t('onboarding.tourOverview.title', 'Tour Overview'),
+    body: (
+      <span className={styles.bodyCopyInner}>
+        <Trans
+          i18nKey="onboarding.tourOverview.body"
+          defaults="Stirling PDF V2 ships with dozens of tools and a refreshed layout. Take a quick tour to see what changed and where to find the features you need."
+          components={{ strong: <strong /> }}
+        />
+      </span>
+    ),
+    background: {
+      gradientStops: ['#2563EB', '#7C3AED'],
+      circles: UNIFIED_CIRCLE_CONFIG,
+    },
+  };
+}
+
diff --git a/frontend/src/core/components/onboarding/useBypassOnboarding.ts b/frontend/src/core/components/onboarding/useBypassOnboarding.ts
new file mode 100644
index 000000000..166c89352
--- /dev/null
+++ b/frontend/src/core/components/onboarding/useBypassOnboarding.ts
@@ -0,0 +1,63 @@
+import { useEffect, useMemo, useState } from 'react';
+import { useLocation } from 'react-router-dom';
+import { markOnboardingCompleted } from '@app/components/onboarding/orchestrator/onboardingStorage';
+
+const SESSION_KEY = 'onboarding::bypass-all';
+const PARAM_KEY = 'bypassOnboarding';
+
+function isTruthy(value: string | null): boolean {
+  return value?.toLowerCase() === 'true';
+}
+
+function readStoredBypass(): boolean {
+  if (typeof window === 'undefined') return false;
+  try {
+    return sessionStorage.getItem(SESSION_KEY) === 'true';
+  } catch {
+    return false;
+  }
+}
+
+function setStoredBypass(enabled: boolean): void {
+  if (typeof window === 'undefined') return;
+  try {
+    if (enabled) {
+      sessionStorage.setItem(SESSION_KEY, 'true');
+    } else {
+      sessionStorage.removeItem(SESSION_KEY);
+    }
+  } catch {
+    // Ignore storage errors to avoid blocking the bypass flow
+  }
+}
+
+/**
+ * Detects the `bypassOnboarding` query parameter and stores it in session storage
+ * so that onboarding remains disabled while the app is open. Also marks onboarding
+ * as completed to ensure any dependent UI elements remain hidden.
+ */
+export function useBypassOnboarding(): boolean {
+  const location = useLocation();
+  const [bypassOnboarding, setBypassOnboarding] = useState<boolean>(() => readStoredBypass());
+
+  const shouldBypassFromSearch = useMemo(() => {
+    try {
+      const params = new URLSearchParams(location.search);
+      return isTruthy(params.get(PARAM_KEY));
+    } catch {
+      return false;
+    }
+  }, [location.search]);
+
+  useEffect(() => {
+    const fromStorage = readStoredBypass();
+    const nextBypass = shouldBypassFromSearch || fromStorage;
+    setBypassOnboarding(nextBypass);
+    if (nextBypass) {
+      setStoredBypass(true);
+      markOnboardingCompleted();
+    }
+  }, [shouldBypassFromSearch]);
+
+  return bypassOnboarding;
+}
diff --git a/frontend/src/core/components/onboarding/useOnboardingEffects.ts b/frontend/src/core/components/onboarding/useOnboardingEffects.ts
index 54c58ecee..f7eacb1f9 100644
--- a/frontend/src/core/components/onboarding/useOnboardingEffects.ts
+++ b/frontend/src/core/components/onboarding/useOnboardingEffects.ts
@@ -51,14 +51,14 @@ export function useTourRequest(): {
   clearTourRequest: () => void;
 } {
   const [tourRequested, setTourRequested] = useState(false);
-  const [requestedTourType, setRequestedTourType] = useState<TourType>('tools');
+  const [requestedTourType, setRequestedTourType] = useState<TourType>('whatsnew');
 
   useEffect(() => {
     if (typeof window === 'undefined') return;
 
     const handleTourRequest = (event: Event) => {
       const { detail } = event as CustomEvent<StartTourPayload>;
-      setRequestedTourType(detail?.tourType ?? 'tools');
+      setRequestedTourType(detail?.tourType ?? 'whatsnew');
       setTourRequested(true);
     };
 
diff --git a/frontend/src/core/components/onboarding/userStepsConfig.ts b/frontend/src/core/components/onboarding/userStepsConfig.ts
index 07e3da760..5a936b3d6 100644
--- a/frontend/src/core/components/onboarding/userStepsConfig.ts
+++ b/frontend/src/core/components/onboarding/userStepsConfig.ts
@@ -8,12 +8,8 @@ export enum TourStep {
   FILES_BUTTON,
   FILE_SOURCES,
   WORKBENCH,
-  VIEW_SWITCHER,
-  VIEWER,
-  PAGE_EDITOR,
   ACTIVE_FILES,
   FILE_CHECKBOX,
-  SELECT_CONTROLS,
   CROP_SETTINGS,
   RUN_BUTTON,
   RESULTS,
@@ -28,10 +24,7 @@ interface UserStepActions {
   backToAllTools: () => void;
   selectCropTool: () => void;
   loadSampleFile: () => void;
-  switchToViewer: () => void;
-  switchToPageEditor: () => void;
   switchToActiveFiles: () => void;
-  selectFirstFile: () => void;
   pinFile: () => void;
   modifyCropSettings: () => void;
   executeTool: () => void;
@@ -50,10 +43,7 @@ export function createUserStepsConfig({ t, actions }: CreateUserStepsConfigArgs)
     backToAllTools,
     selectCropTool,
     loadSampleFile,
-    switchToViewer,
-    switchToPageEditor,
     switchToActiveFiles,
-    selectFirstFile,
     pinFile,
     modifyCropSettings,
     executeTool,
@@ -108,26 +98,6 @@ export function createUserStepsConfig({ t, actions }: CreateUserStepsConfigArgs)
       position: 'center',
       padding: 0,
     },
-    [TourStep.VIEW_SWITCHER]: {
-      selector: '[data-tour="view-switcher"]',
-      content: t('onboarding.viewSwitcher', 'Use these controls to select how you want to view your PDFs.'),
-      position: 'bottom',
-      padding: 0,
-    },
-    [TourStep.VIEWER]: {
-      selector: '[data-tour="workbench"]',
-      content: t('onboarding.viewer', "The <strong>Viewer</strong> lets you read and annotate your PDFs."),
-      position: 'center',
-      padding: 0,
-      action: () => switchToViewer(),
-    },
-    [TourStep.PAGE_EDITOR]: {
-      selector: '[data-tour="workbench"]',
-      content: t('onboarding.pageEditor', "The <strong>Page Editor</strong> allows you to do various operations on the pages within your PDFs, such as reordering, rotating and deleting."),
-      position: 'center',
-      padding: 0,
-      action: () => switchToPageEditor(),
-    },
     [TourStep.ACTIVE_FILES]: {
       selector: '[data-tour="workbench"]',
       content: t('onboarding.activeFiles', "The <strong>Active Files</strong> view shows all of the PDFs you have loaded into the tool, and allows you to select which ones to process."),
@@ -141,14 +111,6 @@ export function createUserStepsConfig({ t, actions }: CreateUserStepsConfigArgs)
       position: 'top',
       padding: 10,
     },
-    [TourStep.SELECT_CONTROLS]: {
-      selector: '[data-tour="right-rail-controls"]',
-      highlightedSelectors: ['[data-tour="right-rail-controls"]', '[data-tour="right-rail-settings"]'],
-      content: t('onboarding.selectControls', "The <strong>Right Rail</strong> contains buttons to quickly select/deselect all of your active PDFs, along with buttons to change the app's theme or language."),
-      position: 'left',
-      padding: 5,
-      action: () => selectFirstFile(),
-    },
     [TourStep.CROP_SETTINGS]: {
       selector: '[data-tour="crop-settings"]',
       content: t('onboarding.cropSettings', "Now that we've selected the file we want crop, we can configure the <strong>Crop</strong> tool to choose the area that we want to crop the PDF to."),
diff --git a/frontend/src/core/components/onboarding/whatsNewStepsConfig.ts b/frontend/src/core/components/onboarding/whatsNewStepsConfig.ts
new file mode 100644
index 000000000..cb86644c4
--- /dev/null
+++ b/frontend/src/core/components/onboarding/whatsNewStepsConfig.ts
@@ -0,0 +1,197 @@
+import type { StepType } from '@reactour/tour';
+import type { TFunction } from 'i18next';
+
+async function waitForElement(selector: string, timeoutMs = 7000, intervalMs = 100): Promise<void> {
+  if (typeof document === 'undefined') return;
+  const start = Date.now();
+  // Immediate hit
+  if (document.querySelector(selector)) return;
+
+  return new Promise((resolve) => {
+    const check = () => {
+      if (document.querySelector(selector) || Date.now() - start >= timeoutMs) {
+        resolve();
+        return;
+      }
+      setTimeout(check, intervalMs);
+    };
+    check();
+  });
+}
+
+async function waitForHighlightable(selector: string, timeoutMs = 7000, intervalMs = 500): Promise<void> {
+  if (typeof document === 'undefined') return;
+  const start = Date.now();
+
+  return new Promise((resolve) => {
+    const check = () => {
+      const el = document.querySelector<HTMLElement>(selector);
+      const isVisible = !!el && el.getClientRects().length > 0;
+      if (isVisible || Date.now() - start >= timeoutMs) {
+        // Nudge Reactour to recalc positions in case layout shifted
+        window.dispatchEvent(new Event('resize'));
+        requestAnimationFrame(() => window.dispatchEvent(new Event('resize')));
+        resolve();
+        return;
+      }
+      setTimeout(check, intervalMs);
+    };
+    check();
+  });
+}
+
+export enum WhatsNewTourStep {
+  QUICK_ACCESS,
+  LEFT_PANEL,
+  FILE_UPLOAD,
+  RIGHT_RAIL,
+  TOP_BAR,
+  PAGE_EDITOR_VIEW,
+  ACTIVE_FILES_VIEW,
+  WRAP_UP,
+}
+
+interface WhatsNewStepActions {
+  saveWorkbenchState: () => void;
+  closeFilesModal: () => void;
+  backToAllTools: () => void;
+  openFilesModal: () => void;
+  loadSampleFile: () => Promise<void> | void;
+  switchToViewer: () => void;
+  switchToPageEditor: () => void;
+  switchToActiveFiles: () => void;
+  selectFirstFile: () => void;
+}
+
+interface CreateWhatsNewStepsConfigArgs {
+  t: TFunction;
+  actions: WhatsNewStepActions;
+}
+
+export function createWhatsNewStepsConfig({ t, actions }: CreateWhatsNewStepsConfigArgs): Record<WhatsNewTourStep, StepType> {
+  const {
+    saveWorkbenchState,
+    closeFilesModal,
+    backToAllTools,
+    openFilesModal,
+    loadSampleFile,
+    switchToViewer,
+    switchToPageEditor,
+    switchToActiveFiles,
+    selectFirstFile,
+  } = actions;
+
+  return {
+    [WhatsNewTourStep.QUICK_ACCESS]: {
+      selector: '[data-tour="quick-access-bar"]',
+      content: t(
+        'onboarding.whatsNew.quickAccess',
+        'Start at the <strong>Quick Access</strong> rail to jump between Reader, Automate, your files, and all the tours.'
+      ),
+      position: 'right',
+      padding: 10,
+      action: () => {
+        saveWorkbenchState();
+        closeFilesModal();
+        backToAllTools();
+      },
+    },
+    [WhatsNewTourStep.LEFT_PANEL]: {
+      selector: '[data-tour="tool-panel"]',
+      content: t(
+        'onboarding.whatsNew.leftPanel',
+        'The left <strong>Tools</strong> panel lists everything you can do. Browse categories or search to find a tool quickly.'
+      ),
+      position: 'center',
+      padding: 0,
+    },
+    [WhatsNewTourStep.FILE_UPLOAD]: {
+      selector: '[data-tour="files-button"]',
+      content: t(
+        'onboarding.whatsNew.fileUpload',
+        'Use the <strong>Files</strong> button to upload or pick a recent PDF. We will load a sample so you can see the workspace.'
+      ),
+      position: 'right',
+      padding: 10,
+      action: async () => {
+        openFilesModal();
+        await waitForElement('[data-tour="file-sources"]', 5000, 100);
+      },
+      actionAfter: async () => {
+        await Promise.resolve(loadSampleFile());
+        closeFilesModal();
+        switchToViewer();
+        // wait for file render and top controls to mount
+        await waitForElement('[data-tour="view-switcher"]', 7000, 100);
+        await waitForHighlightable('[data-tour="view-switcher"]', 7000, 500);
+      },
+    },
+    [WhatsNewTourStep.RIGHT_RAIL]: {
+      selector: '[data-tour="right-rail-controls"]',
+      highlightedSelectors: ['[data-tour="right-rail-controls"]', '[data-tour="right-rail-settings"]'],
+      content: t(
+        'onboarding.whatsNew.rightRail',
+        'The <strong>Right Rail</strong> holds quick actions to select files, change theme or language, and download results.'
+      ),
+      position: 'left',
+      padding: 10,
+      action: async () => {
+        await waitForElement('[data-tour="right-rail-controls"]', 7000, 100);
+        selectFirstFile();
+      },
+    },
+    [WhatsNewTourStep.TOP_BAR]: {
+      selector: '[data-tour="view-switcher"]',
+      content: t(
+        'onboarding.whatsNew.topBar',
+        'The top bar lets you swap between <strong>Viewer</strong>, <strong>Page Editor</strong>, and <strong>Active Files</strong>.'
+      ),
+      position: 'bottom',
+      padding: 8,
+      // Ensure the switcher has mounted before this step renders
+      action: async () => {
+        switchToViewer();
+        await waitForElement('[data-tour="view-switcher"]', 7000, 100);
+        await waitForHighlightable('[data-tour="view-switcher"]', 7000, 500);
+      },
+    },
+    [WhatsNewTourStep.PAGE_EDITOR_VIEW]: {
+      selector: '[data-tour="view-switcher"]',
+      content: t(
+        'onboarding.whatsNew.pageEditorView',
+        'Switch to the Page Editor to reorder, rotate, or delete pages.'
+      ),
+      position: 'bottom',
+      padding: 8,
+      action: async () => {
+        switchToPageEditor();
+        await waitForElement('[data-tour="view-switcher"]', 7000, 100);
+        await waitForHighlightable('[data-tour="view-switcher"]', 7000, 500);
+      },
+    },
+    [WhatsNewTourStep.ACTIVE_FILES_VIEW]: {
+      selector: '[data-tour="view-switcher"]',
+      content: t(
+        'onboarding.whatsNew.activeFilesView',
+        'Use Active Files to see everything you have open and pick what to work on.'
+      ),
+      position: 'bottom',
+      padding: 8,
+      action: async () => {
+        switchToActiveFiles();
+        await waitForElement('[data-tour="view-switcher"]', 7000, 100);
+        await waitForHighlightable('[data-tour="view-switcher"]', 7000, 500);
+      },
+    },
+    [WhatsNewTourStep.WRAP_UP]: {
+      selector: '[data-tour="help-button"]',
+      content: t(
+        'onboarding.whatsNew.wrapUp',
+        'That is what is new in V2. Open the <strong>Tours</strong> menu anytime to replay this, the Tools tour, or the Admin tour.'
+      ),
+      position: 'right',
+      padding: 10,
+    },
+  };
+}
+
diff --git a/frontend/src/core/components/shared/AdminAnalyticsChoiceModal.tsx b/frontend/src/core/components/shared/AdminAnalyticsChoiceModal.tsx
deleted file mode 100644
index f72d28452..000000000
--- a/frontend/src/core/components/shared/AdminAnalyticsChoiceModal.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import {
-  Modal,
-  Stack,
-  Button,
-  Text,
-  Title,
-  Anchor,
-  useMantineTheme,
-  useComputedColorScheme,
-} from '@mantine/core';
-import { useTranslation } from 'react-i18next';
-import { useState } from 'react';
-import { Z_ANALYTICS_MODAL } from '@app/styles/zIndex';
-import { useAppConfig } from '@app/contexts/AppConfigContext';
-import apiClient from '@app/services/apiClient';
-
-interface AdminAnalyticsChoiceModalProps {
-  opened: boolean;
-  onClose: () => void;
-}
-
-export default function AdminAnalyticsChoiceModal({ opened, onClose }: AdminAnalyticsChoiceModalProps) {
-  const { t } = useTranslation();
-  const { refetch } = useAppConfig();
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const theme = useMantineTheme();
-  const computedColorScheme = useComputedColorScheme('light', { getInitialValueInEffect: true });
-  const isDark = computedColorScheme === 'dark';
-  const privacyHighlightStyles = {
-    color: isDark ? '#FFFFFF' : theme.colors.blue[7],
-    padding: `${theme.spacing.xs} ${theme.spacing.sm}`,
-    borderRadius: theme.radius.md,
-    fontWeight: 700,
-    textAlign: 'center' as const,
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'center',
-    gap: theme.spacing.xs,
-    letterSpacing: 0.3,
-  };
-
-  const handleChoice = async (enableAnalytics: boolean) => {
-    setLoading(true);
-    setError(null);
-
-    try {
-      const formData = new FormData();
-      formData.append('enabled', enableAnalytics.toString());
-
-      await apiClient.post('/api/v1/settings/update-enable-analytics', formData);
-
-      // Refetch config to apply new settings without page reload
-      await refetch();
-
-      // Close the modal after successful save
-      onClose();
-    } catch (err) {
-      setError(err instanceof Error ? err.message : 'Unknown error occurred');
-      setLoading(false);
-    }
-  };
-
-  const handleEnable = () => {
-    handleChoice(true);
-  };
-
-  const handleDisable = () => {
-    handleChoice(false);
-  };
-
-  return (
-    <Modal
-      opened={opened}
-      onClose={() => {}} // Prevent closing
-      closeOnClickOutside={false}
-      closeOnEscape={false}
-      withCloseButton={false}
-      size="lg"
-      centered
-      zIndex={Z_ANALYTICS_MODAL}
-    >
-      <Stack gap="md">
-        <Title order={2}>{t('analytics.title', 'Do you want make Stirling PDF better?')}</Title>
-
-        <Text size="sm" c="dimmed">
-          {t('analytics.paragraph1', 'Stirling PDF has opt in analytics to help us improve the product.')}
-        </Text>
-        <Text size="sm" style={privacyHighlightStyles}>
-          • {t('analytics.privacyAssurance', 'We do not track any personal information or the contents of your files.')} •
-        </Text>
-
-        <Text size="sm" c="dimmed">
-          {t('analytics.paragraph2', 'Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.')}{' '}
-          <Anchor
-            href="https://docs.stirlingpdf.com/analytics-telemetry"
-            target="_blank"
-            rel="noopener noreferrer"
-            size="sm"
-          >
-            {t('analytics.learnMore', 'Learn more')}
-          </Anchor>
-        </Text>
-
-        {error && (
-          <Text c="red" size="sm">
-            {error}
-          </Text>
-        )}
-
-        <Stack gap="sm">
-          <Button
-            onClick={handleEnable}
-            loading={loading}
-            fullWidth
-            size="md"
-          >
-            {t('analytics.enable', 'Enable analytics')}
-          </Button>
-
-          <Button
-            onClick={handleDisable}
-            loading={loading}
-            fullWidth
-            size="md"
-            variant="subtle"
-            c="gray"
-          >
-            {t('analytics.disable', 'Disable analytics')}
-          </Button>
-        </Stack>
-
-        <Text size="xs" c="dimmed" ta="center">
-          {t('analytics.settings', 'You can change the settings for analytics in the config/settings.yml file')}
-        </Text>
-      </Stack>
-    </Modal>
-  );
-}
diff --git a/frontend/src/core/components/shared/AllToolsNavButton.tsx b/frontend/src/core/components/shared/AllToolsNavButton.tsx
index cc7a8777c..3ba3bb70b 100644
--- a/frontend/src/core/components/shared/AllToolsNavButton.tsx
+++ b/frontend/src/core/components/shared/AllToolsNavButton.tsx
@@ -1,81 +1,69 @@
 import React from 'react';
-import { ActionIcon } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
-import { Tooltip } from '@app/components/shared/Tooltip';
 import AppsIcon from '@mui/icons-material/AppsRounded';
 import { useToolWorkflow } from '@app/contexts/ToolWorkflowContext';
+import { useNavigationState, useNavigationActions } from '@app/contexts/NavigationContext';
 import { useSidebarNavigation } from '@app/hooks/useSidebarNavigation';
 import { handleUnlessSpecialClick } from '@app/utils/clickHandlers';
+import QuickAccessButton from '@app/components/shared/quickAccessBar/QuickAccessButton';
 
 interface AllToolsNavButtonProps {
   activeButton: string;
   setActiveButton: (id: string) => void;
-  tooltipPosition?: 'left' | 'right' | 'top' | 'bottom';
 }
 
 const AllToolsNavButton: React.FC<AllToolsNavButtonProps> = ({
   activeButton,
   setActiveButton,
-  tooltipPosition = 'right'
 }) => {
   const { t } = useTranslation();
   const { handleReaderToggle, handleBackToTools, selectedToolKey, leftPanelView } = useToolWorkflow();
+  const { hasUnsavedChanges } = useNavigationState();
+  const { actions: navigationActions } = useNavigationActions();
   const { getHomeNavigation } = useSidebarNavigation();
 
-  const handleClick = () => {
+  const performNavigation = () => {
     setActiveButton('tools');
     // Preserve existing behavior used in QuickAccessBar header
     handleReaderToggle();
     handleBackToTools();
   };
 
+  const handleClick = () => {
+    if (hasUnsavedChanges) {
+      navigationActions.requestNavigation(performNavigation);
+      return;
+    }
+    performNavigation();
+  };
+
   // Do not highlight All Tools when a specific tool is open (indicator is shown)
   const isActive = activeButton === 'tools' && !selectedToolKey && leftPanelView === 'toolPicker';
 
   const navProps = getHomeNavigation();
 
   const handleNavClick = (e: React.MouseEvent) => {
+    if (hasUnsavedChanges) {
+      e.preventDefault();
+      navigationActions.requestNavigation(performNavigation);
+      return;
+    }
     handleUnlessSpecialClick(e, handleClick);
   };
 
-  const iconNode = (
-    <span className="iconContainer">
-      <AppsIcon sx={{ fontSize: isActive ? '1.875rem' : '1.5rem' }} />
-    </span>
-  );
-
   return (
-    <Tooltip
-      content={t("quickAccess.allTools", "Tools")}
-      position={tooltipPosition}
-      arrow
-      containerStyle={{ marginTop: "-1rem" }}
-      maxWidth={200}
-    >
-      <div className="flex flex-col items-center gap-1 mt-4 mb-2">
-        <ActionIcon
-          component="a"
-          href={navProps.href}
-          onClick={handleNavClick}
-          size={isActive ? 'lg' : 'md'}
-          variant="subtle"
-          aria-label={t("quickAccess.allTools", "Tools")}
-          style={{
-            backgroundColor: isActive ? 'var(--icon-tools-bg)' : 'var(--icon-inactive-bg)',
-            color: isActive ? 'var(--icon-tools-color)' : 'var(--icon-inactive-color)',
-            border: 'none',
-            borderRadius: '8px',
-            textDecoration: 'none'
-          }}
-          className={isActive ? 'activeIconScale' : ''}
-        >
-          {iconNode}
-        </ActionIcon>
-        <span className={`all-tools-text ${isActive ? 'active' : 'inactive'}`}>
-          {t("quickAccess.allTools", "Tools")}
-        </span>
-      </div>
-    </Tooltip>
+    <div className="mt-4 mb-2">
+      <QuickAccessButton
+        icon={<AppsIcon sx={{ fontSize: isActive ? '1.875rem' : '1.5rem' }} />}
+        label={t("quickAccess.allTools", "Tools")}
+        isActive={isActive}
+        onClick={handleNavClick}
+        href={navProps.href}
+        ariaLabel={t("quickAccess.allTools", "Tools")}
+        textClassName="all-tools-text"
+        component="a"
+      />
+    </div>
   );
 };
 
diff --git a/frontend/src/core/components/shared/AppConfigLoader.tsx b/frontend/src/core/components/shared/AppConfigLoader.tsx
index 45cd7ad1b..7da104a6f 100644
--- a/frontend/src/core/components/shared/AppConfigLoader.tsx
+++ b/frontend/src/core/components/shared/AppConfigLoader.tsx
@@ -14,8 +14,9 @@ export default function AppConfigLoader() {
 
   useEffect(() => {
     if (!loading && config) {
-      // Update supported languages if config specifies a language filter
-      updateSupportedLanguages(config.languages);
+      // Update supported languages and apply default locale from server config
+      // Priority: localStorage > config.defaultLocale > browser detection > fallback
+      updateSupportedLanguages(config.languages, config.defaultLocale);
     }
   }, [config, loading]);
 
diff --git a/frontend/src/core/components/shared/AppConfigModal.tsx b/frontend/src/core/components/shared/AppConfigModal.tsx
index 6dd7491d4..42e6099e3 100644
--- a/frontend/src/core/components/shared/AppConfigModal.tsx
+++ b/frontend/src/core/components/shared/AppConfigModal.tsx
@@ -69,7 +69,7 @@ const AppConfigModalInner: React.FC<AppConfigModalProps> = ({ opened, onClose })
   }), []);
 
   // Get isAdmin and runningEE from app config
-  const isAdmin = true // config?.isAdmin ?? false;
+  const isAdmin = config?.isAdmin ?? false;
   const runningEE = config?.runningEE ?? false;
   const loginEnabled = config?.enableLogin ?? false;
 
diff --git a/frontend/src/core/components/shared/FitText.tsx b/frontend/src/core/components/shared/FitText.tsx
index efdb1c226..29abe6e0c 100644
--- a/frontend/src/core/components/shared/FitText.tsx
+++ b/frontend/src/core/components/shared/FitText.tsx
@@ -53,16 +53,15 @@ const FitText: React.FC<FitTextProps> = ({
   const clampStyles: CSSProperties = {
     // Multi-line clamp with ellipsis fallback
     whiteSpace: lines === 1 ? 'nowrap' : 'normal',
-    overflow: 'visible',
+    overflow: 'hidden',
     textOverflow: 'ellipsis',
-    display: lines > 1 ? ('-webkit-box' as any) : undefined,
-    WebkitBoxOrient: lines > 1 ? ('vertical' as any) : undefined,
-    WebkitLineClamp: lines > 1 ? (lines as any) : undefined,
-    lineClamp: lines > 1 ? (lines as any) : undefined,
-    // Favor shrinking over breaking words; only break at natural spaces or softBreakChars
-    wordBreak: lines > 1 ? ('keep-all' as any) : ('normal' as any),
-    overflowWrap: 'normal',
-    hyphens: 'manual',
+    display: lines > 1 ? '-webkit-box' : undefined,
+    WebkitBoxOrient: lines > 1 ? 'vertical' : undefined,
+    WebkitLineClamp: lines > 1 ? lines : undefined,
+    // Favor breaking words when necessary to prevent overflow
+    wordBreak: lines > 1 ? 'break-word' : 'normal',
+    overflowWrap: lines > 1 ? 'break-word' : 'normal',
+    hyphens: lines > 1 ? 'auto' : 'manual',
     // fontSize expects rem values (e.g., 1.2, 0.9) to scale with global font size
     fontSize: fontSize ? `${fontSize}rem` : undefined,
   };
diff --git a/frontend/src/core/components/shared/Footer.tsx b/frontend/src/core/components/shared/Footer.tsx
index 172861d1b..6a03a2f54 100644
--- a/frontend/src/core/components/shared/Footer.tsx
+++ b/frontend/src/core/components/shared/Footer.tsx
@@ -95,6 +95,22 @@ export default function Footer({
           >
             {t('legal.terms', 'Terms and Conditions')}
           </a>
+          <a
+            className="footer-link px-3"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://discord.gg/Cn8pWhQRxZ"
+          >
+            {t('footer.discord', 'Discord')}
+          </a>
+          <a
+            className="footer-link px-3"
+            target="_blank"
+            rel="noopener noreferrer"
+            href="https://github.com/Stirling-Tools/Stirling-PDF"
+          >
+            {t('footer.issues', 'GitHub')}
+          </a>
           <a
             className="footer-link px-3"
             target="_blank"
diff --git a/frontend/src/core/components/shared/LanguageSelector.tsx b/frontend/src/core/components/shared/LanguageSelector.tsx
index 87fd0db62..4129e3209 100644
--- a/frontend/src/core/components/shared/LanguageSelector.tsx
+++ b/frontend/src/core/components/shared/LanguageSelector.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 import { supportedLanguages } from '@app/i18n';
 import LocalIcon from '@app/components/shared/LocalIcon';
 import styles from '@app/components/shared/LanguageSelector.module.css';
-import { Z_INDEX_OVER_FULLSCREEN_SURFACE } from '@app/styles/zIndex';
+import { Z_INDEX_CONFIG_MODAL } from '@app/styles/zIndex';
 
 // Types
 interface LanguageSelectorProps {
@@ -163,13 +163,35 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({
   const [pendingLanguage, setPendingLanguage] = useState<string | null>(null);
   const [rippleEffect, setRippleEffect] = useState<RippleEffect | null>(null);
 
+  // Get the filtered list of supported languages from i18n
+  // This respects server config (ui.languages) applied by AppConfigLoader
+  const allowedLanguages = (i18n.options.supportedLngs as string[] || [])
+    .filter(lang => lang !== 'cimode'); // Exclude i18next debug language
+
   const languageOptions: LanguageOption[] = Object.entries(supportedLanguages)
+    .filter(([code]) => allowedLanguages.length === 0 || allowedLanguages.includes(code))
     .sort(([, nameA], [, nameB]) => nameA.localeCompare(nameB))
     .map(([code, name]) => ({
       value: code,
       label: name,
     }));
 
+  // Hide the language selector if there's only one language option
+  // (no point showing a selector when there's nothing to select)
+  if (languageOptions.length <= 1) {
+    return null;
+  }
+
+  // Calculate dropdown width and grid columns based on number of languages
+  // 2-4: 300px/2 cols, 5-9: 400px/3 cols, 10+: 600px/4 cols
+  const dropdownWidth = languageOptions.length <= 4 ? 300
+    : languageOptions.length <= 9 ? 400
+    : 600;
+
+  const gridColumns = languageOptions.length <= 4 ? 2
+    : languageOptions.length <= 9 ? 3
+    : 4;
+
   const handleLanguageChange = (value: string, event: React.MouseEvent) => {
     // Create ripple effect at click position (only for button mode)
     if (!compact) {
@@ -219,10 +241,11 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({
       <Menu
         opened={opened}
         onChange={setOpened}
-        width={600}
+        width={dropdownWidth}
         position={position}
         offset={offset}
-        zIndex={Z_INDEX_OVER_FULLSCREEN_SURFACE}
+        zIndex={Z_INDEX_CONFIG_MODAL}
+        withinPortal
         transitionProps={{
           transition: 'scale-y',
           duration: 120,
@@ -278,21 +301,13 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({
             boxShadow: '0 4px 12px rgba(0, 0, 0, 0.1)',
             backgroundColor: 'light-dark(var(--mantine-color-white), var(--mantine-color-dark-6))',
             border: 'light-dark(1px solid var(--mantine-color-gray-3), 1px solid var(--mantine-color-dark-4))',
-            zIndex: Z_INDEX_OVER_FULLSCREEN_SURFACE,
           }}
         >
-          <div className={styles.languageGrid}>
-              {languageOptions.map((option, index) => {
-                const enabledLanguages = [
-                  'en-GB', 'zh-CN', 'zh-TW', 'ar-AR', 'fa-IR', 'tr-TR', 'uk-UA', 'zh-BO', 'sl-SI',
-                  'ru-RU', 'ja-JP', 'ko-KR', 'hu-HU', 'ga-IE', 'bg-BG', 'es-ES', 'hi-IN', 'hr-HR',
-                  'el-GR', 'ml-ML', 'pt-BR', 'pl-PL', 'pt-PT', 'sk-SK', 'sr-LATN-RS', 'no-NB',
-                  'th-TH', 'vi-VN', 'az-AZ', 'eu-ES', 'de-DE', 'sv-SE', 'it-IT', 'ca-CA', 'id-ID',
-                  'ro-RO', 'fr-FR', 'nl-NL', 'da-DK', 'cs-CZ'
-                ];
-                const isDisabled = !enabledLanguages.includes(option.value);
-
-                return (
+          <div
+            className={styles.languageGrid}
+            style={{ gridTemplateColumns: `repeat(${gridColumns}, 1fr)` }}
+          >
+              {languageOptions.map((option, index) => (
                   <LanguageItem
                     key={option.value}
                     option={option}
@@ -303,10 +318,9 @@ const LanguageSelector: React.FC<LanguageSelectorProps> = ({
                     rippleEffect={rippleEffect}
                     pendingLanguage={pendingLanguage}
                     compact={compact}
-                    disabled={isDisabled}
+                    disabled={false}
                   />
-                );
-              })}
+                ))}
           </div>
         </Menu.Dropdown>
       </Menu>
diff --git a/frontend/src/core/components/shared/NavigationWarningModal.tsx b/frontend/src/core/components/shared/NavigationWarningModal.tsx
index faff07427..b8803f176 100644
--- a/frontend/src/core/components/shared/NavigationWarningModal.tsx
+++ b/frontend/src/core/components/shared/NavigationWarningModal.tsx
@@ -12,7 +12,7 @@ interface NavigationWarningModalProps {
 
 const NavigationWarningModal = ({ onApplyAndContinue, onExportAndContinue }: NavigationWarningModalProps) => {
   const { t } = useTranslation();
-  const { showNavigationWarning, hasUnsavedChanges, cancelNavigation, confirmNavigation, setHasUnsavedChanges } =
+  const { showNavigationWarning, hasUnsavedChanges, pendingNavigation, cancelNavigation, confirmNavigation, setHasUnsavedChanges } =
     useNavigationGuard();
 
   const handleKeepWorking = () => {
@@ -41,7 +41,9 @@ const NavigationWarningModal = ({ onApplyAndContinue, onExportAndContinue }: Nav
   };
   const BUTTON_WIDTH = "10rem";
 
-  if (!hasUnsavedChanges) {
+  // Only show modal if there are unsaved changes AND there's an actual pending navigation
+  // This prevents the modal from showing due to spurious state updates
+  if (!hasUnsavedChanges || !pendingNavigation) {
     return null;
   }
 
diff --git a/frontend/src/core/components/shared/QuickAccessBar.tsx b/frontend/src/core/components/shared/QuickAccessBar.tsx
index 029a6d567..3aba740a8 100644
--- a/frontend/src/core/components/shared/QuickAccessBar.tsx
+++ b/frontend/src/core/components/shared/QuickAccessBar.tsx
@@ -1,22 +1,25 @@
 import React, { useState, useRef, forwardRef, useEffect } from "react";
-import { ActionIcon, Stack, Divider, Menu, Indicator } from "@mantine/core";
+import { Stack, Divider, Menu, Indicator } from "@mantine/core";
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useLocation } from 'react-router-dom';
 import LocalIcon from '@app/components/shared/LocalIcon';
 import { useRainbowThemeContext } from "@app/components/shared/RainbowThemeProvider";
-import { useIsOverflowing } from '@app/hooks/useIsOverflowing';
 import { useFilesModalContext } from '@app/contexts/FilesModalContext';
 import { useToolWorkflow } from '@app/contexts/ToolWorkflowContext';
+import { useNavigationState, useNavigationActions } from '@app/contexts/NavigationContext';
 import { useSidebarNavigation } from '@app/hooks/useSidebarNavigation';
 import { handleUnlessSpecialClick } from '@app/utils/clickHandlers';
 import { ButtonConfig } from '@app/types/sidebar';
 import '@app/components/shared/quickAccessBar/QuickAccessBar.css';
+import { Tooltip } from '@app/components/shared/Tooltip';
 import AllToolsNavButton from '@app/components/shared/AllToolsNavButton';
 import ActiveToolButton from "@app/components/shared/quickAccessBar/ActiveToolButton";
 import AppConfigModal from '@app/components/shared/AppConfigModal';
 import { useAppConfig } from '@app/contexts/AppConfigContext';
 import { useLicenseAlert } from "@app/hooks/useLicenseAlert";
 import { requestStartTour } from '@app/constants/events';
+import QuickAccessButton from '@app/components/shared/quickAccessBar/QuickAccessButton';
+import { useToursTooltip } from '@app/components/shared/quickAccessBar/useToursTooltip';
 
 import {
   isNavButtonActive,
@@ -32,13 +35,22 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
   const { isRainbowMode } = useRainbowThemeContext();
   const { openFilesModal, isFilesModalOpen } = useFilesModalContext();
   const { handleReaderToggle, handleToolSelect, selectedToolKey, leftPanelView, toolRegistry, readerMode, resetTool } = useToolWorkflow();
+  const { hasUnsavedChanges } = useNavigationState();
+  const { actions: navigationActions } = useNavigationActions();
   const { getToolNavigation } = useSidebarNavigation();
   const { config } = useAppConfig();
   const licenseAlert = useLicenseAlert();
   const [configModalOpen, setConfigModalOpen] = useState(false);
   const [activeButton, setActiveButton] = useState<string>('tools');
   const scrollableRef = useRef<HTMLDivElement>(null);
-  const isOverflow = useIsOverflowing(scrollableRef);
+  const {
+    tooltipOpen,
+    manualCloseOnly,
+    showCloseButton,
+    toursMenuOpen,
+    setToursMenuOpen,
+    handleTooltipOpenChange,
+  } = useToursTooltip();
 
   const isRTL = typeof document !== 'undefined' && document.documentElement.dir === 'rtl';
 
@@ -58,7 +70,7 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
   };
 
   // Helper function to render navigation buttons with URL support
-  const renderNavButton = (config: ButtonConfig, index: number) => {
+  const renderNavButton = (config: ButtonConfig, index: number, shouldGuardNavigation = false) => {
     const isActive = isNavButtonActive(config, activeButton, isFilesModalOpen, configModalOpen, selectedToolKey, leftPanelView);
 
     // Check if this button has URL navigation support
@@ -67,6 +79,14 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
       : null;
 
     const handleClick = (e?: React.MouseEvent) => {
+      // If there are unsaved changes and this button should guard navigation, show warning modal
+      if (shouldGuardNavigation && hasUnsavedChanges) {
+        e?.preventDefault();
+        navigationActions.requestNavigation(() => {
+          config.onClick();
+        });
+        return;
+      }
       if (navProps && e) {
         handleUnlessSpecialClick(e, config.onClick);
       } else {
@@ -74,37 +94,27 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
       }
     };
 
+    const buttonStyle = getNavButtonStyle(config, activeButton, isFilesModalOpen, configModalOpen, selectedToolKey, leftPanelView);
+
     // Render navigation button with conditional URL support
     return (
       <div
         key={config.id}
-        className="flex flex-col items-center gap-1"
         style={{ marginTop: index === 0 ? '0.5rem' : "0rem" }}
-        data-tour={`${config.id}-button`}
       >
-        <ActionIcon
-          {...(navProps ? {
-            component: "a" as const,
-            href: navProps.href,
-            onClick: (e: React.MouseEvent) => handleClick(e),
-            'aria-label': config.name
-          } : {
-            onClick: () => handleClick(),
-            'aria-label': config.name
-          })}
-          size={isActive ? 'lg' : 'md'}
-          variant="subtle"
-          style={getNavButtonStyle(config, activeButton, isFilesModalOpen, configModalOpen, selectedToolKey, leftPanelView)}
-          className={isActive ? 'activeIconScale' : ''}
-          data-testid={`${config.id}-button`}
-        >
-          <span className="iconContainer">
-            {config.icon}
-          </span>
-        </ActionIcon>
-        <span className={`button-text ${isActive ? 'active' : 'inactive'}`}>
-          {config.name}
-        </span>
+        <QuickAccessButton
+          icon={config.icon}
+          label={config.name}
+          isActive={isActive}
+          onClick={handleClick}
+          href={navProps?.href}
+          ariaLabel={config.name}
+          backgroundColor={buttonStyle.backgroundColor}
+          color={buttonStyle.color}
+          component={navProps ? 'a' : 'button'}
+          dataTestId={`${config.id}-button`}
+          dataTour={`${config.id}-button`}
+        />
       </div>
     );
   };
@@ -139,6 +149,9 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
         }
       }
     },
+  ];
+
+  const middleButtons: ButtonConfig[] = [
     {
       id: 'files',
       name: t("quickAccess.files", "Files"),
@@ -149,8 +162,6 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
       onClick: handleFilesButtonClick
     },
   ];
-
-  const middleButtons: ButtonConfig[] = [];
   //TODO: Activity
   //{
   //  id: 'activity',
@@ -165,8 +176,8 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
   const bottomButtons: ButtonConfig[] = [
     {
       id: 'help',
-      name: t("quickAccess.help", "Help"),
-      icon: <LocalIcon icon="help-rounded" width="1.25rem" height="1.25rem" />,
+      name: t("quickAccess.tours", "Tours"),
+      icon: <LocalIcon icon="explore-rounded" width="1.25rem" height="1.25rem" />,
       isRound: true,
       size: 'md',
       type: 'action',
@@ -191,6 +202,7 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
     <div
       ref={ref}
       data-sidebar="quick-access"
+      data-tour="quick-access-bar"
       className={`h-screen flex flex-col w-16 quick-access-bar-main ${isRainbowMode ? 'rainbow-mode' : ''}`}
     >
       {/* Fixed header outside scrollable area */}
@@ -200,13 +212,6 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
 
       </div>
 
-      {/* Conditional divider when overflowing */}
-      {isOverflow && (
-        <Divider
-          size="xs"
-          className="overflow-divider"
-        />
-      )}
 
       {/* Scrollable content area */}
       <div
@@ -219,22 +224,14 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
       >
         <div className="scrollable-content">
           {/* Main navigation section */}
-          <Stack gap="lg" align="center">
+          <Stack gap="lg" align="stretch">
             {mainButtons.map((config, index) => (
               <React.Fragment key={config.id}>
-                {renderNavButton(config, index)}
+                {renderNavButton(config, index, config.id === 'read' || config.id === 'automate')}
               </React.Fragment>
             ))}
           </Stack>
 
-          {/* Divider after main buttons (creates gap) */}
-          {middleButtons.length === 0 && (
-            <Divider
-              size="xs"
-              className="content-divider"
-            />
-          )}
-
           {/* Middle section */}
           {middleButtons.length > 0 && (
             <>
@@ -242,7 +239,7 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
                 size="xs"
                 className="content-divider"
               />
-              <Stack gap="lg" align="center">
+              <Stack gap="lg" align="stretch">
                 {middleButtons.map((config, index) => (
                   <React.Fragment key={config.id}>
                     {renderNavButton(config, index)}
@@ -256,63 +253,88 @@ const QuickAccessBar = forwardRef<HTMLDivElement>((_, ref) => {
           <div className="spacer" />
 
           {/* Bottom section */}
-          <Stack gap="lg" align="center">
+          <Stack gap="lg" align="stretch">
             {bottomButtons.map((buttonConfig, index) => {
               // Handle help button with menu or direct action
               if (buttonConfig.id === 'help') {
                 const isAdmin = config?.isAdmin === true;
+                const toursTooltipContent = isAdmin
+                  ? t('quickAccess.toursTooltip.admin', 'Watch walkthroughs here: Tools tour, New V2 layout tour, and the Admin tour.')
+                  : t('quickAccess.toursTooltip.user', 'Watch walkthroughs here: Tools tour and the New V2 layout tour.');
+                const tourItems = [
+                  {
+                    key: 'whatsnew',
+                    icon: <LocalIcon icon="auto-awesome-rounded" width="1.25rem" height="1.25rem" />,
+                    title: t("quickAccess.helpMenu.whatsNewTour", "See what's new in V2"),
+                    description: t("quickAccess.helpMenu.whatsNewTourDesc", "Tour the updated layout"),
+                    onClick: () => requestStartTour('whatsnew'),
+                  },
+                  {
+                    key: 'tools',
+                    icon: <LocalIcon icon="view-carousel-rounded" width="1.25rem" height="1.25rem" />,
+                    title: t("quickAccess.helpMenu.toolsTour", "Tools Tour"),
+                    description: t("quickAccess.helpMenu.toolsTourDesc", "Learn what the tools can do"),
+                    onClick: () => requestStartTour('tools'),
+                  },
+                  ...(isAdmin ? [{
+                    key: 'admin',
+                    icon: <LocalIcon icon="admin-panel-settings-rounded" width="1.25rem" height="1.25rem" />,
+                    title: t("quickAccess.helpMenu.adminTour", "Admin Tour"),
+                    description: t("quickAccess.helpMenu.adminTourDesc", "Explore admin settings & features"),
+                    onClick: () => requestStartTour('admin'),
+                  }] : []),
+                ];
 
-                // If not admin, just show button that starts tools tour directly
-                if (!isAdmin) {
-                  return (
-                    <div
-                      key={buttonConfig.id}
-                      data-tour="help-button"
-                      onClick={() => requestStartTour('tools')}
+                const helpButtonNode = (
+                  <div data-tour="help-button">
+                    <Menu
+                      position={isRTL ? 'left' : 'right'}
+                      offset={10}
+                      zIndex={Z_INDEX_OVER_FULLSCREEN_SURFACE}
+                      opened={toursMenuOpen}
+                      onChange={setToursMenuOpen}
                     >
-                      {renderNavButton(buttonConfig, index)}
-                    </div>
-                  );
-                }
-
-                // If admin, show menu with both options
-                return (
-                  <div key={buttonConfig.id} data-tour="help-button">
-                    <Menu position={isRTL ? 'left' : 'right'} offset={10} zIndex={Z_INDEX_OVER_FULLSCREEN_SURFACE}>
                       <Menu.Target>
                         <div>{renderNavButton(buttonConfig, index)}</div>
                       </Menu.Target>
                       <Menu.Dropdown>
-                        <Menu.Item
-                          leftSection={<LocalIcon icon="view-carousel-rounded" width="1.25rem" height="1.25rem" />}
-                          onClick={() => requestStartTour('tools')}
-                        >
-                          <div>
-                            <div style={{ fontWeight: 500 }}>
-                              {t("quickAccess.helpMenu.toolsTour", "Tools Tour")}
+                        {tourItems.map((item) => (
+                          <Menu.Item
+                            key={item.key}
+                            leftSection={item.icon}
+                            onClick={item.onClick}
+                          >
+                            <div>
+                              <div style={{ fontWeight: 500 }}>
+                                {item.title}
+                              </div>
+                              <div style={{ fontSize: '0.875rem', opacity: 0.7 }}>
+                                {item.description}
+                              </div>
                             </div>
-                            <div style={{ fontSize: '0.875rem', opacity: 0.7 }}>
-                              {t("quickAccess.helpMenu.toolsTourDesc", "Learn what the tools can do")}
-                            </div>
-                          </div>
-                        </Menu.Item>
-                        <Menu.Item
-                          leftSection={<LocalIcon icon="admin-panel-settings-rounded" width="1.25rem" height="1.25rem" />}
-                          onClick={() => requestStartTour('admin')}
-                        >
-                          <div>
-                            <div style={{ fontWeight: 500 }}>
-                              {t("quickAccess.helpMenu.adminTour", "Admin Tour")}
-                            </div>
-                            <div style={{ fontSize: '0.875rem', opacity: 0.7 }}>
-                              {t("quickAccess.helpMenu.adminTourDesc", "Explore admin settings & features")}
-                            </div>
-                          </div>
-                        </Menu.Item>
+                          </Menu.Item>
+                        ))}
                       </Menu.Dropdown>
                     </Menu>
                   </div>
                 );
+
+                return (
+                  <Tooltip
+                    position="right"
+                    arrow
+                    offset={8}
+                    open={tooltipOpen}
+                    manualCloseOnly={manualCloseOnly}
+                    showCloseButton={showCloseButton}
+                    closeOnOutside={false}
+                    openOnFocus={false}
+                    content={toursTooltipContent}
+                    onOpenChange={handleTooltipOpenChange}
+                  >
+                    {helpButtonNode}
+                  </Tooltip>
+                );
               }
 
               const buttonNode = renderNavButton(buttonConfig, index);
diff --git a/frontend/src/core/components/shared/SkeletonLoader.tsx b/frontend/src/core/components/shared/SkeletonLoader.tsx
index 63c4bd22a..a95949e8f 100644
--- a/frontend/src/core/components/shared/SkeletonLoader.tsx
+++ b/frontend/src/core/components/shared/SkeletonLoader.tsx
@@ -2,23 +2,44 @@ import React from 'react';
 import { Box, Group, Stack } from '@mantine/core';
 
 interface SkeletonLoaderProps {
-  type: 'pageGrid' | 'fileGrid' | 'controls' | 'viewer';
+  type: 'pageGrid' | 'fileGrid' | 'controls' | 'viewer' | 'block';
   count?: number;
   animated?: boolean;
+  width?: number | string;
+  height?: number | string;
+  radius?: number | string;
 }
 
-const SkeletonLoader: React.FC<SkeletonLoaderProps> = ({ 
-  type, 
-  count = 8, 
-  animated = true 
+const SkeletonLoader: React.FC<SkeletonLoaderProps> = ({
+  type,
+  count = 8,
+  animated = true,
+  width,
+  height,
+  radius = 8,
 }) => {
   const animationStyle = animated ? { animation: 'pulse 2s infinite' } : {};
 
+  // Generic block skeleton for inline text/inputs/etc.
+  const renderBlock = () => (
+    <Box
+      w={typeof width === 'number' ? `${width}px` : width}
+      h={typeof height === 'number' ? `${height}px` : height}
+      bg="gray.1"
+      style={{
+        borderRadius: radius,
+        display: 'inline-block',
+        verticalAlign: 'middle',
+        ...animationStyle
+      }}
+    />
+  );
+
   const renderPageGridSkeleton = () => (
-    <div style={{ 
-      display: 'grid', 
-      gridTemplateColumns: 'repeat(auto-fill, minmax(180px, 1fr))', 
-      gap: '1rem' 
+    <div style={{
+      display: 'grid',
+      gridTemplateColumns: 'repeat(auto-fill, minmax(180px, 1fr))',
+      gap: '1rem'
     }}>
       {Array.from({ length: count }).map((_, i) => (
         <Box
@@ -26,7 +47,7 @@ const SkeletonLoader: React.FC<SkeletonLoaderProps> = ({
           w="100%"
           h={240}
           bg="gray.1"
-          style={{ 
+          style={{
             borderRadius: '8px',
             ...animationStyle,
             animationDelay: animated ? `${i * 0.1}s` : undefined
@@ -37,10 +58,10 @@ const SkeletonLoader: React.FC<SkeletonLoaderProps> = ({
   );
 
   const renderFileGridSkeleton = () => (
-    <div style={{ 
-      display: 'grid', 
-      gridTemplateColumns: 'repeat(auto-fill, minmax(200px, 1fr))', 
-      gap: '1rem' 
+    <div style={{
+      display: 'grid',
+      gridTemplateColumns: 'repeat(auto-fill, minmax(200px, 1fr))',
+      gap: '1rem'
     }}>
       {Array.from({ length: count }).map((_, i) => (
         <Box
@@ -48,7 +69,7 @@ const SkeletonLoader: React.FC<SkeletonLoaderProps> = ({
           w="100%"
           h={280}
           bg="gray.1"
-          style={{ 
+          style={{
             borderRadius: '8px',
             ...animationStyle,
             animationDelay: animated ? `${i * 0.1}s` : undefined
@@ -76,18 +97,20 @@ const SkeletonLoader: React.FC<SkeletonLoaderProps> = ({
         <Box w={40} h={40} bg="gray.1" style={{ borderRadius: 4, ...animationStyle }} />
       </Group>
       {/* Main content skeleton */}
-      <Box 
-        flex={1} 
-        bg="gray.1" 
-        style={{ 
+      <Box
+        flex={1}
+        bg="gray.1"
+        style={{
           borderRadius: '8px',
-          ...animationStyle 
-        }} 
+          ...animationStyle
+        }}
       />
     </Stack>
   );
 
   switch (type) {
+    case 'block':
+      return renderBlock();
     case 'pageGrid':
       return renderPageGridSkeleton();
     case 'fileGrid':
@@ -101,4 +124,4 @@ const SkeletonLoader: React.FC<SkeletonLoaderProps> = ({
   }
 };
 
-export default SkeletonLoader;
\ No newline at end of file
+export default SkeletonLoader;
diff --git a/frontend/src/core/components/shared/Tooltip.tsx b/frontend/src/core/components/shared/Tooltip.tsx
index db6bce849..10fefec02 100644
--- a/frontend/src/core/components/shared/Tooltip.tsx
+++ b/frontend/src/core/components/shared/Tooltip.tsx
@@ -33,6 +33,10 @@ export interface TooltipProps {
   disabled?: boolean;
   /** If false, tooltip will not open on focus (hover only) */
   openOnFocus?: boolean;
+  /** If true, tooltip stays open until explicitly closed (ignores hover/blur/esc/outside) */
+  manualCloseOnly?: boolean;
+  /** Show a close button even when not pinned */
+  showCloseButton?: boolean;
 }
 
 export const Tooltip: React.FC<TooltipProps> = ({
@@ -55,6 +59,8 @@ export const Tooltip: React.FC<TooltipProps> = ({
   closeOnOutside = true,
   disabled = false,
   openOnFocus = true,
+  manualCloseOnly = false,
+  showCloseButton = false,
 }) => {
   const [internalOpen, setInternalOpen] = useState(false);
   const [isPinned, setIsPinned] = useState(false);
@@ -81,6 +87,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
 
   const isControlled = controlledOpen !== undefined;
   const open = (isControlled ? !!controlledOpen : internalOpen) && !disabled;
+  const allowAutoClose = !manualCloseOnly;
 
   const resolvedPosition: NonNullable<TooltipProps['position']> = useMemo(() => {
     const htmlDir = typeof document !== 'undefined' ? document.documentElement.dir : 'ltr';
@@ -132,11 +139,11 @@ export const Tooltip: React.FC<TooltipProps> = ({
       }
 
       // Not pinned and configured to close on outside
-      if (closeOnOutside && !insideTooltip && !insideTrigger) {
+      if (allowAutoClose && closeOnOutside && !insideTooltip && !insideTrigger) {
         setOpen(false);
       }
     },
-    [isPinned, closeOnOutside, setOpen]
+    [isPinned, closeOnOutside, setOpen, allowAutoClose]
   );
 
   useEffect(() => {
@@ -200,10 +207,10 @@ export const Tooltip: React.FC<TooltipProps> = ({
       }
 
       clearTimers();
-      if (!isPinned) setOpen(false);
+      if (allowAutoClose && !isPinned) setOpen(false);
       (children.props as any)?.onPointerLeave?.(e);
     },
-    [clearTimers, isPinned, setOpen, children.props]
+    [clearTimers, isPinned, setOpen, children.props, allowAutoClose]
   );
 
   const handleMouseDown = useCallback(
@@ -256,15 +263,17 @@ export const Tooltip: React.FC<TooltipProps> = ({
         (children.props as any)?.onBlur?.(e);
         return;
       }
-      if (!isPinned) setOpen(false);
+      clearTimers();
+      if (allowAutoClose && !isPinned) setOpen(false);
       (children.props as any)?.onBlur?.(e);
     },
-    [isPinned, setOpen, children.props]
+    [isPinned, setOpen, children.props, allowAutoClose, clearTimers]
   );
 
   const handleKeyDown = useCallback((e: React.KeyboardEvent) => {
+    if (manualCloseOnly) return;
     if (e.key === 'Escape') setOpen(false);
-  }, [setOpen]);
+  }, [setOpen, manualCloseOnly]);
 
   // Keep open while pointer is over the tooltip; close when leaving it (if not pinned)
   const handleTooltipPointerEnter = useCallback(() => {
@@ -275,9 +284,9 @@ export const Tooltip: React.FC<TooltipProps> = ({
     (e: React.PointerEvent) => {
       const related = e.relatedTarget as Node | null;
       if (isDomNode(related) && triggerRef.current && triggerRef.current.contains(related)) return;
-      if (!isPinned) setOpen(false);
+      if (allowAutoClose && !isPinned) setOpen(false);
     },
-    [isPinned, setOpen]
+    [isPinned, setOpen, allowAutoClose]
   );
 
   // Enhance child with handlers and ref
@@ -300,6 +309,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
   });
 
   const shouldShowTooltip = open;
+  const shouldShowCloseButton = showCloseButton || isPinned;
 
   const tooltipElement = shouldShowTooltip ? (
     <div
@@ -324,7 +334,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
       className={`${styles['tooltip-container']} ${isPinned ? styles.pinned : ''}`}
       onClick={pinOnClick ? (e) => { e.stopPropagation(); setIsPinned(true); } : undefined}
     >
-      {isPinned && (
+      {shouldShowCloseButton && (
         <button
           className={styles['tooltip-pin-button']}
           onClick={(e) => {
@@ -362,7 +372,7 @@ export const Tooltip: React.FC<TooltipProps> = ({
           <span className={styles['tooltip-title']}>{header.title}</span>
         </div>
       )}
-      <TooltipContent content={content} tips={tips} />
+      <TooltipContent content={content} tips={tips} extraRightPadding={shouldShowCloseButton ? 48 : 0} />
     </div>
   ) : null;
 
diff --git a/frontend/src/core/components/shared/config/configSections/providerDefinitions.ts b/frontend/src/core/components/shared/config/configSections/providerDefinitions.ts
index f51f997c7..f9d4af7c4 100644
--- a/frontend/src/core/components/shared/config/configSections/providerDefinitions.ts
+++ b/frontend/src/core/components/shared/config/configSections/providerDefinitions.ts
@@ -97,6 +97,7 @@ export const OAUTH2_PROVIDERS: Provider[] = [
     icon: 'key-rounded',
     type: 'oauth2',
     scope: 'SSO',
+    businessTier: false, // Server tier - OAuth2/OIDC SSO
     fields: [
       {
         key: 'issuer',
@@ -141,6 +142,7 @@ export const GENERIC_OAUTH2_PROVIDER: Provider = {
   icon: 'link-rounded',
   type: 'oauth2',
   scope: 'SSO',
+  businessTier: false, // Server tier - OAuth2/OIDC SSO
   fields: [
     {
       key: 'enabled',
@@ -262,8 +264,8 @@ export const SAML2_PROVIDER: Provider = {
   name: 'SAML2',
   icon: 'verified-user-rounded',
   type: 'saml2',
-  scope: 'SSO',
-  businessTier: true,
+  scope: 'SSO (SAML)',
+  businessTier: true, // Enterprise tier - SAML only
   fields: [
     {
       key: 'enabled',
diff --git a/frontend/src/core/components/shared/config/types.ts b/frontend/src/core/components/shared/config/types.ts
index d4bd9a83c..740e6130e 100644
--- a/frontend/src/core/components/shared/config/types.ts
+++ b/frontend/src/core/components/shared/config/types.ts
@@ -3,6 +3,7 @@ export const VALID_NAV_KEYS = [
   'preferences',
   'notifications',
   'connections',
+  'account',
   'general',
   'people',
   'teams',
diff --git a/frontend/src/core/components/shared/quickAccessBar/ActiveToolButton.tsx b/frontend/src/core/components/shared/quickAccessBar/ActiveToolButton.tsx
index 273c09d0e..38ed45484 100644
--- a/frontend/src/core/components/shared/quickAccessBar/ActiveToolButton.tsx
+++ b/frontend/src/core/components/shared/quickAccessBar/ActiveToolButton.tsx
@@ -13,9 +13,10 @@
  */
 
 import React, { useEffect, useRef, useState } from 'react';
-import { ActionIcon } from '@mantine/core';
+import { ActionIcon, Divider } from '@mantine/core';
 import ArrowBackRoundedIcon from '@mui/icons-material/ArrowBackRounded';
 import { useToolWorkflow } from '@app/contexts/ToolWorkflowContext';
+import { useNavigationState, useNavigationActions } from '@app/contexts/NavigationContext';
 import { useSidebarNavigation } from '@app/hooks/useSidebarNavigation';
 import { handleUnlessSpecialClick } from '@app/utils/clickHandlers';
 import FitText from '@app/components/shared/FitText';
@@ -31,6 +32,8 @@ const NAV_IDS = ['read', 'sign', 'automate'];
 
 const ActiveToolButton: React.FC<ActiveToolButtonProps> = ({ setActiveButton, tooltipPosition = 'right' }) => {
   const { selectedTool, selectedToolKey, leftPanelView, handleBackToTools } = useToolWorkflow();
+  const { hasUnsavedChanges } = useNavigationState();
+  const { actions: navigationActions } = useNavigationActions();
   const { getHomeNavigation } = useSidebarNavigation();
 
   // Determine if the indicator should be visible (do not require selectedTool to be resolved yet)
@@ -150,10 +153,16 @@ const ActiveToolButton: React.FC<ActiveToolButtonProps> = ({ setActiveButton, to
                   component="a"
                   href={getHomeNavigation().href}
                   onClick={(e: React.MouseEvent) => {
-                    handleUnlessSpecialClick(e, () => {
+                    const performNavigation = () => {
                       setActiveButton('tools');
                       handleBackToTools();
-                    });
+                    };
+                    if (hasUnsavedChanges) {
+                      e.preventDefault();
+                      navigationActions.requestNavigation(performNavigation);
+                      return;
+                    }
+                    handleUnlessSpecialClick(e, performNavigation);
                   }}
                   size={'lg'}
                   variant="subtle"
@@ -186,6 +195,10 @@ const ActiveToolButton: React.FC<ActiveToolButtonProps> = ({ setActiveButton, to
                 className="button-text active current-tool-label"
               />
             </div>
+            <Divider
+              size="xs"
+              className="current-tool-divider"
+            />
           </div>
         )}
       </div>
diff --git a/frontend/src/core/components/shared/quickAccessBar/QuickAccessBar.css b/frontend/src/core/components/shared/quickAccessBar/QuickAccessBar.css
index 2c4d3004a..6f0366fbc 100644
--- a/frontend/src/core/components/shared/quickAccessBar/QuickAccessBar.css
+++ b/frontend/src/core/components/shared/quickAccessBar/QuickAccessBar.css
@@ -38,9 +38,9 @@
 /* Main container styles */
 .quick-access-bar-main {
   background-color: var(--bg-muted);
-  width: 4rem;
-  min-width: 4rem;
-  max-width: 4rem;
+  width: 4.5rem;
+  min-width: 4.5rem;
+  max-width: 4.5rem;
   position: relative;
   z-index: 10;
   border-right: 1px solid var(--border-default);
@@ -52,9 +52,9 @@
 /* Rainbow mode container */
 .quick-access-bar-main.rainbow-mode {
   background-color: var(--bg-muted);
-  width: 4rem;
-  min-width: 4rem;
-  max-width: 4rem;
+  width: 4.5rem;
+  min-width: 4.5rem;
+  max-width: 4.5rem;
   position: relative;
   z-index: 10;
   border-right: 1px solid var(--border-default);
@@ -72,7 +72,7 @@
 
 /* Header padding */
 .quick-access-header {
-  padding: 1rem 0.5rem 0.5rem 0.5rem;
+  padding: 1rem 0.25rem 0.5rem 0.25rem;
 }
 
 .nav-header { 
@@ -84,14 +84,6 @@
   gap: 0.5rem;
 }
 
-/* Nav header divider */
-.nav-header-divider {
-  width: 3rem;
-  border-color: var(--color-gray-300);
-  margin-top: 0.5rem;
-  margin-bottom: 1rem;
-}
-
 /* All tools text styles */
 .all-tools-text {
   margin-top: 0.75rem;
@@ -116,16 +108,15 @@
 .overflow-divider {
   width: 3rem;
   border-color: var(--color-gray-300);
-  margin: 0 0.5rem;
+  margin: 0 auto;
+  align-self: center;
 }
 
 /* Scrollable content area */
 .quick-access-bar {
-  overflow-x: auto;
-  overflow-y: auto;
-  scrollbar-gutter: stable both-edges;
-  -webkit-overflow-scrolling: touch;
-  padding: 0 0.5rem 1rem 0.5rem;
+  overflow-x: hidden;
+  overflow-y: hidden;
+  padding: 0 0.25rem 1rem 0.25rem;
 }
 
 /* Scrollable content container */
@@ -143,21 +134,21 @@
   text-rendering: optimizeLegibility;
   font-synthesis: none;
   text-align: center;
-  display: block;
+  width: 100%;
 }
 
-/* Allow wrapping under the active top indicator; constrain to two lines */
+/* Allow wrapping under the active top indicator; constrain to three lines */
 .current-tool-label {
   white-space: normal;
   overflow: hidden;
-  text-overflow: ellipsis;
   display: -webkit-box;
-  -webkit-line-clamp: 2; /* show up to two lines */
-  line-clamp: 2;
+  -webkit-line-clamp: 3; /* show up to three lines */
+  line-clamp: 3;
   -webkit-box-orient: vertical;
-  word-break: keep-all;
-  overflow-wrap: normal;
-  hyphens: manual;
+  word-break: break-all;
+  width: 100%;
+  box-sizing: border-box;
+  text-align: center;
 }
 
 .button-text.active {
@@ -174,13 +165,14 @@
 .content-divider {
   width: 3rem;
   border-color: var(--color-gray-300);
-  margin: 1rem 0;
+  margin: 1rem auto;
+  align-self: center;
 }
 
 /* Spacer */
 .spacer {
   flex: 1;
-  margin-top: 1rem;
+  min-height: 1rem;
 }
 
 /* Config button text */
@@ -242,8 +234,6 @@
 .current-tool-slot.visible {
   max-height: 8.25rem; /* icon + up to 3-line label + divider (132px) */
   opacity: 1;
-  border-bottom: 1px solid var(--color-gray-300);
-  padding-bottom: 0.75rem; /* push border down for spacing */
   margin-bottom: 1rem;
 }
 
@@ -268,27 +258,9 @@
   }
 }
 
-/* Divider that animates growing from top */
+/* Divider under active tool indicator */
 .current-tool-divider {
   width: 3rem;
   border-color: var(--color-gray-300);
-  margin: 0.5rem auto 0.5rem auto;
-  transform-origin: top;
-  animation: dividerGrowDown 350ms ease-out;
-  animation-fill-mode: both;
-}
-
-@keyframes dividerGrowDown {
-  0% {
-    transform: scaleY(0);
-    opacity: 0;
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-  100% {
-    transform: scaleY(1);
-    opacity: 1;
-    margin-top: 0.5rem;
-    margin-bottom: 0.5rem;
-  }
+  margin: 0.75rem auto 0;
 }
diff --git a/frontend/src/core/components/shared/quickAccessBar/QuickAccessButton.tsx b/frontend/src/core/components/shared/quickAccessBar/QuickAccessButton.tsx
new file mode 100644
index 000000000..c3ff23726
--- /dev/null
+++ b/frontend/src/core/components/shared/quickAccessBar/QuickAccessButton.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { ActionIcon } from '@mantine/core';
+import FitText from '@app/components/shared/FitText';
+
+interface QuickAccessButtonProps {
+  icon: React.ReactNode;
+  label: string;
+  isActive: boolean;
+  onClick?: (e: React.MouseEvent) => void;
+  href?: string;
+  ariaLabel: string;
+  textClassName?: 'button-text' | 'all-tools-text';
+  backgroundColor?: string;
+  color?: string;
+  size?: 'sm' | 'md' | 'lg';
+  className?: string;
+  component?: 'a' | 'button';
+  dataTestId?: string;
+  dataTour?: string;
+}
+
+const QuickAccessButton: React.FC<QuickAccessButtonProps> = ({
+  icon,
+  label,
+  isActive,
+  onClick,
+  href,
+  ariaLabel,
+  textClassName = 'button-text',
+  backgroundColor,
+  color,
+  size,
+  className,
+  component = 'button',
+  dataTestId,
+  dataTour,
+}) => {
+  const buttonSize = size || (isActive ? 'lg' : 'md');
+  const bgColor = backgroundColor || (isActive ? 'var(--icon-tools-bg)' : 'var(--icon-inactive-bg)');
+  const textColor = color || (isActive ? 'var(--icon-tools-color)' : 'var(--icon-inactive-color)');
+
+  const actionIconProps = component === 'a' && href
+    ? {
+        component: 'a' as const,
+        href,
+        onClick,
+        'aria-label': ariaLabel,
+      }
+    : {
+        onClick,
+        'aria-label': ariaLabel,
+      };
+
+  return (
+    <div className="flex flex-col items-center gap-1" data-tour={dataTour}>
+      <ActionIcon
+        {...actionIconProps}
+        size={buttonSize}
+        variant="subtle"
+        style={{
+          backgroundColor: bgColor,
+          color: textColor,
+          border: 'none',
+          borderRadius: '8px',
+          textDecoration: 'none',
+        }}
+        className={className || (isActive ? 'activeIconScale' : '')}
+        data-testid={dataTestId}
+      >
+        <span className="iconContainer">{icon}</span>
+      </ActionIcon>
+      <div style={{ width: '100%' }}>
+        <FitText
+          as="span"
+          text={label}
+          lines={2}
+          minimumFontScale={0.5}
+          className={`${textClassName} ${isActive ? 'active' : 'inactive'}`}
+          style={{
+            fontSize: '0.75rem',
+            textAlign: 'center',
+            display: 'block',
+          }}
+        />
+      </div>
+    </div>
+  );
+};
+
+export default QuickAccessButton;
diff --git a/frontend/src/core/components/shared/quickAccessBar/useToursTooltip.ts b/frontend/src/core/components/shared/quickAccessBar/useToursTooltip.ts
new file mode 100644
index 000000000..bed983fdd
--- /dev/null
+++ b/frontend/src/core/components/shared/quickAccessBar/useToursTooltip.ts
@@ -0,0 +1,81 @@
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { TOUR_STATE_EVENT, type TourStatePayload } from '@app/constants/events';
+import { isOnboardingCompleted, hasShownToursTooltip, markToursTooltipShown } from '@app/components/onboarding/orchestrator/onboardingStorage';
+
+export interface ToursTooltipState {
+  tooltipOpen: boolean | undefined;
+  manualCloseOnly: boolean;
+  showCloseButton: boolean;
+  toursMenuOpen: boolean;
+  setToursMenuOpen: (open: boolean) => void;
+  handleTooltipOpenChange: (next: boolean) => void;
+}
+
+/**
+ * Encapsulates all the logic for the tours tooltip:
+ * - Shows automatically after onboarding/tour completes (once per user)
+ * - Hides while the tours menu is open
+ * - After dismissal, reverts to hover-only tooltip
+ */
+export function useToursTooltip(): ToursTooltipState {
+  const [showToursTooltip, setShowToursTooltip] = useState(false);
+  const [toursMenuOpen, setToursMenuOpen] = useState(false);
+  const tourWasOpenRef = useRef(false);
+
+  // Auto-show when a tour ends (fires once per user)
+  useEffect(() => {
+    if (typeof window === 'undefined') return;
+
+    const handleTourStateChange = (event: Event) => {
+      const { detail } = event as CustomEvent<TourStatePayload>;
+      const wasOpen = tourWasOpenRef.current;
+      tourWasOpenRef.current = detail.isOpen;
+
+      if (wasOpen && !detail.isOpen && !hasShownToursTooltip()) {
+        setShowToursTooltip(true);
+      }
+    };
+
+    window.addEventListener(TOUR_STATE_EVENT, handleTourStateChange);
+    return () => window.removeEventListener(TOUR_STATE_EVENT, handleTourStateChange);
+  }, []);
+
+  // Show once after onboarding is complete
+  useEffect(() => {
+    if (isOnboardingCompleted() && !hasShownToursTooltip()) {
+      setShowToursTooltip(true);
+    }
+  }, []);
+
+  const handleDismissToursTooltip = useCallback(() => {
+    markToursTooltipShown();
+    setShowToursTooltip(false);
+  }, []);
+
+  const hasBeenDismissed = hasShownToursTooltip();
+
+  const handleTooltipOpenChange = useCallback(
+    (next: boolean) => {
+      if (!next) {
+        if (!hasBeenDismissed) {
+          handleDismissToursTooltip();
+        }
+      } else if (!hasBeenDismissed && !toursMenuOpen) {
+        setShowToursTooltip(true);
+      }
+    },
+    [hasBeenDismissed, toursMenuOpen, handleDismissToursTooltip]
+  );
+
+  const tooltipOpen = toursMenuOpen ? false : hasBeenDismissed ? undefined : showToursTooltip;
+
+  return {
+    tooltipOpen,
+    manualCloseOnly: !hasBeenDismissed,
+    showCloseButton: !hasBeenDismissed,
+    toursMenuOpen,
+    setToursMenuOpen,
+    handleTooltipOpenChange,
+  };
+}
+
diff --git a/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx b/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx
index 391d595c0..0c9cfc3dd 100644
--- a/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx
+++ b/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx
@@ -1,15 +1,10 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { ActionIcon } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import LocalIcon from '@app/components/shared/LocalIcon';
 import { Tooltip } from '@app/components/shared/Tooltip';
 import { ViewerContext } from '@app/contexts/ViewerContext';
-import { useSignature } from '@app/contexts/SignatureContext';
-import { useFileState, useFileContext } from '@app/contexts/FileContext';
-import { generateThumbnailWithMetadata } from '@app/utils/thumbnailUtils';
-import { createProcessedFile } from '@app/contexts/file/fileActions';
-import { createStirlingFile, createNewStirlingFileStub } from '@app/types/fileContext';
-import { useNavigation, useNavigationState } from '@app/contexts/NavigationContext';
+import { useNavigationState } from '@app/contexts/NavigationContext';
 import { useSidebarContext } from '@app/contexts/SidebarContext';
 import { useRightRailTooltipSide } from '@app/hooks/useRightRailTooltipSide';
 
@@ -22,37 +17,13 @@ export default function ViewerAnnotationControls({ currentView, disabled = false
   const { t } = useTranslation();
   const { sidebarRefs } = useSidebarContext();
   const { position: tooltipPosition, offset: tooltipOffset } = useRightRailTooltipSide(sidebarRefs);
+
   // Viewer context for PDF controls - safely handle when not available
   const viewerContext = React.useContext(ViewerContext);
 
-  // Signature context for accessing drawing API
-  const { signatureApiRef, isPlacementMode } = useSignature();
-
-  const { setToolAndWorkbench } = useNavigation();
-
-  // File state for save functionality
-  const { state, selectors } = useFileState();
-  const { actions: fileActions } = useFileContext();
-  const activeFiles = selectors.getFiles();
-
   // Check if we're in sign mode
   const { selectedTool } = useNavigationState();
   const isSignMode = selectedTool === 'sign';
-  const isAnnotateMode = selectedTool === 'annotate';
-
-  // When leaving viewer, turn off annotation overlay
-  useEffect(() => {
-    if (currentView !== 'viewer' && viewerContext?.isAnnotationMode) {
-      viewerContext.setAnnotationMode(false);
-    }
-  }, [currentView, viewerContext]);
-
-  // Turn off annotation mode when switching away from viewer
-  useEffect(() => {
-    if (currentView !== 'viewer' && viewerContext?.isAnnotationMode) {
-      viewerContext.setAnnotationMode(false);
-    }
-  }, [currentView, viewerContext]);
 
   // Don't show any annotation controls in sign mode
   if (isSignMode) {
@@ -70,7 +41,7 @@ export default function ViewerAnnotationControls({ currentView, disabled = false
           onClick={() => {
             viewerContext?.toggleAnnotationsVisibility();
           }}
-          disabled={disabled || currentView !== 'viewer' || viewerContext?.isAnnotationMode || isPlacementMode}
+          disabled={disabled || currentView !== 'viewer'}
         >
           <LocalIcon
             icon={viewerContext?.isAnnotationsVisible ? "visibility" : "visibility-off-rounded"}
@@ -79,75 +50,6 @@ export default function ViewerAnnotationControls({ currentView, disabled = false
           />
         </ActionIcon>
       </Tooltip>
-
-      {/* Launch Annotate tool in the left panel */}
-      <Tooltip content={t('rightRail.draw', 'Draw')} position={tooltipPosition} offset={tooltipOffset} arrow portalTarget={document.body}>
-        <ActionIcon
-          variant="subtle"
-          radius="md"
-          className="right-rail-icon"
-          onClick={() => setToolAndWorkbench('annotate', 'viewer')}
-          disabled={disabled}
-          aria-label={typeof t === 'function' ? t('rightRail.draw', 'Draw') : 'Draw'}
-        >
-          <LocalIcon icon="edit" width="1.5rem" height="1.5rem" />
-        </ActionIcon>
-      </Tooltip>
-
-      {/* Save PDF with Annotations */}
-      <Tooltip content={t('rightRail.save', 'Save')} position={tooltipPosition} offset={tooltipOffset} arrow portalTarget={document.body}>
-        <ActionIcon
-          variant="subtle"
-          radius="md"
-          className="right-rail-icon"
-          onClick={async () => {
-            if (viewerContext?.exportActions?.saveAsCopy && currentView === 'viewer') {
-              try {
-                const pdfArrayBuffer = await viewerContext.exportActions.saveAsCopy();
-                if (pdfArrayBuffer) {
-                  // Create new File object with flattened annotations
-                  const blob = new Blob([pdfArrayBuffer], { type: 'application/pdf' });
-
-                  // Get the original file name or use a default
-                  const originalFileName = activeFiles.length > 0 ? activeFiles[0].name : 'document.pdf';
-                  const newFile = new File([blob], originalFileName, { type: 'application/pdf' });
-
-                  // Replace the current file in context with the saved version (exact same logic as Sign tool)
-                  if (activeFiles.length > 0) {
-                    // Generate thumbnail and metadata for the saved file
-                    const thumbnailResult = await generateThumbnailWithMetadata(newFile);
-                    const processedFileMetadata = createProcessedFile(thumbnailResult.pageCount, thumbnailResult.thumbnail);
-
-                    // Get current file info
-                    const currentFileIds = state.files.ids;
-                    if (currentFileIds.length > 0) {
-                      const currentFileId = currentFileIds[0];
-                      const currentRecord = selectors.getStirlingFileStub(currentFileId);
-
-                      if (!currentRecord) {
-                        console.error('No file record found for:', currentFileId);
-                        return;
-                      }
-
-                      // Create output stub and file (exact same as Sign tool)
-                      const outputStub = createNewStirlingFileStub(newFile, undefined, thumbnailResult.thumbnail, processedFileMetadata);
-                      const outputStirlingFile = createStirlingFile(newFile, outputStub.id);
-
-                      // Replace the original file with the saved version
-                      await fileActions.consumeFiles([currentFileId], [outputStirlingFile], [outputStub]);
-                    }
-                  }
-                }
-              } catch (error) {
-                console.error('Error saving PDF:', error);
-              }
-            }
-          }}
-          disabled={disabled}
-        >
-          <LocalIcon icon="save" width="1.5rem" height="1.5rem" />
-        </ActionIcon>
-      </Tooltip>
     </>
   );
 }
diff --git a/frontend/src/core/components/shared/tooltip/Tooltip.module.css b/frontend/src/core/components/shared/tooltip/Tooltip.module.css
index 62c4bf696..9d3bdb80a 100644
--- a/frontend/src/core/components/shared/tooltip/Tooltip.module.css
+++ b/frontend/src/core/components/shared/tooltip/Tooltip.module.css
@@ -39,7 +39,7 @@
   background: var(--bg-raised);
   padding: 0.25rem;
   border-radius: 0.25rem;
-  border: 0.0625rem solid var(--primary-color, #3b82f6);
+  border: 0.0625rem solid var(--border-default);
   cursor: pointer;
   transition: background-color 0.2s ease, border-color 0.2s ease;
   z-index: 1;
@@ -60,6 +60,13 @@
   border-color: #ef4444 !important;
 }
 
+.tooltip-pin-button:focus,
+.tooltip-pin-button:focus-visible {
+  outline: none;
+  border-color: var(--border-default) !important;
+  background-color: var(--bg-raised) !important;
+}
+
 /* Tooltip Header */
 .tooltip-header {
   display: flex;
@@ -91,7 +98,7 @@
 
 /* Tooltip Body */
 .tooltip-body {
-  padding: 1rem !important;
+  padding: 1rem;
   color: var(--text-primary) !important;
   font-size: 0.875rem !important;
   line-height: 1.6 !important;
diff --git a/frontend/src/core/components/shared/tooltip/TooltipContent.tsx b/frontend/src/core/components/shared/tooltip/TooltipContent.tsx
index 8bd85966a..42ee19af3 100644
--- a/frontend/src/core/components/shared/tooltip/TooltipContent.tsx
+++ b/frontend/src/core/components/shared/tooltip/TooltipContent.tsx
@@ -5,18 +5,20 @@ import { TooltipTip } from '@app/types/tips';
 interface TooltipContentProps {
   content?: React.ReactNode;
   tips?: TooltipTip[];
+  extraRightPadding?: number;
 }
 
 export const TooltipContent: React.FC<TooltipContentProps> = ({
   content,
   tips,
+  extraRightPadding = 0,
 }) => {
   return (
     <div
       className={`${styles['tooltip-body']}`}
       style={{
         color: 'var(--text-primary)',
-        padding: '16px',
+        padding: `16px ${16 + extraRightPadding}px 16px 16px`,
         fontSize: '14px',
         lineHeight: '1.6'
       }}
diff --git a/frontend/src/core/components/tools/compress/CompressSettings.tsx b/frontend/src/core/components/tools/compress/CompressSettings.tsx
index 398e0b7b4..f444da263 100644
--- a/frontend/src/core/components/tools/compress/CompressSettings.tsx
+++ b/frontend/src/core/components/tools/compress/CompressSettings.tsx
@@ -1,8 +1,9 @@
-import { useState } from "react";
-import { Stack, Text, NumberInput, Select, Divider, Checkbox } from "@mantine/core";
+import { useState, useEffect } from "react";
+import { Stack, Text, NumberInput, Select, Divider, Checkbox, Slider, SegmentedControl } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import { CompressParameters } from "@app/hooks/tools/compress/useCompressParameters";
 import ButtonSelector from "@app/components/shared/ButtonSelector";
+import apiClient from "@app/services/apiClient";
 
 interface CompressSettingsProps {
   parameters: CompressParameters;
@@ -13,6 +14,20 @@ interface CompressSettingsProps {
 const CompressSettings = ({ parameters, onParameterChange, disabled = false }: CompressSettingsProps) => {
   const { t } = useTranslation();
   const [isSliding, setIsSliding] = useState(false);
+  const [imageMagickAvailable, setImageMagickAvailable] = useState<boolean | null>(null);
+
+  useEffect(() => {
+    const checkImageMagick = async () => {
+      try {
+        const response = await apiClient.get<boolean>('/api/v1/config/group-enabled?group=ImageMagick');
+        setImageMagickAvailable(response.data);
+      } catch (error) {
+        console.error('Failed to check ImageMagick availability:', error);
+        setImageMagickAvailable(true); // Optimistic fallback
+      }
+    };
+    checkImageMagick();
+  }, []);
 
   return (
     <Stack gap="md">
@@ -129,6 +144,62 @@ const CompressSettings = ({ parameters, onParameterChange, disabled = false }: C
           disabled={disabled}
           label={t("compress.grayscale.label", "Apply Grayscale for compression")}
         />
+        <Checkbox
+          checked={parameters.lineArt}
+          onChange={(event) => onParameterChange('lineArt', event.currentTarget.checked)}
+          disabled={disabled || imageMagickAvailable === false}
+          label={t("compress.lineArt.label", "Convert images to line art (bilevel)")}
+          description={
+            imageMagickAvailable === false
+              ? t("compress.lineArt.unavailable", "ImageMagick is not installed or enabled on this server")
+              : t("compress.lineArt.description", "Uses ImageMagick to reduce pages to high-contrast black and white for maximum size reduction.")
+          }
+        />
+        {parameters.lineArt && (
+          <Stack gap="xs" style={{ opacity: (disabled || imageMagickAvailable === false) ? 0.6 : 1 }}>
+            <Text size="sm" fw={600}>{t('compress.lineArt.detailLevel', 'Detail level')}</Text>
+            <Slider
+              min={1}
+              max={5}
+              step={1}
+              value={(() => {
+                // Map threshold to slider position
+                const thresholdMap = [20, 35, 50, 65, 80];
+                const closest = thresholdMap.reduce((prev, curr, idx) =>
+                  Math.abs(curr - parameters.lineArtThreshold) < Math.abs(thresholdMap[prev] - parameters.lineArtThreshold)
+                    ? idx : prev, 0);
+                return closest + 1;
+              })()}
+              onChange={(value) => {
+                // Map slider position to threshold: 1=20%, 2=35%, 3=50%, 4=65%, 5=80%
+                const thresholdMap = [20, 35, 50, 65, 80];
+                onParameterChange('lineArtThreshold', thresholdMap[value - 1]);
+              }}
+              disabled={disabled || imageMagickAvailable === false}
+              label={null}
+              marks={[
+                { value: 1 },
+                { value: 2 },
+                { value: 3 },
+                { value: 4 },
+                { value: 5 },
+              ]}
+            />
+
+            <Text size="sm" fw={600}>{t('compress.lineArt.edgeEmphasis', 'Edge emphasis')}</Text>
+            <SegmentedControl
+              fullWidth
+              disabled={disabled || imageMagickAvailable === false}
+              data={[
+                { value: '1', label: t('compress.lineArt.edgeLow', 'Gentle') },
+                { value: '2', label: t('compress.lineArt.edgeMedium', 'Balanced') },
+                { value: '3', label: t('compress.lineArt.edgeHigh', 'Strong') },
+              ]}
+              value={parameters.lineArtEdgeLevel.toString()}
+              onChange={(value) => onParameterChange('lineArtEdgeLevel', parseInt(value) as 1 | 2 | 3)}
+            />
+          </Stack>
+        )}
       </Stack>
     </Stack>
   );
diff --git a/frontend/src/core/components/tools/getPdfInfo/GetPdfInfoReportView.tsx b/frontend/src/core/components/tools/getPdfInfo/GetPdfInfoReportView.tsx
new file mode 100644
index 000000000..ec5d3805e
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/GetPdfInfoReportView.tsx
@@ -0,0 +1,128 @@
+import React, { useEffect, useMemo, useRef } from 'react';
+import { Badge, Divider, Stack, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import type {
+  PdfInfoReportData,
+  PdfInfoReportEntry,
+  PdfInfoBackendData,
+  ParsedPdfSections,
+} from '@app/types/getPdfInfo';
+import '@app/components/tools/validateSignature/reportView/styles.css';
+import SummarySection from '@app/components/tools/getPdfInfo/sections/SummarySection';
+import KeyValueSection from '@app/components/tools/getPdfInfo/sections/KeyValueSection';
+import TableOfContentsSection from '@app/components/tools/getPdfInfo/sections/TableOfContentsSection';
+import OtherSection from '@app/components/tools/getPdfInfo/sections/OtherSection';
+import PerPageSection from '@app/components/tools/getPdfInfo/sections/PerPageSection';
+
+
+/** Valid section anchor IDs for navigation */
+const VALID_ANCHORS = new Set([
+  'summary', 'metadata', 'formFields', 'basicInfo', 'documentInfo',
+  'compliance', 'encryption', 'permissions', 'toc', 'other', 'perPage',
+]);
+
+interface GetPdfInfoReportViewProps {
+  data: PdfInfoReportData & { scrollTo?: string | null };
+}
+
+const GetPdfInfoReportView: React.FC<GetPdfInfoReportViewProps> = ({ data }) => {
+  const { t } = useTranslation();
+  const containerRef = useRef<HTMLDivElement>(null);
+  const entry: PdfInfoReportEntry | null = data.entries[0] ?? null;
+
+  useEffect(() => {
+    if (!data.scrollTo || !VALID_ANCHORS.has(data.scrollTo)) return;
+    const anchor = data.scrollTo;
+    const container = containerRef.current;
+    const el = container?.querySelector<HTMLElement>(`#${anchor}`);
+    if (el && container) {
+      // Calculate scroll position with 4rem buffer from top
+      const bufferPx = parseFloat(getComputedStyle(document.documentElement).fontSize) * 4;
+      const elementTop = el.getBoundingClientRect().top;
+      const containerTop = container.getBoundingClientRect().top;
+      const currentScroll = container.scrollTop;
+      const targetScroll = currentScroll + (elementTop - containerTop) - bufferPx;
+      
+      container.scrollTo({ top: Math.max(0, targetScroll), behavior: 'smooth' });
+      
+      // Flash highlight the section
+      el.classList.remove('section-flash-highlight');
+      void el.offsetWidth; // Force reflow
+      el.classList.add('section-flash-highlight');
+      setTimeout(() => el.classList.remove('section-flash-highlight'), 1500);
+    }
+  }, [data.scrollTo]);
+
+  const sections = useMemo((): ParsedPdfSections => {
+    const raw: PdfInfoBackendData = entry?.data ?? {};
+    return {
+      metadata: raw.Metadata ?? null,
+      formFields: raw.FormFields ?? raw['Form Fields'] ?? null,
+      basicInfo: raw.BasicInfo ?? raw['Basic Info'] ?? null,
+      documentInfo: raw.DocumentInfo ?? raw['Document Info'] ?? null,
+      compliance: raw.Compliancy ?? raw.Compliance ?? null,
+      encryption: raw.Encryption ?? null,
+      permissions: raw.Permissions ?? null,
+      toc: raw['Bookmarks/Outline/TOC'] ?? raw['Table of Contents'] ?? null,
+      other: raw.Other ?? null,
+      perPage: raw.PerPageInfo ?? raw['Per Page Info'] ?? null,
+      summaryData: raw.SummaryData ?? null,
+    };
+  }, [entry]);
+
+  if (!entry) {
+    return (
+      <div className="report-container">
+        <Stack gap="md" align="center">
+          <Badge color="gray" variant="light">No Data</Badge>
+          <Text size="sm" c="dimmed">Run the tool to generate the report.</Text>
+        </Stack>
+      </div>
+    );
+  }
+
+  return (
+    <div className="report-container" ref={containerRef}>
+      <Stack gap="xl" align="center">
+
+        <div className="simulated-page">
+          <Stack gap="lg">
+            <Stack gap="xs">
+              <Text fw={700} size="xl" style={{ lineHeight: 1.3, wordBreak: 'break-word' }}>
+                {entry.fileName}
+                <Text component="span" fw={700}> - {t('getPdfInfo.summary.title', 'PDF Summary')}</Text>
+              </Text>
+              <Divider />
+            </Stack>
+
+            <SummarySection sections={sections} hideSectionTitle />
+
+            <KeyValueSection title={t('getPdfInfo.sections.metadata', 'Metadata')} anchorId="metadata" obj={sections.metadata} />
+
+            <KeyValueSection title={t('getPdfInfo.sections.formFields', 'Form Fields')} anchorId="formFields" obj={sections.formFields} />
+
+            <KeyValueSection title={t('getPdfInfo.sections.basicInfo', 'Basic Info')} anchorId="basicInfo" obj={sections.basicInfo} />
+
+            <KeyValueSection title={t('getPdfInfo.sections.documentInfo', 'Document Info')} anchorId="documentInfo" obj={sections.documentInfo} />
+
+            <KeyValueSection title={t('getPdfInfo.sections.compliance', 'Compliance')} anchorId="compliance" obj={sections.compliance} />
+
+            <KeyValueSection title={t('getPdfInfo.sections.encryption', 'Encryption')} anchorId="encryption" obj={sections.encryption} />
+
+            <KeyValueSection title={t('getPdfInfo.sections.permissions', 'Permissions')} anchorId="permissions" obj={sections.permissions} />
+
+            <TableOfContentsSection anchorId="toc" tocArray={sections.toc ?? []} />
+
+            <OtherSection anchorId="other" other={sections.other} />
+
+            <PerPageSection anchorId="perPage" perPage={sections.perPage} />
+          </Stack>
+        </div>
+      </Stack>
+    </div>
+  );
+};
+
+export default GetPdfInfoReportView;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/GetPdfInfoResults.tsx b/frontend/src/core/components/tools/getPdfInfo/GetPdfInfoResults.tsx
new file mode 100644
index 000000000..5ee89db4a
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/GetPdfInfoResults.tsx
@@ -0,0 +1,79 @@
+import { useCallback, useMemo } from 'react';
+import { Alert, Button, Group, Loader, Stack, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import type { GetPdfInfoOperationHook } from '@app/hooks/tools/getPdfInfo/useGetPdfInfoOperation';
+
+interface GetPdfInfoResultsProps {
+  operation: GetPdfInfoOperationHook;
+  isLoading: boolean;
+  errorMessage: string | null;
+}
+
+const findFileByExtension = (files: File[], extension: string) => {
+  return files.find((file) => file.name.toLowerCase().endsWith(extension));
+};
+
+const GetPdfInfoResults = ({ operation, isLoading, errorMessage }: GetPdfInfoResultsProps) => {
+  const { t } = useTranslation();
+
+  const jsonFile = useMemo(() => findFileByExtension(operation.files, '.json'), [operation.files]);
+  const selectedFile = useMemo(() => jsonFile ?? null, [jsonFile]);
+  const selectedDownloadLabel = useMemo(() => t('getPdfInfo.downloadJson', 'Download JSON'), [t]);
+
+  const handleDownload = useCallback((file: File) => {
+    const blobUrl = URL.createObjectURL(file);
+    const link = document.createElement('a');
+    link.href = blobUrl;
+    link.download = file.name;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    URL.revokeObjectURL(blobUrl);
+  }, []);
+
+  if (isLoading && operation.results.length === 0) {
+    return (
+      <Group justify="center" gap="sm" py="md">
+        <Loader size="sm" />
+        <Text>{t('getPdfInfo.processing', 'Extracting information...')}</Text>
+      </Group>
+    );
+  }
+
+  if (!isLoading && operation.results.length === 0) {
+    return (
+      <Alert color="gray" variant="light" title={t('getPdfInfo.results', 'Results')}>
+        <Text size="sm">{t('getPdfInfo.noResults', 'Run the tool to generate a report.')}</Text>
+      </Alert>
+    );
+  }
+
+  return (
+    <Stack gap="md">
+      {/* No background post-processing once JSON is ready */}
+      {errorMessage && (
+        <Alert color="yellow" variant="light">
+          <Text size="sm">{errorMessage}</Text>
+        </Alert>
+      )}
+
+      <Stack gap="xs">
+        <Text size="sm" fw={600}>
+          {t('getPdfInfo.downloads', 'Downloads')}
+        </Text>
+        <Button
+          color="blue"
+          onClick={() => selectedFile && handleDownload(selectedFile)}
+          disabled={!selectedFile}
+          fullWidth
+        >
+          {selectedDownloadLabel}
+        </Button>
+      </Stack>
+    </Stack>
+  );
+};
+
+export default GetPdfInfoResults;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/sections/KeyValueSection.tsx b/frontend/src/core/components/tools/getPdfInfo/sections/KeyValueSection.tsx
new file mode 100644
index 000000000..a98a47568
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/sections/KeyValueSection.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import SectionBlock from '@app/components/tools/getPdfInfo/shared/SectionBlock';
+import KeyValueList from '@app/components/tools/getPdfInfo/shared/KeyValueList';
+
+interface KeyValueSectionProps {
+  title: string;
+  anchorId: string;
+  obj?: Record<string, unknown> | null;
+  emptyLabel?: string;
+}
+
+const KeyValueSection: React.FC<KeyValueSectionProps> = ({ title, anchorId, obj, emptyLabel }) => {
+  return (
+    <SectionBlock title={title} anchorId={anchorId}>
+      <KeyValueList obj={obj} emptyLabel={emptyLabel} />
+    </SectionBlock>
+  );
+};
+
+export default KeyValueSection;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/sections/OtherSection.tsx b/frontend/src/core/components/tools/getPdfInfo/sections/OtherSection.tsx
new file mode 100644
index 000000000..e7eb8d8b3
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/sections/OtherSection.tsx
@@ -0,0 +1,84 @@
+import React from 'react';
+import { Accordion, Stack, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import type { PdfOtherInfo } from '@app/types/getPdfInfo';
+import SectionBlock from '@app/components/tools/getPdfInfo/shared/SectionBlock';
+import ScrollableCodeBlock from '@app/components/tools/getPdfInfo/shared/ScrollableCodeBlock';
+import { pdfInfoAccordionStyles } from '@app/components/tools/getPdfInfo/shared/accordionStyles';
+
+interface OtherSectionProps {
+  anchorId: string;
+  other?: PdfOtherInfo | null;
+}
+
+const renderList = (arr: unknown[] | undefined, emptyText: string) => {
+  if (!arr || arr.length === 0) return <Text size="sm" c="dimmed">{emptyText}</Text>;
+  return (
+    <Stack gap={4}>
+      {arr.map((item, idx) => (
+        <Text key={idx} size="sm" c="dimmed" style={{ wordBreak: 'break-word', overflowWrap: 'break-word' }}>
+          {typeof item === 'string' ? item : JSON.stringify(item)}
+        </Text>
+      ))}
+    </Stack>
+  );
+};
+
+const OtherSection: React.FC<OtherSectionProps> = ({ anchorId, other }) => {
+  const { t } = useTranslation();
+  const noneDetected = t('getPdfInfo.noneDetected', 'None detected');
+
+  const structureTreeContent = Array.isArray(other?.StructureTree) && other.StructureTree.length > 0
+    ? JSON.stringify(other.StructureTree, null, 2)
+    : null;
+
+  return (
+    <SectionBlock title={t('getPdfInfo.sections.other', 'Other')} anchorId={anchorId}>
+      <Stack gap="sm">
+        <Stack gap={6}>
+          <Text fw={600} size="sm">{t('getPdfInfo.other.attachments', 'Attachments')}</Text>
+          {renderList(other?.Attachments, noneDetected)}
+        </Stack>
+        <Stack gap={6}>
+          <Text fw={600} size="sm">{t('getPdfInfo.other.embeddedFiles', 'Embedded Files')}</Text>
+          {renderList(other?.EmbeddedFiles, noneDetected)}
+        </Stack>
+        <Stack gap={6}>
+          <Text fw={600} size="sm">{t('getPdfInfo.other.javaScript', 'JavaScript')}</Text>
+          {renderList(other?.JavaScript, noneDetected)}
+        </Stack>
+        <Stack gap={6}>
+          <Text fw={600} size="sm">{t('getPdfInfo.other.layers', 'Layers')}</Text>
+          {renderList(other?.Layers, noneDetected)}
+        </Stack>
+        <Accordion
+          variant="separated"
+          radius="md"
+          defaultValue=""
+          styles={pdfInfoAccordionStyles}
+        >
+          <Accordion.Item value="structureTree">
+            <Accordion.Control>
+              <Text fw={600} size="sm">{t('getPdfInfo.other.structureTree', 'StructureTree')}</Text>
+            </Accordion.Control>
+            <Accordion.Panel>
+              <ScrollableCodeBlock content={structureTreeContent} maxHeight="20rem" />
+            </Accordion.Panel>
+          </Accordion.Item>
+          <Accordion.Item value="xmp">
+            <Accordion.Control>
+              <Text fw={600} size="sm">{t('getPdfInfo.other.xmp', 'XMPMetadata')}</Text>
+            </Accordion.Control>
+            <Accordion.Panel>
+              <ScrollableCodeBlock content={other?.XMPMetadata} maxHeight="400px" />
+            </Accordion.Panel>
+          </Accordion.Item>
+        </Accordion>
+      </Stack>
+    </SectionBlock>
+  );
+};
+
+export default OtherSection;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/sections/PerPageSection.tsx b/frontend/src/core/components/tools/getPdfInfo/sections/PerPageSection.tsx
new file mode 100644
index 000000000..4fd257cce
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/sections/PerPageSection.tsx
@@ -0,0 +1,122 @@
+import React from 'react';
+import { Accordion, Stack, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import type { PdfPerPageInfo, PdfPageInfo, PdfFontInfo } from '@app/types/getPdfInfo';
+import SectionBlock from '@app/components/tools/getPdfInfo/shared/SectionBlock';
+import KeyValueList from '@app/components/tools/getPdfInfo/shared/KeyValueList';
+import { pdfInfoAccordionStyles } from '@app/components/tools/getPdfInfo/shared/accordionStyles';
+
+interface PerPageSectionProps {
+  anchorId: string;
+  perPage?: PdfPerPageInfo | null;
+}
+
+const renderList = (arr: unknown[] | undefined, emptyText: string) => {
+  if (!arr || arr.length === 0) return <Text size="sm" c="dimmed">{emptyText}</Text>;
+  return (
+    <Stack gap={4}>
+      {arr.map((item, idx) => (
+        <Text key={idx} size="sm" c="dimmed" style={{ wordBreak: 'break-word', overflowWrap: 'break-word' }}>
+          {typeof item === 'string' ? item : JSON.stringify(item)}
+        </Text>
+      ))}
+    </Stack>
+  );
+};
+
+const renderFontsList = (fonts: PdfFontInfo[] | undefined, emptyText: string) => {
+  if (!fonts || fonts.length === 0) return <Text size="sm" c="dimmed">{emptyText}</Text>;
+  return (
+    <Stack gap={4}>
+      {fonts.map((font, idx) => (
+        <Text key={idx} size="sm" c="dimmed" style={{ wordBreak: 'break-word', overflowWrap: 'break-word' }}>
+          {`${font.Name ?? 'Unknown'}${font.IsEmbedded ? ' (embedded)' : ''}`}
+        </Text>
+      ))}
+    </Stack>
+  );
+};
+
+const PerPageSection: React.FC<PerPageSectionProps> = ({ anchorId, perPage }) => {
+  const { t } = useTranslation();
+  const noneDetected = t('getPdfInfo.noneDetected', 'None detected');
+
+  const hasPages = perPage && Object.keys(perPage).length > 0;
+
+  return (
+    <SectionBlock title={t('getPdfInfo.sections.perPageInfo', 'Per Page Info')} anchorId={anchorId}>
+      {hasPages ? (
+        <Accordion
+          variant="separated"
+          radius="md"
+          defaultValue=""
+          styles={pdfInfoAccordionStyles}
+        >
+          {Object.entries(perPage).map(([pageLabel, pageInfo]: [string, PdfPageInfo]) => (
+            <Accordion.Item key={pageLabel} value={pageLabel}>
+              <Accordion.Control>
+                <Text fw={600} size="sm">{pageLabel}</Text>
+              </Accordion.Control>
+              <Accordion.Panel>
+                <div style={{ backgroundColor: 'var(--bg-raised)', color: 'var(--text-primary)', borderRadius: 8, padding: 12 }}>
+                  <Stack gap="sm">
+                    {pageInfo?.Size && (
+                      <Stack gap={4}>
+                        <Text fw={600} size="sm">{t('getPdfInfo.perPage.size', 'Size')}</Text>
+                        <KeyValueList obj={pageInfo.Size} />
+                      </Stack>
+                    )}
+                    <KeyValueList obj={{
+                      'Rotation': pageInfo?.Rotation,
+                      'Page Orientation': pageInfo?.['Page Orientation'],
+                      'MediaBox': pageInfo?.MediaBox,
+                      'CropBox': pageInfo?.CropBox,
+                      'BleedBox': pageInfo?.BleedBox,
+                      'TrimBox': pageInfo?.TrimBox,
+                      'ArtBox': pageInfo?.ArtBox,
+                      'Text Characters Count': pageInfo?.['Text Characters Count'],
+                    }} />
+                    {pageInfo?.Annotations && (
+                      <Stack gap={4}>
+                        <Text fw={600} size="sm">{t('getPdfInfo.perPage.annotations', 'Annotations')}</Text>
+                        <KeyValueList obj={pageInfo.Annotations} />
+                      </Stack>
+                    )}
+                    <Stack gap={4}>
+                      <Text fw={600} size="sm">{t('getPdfInfo.perPage.images', 'Images')}</Text>
+                      {renderList(pageInfo?.Images, noneDetected)}
+                    </Stack>
+                    <Stack gap={4}>
+                      <Text fw={600} size="sm">{t('getPdfInfo.perPage.links', 'Links')}</Text>
+                      {renderList(pageInfo?.Links, noneDetected)}
+                    </Stack>
+                    <Stack gap={4}>
+                      <Text fw={600} size="sm">{t('getPdfInfo.perPage.fonts', 'Fonts')}</Text>
+                      {renderFontsList(pageInfo?.Fonts, noneDetected)}
+                    </Stack>
+                    {pageInfo?.XObjectCounts && (
+                      <Stack gap={4}>
+                        <Text fw={600} size="sm">{t('getPdfInfo.perPage.xobjects', 'XObject Counts')}</Text>
+                        <KeyValueList obj={pageInfo.XObjectCounts} />
+                      </Stack>
+                    )}
+                    <Stack gap={4}>
+                      <Text fw={600} size="sm">{t('getPdfInfo.perPage.multimedia', 'Multimedia')}</Text>
+                      {renderList(pageInfo?.Multimedia, noneDetected)}
+                    </Stack>
+                  </Stack>
+                </div>
+              </Accordion.Panel>
+            </Accordion.Item>
+          ))}
+        </Accordion>
+      ) : (
+        <Text size="sm" c="dimmed">{noneDetected}</Text>
+      )}
+    </SectionBlock>
+  );
+};
+
+export default PerPageSection;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/sections/SummarySection.tsx b/frontend/src/core/components/tools/getPdfInfo/sections/SummarySection.tsx
new file mode 100644
index 000000000..680f4b64d
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/sections/SummarySection.tsx
@@ -0,0 +1,148 @@
+import React, { useMemo } from 'react';
+import { Stack, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import type { ParsedPdfSections, PdfFontInfo } from '@app/types/getPdfInfo';
+import SectionBlock from '@app/components/tools/getPdfInfo/shared/SectionBlock';
+import KeyValueList from '@app/components/tools/getPdfInfo/shared/KeyValueList';
+
+interface SummarySectionProps {
+  sections: ParsedPdfSections;
+  hideSectionTitle?: boolean;
+}
+
+const SummarySection: React.FC<SummarySectionProps> = ({ sections, hideSectionTitle = false }) => {
+  const { t } = useTranslation();
+
+  const summaryBlocks = useMemo(() => {
+    const basic = sections.basicInfo ?? {};
+    const docInfo = sections.documentInfo ?? {};
+    const metadata = sections.metadata ?? {};
+    const encryption = sections.encryption ?? {};
+    const permissions = sections.permissions ?? {};
+    const summary = sections.summaryData ?? {};
+    const other = sections.other ?? {};
+    const perPage = sections.perPage ?? {};
+
+    const pages = basic['Number of pages'];
+    const fileSizeBytes = basic.FileSizeInBytes;
+    const pdfVersion = docInfo['PDF version'];
+    const language = basic.Language;
+
+    const basicInformation: Record<string, unknown> = {
+      [t('getPdfInfo.summary.pages', 'Pages')]: pages,
+      [t('getPdfInfo.summary.fileSize', 'File Size')]: typeof fileSizeBytes === 'number' ? `${(fileSizeBytes / 1024).toFixed(2)} KB` : fileSizeBytes,
+      [t('getPdfInfo.summary.pdfVersion', 'PDF Version')]: pdfVersion,
+      [t('getPdfInfo.summary.language', 'Language')]: language,
+    };
+
+    const documentInformation: Record<string, unknown> = {
+      [t('getPdfInfo.summary.title', 'Title')]: metadata.Title,
+      [t('getPdfInfo.summary.author', 'Author')]: metadata.Author,
+      [t('getPdfInfo.summary.created', 'Created')]: metadata.CreationDate,
+      [t('getPdfInfo.summary.modified', 'Modified')]: metadata.ModificationDate,
+    };
+
+    const securityStatusText = encryption.IsEncrypted
+      ? t('getPdfInfo.summary.security.encrypted', 'Encrypted PDF - Password protection present')
+      : t('getPdfInfo.summary.security.unencrypted', 'Unencrypted PDF - No password protection');
+
+    const restrictedCount = summary.restrictedPermissionsCount ?? 0;
+    const permissionsAllAllowed = Object.values(permissions).every((v) => v === 'Allowed');
+    const permSummary = permissionsAllAllowed
+      ? t('getPdfInfo.summary.permsAll', 'All Permissions Allowed')
+      : restrictedCount > 0
+        ? t('getPdfInfo.summary.permsRestricted', '{{count}} restrictions', { count: restrictedCount })
+        : t('getPdfInfo.summary.permsMixed', 'Some permissions restricted');
+
+    const complianceText = sections.compliance && Object.values(sections.compliance).some(Boolean)
+      ? t('getPdfInfo.summary.hasCompliance', 'Has compliance standards')
+      : t('getPdfInfo.summary.noCompliance', 'No Compliance Standards');
+
+    // Helper to get first page data
+    const firstPage = perPage['Page 1'];
+    const firstPageFonts: PdfFontInfo[] = firstPage?.Fonts ?? [];
+
+    const technical: Record<string, unknown> = {
+      [t('getPdfInfo.summary.tech.images', 'Images')]: (() => {
+        const total = basic.TotalImages;
+        if (typeof total === 'number') return total === 0 ? 'None' : `${total}`;
+        return 'None';
+      })(),
+      [t('getPdfInfo.summary.tech.fonts', 'Fonts')]: (() => {
+        if (firstPageFonts.length === 0) return 'None';
+        const embedded = firstPageFonts.filter((f) => f.IsEmbedded).length;
+        return `${firstPageFonts.length} (${embedded} embedded)`;
+      })(),
+      [t('getPdfInfo.summary.tech.formFields', 'Form Fields')]: sections.formFields && Object.keys(sections.formFields).length > 0 ? Object.keys(sections.formFields).length : 'None',
+      [t('getPdfInfo.summary.tech.embeddedFiles', 'Embedded Files')]: other.EmbeddedFiles?.length ?? 'None',
+      [t('getPdfInfo.summary.tech.javaScript', 'JavaScript')]: other.JavaScript?.length ?? 'None',
+      [t('getPdfInfo.summary.tech.layers', 'Layers')]: other.Layers?.length ?? 'None',
+      [t('getPdfInfo.summary.tech.bookmarks', 'Bookmarks')]: sections.toc?.length ?? 'None',
+      [t('getPdfInfo.summary.tech.multimedia', 'Multimedia')]: firstPage?.Multimedia?.length ?? 'None',
+    };
+
+    const overview = (() => {
+      const tTitle = metadata.Title ? `"${metadata.Title}"` : t('getPdfInfo.summary.overview.untitled', 'an untitled document');
+      const author = metadata.Author || t('getPdfInfo.summary.overview.unknown', 'Unknown Author');
+      const pagesCount = typeof pages === 'number' ? pages : '?';
+      const version = pdfVersion ?? '?';
+      return t('getPdfInfo.summary.overview.text', 'This is a {{pages}}-page PDF titled {{title}} created by {{author}} (PDF version {{version}}).', {
+        pages: pagesCount,
+        title: tTitle,
+        author,
+        version,
+      });
+    })();
+
+    return {
+      basicInformation,
+      documentInformation,
+      securityStatusText,
+      permSummary,
+      complianceText,
+      technical,
+      overview,
+    };
+  }, [sections, t]);
+
+  const content = (
+    <Stack gap="md">
+      <Stack gap={6}>
+        <Text fw={600} size="sm">{t('getPdfInfo.summary.basic', 'Basic Information')}</Text>
+        <KeyValueList obj={summaryBlocks.basicInformation} />
+      </Stack>
+      <Stack gap={6}>
+        <Text fw={600} size="sm">{t('getPdfInfo.summary.documentInfo', 'Document Information')}</Text>
+        <KeyValueList obj={summaryBlocks.documentInformation} />
+      </Stack>
+      <Stack gap={6}>
+        <Text fw={600} size="sm">{t('getPdfInfo.summary.securityTitle', 'Security Status')}</Text>
+        <Text size="sm" c="dimmed">{summaryBlocks.securityStatusText}</Text>
+        <Text size="sm" c="dimmed">{summaryBlocks.permSummary}</Text>
+        <Text size="sm" c="dimmed">{summaryBlocks.complianceText}</Text>
+      </Stack>
+      <Stack gap={6}>
+        <Text fw={600} size="sm">{t('getPdfInfo.summary.technical', 'Technical')}</Text>
+        <KeyValueList obj={summaryBlocks.technical} />
+      </Stack>
+      <Stack gap={6}>
+        <Text fw={600} size="sm">{t('getPdfInfo.summary.overviewTitle', 'PDF Overview')}</Text>
+        <Text size="sm" c="dimmed">{summaryBlocks.overview}</Text>
+      </Stack>
+    </Stack>
+  );
+
+  if (hideSectionTitle) {
+    return <div id="summary">{content}</div>;
+  }
+
+  return (
+    <SectionBlock title={t('getPdfInfo.summary.title', 'PDF Summary')} anchorId="summary">
+      {content}
+    </SectionBlock>
+  );
+};
+
+export default SummarySection;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/sections/TableOfContentsSection.tsx b/frontend/src/core/components/tools/getPdfInfo/sections/TableOfContentsSection.tsx
new file mode 100644
index 000000000..57e4ac2fe
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/sections/TableOfContentsSection.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import { Stack, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import type { PdfTocEntry } from '@app/types/getPdfInfo';
+import SectionBlock from '@app/components/tools/getPdfInfo/shared/SectionBlock';
+
+interface TableOfContentsSectionProps {
+  anchorId: string;
+  tocArray: PdfTocEntry[];
+}
+
+const TableOfContentsSection: React.FC<TableOfContentsSectionProps> = ({ anchorId, tocArray }) => {
+  const { t } = useTranslation();
+  const noneDetected = t('getPdfInfo.noneDetected', 'None detected');
+
+  return (
+    <SectionBlock title={t('getPdfInfo.sections.tableOfContents', 'Table of Contents')} anchorId={anchorId}>
+      {!tocArray || tocArray.length === 0 ? (
+        <Text size="sm" c="dimmed">{noneDetected}</Text>
+      ) : (
+        <Stack gap={4}>
+          {tocArray.map((item, idx) => (
+            <Text key={idx} size="sm" c="dimmed">
+              {typeof item === 'string' ? item : JSON.stringify(item)}
+            </Text>
+          ))}
+        </Stack>
+      )}
+    </SectionBlock>
+  );
+};
+
+export default TableOfContentsSection;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/shared/KeyValueList.tsx b/frontend/src/core/components/tools/getPdfInfo/shared/KeyValueList.tsx
new file mode 100644
index 000000000..e0cd809cc
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/shared/KeyValueList.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Group, Stack, Text } from '@mantine/core';
+
+interface KeyValueListProps {
+  obj?: Record<string, unknown> | null;
+  emptyLabel?: string;
+}
+
+const KeyValueList: React.FC<KeyValueListProps> = ({ obj, emptyLabel }) => {
+  if (!obj || Object.keys(obj).length === 0) {
+    return <Text size="sm" c="dimmed">{emptyLabel ?? 'None detected'}</Text>;
+  }
+  return (
+    <Stack gap={6}>
+      {Object.entries(obj).map(([k, v]) => (
+        <Group key={k} wrap="nowrap" align="flex-start" style={{ width: '100%' }}>
+          <Text size="sm" style={{ minWidth: 180, maxWidth: 180, flexShrink: 0 }}>{k}</Text>
+          <Text size="sm" c="dimmed" style={{ wordBreak: 'break-word', overflowWrap: 'break-word', flex: 1 }}>
+            {v == null ? '' : String(v)}
+          </Text>
+        </Group>
+      ))}
+    </Stack>
+  );
+};
+
+export default KeyValueList;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/shared/ScrollableCodeBlock.tsx b/frontend/src/core/components/tools/getPdfInfo/shared/ScrollableCodeBlock.tsx
new file mode 100644
index 000000000..bf0426426
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/shared/ScrollableCodeBlock.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import { Code, Text } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+
+interface ScrollableCodeBlockProps {
+  content: string | null | undefined;
+  maxHeight?: string;
+  emptyMessage?: string;
+}
+
+/**
+ * A reusable scrollable code block component with consistent styling.
+ * Used for displaying large text content like XMP metadata or structure trees.
+ */
+const ScrollableCodeBlock: React.FC<ScrollableCodeBlockProps> = ({
+  content,
+  maxHeight = '400px',
+  emptyMessage,
+}) => {
+  const { t } = useTranslation();
+
+  if (!content) {
+    return (
+      <Text size="sm" c="dimmed">
+        {emptyMessage ?? t('getPdfInfo.noneDetected', 'None detected')}
+      </Text>
+    );
+  }
+
+  return (
+    <Code
+      block
+      style={{
+        whiteSpace: 'pre-wrap',
+        backgroundColor: 'var(--bg-raised)',
+        color: 'var(--text-primary)',
+        maxHeight,
+        overflowY: 'auto',
+      }}
+    >
+      {content}
+    </Code>
+  );
+};
+
+export default ScrollableCodeBlock;
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/shared/SectionBlock.tsx b/frontend/src/core/components/tools/getPdfInfo/shared/SectionBlock.tsx
new file mode 100644
index 000000000..0faa993f6
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/shared/SectionBlock.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { Stack, Text, Divider } from '@mantine/core';
+
+interface SectionBlockProps {
+  title: string;
+  anchorId: string;
+  children: React.ReactNode;
+}
+
+const SectionBlock: React.FC<SectionBlockProps> = ({ title, anchorId, children }) => {
+  return (
+    <Stack gap="sm" id={anchorId}>
+      <Text fw={700} size="lg">{title}</Text>
+      <Divider />
+      {children}
+    </Stack>
+  );
+};
+
+export default SectionBlock;
+
+
diff --git a/frontend/src/core/components/tools/getPdfInfo/shared/accordionStyles.ts b/frontend/src/core/components/tools/getPdfInfo/shared/accordionStyles.ts
new file mode 100644
index 000000000..e974c9845
--- /dev/null
+++ b/frontend/src/core/components/tools/getPdfInfo/shared/accordionStyles.ts
@@ -0,0 +1,14 @@
+import type { AccordionStylesNames } from '@mantine/core';
+import type { CSSProperties } from 'react';
+
+type AccordionStyles = Partial<Record<AccordionStylesNames, CSSProperties>>;
+
+export const pdfInfoAccordionStyles: AccordionStyles = {
+  item: {
+    backgroundColor: 'var(--accordion-item-bg)',
+  },
+  control: {
+    backgroundColor: 'transparent',
+  },
+};
+
diff --git a/frontend/src/core/components/tools/ocr/LanguagePicker.tsx b/frontend/src/core/components/tools/ocr/LanguagePicker.tsx
index 784d22da5..7e023e9cc 100644
--- a/frontend/src/core/components/tools/ocr/LanguagePicker.tsx
+++ b/frontend/src/core/components/tools/ocr/LanguagePicker.tsx
@@ -134,7 +134,7 @@ const LanguagePicker: React.FC<LanguagePickerProps> = ({
           textDecoration: 'underline',
           textAlign: 'center'
         }}
-        onClick={() => window.open('https://docs.stirlingpdf.com/Advanced%20Configuration/OCR', '_blank')}
+        onClick={() => window.open('https://docs.stirlingpdf.com/Configuration/OCR', '_blank')}
       >
         {t('ocr.languagePicker.viewSetupGuide', 'View setup guide →')}
       </Text>
@@ -158,4 +158,4 @@ const LanguagePicker: React.FC<LanguagePickerProps> = ({
   );
 };
 
-export default LanguagePicker; 
\ No newline at end of file
+export default LanguagePicker; 
diff --git a/frontend/src/proprietary/components/tools/pdfTextEditor/FontStatusPanel.tsx b/frontend/src/core/components/tools/pdfTextEditor/FontStatusPanel.tsx
similarity index 100%
rename from frontend/src/proprietary/components/tools/pdfTextEditor/FontStatusPanel.tsx
rename to frontend/src/core/components/tools/pdfTextEditor/FontStatusPanel.tsx
diff --git a/frontend/src/proprietary/components/tools/pdfTextEditor/PdfTextEditorView.tsx b/frontend/src/core/components/tools/pdfTextEditor/PdfTextEditorView.tsx
similarity index 95%
rename from frontend/src/proprietary/components/tools/pdfTextEditor/PdfTextEditorView.tsx
rename to frontend/src/core/components/tools/pdfTextEditor/PdfTextEditorView.tsx
index 3c9309e96..3c5b45e0e 100644
--- a/frontend/src/proprietary/components/tools/pdfTextEditor/PdfTextEditorView.tsx
+++ b/frontend/src/core/components/tools/pdfTextEditor/PdfTextEditorView.tsx
@@ -21,6 +21,7 @@ import {
   Title,
   Tooltip,
 } from '@mantine/core';
+import { Dropzone } from '@mantine/dropzone';
 import { useTranslation } from 'react-i18next';
 import DescriptionIcon from '@mui/icons-material/DescriptionOutlined';
 import FileDownloadIcon from '@mui/icons-material/FileDownloadOutlined';
@@ -32,9 +33,12 @@ import CloseIcon from '@mui/icons-material/Close';
 import MergeTypeIcon from '@mui/icons-material/MergeType';
 import CallSplitIcon from '@mui/icons-material/CallSplit';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
+import UploadFileIcon from '@mui/icons-material/UploadFileOutlined';
+import SaveIcon from '@mui/icons-material/SaveOutlined';
 import { Rnd } from 'react-rnd';
-import NavigationWarningModal from '@core/components/shared/NavigationWarningModal';
+import NavigationWarningModal from '@app/components/shared/NavigationWarningModal';
 
+import { useFileContext } from '@app/contexts/FileContext';
 import {
   PdfTextEditorViewData,
   PdfJsonFont,
@@ -313,6 +317,7 @@ type GroupingMode = 'auto' | 'paragraph' | 'singleLine';
 
 const PdfTextEditorView = ({ data }: PdfTextEditorViewProps) => {
   const { t } = useTranslation();
+  const { activeFiles } = useFileContext();
   const [activeGroupId, setActiveGroupId] = useState<string | null>(null);
   const [editingGroupId, setEditingGroupId] = useState<string | null>(null);
   const [activeImageId, setActiveImageId] = useState<string | null>(null);
@@ -329,6 +334,7 @@ const PdfTextEditorView = ({ data }: PdfTextEditorViewProps) => {
   const containerRef = useRef<HTMLDivElement | null>(null);
   const editorRefs = useRef<Map<string, HTMLDivElement>>(new Map());
   const caretOffsetsRef = useRef<Map<string, number>>(new Map());
+  const composingGroupsRef = useRef<Set<string>>(new Set());
   const lastSelectedGroupIdRef = useRef<string | null>(null);
   const widthOverridesRef = useRef<Map<string, number>>(widthOverrides);
   const resizingRef = useRef<{
@@ -375,6 +381,7 @@ const PdfTextEditorView = ({ data }: PdfTextEditorViewProps) => {
     fileName,
     errorMessage,
     isGeneratingPdf,
+    isSavingToWorkbench,
     isConverting,
     conversionProgress,
     hasChanges,
@@ -389,11 +396,12 @@ const PdfTextEditorView = ({ data }: PdfTextEditorViewProps) => {
     onReset,
     onDownloadJson,
     onGeneratePdf,
-    onGeneratePdfForNavigation,
+    onSaveToWorkbench,
     onForceSingleTextElementChange,
     onGroupingModeChange,
     onMergeGroups,
     onUngroupGroup,
+    onLoadFile,
   } = data;
 
   // Define derived variables immediately after props destructuring, before any hooks
@@ -607,6 +615,18 @@ const PdfTextEditorView = ({ data }: PdfTextEditorViewProps) => {
     [editingGroupId, onGroupEdit],
   );
 
+  const handleCompositionStart = useCallback((groupId: string) => {
+    composingGroupsRef.current.add(groupId);
+  }, []);
+
+  const handleCompositionEnd = useCallback(
+    (element: HTMLElement, pageIndex: number, groupId: string) => {
+      composingGroupsRef.current.delete(groupId);
+      syncEditorValue(element, pageIndex, groupId);
+    },
+    [syncEditorValue],
+  );
+
   const handleMergeSelection = useCallback(() => {
     if (!canMergeSelection) {
       return;
@@ -1430,7 +1450,8 @@ const selectionToolbarPosition = useMemo(() => {
         height: '100%',
         display: 'grid',
         gridTemplateColumns: 'minmax(0, 1fr) 320px',
-        alignItems: 'start',
+        gridTemplateRows: '1fr',
+        alignItems: hasDocument ? 'start' : 'stretch',
         gap: '1.5rem',
       }}
     >
@@ -1486,6 +1507,17 @@ const selectionToolbarPosition = useMemo(() => {
               >
                 {t('pdfTextEditor.actions.generatePdf', 'Generate PDF')}
               </Button>
+              <Button
+                variant="filled"
+                color="green"
+                leftSection={<SaveIcon fontSize="small" />}
+                onClick={onSaveToWorkbench}
+                loading={isSavingToWorkbench}
+                disabled={!hasDocument || !hasChanges || isConverting}
+                fullWidth
+              >
+                {t('pdfTextEditor.actions.saveChanges', 'Save Changes')}
+              </Button>
             </Stack>
 
             {fileName && (
@@ -1639,17 +1671,45 @@ const selectionToolbarPosition = useMemo(() => {
       )}
 
       {!hasDocument && !isConverting && (
-        <Card withBorder radius="md" padding="xl" style={{ gridColumn: '1 / 2', gridRow: 1 }}>
-          <Stack align="center" gap="md">
-            <DescriptionIcon sx={{ fontSize: 48 }} />
-            <Text size="lg" fw={600}>
-              {t('pdfTextEditor.empty.title', 'No document loaded')}
-            </Text>
-            <Text size="sm" c="dimmed" ta="center" maw={420}>
-              {t('pdfTextEditor.empty.subtitle', 'Load a PDF or JSON file to begin editing text content.')}
-            </Text>
-          </Stack>
-        </Card>
+        <Stack
+          align="center"
+          justify="center"
+          style={{ gridColumn: '1 / 2', gridRow: 1, height: '100%' }}
+        >
+          <Dropzone
+            onDrop={(files) => {
+              if (files.length > 0) {
+                onLoadFile(files[0]);
+              }
+            }}
+            accept={['application/pdf', 'application/json']}
+            maxFiles={1}
+            style={{
+              width: '100%',
+              maxWidth: 480,
+              minHeight: 200,
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              border: '2px dashed var(--mantine-color-gray-4)',
+              borderRadius: 'var(--mantine-radius-lg)',
+              cursor: 'pointer',
+              transition: 'border-color 150ms ease, background-color 150ms ease',
+            }}
+          >
+            <Stack align="center" gap="md" style={{ pointerEvents: 'none' }}>
+              <UploadFileIcon sx={{ fontSize: 48, color: 'var(--mantine-color-blue-5)' }} />
+              <Text size="lg" fw={600}>
+                {t('pdfTextEditor.empty.title', 'No document loaded')}
+              </Text>
+              <Text size="sm" c="dimmed" ta="center" maw={420}>
+                {activeFiles.length > 0
+                  ? t('pdfTextEditor.empty.dropzoneWithFiles', 'Select a file from the Files tab, or drag and drop a PDF or JSON file here, or click to browse')
+                  : t('pdfTextEditor.empty.dropzone', 'Drag and drop a PDF or JSON file here, or click to browse')}
+              </Text>
+            </Stack>
+          </Dropzone>
+        </Stack>
       )}
 
       {isConverting && (
@@ -1683,7 +1743,7 @@ const selectionToolbarPosition = useMemo(() => {
         </Card>
       )}
 
-      {hasDocument && (
+      {hasDocument && !isConverting && (
         <Stack
           gap="lg"
           className="flex-1"
@@ -2147,14 +2207,20 @@ const selectionToolbarPosition = useMemo(() => {
                       // Determine text wrapping behavior based on whether text has been changed
                       const hasChanges = changed;
                       const widthExtended = resolvedWidth - baseWidth > 0.5;
-                      const enableWrap = isParagraphLayout || widthExtended || isEditing || hasChanges;
+                      // Only enable wrapping if:
+                      // 1. It's paragraph layout (multi-line groups should wrap)
+                      // 2. Width was manually extended (user explicitly made space for wrapping)
+                      // 3. Has changes AND was already wrapping (preserve existing wrap state)
+                      // DO NOT enable wrapping just because isEditing - text should only wrap when it actually overflows
+                      const wasWrapping = isParagraphLayout || widthExtended;
+                      const enableWrap = wasWrapping || (hasChanges && wasWrapping);
                       const whiteSpace = enableWrap ? 'pre-wrap' : 'pre';
                       const wordBreak = enableWrap ? 'break-word' : 'normal';
                       const overflowWrap = enableWrap ? 'break-word' : 'normal';
 
                       // For paragraph mode, allow height to grow to accommodate lines without wrapping
                       // For single-line mode, maintain fixed height based on PDF bounds
-                      const useFlexibleHeight = isEditing || enableWrap || (isParagraphLayout && lineCount > 1);
+                      const useFlexibleHeight = enableWrap || (isParagraphLayout && lineCount > 1);
 
                       // The renderGroupContainer wrapper adds 4px horizontal padding (2px left + 2px right)
                       // We need to add this to the container width to compensate, so the inner content
@@ -2226,6 +2292,10 @@ const selectionToolbarPosition = useMemo(() => {
                                 contentEditable
                                 suppressContentEditableWarning
                                 data-editor-group={group.id}
+                                onCompositionStart={() => handleCompositionStart(group.id)}
+                                onCompositionEnd={(event) =>
+                                  handleCompositionEnd(event.currentTarget, group.pageIndex, group.id)
+                                }
                                 onFocus={(event) => {
                                   const primaryFont = fontFamily.split(',')[0]?.replace(/['"]/g, '').trim();
                                   if (primaryFont && typeof document !== 'undefined') {
@@ -2247,6 +2317,7 @@ const selectionToolbarPosition = useMemo(() => {
                                   event.stopPropagation();
                                 }}
                                 onBlur={(event) => {
+                                  composingGroupsRef.current.delete(group.id);
                                   syncEditorValue(event.currentTarget, group.pageIndex, group.id, {
                                     skipCaretRestore: true,
                                   });
@@ -2256,6 +2327,9 @@ const selectionToolbarPosition = useMemo(() => {
                                   setEditingGroupId(null);
                                 }}
                                 onInput={(event) => {
+                                  if (composingGroupsRef.current.has(group.id)) {
+                                    return;
+                                  }
                                   syncEditorValue(event.currentTarget, group.pageIndex, group.id);
                                 }}
                                 style={{
@@ -2438,7 +2512,7 @@ const selectionToolbarPosition = useMemo(() => {
 
       {/* Navigation Warning Modal */}
       <NavigationWarningModal
-        onApplyAndContinue={onGeneratePdfForNavigation}
+        onApplyAndContinue={onSaveToWorkbench}
       />
     </Stack>
   );
diff --git a/frontend/src/core/components/tools/shared/createToolFlow.tsx b/frontend/src/core/components/tools/shared/createToolFlow.tsx
index 5e42e73ab..4ddaae67c 100644
--- a/frontend/src/core/components/tools/shared/createToolFlow.tsx
+++ b/frontend/src/core/components/tools/shared/createToolFlow.tsx
@@ -87,6 +87,7 @@ export function createToolFlow<TParams = unknown>(config: ToolFlowConfig<TParams
         {config.steps.map((stepConfig) =>
           steps.create(stepConfig.title, {
             isVisible: stepConfig.isVisible,
+            isCollapsed: stepConfig.isCollapsed,
             onCollapsedClick: stepConfig.onCollapsedClick,
             tooltip: stepConfig.tooltip
           }, stepConfig.content)
diff --git a/frontend/src/core/components/tools/sign/SavedSignaturesSection.tsx b/frontend/src/core/components/tools/sign/SavedSignaturesSection.tsx
index c2e8ca8f1..95a8a7e77 100644
--- a/frontend/src/core/components/tools/sign/SavedSignaturesSection.tsx
+++ b/frontend/src/core/components/tools/sign/SavedSignaturesSection.tsx
@@ -2,14 +2,16 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ActionIcon, Alert, Badge, Box, Card, Group, Stack, Text, TextInput, Tooltip } from '@mantine/core';
 import { LocalIcon } from '@app/components/shared/LocalIcon';
-import { MAX_SAVED_SIGNATURES, SavedSignature, SavedSignatureType } from '@app/hooks/tools/sign/useSavedSignatures';
+import { SavedSignature, SavedSignatureType } from '@app/hooks/tools/sign/useSavedSignatures';
 import type { StorageType } from '@app/services/signatureStorageService';
 
 interface SavedSignaturesSectionProps {
   signatures: SavedSignature[];
   disabled?: boolean;
   isAtCapacity: boolean;
+  maxLimit: number;
   storageType?: StorageType | null;
+  isAdmin?: boolean;
   onUseSignature: (signature: SavedSignature) => void;
   onDeleteSignature: (signature: SavedSignature) => void;
   onRenameSignature: (id: string, label: string) => void;
@@ -26,7 +28,9 @@ export const SavedSignaturesSection = ({
   signatures,
   disabled = false,
   isAtCapacity,
+  maxLimit,
   storageType: _storageType,
+  isAdmin = false,
   onUseSignature,
   onDeleteSignature,
   onRenameSignature,
@@ -155,7 +159,7 @@ export const SavedSignaturesSection = ({
           {translate(
             'saved.emptyDescription',
             'Draw, upload, or type a signature above, then use "Save to library" to keep up to {{max}} favourites ready to use.',
-            { max: MAX_SAVED_SIGNATURES }
+            { max: maxLimit }
           )}
         </Text>
       </Stack>
@@ -216,7 +220,7 @@ export const SavedSignaturesSection = ({
         <Alert color="yellow" title={translate('saved.limitTitle', 'Limit reached')}>
           <Text size="sm">
             {translate('saved.limitDescription', 'Remove a saved signature before adding new ones (max {{max}}).', {
-              max: MAX_SAVED_SIGNATURES,
+              max: maxLimit,
             })}
           </Text>
         </Alert>
@@ -365,17 +369,19 @@ export const SavedSignaturesSection = ({
                       >
                         <LocalIcon icon="material-symbols:check-circle-outline-rounded" width={18} height={18} />
                       </ActionIcon>
-                      <Tooltip label={translate('saved.delete', 'Remove')}>
-                        <ActionIcon
-                          variant="subtle"
-                          color="red"
-                          aria-label={translate('saved.delete', 'Remove')}
-                          onClick={() => onDeleteSignature(activeSharedSignature)}
-                          disabled={disabled}
-                        >
-                          <LocalIcon icon="material-symbols:delete-outline-rounded" width={18} height={18} />
-                        </ActionIcon>
-                      </Tooltip>
+                      {isAdmin && (
+                        <Tooltip label={translate('saved.delete', 'Remove')}>
+                          <ActionIcon
+                            variant="subtle"
+                            color="red"
+                            aria-label={translate('saved.delete', 'Remove')}
+                            onClick={() => onDeleteSignature(activeSharedSignature)}
+                            disabled={disabled}
+                          >
+                            <LocalIcon icon="material-symbols:delete-outline-rounded" width={18} height={18} />
+                          </ActionIcon>
+                        </Tooltip>
+                      )}
                     </Group>
                   </Group>
                   {renderPreview(activeSharedSignature)}
diff --git a/frontend/src/core/components/tools/sign/SignSettings.tsx b/frontend/src/core/components/tools/sign/SignSettings.tsx
index 6fb3238f8..12de2cadd 100644
--- a/frontend/src/core/components/tools/sign/SignSettings.tsx
+++ b/frontend/src/core/components/tools/sign/SignSettings.tsx
@@ -14,7 +14,7 @@ import { ImageUploader } from "@app/components/annotation/shared/ImageUploader";
 import { TextInputWithFont } from "@app/components/annotation/shared/TextInputWithFont";
 import { ColorPicker } from "@app/components/annotation/shared/ColorPicker";
 import { LocalIcon } from "@app/components/shared/LocalIcon";
-import { useSavedSignatures, SavedSignature, SavedSignaturePayload, SavedSignatureType, MAX_SAVED_SIGNATURES, AddSignatureResult } from '@app/hooks/tools/sign/useSavedSignatures';
+import { useSavedSignatures, SavedSignature, SavedSignaturePayload, SavedSignatureType, AddSignatureResult } from '@app/hooks/tools/sign/useSavedSignatures';
 import { SavedSignaturesSection } from '@app/components/tools/sign/SavedSignaturesSection';
 import { buildSignaturePreview } from '@app/utils/signaturePreview';
 
@@ -96,11 +96,13 @@ const SignSettings = ({
   const {
     savedSignatures,
     isAtCapacity: isSavedSignatureLimitReached,
+    maxLimit,
     addSignature,
     removeSignature,
     updateSignatureLabel,
     byTypeCounts,
     storageType,
+    isAdmin,
   } = useSavedSignatures();
   const [signatureSource, setSignatureSource] = useState<SignatureSource>(() => {
     const paramSource = parameters.signatureType as SignatureSource;
@@ -246,16 +248,19 @@ const SignSettings = ({
     (signature: SavedSignature) => {
       setPlacementManuallyPaused(false);
 
+      // Use the data URL directly (already converted to base64 when loaded)
+      const dataUrlToUse = signature.dataUrl;
+
       if (signature.type === 'canvas') {
         if (parameters.signatureType !== 'canvas') {
           onParameterChange('signatureType', 'canvas');
         }
-        setCanvasSignatureData(signature.dataUrl);
+        setCanvasSignatureData(dataUrlToUse);
       } else if (signature.type === 'image') {
         if (parameters.signatureType !== 'image') {
           onParameterChange('signatureType', 'image');
         }
-        setImageSignatureData(signature.dataUrl);
+        setImageSignatureData(dataUrlToUse);
       } else if (signature.type === 'text') {
         if (parameters.signatureType !== 'text') {
           onParameterChange('signatureType', 'text');
@@ -269,7 +274,7 @@ const SignSettings = ({
       const savedKey =
         signature.type === 'text'
           ? buildTextSignatureKey(signature.signerName, signature.fontSize, signature.fontFamily, signature.textColor)
-          : signature.dataUrl;
+          : dataUrlToUse;
       setLastSavedKeyForType(signature.type, savedKey);
 
       const activate = () => onActivateSignaturePlacement?.();
@@ -326,8 +331,8 @@ const SignSettings = ({
     } else if (isSaved) {
       tooltipMessage = translate('saved.noChanges', 'Current signature is already saved.');
     } else if (isSavedSignatureLimitReached) {
-      tooltipMessage = translate('saved.limitDescription', 'Remove a saved signature before adding new ones (max {{max}}).', {
-        max: MAX_SAVED_SIGNATURES,
+      tooltipMessage = translate('saved.limitDescription', 'You have reached the maximum limit of {{max}} saved signatures. Remove a saved signature before adding new ones.', {
+        max: maxLimit,
       });
     }
 
@@ -791,7 +796,9 @@ const SignSettings = ({
           signatures={savedSignatures}
           disabled={disabled}
           isAtCapacity={isSavedSignatureLimitReached}
+          maxLimit={maxLimit}
           storageType={storageType}
+          isAdmin={isAdmin}
           onUseSignature={handleUseSavedSignature}
           onDeleteSignature={handleDeleteSavedSignature}
           onRenameSignature={handleRenameSavedSignature}
@@ -846,6 +853,12 @@ const SignSettings = ({
           textColor={parameters.textColor || '#000000'}
           onTextColorChange={(color) => onParameterChange('textColor', color)}
           disabled={disabled}
+          label={translate('text.name', 'Text')}
+          placeholder={translate('text.placeholder', 'Enter text')}
+          fontLabel={translate('text.fontLabel', 'Font')}
+          fontSizeLabel={translate('text.fontSizeLabel', 'Font size')}
+          fontSizePlaceholder={translate('text.fontSizePlaceholder', 'Type or select font size (8-200)')}
+          colorLabel={translate('text.colorLabel', 'Text colour')}
           onAnyChange={() => {
             setPlacementManuallyPaused(false);
             lastAppliedPlacementKey.current = null;
diff --git a/frontend/src/core/components/tools/validateSignature/reportView/styles.css b/frontend/src/core/components/tools/validateSignature/reportView/styles.css
index b2d01f224..27b1081d4 100644
--- a/frontend/src/core/components/tools/validateSignature/reportView/styles.css
+++ b/frontend/src/core/components/tools/validateSignature/reportView/styles.css
@@ -44,15 +44,15 @@
 .simulated-page {
   width: min(820px, 100%);
   min-height: 1040px;
-  background-color: rgb(var(--pdf-light-simulated-page-bg)) !important;
-  box-shadow: 0 12px 32px rgba(var(--pdf-light-simulated-page-text), 0.12) !important;
+  background-color: var(--bg-raised) !important;
+  box-shadow: 0 12px 32px var(--shadow-color) !important;
   border-radius: 12px !important;
   padding: 48px 56px !important;
   position: relative;
   overflow: hidden;
   display: flex;
   flex-direction: column;
-  color: rgb(var(--pdf-light-simulated-page-text)) !important;
+  color: var(--text-primary) !important;
 }
 
 /* Container for the interactive report view */
@@ -67,12 +67,12 @@
 
 /* Keep field blocks stable colors across themes */
 .field-value {
-  border: 1px solid rgb(var(--pdf-light-box-border)) !important;
-  background-color: rgb(var(--pdf-light-box-bg)) !important;
+  border: 1px solid var(--border-default) !important;
+  background-color: var(--bg-raised) !important;
 }
 
 .field-container {
-  color: rgb(var(--pdf-light-simulated-page-text)) !important;
+  color: var(--text-primary) !important;
 }
 
 /* Thumbnail preview styles */
@@ -103,3 +103,28 @@
   color: rgb(var(--pdf-light-text-muted));
   background: linear-gradient(145deg, var(--mantine-color-gray-1) 0%, var(--mantine-color-gray-0) 100%);
 }
+
+/* Flash highlight animation for section navigation */
+@keyframes section-flash {
+  0% {
+    background-color: rgba(255, 235, 59, 0);
+    box-shadow: none;
+  }
+  20% {
+    background-color: rgba(255, 235, 59, 0.35);
+    box-shadow: 0 0 20px rgba(255, 235, 59, 0.5);
+  }
+  50% {
+    background-color: rgba(255, 235, 59, 0.25);
+    box-shadow: 0 0 15px rgba(255, 235, 59, 0.4);
+  }
+  100% {
+    background-color: rgba(255, 235, 59, 0);
+    box-shadow: none;
+  }
+}
+
+.section-flash-highlight {
+  animation: section-flash 1.5s ease-out;
+  border-radius: 8px;
+}
diff --git a/frontend/src/core/components/tooltips/useCompressTips.ts b/frontend/src/core/components/tooltips/useCompressTips.ts
index c49ceaca2..3b5299e08 100644
--- a/frontend/src/core/components/tooltips/useCompressTips.ts
+++ b/frontend/src/core/components/tooltips/useCompressTips.ts
@@ -24,6 +24,13 @@ export const useCompressTips = (): TooltipContent => {
       {
         title: t("compress.tooltip.grayscale.title", "Grayscale"),
         description: t("compress.tooltip.grayscale.text", "Select this option to convert all images to black and white, which can significantly reduce file size especially for scanned PDFs or image-heavy documents.")
+      },
+      {
+        title: t("compress.tooltip.lineArt.title", "Line Art"),
+        description: t(
+          "compress.tooltip.lineArt.text",
+          "Convert pages to high-contrast black and white using ImageMagick. Use line thickness to control the threshold percentage and detection strength to choose how aggressively edges are outlined."
+        )
       }
     ]
   };
diff --git a/frontend/src/core/components/viewer/CustomSearchLayer.tsx b/frontend/src/core/components/viewer/CustomSearchLayer.tsx
index 05b50ecab..29f3b528c 100644
--- a/frontend/src/core/components/viewer/CustomSearchLayer.tsx
+++ b/frontend/src/core/components/viewer/CustomSearchLayer.tsx
@@ -44,8 +44,10 @@ export function CustomSearchLayer({
     }
 
     const unsubscribe = searchProvides.onSearchResultStateChange?.((state: SearchResultState) => {
+      if (!state) return;
+
       // Auto-scroll to active search result
-      if (state?.results && state.activeResultIndex !== undefined && state.activeResultIndex >= 0) {
+      if (state.results && state.activeResultIndex !== undefined && state.activeResultIndex >= 0) {
         const activeResult = state.results[state.activeResultIndex];
         if (activeResult) {
           const pageNumber = activeResult.pageIndex + 1; // Convert to 1-based page number
diff --git a/frontend/src/core/components/viewer/EmbedPdfViewer.tsx b/frontend/src/core/components/viewer/EmbedPdfViewer.tsx
index 2ad3c0ff9..559da623b 100644
--- a/frontend/src/core/components/viewer/EmbedPdfViewer.tsx
+++ b/frontend/src/core/components/viewer/EmbedPdfViewer.tsx
@@ -43,12 +43,15 @@ const EmbedPdfViewerContent = ({
     isThumbnailSidebarVisible,
     toggleThumbnailSidebar,
     isBookmarkSidebarVisible,
+    isSearchInterfaceVisible,
+    searchInterfaceActions,
     zoomActions,
     panActions: _panActions,
     rotationActions: _rotationActions,
     getScrollState,
     getRotationState,
     isAnnotationMode,
+    setAnnotationMode,
     isAnnotationsVisible,
     exportActions,
   } = useViewer();
@@ -80,19 +83,18 @@ const EmbedPdfViewerContent = ({
   // Navigation guard for unsaved changes
   const { setHasUnsavedChanges, registerUnsavedChangesChecker, unregisterUnsavedChangesChecker } = useNavigationGuard();
 
-  // Check if we're in signature mode OR viewer annotation mode
+  // Check if we're in an annotation tool
   const { selectedTool } = useNavigationState();
-  // Tools that use the stamp/signature placement system with hover preview
-  const isSignatureMode = selectedTool === 'sign' || selectedTool === 'addText' || selectedTool === 'addImage';
-  const isAnnotateTool = selectedTool === 'annotate';
+  // Tools that require the annotation layer (Sign, Add Text, Add Image)
+  const isInAnnotationTool = selectedTool === 'sign' || selectedTool === 'addText' || selectedTool === 'addImage';
+
+  // Sync isAnnotationMode in ViewerContext with current tool
+  useEffect(() => {
+    setAnnotationMode(isInAnnotationTool);
+  }, [isInAnnotationTool, setAnnotationMode]);
 
-  // Enable annotations when: in sign mode, OR annotation mode is active, OR we want to show existing annotations
-  const shouldEnableAnnotations = isSignatureMode || isAnnotateTool || isAnnotationMode || isAnnotationsVisible;
   const isPlacementOverlayActive = Boolean(
-    (isSignatureMode || (isAnnotateTool && signatureConfig?.signatureType === 'image')) &&
-    shouldEnableAnnotations &&
-    isPlacementMode &&
-    signatureConfig
+    isInAnnotationTool && isPlacementMode && signatureConfig
   );
 
   // Track which file tab is active
@@ -188,7 +190,7 @@ const EmbedPdfViewerContent = ({
     onZoomOut: zoomActions.zoomOut,
   });
 
-  // Handle keyboard zoom shortcuts
+  // Handle keyboard shortcuts (zoom and search)
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       if (!isViewerHovered) return;
@@ -203,6 +205,16 @@ const EmbedPdfViewerContent = ({
           // Ctrl+- for zoom out
           event.preventDefault();
           zoomActions.zoomOut();
+        } else if (event.key === 'f' || event.key === 'F') {
+          // Ctrl+F for search
+          event.preventDefault();
+          if (isSearchInterfaceVisible) {
+            // If already open, trigger refocus event
+            window.dispatchEvent(new CustomEvent('refocus-search-input'));
+          } else {
+            // Open search interface
+            searchInterfaceActions.open();
+          }
         }
       }
     };
@@ -211,7 +223,7 @@ const EmbedPdfViewerContent = ({
     return () => {
       document.removeEventListener('keydown', handleKeyDown);
     };
-  }, [isViewerHovered]);
+  }, [isViewerHovered, isSearchInterfaceVisible, zoomActions, searchInterfaceActions]);
 
   // Register checker for unsaved changes (annotations only for now)
   useEffect(() => {
@@ -325,7 +337,8 @@ const EmbedPdfViewerContent = ({
               key={currentFile && isStirlingFile(currentFile) ? currentFile.fileId : (effectiveFile.file instanceof File ? effectiveFile.file.name : effectiveFile.url)}
               file={effectiveFile.file}
               url={effectiveFile.url}
-              enableAnnotations={shouldEnableAnnotations}
+              enableAnnotations={isAnnotationMode}
+              showBakedAnnotations={isAnnotationsVisible}
               signatureApiRef={signatureApiRef as React.RefObject<any>}
               annotationApiRef={annotationApiRef as React.RefObject<any>}
               historyApiRef={historyApiRef as React.RefObject<any>}
diff --git a/frontend/src/core/components/viewer/LocalEmbedPDF.tsx b/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
index 995f8c976..77b447c89 100644
--- a/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
+++ b/frontend/src/core/components/viewer/LocalEmbedPDF.tsx
@@ -47,18 +47,20 @@ import { PrintAPIBridge } from '@app/components/viewer/PrintAPIBridge';
 import { isPdfFile } from '@app/utils/fileUtils';
 import { useTranslation } from 'react-i18next';
 import { LinkLayer } from '@app/components/viewer/LinkLayer';
+import { absoluteWithBasePath } from '@app/constants/app';
 
 interface LocalEmbedPDFProps {
   file?: File | Blob;
   url?: string | null;
   enableAnnotations?: boolean;
+  showBakedAnnotations?: boolean;
   onSignatureAdded?: (annotation: any) => void;
   signatureApiRef?: React.RefObject<SignatureAPI>;
   annotationApiRef?: React.RefObject<AnnotationAPI>;
   historyApiRef?: React.RefObject<HistoryAPI>;
 }
 
-export function LocalEmbedPDF({ file, url, enableAnnotations = false, onSignatureAdded, signatureApiRef, annotationApiRef, historyApiRef }: LocalEmbedPDFProps) {
+export function LocalEmbedPDF({ file, url, enableAnnotations = false, showBakedAnnotations = true, onSignatureAdded, signatureApiRef, historyApiRef }: LocalEmbedPDFProps) {
   const { t } = useTranslation();
   const [pdfUrl, setPdfUrl] = useState<string | null>(null);
   const [, setAnnotations] = useState<Array<{id: string, pageIndex: number, rect: any}>>([]);
@@ -101,7 +103,7 @@ export function LocalEmbedPDF({ file, url, enableAnnotations = false, onSignatur
       }),
       createPluginRegistration(RenderPluginPackage, {
         withForms: true,
-        withAnnotations: true,
+        withAnnotations: showBakedAnnotations && !enableAnnotations, // Show baked annotations only when: visibility is ON and annotation layer is OFF
       }),
 
       // Register interaction manager (required for zoom and selection features)
@@ -167,10 +169,12 @@ export function LocalEmbedPDF({ file, url, enableAnnotations = false, onSignatur
       // Register print plugin for printing PDFs
       createPluginRegistration(PrintPluginPackage),
     ];
-  }, [pdfUrl]);
+  }, [pdfUrl, enableAnnotations, showBakedAnnotations]);
 
-  // Initialize the engine with the React hook
-  const { engine, isLoading, error } = usePdfiumEngine();
+  // Initialize the engine with the React hook - use local WASM for offline support
+  const { engine, isLoading, error } = usePdfiumEngine({
+    wasmUrl: absoluteWithBasePath('/pdfium/pdfium.wasm'),
+  });
 
 
   // Early return if no file or URL provided
diff --git a/frontend/src/core/components/viewer/PdfViewerToolbar.tsx b/frontend/src/core/components/viewer/PdfViewerToolbar.tsx
index a2e36d4e2..258b8ba43 100644
--- a/frontend/src/core/components/viewer/PdfViewerToolbar.tsx
+++ b/frontend/src/core/components/viewer/PdfViewerToolbar.tsx
@@ -2,6 +2,7 @@ import { useState, useEffect } from 'react';
 import { Button, Paper, Group, NumberInput } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { useViewer } from '@app/contexts/ViewerContext';
+import { Tooltip } from '@app/components/shared/Tooltip';
 import FirstPageIcon from '@mui/icons-material/FirstPage';
 import ArrowBackIosIcon from '@mui/icons-material/ArrowBackIos';
 import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos';
@@ -209,21 +210,27 @@ export function PdfViewerToolbar({
         </Button>
 
         {/* Dual Page Toggle */}
-        <Button
-          variant={isDualPageActive ? "filled" : "light"}
-          color="blue"
-          size="md"
-          radius="xl"
-          onClick={handleDualPageToggle}
-          style={{ minWidth: '2.5rem' }}
-          title={
+        <Tooltip
+          content={
             isDualPageActive
               ? t("viewer.singlePageView", "Single Page View")
               : t("viewer.dualPageView", "Dual Page View")
           }
+          position="top"
+          arrow
         >
-          {isDualPageActive ? <DescriptionIcon fontSize="small" /> : <ViewWeekIcon fontSize="small" />}
-        </Button>
+          <Button
+            variant={isDualPageActive ? "filled" : "light"}
+            color="blue"
+            size="md"
+            radius="xl"
+            onClick={handleDualPageToggle}
+            disabled={scrollState.totalPages <= 1}
+            style={{ minWidth: '2.5rem' }}
+          >
+            {isDualPageActive ? <DescriptionIcon fontSize="small" /> : <ViewWeekIcon fontSize="small" />}
+          </Button>
+        </Tooltip>
 
         {/* Zoom Controls */}
         <Group gap={4} align="center" style={{ marginLeft: 16 }}>
diff --git a/frontend/src/core/components/viewer/SearchAPIBridge.tsx b/frontend/src/core/components/viewer/SearchAPIBridge.tsx
index 4b0eadd23..4003e1d0b 100644
--- a/frontend/src/core/components/viewer/SearchAPIBridge.tsx
+++ b/frontend/src/core/components/viewer/SearchAPIBridge.tsx
@@ -28,11 +28,13 @@ export function SearchAPIBridge() {
     if (!search) return;
 
     const unsubscribe = search.onSearchResultStateChange?.((state: any) => {
+      if (!state) return;
+
       const newState = {
-        results: state?.results || null,
-        activeIndex: (state?.activeResultIndex || 0) + 1 // Convert to 1-based index
+        results: state.results || null,
+        activeIndex: (state.activeResultIndex || 0) + 1 // Convert to 1-based index
       };
-      
+
       setLocalState(prevState => {
         // Only update if state actually changed
         if (prevState.results !== newState.results || prevState.activeIndex !== newState.activeIndex) {
@@ -52,16 +54,42 @@ export function SearchAPIBridge() {
         state: localState,
         api: {
           search: async (query: string) => {
-            search.startSearch();
-            return search.searchAllPages(query);
+            if (search?.startSearch && search?.searchAllPages) {
+              search.startSearch();
+              return search.searchAllPages(query);
+            }
           },
           clear: () => {
-            search.stopSearch();
+            try {
+              if (search?.stopSearch) {
+                search.stopSearch();
+              }
+            } catch (error) {
+              console.warn('Error stopping search:', error);
+            }
             setLocalState({ results: null, activeIndex: 0 });
           },
-          next: () => search.nextResult(),
-          previous: () => search.previousResult(),
-          goToResult: (index: number) => search.goToResult(index),
+          next: () => {
+            try {
+              search?.nextResult?.();
+            } catch (error) {
+              console.warn('Error navigating to next result:', error);
+            }
+          },
+          previous: () => {
+            try {
+              search?.previousResult?.();
+            } catch (error) {
+              console.warn('Error navigating to previous result:', error);
+            }
+          },
+          goToResult: (index: number) => {
+            try {
+              search?.goToResult?.(index);
+            } catch (error) {
+              console.warn('Error going to result:', error);
+            }
+          },
         }
       });
     }
diff --git a/frontend/src/core/components/viewer/SearchInterface.tsx b/frontend/src/core/components/viewer/SearchInterface.tsx
index da6f6472a..eefac8154 100644
--- a/frontend/src/core/components/viewer/SearchInterface.tsx
+++ b/frontend/src/core/components/viewer/SearchInterface.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Box, TextInput, ActionIcon, Text, Group } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { LocalIcon } from '@app/components/shared/LocalIcon';
@@ -12,7 +12,9 @@ interface SearchInterfaceProps {
 export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   const { t } = useTranslation();
   const viewerContext = React.useContext(ViewerContext);
-  
+  const inputRef = useRef<HTMLInputElement>(null);
+  const searchTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+
   const searchState = viewerContext?.getSearchState();
   const searchResults = searchState?.results;
   const searchActiveIndex = searchState?.activeIndex;
@@ -26,6 +28,61 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   } | null>(null);
   const [isSearching, setIsSearching] = useState(false);
 
+  // Auto-focus search input when visible
+  useEffect(() => {
+    if (visible) {
+      inputRef.current?.focus();
+    }
+  }, [visible]);
+
+  // Listen for refocus event (when Ctrl+F pressed while already open)
+  useEffect(() => {
+    const handleRefocus = () => {
+      inputRef.current?.focus();
+      inputRef.current?.select();
+    };
+
+    window.addEventListener('refocus-search-input', handleRefocus);
+    return () => {
+      window.removeEventListener('refocus-search-input', handleRefocus);
+    };
+  }, []);
+
+  // Auto-search as user types (debounced)
+  useEffect(() => {
+    // Clear existing timeout
+    if (searchTimeoutRef.current) {
+      clearTimeout(searchTimeoutRef.current);
+    }
+
+    // If query is empty, clear search immediately
+    if (!searchQuery.trim()) {
+      searchActions?.clear();
+      setResultInfo(null);
+      return;
+    }
+
+    // Debounce search by 300ms
+    searchTimeoutRef.current = setTimeout(async () => {
+      if (searchQuery.trim() && searchActions) {
+        setIsSearching(true);
+        try {
+          await searchActions.search(searchQuery.trim());
+        } catch (error) {
+          console.error('Search failed:', error);
+        } finally {
+          setIsSearching(false);
+        }
+      }
+    }, 300);
+
+    return () => {
+      if (searchTimeoutRef.current) {
+        clearTimeout(searchTimeoutRef.current);
+      }
+    };
+  }, [searchQuery, searchActions]);
+
   // Monitor search state changes
   useEffect(() => {
     if (!visible) return;
@@ -59,30 +116,21 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
     return () => clearInterval(interval);
   }, [visible, searchResults, searchActiveIndex, searchQuery]);
 
-  const handleSearch = async (query: string) => {
-    if (!query.trim()) {
-      // If query is empty, clear the search
-      handleClearSearch();
-      return;
-    }
-
-    if (query.trim() && searchActions) {
-      setIsSearching(true);
-      try {
-        await searchActions.search(query.trim());
-      } catch (error) {
-        console.error('Search failed:', error);
-      } finally {
-        setIsSearching(false);
-      }
-    }
-  };
-
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
     if (event.key === 'Enter') {
-      handleSearch(searchQuery);
+      // Navigate to next result on Enter
+      event.preventDefault();
+      handleNext();
     } else if (event.key === 'Escape') {
       onClose();
+    } else if (event.key === 'ArrowDown') {
+      // Navigate to next result
+      event.preventDefault();
+      handleNext();
+    } else if (event.key === 'ArrowUp') {
+      // Navigate to previous result
+      event.preventDefault();
+      handlePrevious();
     }
   };
 
@@ -103,17 +151,17 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   // No longer need to sync with external API on mount - removed
 
   const handleJumpToResult = (index: number) => {
-    // Use context actions instead of window API - functionality simplified for now
     if (resultInfo && index >= 1 && index <= resultInfo.totalResults) {
-      // Note: goToResult functionality would need to be implemented in SearchAPIBridge
-      console.log('Jump to result:', index);
+      // Convert to 0-based index for the API
+      searchActions?.goToResult?.(index - 1);
     }
   };
 
   const handleJumpToSubmit = () => {
-    const index = parseInt(jumpToValue);
-    if (index && resultInfo && index >= 1 && index <= resultInfo.totalResults) {
+    const index = parseInt(jumpToValue, 10);
+    if (!isNaN(index) && resultInfo && index >= 1 && index <= resultInfo.totalResults) {
       handleJumpToResult(index);
+      setJumpToValue(''); // Clear the input after jumping
     }
   };
 
@@ -123,7 +171,14 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
     }
   };
 
-  const _handleClose = () => {
+  const handleInputBlur = () => {
+    // Close popover on blur if no text is entered
+    if (!searchQuery.trim()) {
+      onClose();
+    }
+  };
+
+  const handleCloseClick = () => {
     handleClearSearch();
     onClose();
   };
@@ -135,100 +190,99 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
         padding: '0px'
       }}
     >
-      {/* Header */}
-      <Group mb="md">
+      {/* Header with close button */}
+      <Group mb="md" justify="space-between">
         <Text size="sm" fw={600}>
           {t('search.title', 'Search PDF')}
         </Text>
+        <ActionIcon
+          variant="subtle"
+          size="sm"
+          onClick={handleCloseClick}
+          aria-label="Close search"
+        >
+          <LocalIcon icon="close" width="1rem" height="1rem" />
+        </ActionIcon>
       </Group>
 
       {/* Search input */}
       <Group mb="md">
         <TextInput
+          ref={inputRef}
           placeholder={t('search.placeholder', 'Enter search term...')}
           value={searchQuery}
           onChange={(e) => {
             const newValue = e.currentTarget.value;
             setSearchQuery(newValue);
-            // If user clears the input, clear the search highlights
-            if (!newValue.trim()) {
-              handleClearSearch();
-            }
           }}
           onKeyDown={handleKeyDown}
+          onBlur={handleInputBlur}
           style={{ flex: 1 }}
           rightSection={
-            <ActionIcon
-              variant="subtle"
-              onClick={() => handleSearch(searchQuery)}
-              disabled={!searchQuery.trim() || isSearching}
-              loading={isSearching}
-            >
-              <LocalIcon icon="search" width="1rem" height="1rem" />
-            </ActionIcon>
+            searchQuery.trim() && (
+              <ActionIcon
+                variant="subtle"
+                onClick={handleClearSearch}
+                aria-label="Clear search"
+              >
+                <LocalIcon icon="close" width="0.875rem" height="0.875rem" />
+              </ActionIcon>
+            )
           }
         />
       </Group>
 
-      {/* Results info and navigation */}
-      {resultInfo && (
-        <Group justify="space-between" align="center">
-          {resultInfo.totalResults === 0 ? (
-            <Text size="sm" c="dimmed">
-              {t('search.noResults', 'No results found')}
-            </Text>
-          ) : (
-            <Group gap="xs" align="center">
-              <TextInput
-                size="xs"
-                value={jumpToValue}
-                onChange={(e) => setJumpToValue(e.currentTarget.value)}
-                onKeyDown={handleJumpToKeyDown}
-                onBlur={handleJumpToSubmit}
-                placeholder={resultInfo.currentIndex.toString()}
-                style={{ width: '3rem' }}
-                type="number"
-                min="1"
-                max={resultInfo.totalResults}
-              />
-              <Text size="sm" c="dimmed">
-                of {resultInfo.totalResults}
-              </Text>
-            </Group>
-          )}
-          
-          {resultInfo.totalResults > 0 && (
-            <Group gap="xs">
-              <ActionIcon
-                variant="subtle"
-                size="sm"
-                onClick={handlePrevious}
-                disabled={resultInfo.currentIndex <= 1}
-                aria-label="Previous result"
-              >
-                <LocalIcon icon="keyboard-arrow-up" width="1rem" height="1rem" />
-              </ActionIcon>
-              <ActionIcon
-                variant="subtle"
-                size="sm"
-                onClick={handleNext}
-                disabled={resultInfo.currentIndex >= resultInfo.totalResults}
-                aria-label="Next result"
-              >
-                <LocalIcon icon="keyboard-arrow-down" width="1rem" height="1rem" />
-              </ActionIcon>
-              <ActionIcon
-                variant="subtle"
-                size="sm"
-                onClick={handleClearSearch}
-                aria-label="Clear search"
-              >
-                <LocalIcon icon="close" width="1rem" height="1rem" />
-              </ActionIcon>
-            </Group>
-          )}
+      {/* Results info and navigation - always show */}
+      <Group justify="space-between" align="center">
+        <Group gap="xs" align="center">
+          <TextInput
+            size="xs"
+            value={jumpToValue}
+            onChange={(e) => {
+              const newValue = e.currentTarget.value;
+              setJumpToValue(newValue);
+
+              // Jump immediately as user types
+              const index = parseInt(newValue, 10);
+              if (resultInfo && !isNaN(index) && index >= 1 && index <= resultInfo.totalResults) {
+                handleJumpToResult(index);
+              }
+            }}
+            onKeyDown={handleJumpToKeyDown}
+            onBlur={() => setJumpToValue('')} // Clear on blur instead of submit
+            placeholder={(resultInfo?.currentIndex || 0).toString()}
+            style={{ width: '3rem' }}
+            type="number"
+            min="1"
+            max={resultInfo?.totalResults || 0}
+            disabled={!resultInfo || resultInfo.totalResults === 0}
+          />
+          <Text size="sm" c="dimmed">
+            of {resultInfo?.totalResults || 0}
+          </Text>
         </Group>
-      )}
+
+        <Group gap="xs">
+          <ActionIcon
+            variant="subtle"
+            size="sm"
+            onClick={handlePrevious}
+            disabled={!resultInfo || resultInfo.currentIndex <= 1}
+            aria-label="Previous result"
+          >
+            <LocalIcon icon="keyboard-arrow-up" width="1rem" height="1rem" />
+          </ActionIcon>
+          <ActionIcon
+            variant="subtle"
+            size="sm"
+            onClick={handleNext}
+            disabled={!resultInfo || resultInfo.currentIndex >= resultInfo.totalResults}
+            aria-label="Next result"
+          >
+            <LocalIcon icon="keyboard-arrow-down" width="1rem" height="1rem" />
+          </ActionIcon>
+        </Group>
+      </Group>
 
       {/* Loading state */}
       {isSearching && (
diff --git a/frontend/src/core/components/viewer/useViewerRightRailButtons.tsx b/frontend/src/core/components/viewer/useViewerRightRailButtons.tsx
index 995d7d095..9ef19dd71 100644
--- a/frontend/src/core/components/viewer/useViewerRightRailButtons.tsx
+++ b/frontend/src/core/components/viewer/useViewerRightRailButtons.tsx
@@ -36,7 +36,14 @@ export function useViewerRightRailButtons() {
         order: 10,
         render: ({ disabled }) => (
           <Tooltip content={searchLabel} position={tooltipPosition} offset={12} arrow portalTarget={document.body}>
-            <Popover position={tooltipPosition} withArrow shadow="md" offset={8}>
+            <Popover
+              position={tooltipPosition}
+              withArrow
+              shadow="md"
+              offset={8}
+              opened={viewer.isSearchInterfaceVisible}
+              onClose={viewer.searchInterfaceActions.close}
+            >
               <Popover.Target>
                 <div style={{ display: 'inline-flex' }}>
                   <ActionIcon
@@ -45,6 +52,7 @@ export function useViewerRightRailButtons() {
                     className="right-rail-icon"
                     disabled={disabled}
                     aria-label={searchLabel}
+                    onClick={viewer.searchInterfaceActions.toggle}
                   >
                     <LocalIcon icon="search" width="1.5rem" height="1.5rem" />
                   </ActionIcon>
@@ -52,7 +60,7 @@ export function useViewerRightRailButtons() {
               </Popover.Target>
               <Popover.Dropdown>
                 <div style={{ minWidth: '20rem' }}>
-                  <SearchInterface visible={true} onClose={() => {}} />
+                  <SearchInterface visible={viewer.isSearchInterfaceVisible} onClose={viewer.searchInterfaceActions.close} />
                 </div>
               </Popover.Dropdown>
             </Popover>
diff --git a/frontend/src/core/constants/events.ts b/frontend/src/core/constants/events.ts
index e95895f93..a7455fc3f 100644
--- a/frontend/src/core/constants/events.ts
+++ b/frontend/src/core/constants/events.ts
@@ -25,7 +25,7 @@ export interface UpgradeBannerAlertPayload {
   freeTierLimit?: number;
 }
 
-export type TourType = 'admin' | 'tools';
+export type TourType = 'admin' | 'tools' | 'whatsnew';
 
 export interface StartTourPayload {
   tourType: TourType;
diff --git a/frontend/src/core/constants/links.ts b/frontend/src/core/constants/links.ts
new file mode 100644
index 000000000..294e99363
--- /dev/null
+++ b/frontend/src/core/constants/links.ts
@@ -0,0 +1 @@
+export const devApiLink = "/swagger-ui/index.html";
diff --git a/frontend/src/core/contexts/AppConfigContext.tsx b/frontend/src/core/contexts/AppConfigContext.tsx
index 5ae0d30a6..c8fcdf64c 100644
--- a/frontend/src/core/contexts/AppConfigContext.tsx
+++ b/frontend/src/core/contexts/AppConfigContext.tsx
@@ -20,6 +20,7 @@ export interface AppConfig {
   serverPort?: number;
   appNameNavbar?: string;
   languages?: string[];
+  defaultLocale?: string;
   logoStyle?: 'modern' | 'classic';
   enableLogin?: boolean;
   enableEmailInvites?: boolean;
@@ -28,6 +29,7 @@ export interface AppConfig {
   enableAnalytics?: boolean | null;
   enablePosthog?: boolean | null;
   enableScarf?: boolean | null;
+  enableDesktopInstallSlide?: boolean;
   premiumEnabled?: boolean;
   premiumKey?: string;
   termsAndConditions?: string;
diff --git a/frontend/src/core/contexts/NavigationContext.tsx b/frontend/src/core/contexts/NavigationContext.tsx
index 500a6db5e..c11649400 100644
--- a/frontend/src/core/contexts/NavigationContext.tsx
+++ b/frontend/src/core/contexts/NavigationContext.tsx
@@ -1,4 +1,4 @@
-import React, { createContext, useContext, useReducer, useCallback } from 'react';
+import React, { createContext, useContext, useReducer, useCallback, useMemo } from 'react';
 import { WorkbenchType, getDefaultWorkbench } from '@app/types/workbench';
 import { ToolId, isValidToolId } from '@app/types/toolId';
 import { useToolRegistry } from '@app/contexts/ToolRegistryContext';
@@ -110,8 +110,8 @@ export const NavigationProvider: React.FC<{
   const { allTools: toolRegistry } = useToolRegistry();
   const unsavedChangesCheckerRef = React.useRef<(() => boolean) | null>(null);
 
-  const actions: NavigationContextActions = {
-    setWorkbench: useCallback((workbench: WorkbenchType) => {
+  // Memoize individual callbacks
+  const setWorkbench = useCallback((workbench: WorkbenchType) => {
       // Check for unsaved changes using registered checker or state
       const hasUnsavedChanges = unsavedChangesCheckerRef.current?.() || state.hasUnsavedChanges;
       console.log('[NavigationContext] setWorkbench:', {
@@ -152,13 +152,13 @@ export const NavigationProvider: React.FC<{
       } else {
         dispatch({ type: 'SET_WORKBENCH', payload: { workbench } });
       }
-    }, [state.workbench, state.hasUnsavedChanges]),
+    }, [state.workbench, state.hasUnsavedChanges]);
 
-    setSelectedTool: useCallback((toolId: ToolId | null) => {
+    const setSelectedTool = useCallback((toolId: ToolId | null) => {
       dispatch({ type: 'SET_SELECTED_TOOL', payload: { toolId } });
-    }, []),
+    }, []);
 
-    setToolAndWorkbench: useCallback((toolId: ToolId | null, workbench: WorkbenchType) => {
+    const setToolAndWorkbench = useCallback((toolId: ToolId | null, workbench: WorkbenchType) => {
       // Check for unsaved changes using registered checker or state
       const hasUnsavedChanges = unsavedChangesCheckerRef.current?.() || state.hasUnsavedChanges;
 
@@ -177,25 +177,25 @@ export const NavigationProvider: React.FC<{
       } else {
         dispatch({ type: 'SET_TOOL_AND_WORKBENCH', payload: { toolId, workbench } });
       }
-    }, [state.workbench, state.hasUnsavedChanges]),
+    }, [state.workbench, state.hasUnsavedChanges]);
 
-    setHasUnsavedChanges: useCallback((hasChanges: boolean) => {
+    const setHasUnsavedChanges = useCallback((hasChanges: boolean) => {
       dispatch({ type: 'SET_UNSAVED_CHANGES', payload: { hasChanges } });
-    }, []),
+    }, []);
 
-    registerUnsavedChangesChecker: useCallback((checker: () => boolean) => {
+    const registerUnsavedChangesChecker = useCallback((checker: () => boolean) => {
       unsavedChangesCheckerRef.current = checker;
-    }, []),
+    }, []);
 
-    unregisterUnsavedChangesChecker: useCallback(() => {
+    const unregisterUnsavedChangesChecker = useCallback(() => {
       unsavedChangesCheckerRef.current = null;
-    }, []),
+    }, []);
 
-    showNavigationWarning: useCallback((show: boolean) => {
+    const showNavigationWarning = useCallback((show: boolean) => {
       dispatch({ type: 'SHOW_NAVIGATION_WARNING', payload: { show } });
-    }, []),
+    }, []);
 
-    requestNavigation: useCallback((navigationFn: () => void) => {
+    const requestNavigation = useCallback((navigationFn: () => void) => {
       if (!state.hasUnsavedChanges) {
         navigationFn();
         return;
@@ -203,9 +203,9 @@ export const NavigationProvider: React.FC<{
 
       dispatch({ type: 'SET_PENDING_NAVIGATION', payload: { navigationFn } });
       dispatch({ type: 'SHOW_NAVIGATION_WARNING', payload: { show: true } });
-    }, [state.hasUnsavedChanges]),
+    }, [state.hasUnsavedChanges]);
 
-    confirmNavigation: useCallback(() => {
+    const confirmNavigation = useCallback(() => {
       console.log('[NavigationContext] confirmNavigation called', {
         hasPendingNav: !!state.pendingNavigation,
         currentWorkbench: state.workbench,
@@ -218,18 +218,18 @@ export const NavigationProvider: React.FC<{
       dispatch({ type: 'SET_PENDING_NAVIGATION', payload: { navigationFn: null } });
       dispatch({ type: 'SHOW_NAVIGATION_WARNING', payload: { show: false } });
       console.log('[NavigationContext] confirmNavigation completed');
-    }, [state.pendingNavigation, state.workbench, state.selectedTool]),
+    }, [state.pendingNavigation, state.workbench, state.selectedTool]);
 
-    cancelNavigation: useCallback(() => {
+    const cancelNavigation = useCallback(() => {
       dispatch({ type: 'SET_PENDING_NAVIGATION', payload: { navigationFn: null } });
       dispatch({ type: 'SHOW_NAVIGATION_WARNING', payload: { show: false } });
-    }, []),
+    }, []);
 
-    clearToolSelection: useCallback(() => {
+    const clearToolSelection = useCallback(() => {
       dispatch({ type: 'SET_TOOL_AND_WORKBENCH', payload: { toolId: null, workbench: getDefaultWorkbench() } });
-    }, []),
+    }, []);
 
-    handleToolSelect: useCallback((toolId: string) => {
+    const handleToolSelect = useCallback((toolId: string) => {
       if (toolId === 'allTools') {
         dispatch({ type: 'SET_TOOL_AND_WORKBENCH', payload: { toolId: null, workbench: getDefaultWorkbench() } });
         return;
@@ -245,11 +245,40 @@ export const NavigationProvider: React.FC<{
       const tool = isValidToolId(toolId)? toolRegistry[toolId] : null;
       const workbench = tool ? (tool.workbench || getDefaultWorkbench()) : getDefaultWorkbench();
 
-      // Validate toolId and convert to ToolId type
-      const validToolId = isValidToolId(toolId) ? toolId : null;
-      dispatch({ type: 'SET_TOOL_AND_WORKBENCH', payload: { toolId: validToolId, workbench } });
-    }, [toolRegistry])
-  };
+    // Validate toolId and convert to ToolId type
+    const validToolId = isValidToolId(toolId) ? toolId : null;
+    dispatch({ type: 'SET_TOOL_AND_WORKBENCH', payload: { toolId: validToolId, workbench } });
+  }, [toolRegistry]);
+
+  // Memoize the actions object to prevent unnecessary context updates
+  // This is critical to avoid infinite loops when effects depend on actions
+  const actions: NavigationContextActions = useMemo(() => ({
+    setWorkbench,
+    setSelectedTool,
+    setToolAndWorkbench,
+    setHasUnsavedChanges,
+    registerUnsavedChangesChecker,
+    unregisterUnsavedChangesChecker,
+    showNavigationWarning,
+    requestNavigation,
+    confirmNavigation,
+    cancelNavigation,
+    clearToolSelection,
+    handleToolSelect,
+  }), [
+    setWorkbench,
+    setSelectedTool,
+    setToolAndWorkbench,
+    setHasUnsavedChanges,
+    registerUnsavedChangesChecker,
+    unregisterUnsavedChangesChecker,
+    showNavigationWarning,
+    requestNavigation,
+    confirmNavigation,
+    cancelNavigation,
+    clearToolSelection,
+    handleToolSelect,
+  ]);
 
   const stateValue: NavigationContextStateValue = {
     workbench: state.workbench,
@@ -259,9 +288,10 @@ export const NavigationProvider: React.FC<{
     showNavigationWarning: state.showNavigationWarning
   };
 
-  const actionsValue: NavigationContextActionsValue = {
+  // Also memoize the context value to prevent unnecessary re-renders
+  const actionsValue: NavigationContextActionsValue = useMemo(() => ({
     actions
-  };
+  }), [actions]);
 
   return (
     <NavigationStateContext.Provider value={stateValue}>
diff --git a/frontend/src/core/contexts/ToolWorkflowContext.tsx b/frontend/src/core/contexts/ToolWorkflowContext.tsx
index 9717b7f68..b2c695801 100644
--- a/frontend/src/core/contexts/ToolWorkflowContext.tsx
+++ b/frontend/src/core/contexts/ToolWorkflowContext.tsx
@@ -224,11 +224,15 @@ export function ToolWorkflowProvider({ children }: ToolWorkflowProviderProps) {
       return;
     }
 
+    if (navigationState.pendingNavigation || navigationState.showNavigationWarning) {
+      return;
+    }
+
     const currentCustomView = customWorkbenchViews.find(view => view.workbenchId === navigationState.workbench);
     if (!currentCustomView || currentCustomView.data == null) {
       actions.setWorkbench(getDefaultWorkbench());
     }
-  }, [actions, customWorkbenchViews, navigationState.workbench]);
+  }, [actions, customWorkbenchViews, navigationState.workbench, navigationState.pendingNavigation, navigationState.showNavigationWarning]);
 
   // Persisted via PreferencesContext; no direct localStorage writes needed here
 
diff --git a/frontend/src/core/contexts/TourOrchestrationContext.tsx b/frontend/src/core/contexts/TourOrchestrationContext.tsx
index f8364ba5c..2c5b9dda5 100644
--- a/frontend/src/core/contexts/TourOrchestrationContext.tsx
+++ b/frontend/src/core/contexts/TourOrchestrationContext.tsx
@@ -1,4 +1,5 @@
 import React, { createContext, useContext, useCallback, useRef } from 'react';
+import { BASE_PATH } from '@app/constants/app';
 import { useFileHandler } from '@app/hooks/useFileHandler';
 import { useFilesModalContext } from '@app/contexts/FilesModalContext';
 import { useNavigationActions } from '@app/contexts/NavigationContext';
@@ -110,7 +111,9 @@ export const TourOrchestrationProvider: React.FC<{ children: React.ReactNode }>
 
   const loadSampleFile = useCallback(async () => {
     try {
-      const response = await fetch('samples/Sample.pdf');
+      // Hide the modal immediately so the tour targets are visible while we load
+      closeFilesModal();
+      const response = await fetch(`${BASE_PATH}/samples/Sample.pdf`);
       const blob = await response.blob();
       const file = new File([blob], 'Sample.pdf', { type: 'application/pdf' });
 
diff --git a/frontend/src/core/contexts/ViewerContext.tsx b/frontend/src/core/contexts/ViewerContext.tsx
index 937c6067a..aa2dc497b 100644
--- a/frontend/src/core/contexts/ViewerContext.tsx
+++ b/frontend/src/core/contexts/ViewerContext.tsx
@@ -80,6 +80,14 @@ interface ViewerContextType {
   isBookmarkSidebarVisible: boolean;
   toggleBookmarkSidebar: () => void;
 
+  // Search interface visibility
+  isSearchInterfaceVisible: boolean;
+  searchInterfaceActions: {
+    open: () => void;
+    close: () => void;
+    toggle: () => void;
+  };
+
   // Annotation visibility toggle
   isAnnotationsVisible: boolean;
   toggleAnnotationsVisibility: () => void;
@@ -87,7 +95,6 @@ interface ViewerContextType {
   // Annotation/drawing mode for viewer
   isAnnotationMode: boolean;
   setAnnotationMode: (enabled: boolean) => void;
-  toggleAnnotationMode: () => void;
 
   // Active file index for multi-file viewing
   activeFileIndex: number;
@@ -145,6 +152,7 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
   // UI state - only state directly managed by this context
   const [isThumbnailSidebarVisible, setIsThumbnailSidebarVisible] = useState(false);
   const [isBookmarkSidebarVisible, setIsBookmarkSidebarVisible] = useState(false);
+  const [isSearchInterfaceVisible, setSearchInterfaceVisible] = useState(false);
   const [isAnnotationsVisible, setIsAnnotationsVisible] = useState(true);
   const [isAnnotationMode, setIsAnnotationModeState] = useState(false);
   const [activeFileIndex, setActiveFileIndex] = useState(0);
@@ -207,6 +215,12 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
     setIsBookmarkSidebarVisible(prev => !prev);
   };
 
+  const searchInterfaceActions = {
+    open: () => setSearchInterfaceVisible(true),
+    close: () => setSearchInterfaceVisible(false),
+    toggle: () => setSearchInterfaceVisible(prev => !prev),
+  };
+
   const toggleAnnotationsVisibility = () => {
     setIsAnnotationsVisible(prev => !prev);
   };
@@ -215,10 +229,6 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
     setIsAnnotationModeState(enabled);
   };
 
-  const toggleAnnotationMode = () => {
-    setIsAnnotationModeState(prev => !prev);
-  };
-
   // State getters - read from bridge refs
   const getScrollState = (): ScrollState => {
     return bridgeRefs.current.scroll?.state || { currentPage: 1, totalPages: 0 };
@@ -294,12 +304,15 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
     isBookmarkSidebarVisible,
     toggleBookmarkSidebar,
 
+    // Search interface
+    isSearchInterfaceVisible,
+    searchInterfaceActions,
+
     // Annotation controls
     isAnnotationsVisible,
     toggleAnnotationsVisibility,
     isAnnotationMode,
     setAnnotationMode,
-    toggleAnnotationMode,
 
     // Active file index
     activeFileIndex,
diff --git a/frontend/src/core/contexts/viewer/viewerActions.ts b/frontend/src/core/contexts/viewer/viewerActions.ts
index d32c5077c..882ba8aa8 100644
--- a/frontend/src/core/contexts/viewer/viewerActions.ts
+++ b/frontend/src/core/contexts/viewer/viewerActions.ts
@@ -52,6 +52,7 @@ export interface SearchActions {
   next: () => void;
   previous: () => void;
   clear: () => void;
+  goToResult: (index: number) => void;
 }
 
 export interface ExportActions {
@@ -287,6 +288,12 @@ export function createViewerActions({
         api.clear();
       }
     },
+    goToResult: (index: number) => {
+      const api = registry.current.search?.api;
+      if (api?.goToResult) {
+        api.goToResult(index);
+      }
+    },
   };
 
   const exportActions: ExportActions = {
diff --git a/frontend/src/core/data/useTranslatedToolRegistry.tsx b/frontend/src/core/data/useTranslatedToolRegistry.tsx
index 9faff8c54..997d4c527 100644
--- a/frontend/src/core/data/useTranslatedToolRegistry.tsx
+++ b/frontend/src/core/data/useTranslatedToolRegistry.tsx
@@ -1,6 +1,7 @@
 import { useMemo } from "react";
 import LocalIcon from "@app/components/shared/LocalIcon";
 import { useTranslation } from "react-i18next";
+import { devApiLink } from "@app/constants/links";
 import SplitPdfPanel from "@app/tools/Split";
 import CompressPdfPanel from "@app/tools/Compress";
 import OCRPanel from "@app/tools/OCR";
@@ -27,6 +28,7 @@ import AdjustContrastSingleStepSettings from "@app/components/tools/adjustContra
 import { adjustContrastOperationConfig } from "@app/hooks/tools/adjustContrast/useAdjustContrastOperation";
 import { getSynonyms } from "@app/utils/toolSynonyms";
 import { useProprietaryToolRegistry } from "@app/data/useProprietaryToolRegistry";
+import GetPdfInfo from "@app/tools/GetPdfInfo";
 import AddWatermark from "@app/tools/AddWatermark";
 import AddStamp from "@app/tools/AddStamp";
 import AddAttachments from "@app/tools/AddAttachments";
@@ -43,6 +45,7 @@ import CertSign from "@app/tools/CertSign";
 import BookletImposition from "@app/tools/BookletImposition";
 import Flatten from "@app/tools/Flatten";
 import Rotate from "@app/tools/Rotate";
+import PdfTextEditor from "@app/tools/pdfTextEditor/PdfTextEditor";
 import ChangeMetadata from "@app/tools/ChangeMetadata";
 import Crop from "@app/tools/Crop";
 import Sign from "@app/tools/Sign";
@@ -151,6 +154,23 @@ export function useTranslatedToolCatalog(): TranslatedToolCatalog {
       // Proprietary tools (if any)
       ...proprietaryTools,
       // Recommended Tools in order
+      pdfTextEditor: {
+        icon: <LocalIcon icon="edit-square-outline-rounded" width="1.5rem" height="1.5rem" />,
+        name: t("home.pdfTextEditor.title", "PDF Text Editor"),
+        component: PdfTextEditor,
+        description: t(
+          "home.pdfTextEditor.desc",
+          "Review and edit text and images in PDFs with grouped text editing and PDF regeneration"
+        ),
+        categoryId: ToolCategoryId.RECOMMENDED_TOOLS,
+        subcategoryId: SubcategoryId.GENERAL,
+        maxFiles: 1,
+        endpoints: ["text-editor-pdf"],
+        synonyms: getSynonyms(t, "pdfTextEditor"),
+        supportsAutomate: false,
+        automationSettings: null,
+        versionStatus: "alpha",
+      },
       multiTool: {
         icon: <LocalIcon icon="dashboard-customize-rounded" width="1.5rem" height="1.5rem" />,
         name: t("home.multiTool.title", "Multi-Tool"),
@@ -337,14 +357,15 @@ export function useTranslatedToolCatalog(): TranslatedToolCatalog {
       getPdfInfo: {
         icon: <LocalIcon icon="fact-check-rounded" width="1.5rem" height="1.5rem" />,
         name: t("home.getPdfInfo.title", "Get ALL Info on PDF"),
-        component: null,
+        component: GetPdfInfo,
         description: t("home.getPdfInfo.desc", "Grabs any and all information possible on PDFs"),
         categoryId: ToolCategoryId.STANDARD_TOOLS,
         subcategoryId: SubcategoryId.VERIFICATION,
         endpoints: ["get-info-on-pdf"],
         synonyms: getSynonyms(t, "getPdfInfo"),
         supportsAutomate: false,
-        automationSettings: null
+        automationSettings: null,
+        maxFiles: 1,
       },
       validateSignature: {
         icon: <LocalIcon icon="verified-rounded" width="1.5rem" height="1.5rem" />,
@@ -778,7 +799,7 @@ export function useTranslatedToolCatalog(): TranslatedToolCatalog {
         description: t("home.devApi.desc", "Link to API documentation"),
         categoryId: ToolCategoryId.ADVANCED_TOOLS,
         subcategoryId: SubcategoryId.DEVELOPER_TOOLS,
-        link: "https://stirlingpdf.io/swagger-ui/5.21.0/index.html",
+        link: devApiLink,
         synonyms: getSynonyms(t, "devApi"),
         supportsAutomate: false,
         automationSettings: null
diff --git a/frontend/src/core/hooks/tools/adjustContrast/useAdjustContrastOperation.ts b/frontend/src/core/hooks/tools/adjustContrast/useAdjustContrastOperation.ts
index 176ddd4b5..6524a2585 100644
--- a/frontend/src/core/hooks/tools/adjustContrast/useAdjustContrastOperation.ts
+++ b/frontend/src/core/hooks/tools/adjustContrast/useAdjustContrastOperation.ts
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { ToolType, useToolOperation } from '@app/hooks/tools/shared/useToolOperation';
+import { ToolType, useToolOperation, CustomProcessorResult } from '@app/hooks/tools/shared/useToolOperation';
 import { AdjustContrastParameters, defaultParameters } from '@app/hooks/tools/adjustContrast/useAdjustContrastParameters';
 import { PDFDocument as PDFLibDocument } from 'pdf-lib';
 import { applyAdjustmentsToCanvas } from '@app/components/tools/adjustContrast/utils';
@@ -46,7 +46,7 @@ async function buildAdjustedPdfForFile(file: File, params: AdjustContrastParamet
     return out;
 }
 
-async function processPdfClientSide(params: AdjustContrastParameters, files: File[]): Promise<File[]> {
+async function processPdfClientSide(params: AdjustContrastParameters, files: File[]): Promise<CustomProcessorResult> {
   // Limit concurrency to avoid exhausting memory/CPU while still getting speedups
   // Heuristic: use up to 4 workers on capable machines, otherwise 2-3
   let CONCURRENCY_LIMIT = 2;
@@ -72,7 +72,12 @@ async function processPdfClientSide(params: AdjustContrastParameters, files: Fil
     return results;
   };
 
-  return mapWithConcurrency(files, CONCURRENCY_LIMIT, (file) => buildAdjustedPdfForFile(file, params));
+  const processedFiles = await mapWithConcurrency(files, CONCURRENCY_LIMIT, (file) => buildAdjustedPdfForFile(file, params));
+
+  return {
+    files: processedFiles,
+    consumedAllInputs: false,
+  };
 }
 
 export const adjustContrastOperationConfig = {
diff --git a/frontend/src/core/hooks/tools/automate/useAutomateOperation.ts b/frontend/src/core/hooks/tools/automate/useAutomateOperation.ts
index 004f28902..f6fbcacda 100644
--- a/frontend/src/core/hooks/tools/automate/useAutomateOperation.ts
+++ b/frontend/src/core/hooks/tools/automate/useAutomateOperation.ts
@@ -36,7 +36,10 @@ export function useAutomateOperation() {
     );
 
     console.log(`✅ Automation completed, returning ${finalResults.length} files`);
-    return finalResults;
+    return {
+      files: finalResults,
+      consumedAllInputs: false,
+    };
   }, [toolRegistry]);
 
   return useToolOperation<AutomateParameters>({
diff --git a/frontend/src/core/hooks/tools/compress/useCompressOperation.ts b/frontend/src/core/hooks/tools/compress/useCompressOperation.ts
index 5b1417b21..8e8f27b33 100644
--- a/frontend/src/core/hooks/tools/compress/useCompressOperation.ts
+++ b/frontend/src/core/hooks/tools/compress/useCompressOperation.ts
@@ -19,6 +19,11 @@ export const buildCompressFormData = (parameters: CompressParameters, file: File
   }
 
   formData.append("grayscale", parameters.grayscale.toString());
+  formData.append("lineArt", parameters.lineArt.toString());
+  if (parameters.lineArt) {
+    formData.append("lineArtThreshold", parameters.lineArtThreshold.toString());
+    formData.append("lineArtEdgeLevel", parameters.lineArtEdgeLevel.toString());
+  }
   return formData;
 };
 
diff --git a/frontend/src/core/hooks/tools/compress/useCompressParameters.ts b/frontend/src/core/hooks/tools/compress/useCompressParameters.ts
index 1ae9298f5..16f80f1d1 100644
--- a/frontend/src/core/hooks/tools/compress/useCompressParameters.ts
+++ b/frontend/src/core/hooks/tools/compress/useCompressParameters.ts
@@ -4,6 +4,9 @@ import { useBaseParameters, BaseParametersHook } from '@app/hooks/tools/shared/u
 export interface CompressParameters extends BaseParameters {
   compressionLevel: number;
   grayscale: boolean;
+  lineArt: boolean;
+  lineArtThreshold: number;
+  lineArtEdgeLevel: 1 | 2 | 3;
   expectedSize: string;
   compressionMethod: 'quality' | 'filesize';
   fileSizeValue: string;
@@ -13,6 +16,9 @@ export interface CompressParameters extends BaseParameters {
 export const defaultParameters: CompressParameters = {
   compressionLevel: 5,
   grayscale: false,
+  lineArt: false,
+  lineArtThreshold: 50,
+  lineArtEdgeLevel: 3,
   expectedSize: '',
   compressionMethod: 'quality',
   fileSizeValue: '',
diff --git a/frontend/src/core/hooks/tools/convert/useConvertOperation.ts b/frontend/src/core/hooks/tools/convert/useConvertOperation.ts
index 9134c9db4..9650ac0e2 100644
--- a/frontend/src/core/hooks/tools/convert/useConvertOperation.ts
+++ b/frontend/src/core/hooks/tools/convert/useConvertOperation.ts
@@ -3,8 +3,8 @@ import apiClient from '@app/services/apiClient';
 import { useTranslation } from 'react-i18next';
 import { ConvertParameters, defaultParameters } from '@app/hooks/tools/convert/useConvertParameters';
 import { createFileFromApiResponse } from '@app/utils/fileResponseUtils';
-import { useToolOperation, ToolType } from '@app/hooks/tools/shared/useToolOperation';
-import { getEndpointUrl, isImageFormat, isWebFormat } from '@app/utils/convertUtils';
+import { useToolOperation, ToolType, CustomProcessorResult } from '@app/hooks/tools/shared/useToolOperation';
+import { getEndpointUrl, isImageFormat, isWebFormat, isOfficeFormat } from '@app/utils/convertUtils';
 
 // Static function that can be used by both the hook and automation executor
 export const shouldProcessFilesSeparately = (
@@ -21,6 +21,10 @@ export const shouldProcessFilesSeparately = (
     (parameters.fromExtension === 'pdf' && parameters.toExtension === 'pdfa') ||
     // PDF to text-like formats should be one output per input
     (parameters.fromExtension === 'pdf' && ['txt', 'rtf', 'csv'].includes(parameters.toExtension)) ||
+    // PDF to office format conversions (each PDF should generate its own office file)
+    (parameters.fromExtension === 'pdf' && isOfficeFormat(parameters.toExtension)) ||
+    // Office files to PDF conversions (each file should be processed separately via LibreOffice)
+    (isOfficeFormat(parameters.fromExtension) && parameters.toExtension === 'pdf') ||
     // Web files to PDF conversions (each web file should generate its own PDF)
     ((isWebFormat(parameters.fromExtension) || parameters.fromExtension === 'web') &&
      parameters.toExtension === 'pdf') ||
@@ -98,7 +102,7 @@ export const createFileFromResponse = (
 export const convertProcessor = async (
   parameters: ConvertParameters,
   selectedFiles: File[]
-): Promise<File[]> => {
+): Promise<CustomProcessorResult> => {
   const processedFiles: File[] = [];
   const endpoint = getEndpointUrl(parameters.fromExtension, parameters.toExtension);
 
@@ -107,7 +111,9 @@ export const convertProcessor = async (
   }
 
   // Convert-specific routing logic: decide batch vs individual processing
-  if (shouldProcessFilesSeparately(selectedFiles, parameters)) {
+  const isSeparateProcessing = shouldProcessFilesSeparately(selectedFiles, parameters);
+
+  if (isSeparateProcessing) {
     // Individual processing for complex cases (PDF→image, smart detection, etc.)
     for (const file of selectedFiles) {
       try {
@@ -134,7 +140,14 @@ export const convertProcessor = async (
     processedFiles.push(convertedFile);
   }
 
-  return processedFiles;
+  // When batch processing multiple files into one output (e.g., 3 images → 1 PDF),
+  // mark all inputs as consumed even though there's only 1 output file
+  const isCombiningMultiple = !isSeparateProcessing && selectedFiles.length > 1;
+
+  return {
+    files: processedFiles,
+    consumedAllInputs: isCombiningMultiple,
+  };
 };
 
 // Static configuration object
@@ -151,7 +164,7 @@ export const useConvertOperation = () => {
   const customConvertProcessor = useCallback(async (
     parameters: ConvertParameters,
     selectedFiles: File[]
-  ): Promise<File[]> => {
+  ): Promise<CustomProcessorResult> => {
     return convertProcessor(parameters, selectedFiles);
   }, []);
 
diff --git a/frontend/src/core/hooks/tools/extractPages/useExtractPagesOperation.ts b/frontend/src/core/hooks/tools/extractPages/useExtractPagesOperation.ts
index 086fd65cc..687dde170 100644
--- a/frontend/src/core/hooks/tools/extractPages/useExtractPagesOperation.ts
+++ b/frontend/src/core/hooks/tools/extractPages/useExtractPagesOperation.ts
@@ -1,6 +1,6 @@
 import apiClient from '@app/services/apiClient';
 import { useTranslation } from 'react-i18next';
-import { ToolType, useToolOperation } from '@app/hooks/tools/shared/useToolOperation';
+import { ToolType, useToolOperation, CustomProcessorResult } from '@app/hooks/tools/shared/useToolOperation';
 import { createStandardErrorHandler } from '@app/utils/toolErrorHandler';
 import { ExtractPagesParameters, defaultParameters } from '@app/hooks/tools/extractPages/useExtractPagesParameters';
 import { pdfWorkerManager } from '@app/services/pdfWorkerManager';
@@ -23,7 +23,7 @@ async function resolveSelectionToCsv(expression: string, file: File): Promise<st
 export const extractPagesOperationConfig = {
   toolType: ToolType.custom,
   operationType: 'extractPages',
-  customProcessor: async (parameters: ExtractPagesParameters, files: File[]): Promise<File[]> => {
+  customProcessor: async (parameters: ExtractPagesParameters, files: File[]): Promise<CustomProcessorResult> => {
     const outputs: File[] = [];
 
     for (const file of files) {
@@ -43,7 +43,10 @@ export const extractPagesOperationConfig = {
       outputs.push(outFile);
     }
 
-    return outputs;
+    return {
+      files: outputs,
+      consumedAllInputs: false,
+    };
   },
   defaultParameters,
 } as const;
diff --git a/frontend/src/core/hooks/tools/getPdfInfo/useGetPdfInfoOperation.ts b/frontend/src/core/hooks/tools/getPdfInfo/useGetPdfInfoOperation.ts
new file mode 100644
index 000000000..019968bca
--- /dev/null
+++ b/frontend/src/core/hooks/tools/getPdfInfo/useGetPdfInfoOperation.ts
@@ -0,0 +1,194 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import apiClient from '@app/services/apiClient';
+import { useFileContext } from '@app/contexts/file/fileHooks';
+import { ToolOperationHook } from '@app/hooks/tools/shared/useToolOperation';
+import type { StirlingFile } from '@app/types/fileContext';
+import { extractErrorMessage } from '@app/utils/toolErrorHandler';
+import {
+  PdfInfoReportEntry,
+  INFO_JSON_FILENAME,
+} from '@app/types/getPdfInfo';
+import type { GetPdfInfoParameters } from '@app/hooks/tools/getPdfInfo/useGetPdfInfoParameters';
+
+export interface GetPdfInfoOperationHook extends ToolOperationHook<GetPdfInfoParameters> {
+  results: PdfInfoReportEntry[];
+}
+
+export const useGetPdfInfoOperation = (): GetPdfInfoOperationHook => {
+  const { t } = useTranslation();
+  const { selectors } = useFileContext();
+  const [isLoading, setIsLoading] = useState(false);
+  const [status, setStatus] = useState('');
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const [files, setFiles] = useState<File[]>([]);
+  const [downloadUrl, setDownloadUrl] = useState<string | null>(null);
+  const [downloadFilename, setDownloadFilename] = useState('');
+  const [results, setResults] = useState<PdfInfoReportEntry[]>([]);
+
+  const cancelRequested = useRef(false);
+  const previousUrl = useRef<string | null>(null);
+
+  const cleanupDownloadUrl = useCallback(() => {
+    if (previousUrl.current) {
+      URL.revokeObjectURL(previousUrl.current);
+      previousUrl.current = null;
+    }
+  }, []);
+
+  const resetResults = useCallback(() => {
+    cancelRequested.current = false;
+    setResults([]);
+    setFiles([]);
+    cleanupDownloadUrl();
+    setDownloadUrl(null);
+    setDownloadFilename('');
+    setStatus('');
+    setErrorMessage(null);
+  }, [cleanupDownloadUrl]);
+
+  const clearError = useCallback(() => {
+    setErrorMessage(null);
+  }, []);
+
+  const executeOperation = useCallback(
+    async (_params: GetPdfInfoParameters, selectedFiles: StirlingFile[]) => {
+      if (selectedFiles.length === 0) {
+        setErrorMessage(t('noFileSelected', 'No files selected'));
+        return;
+      }
+
+      cancelRequested.current = false;
+      setIsLoading(true);
+      setStatus(t('getPdfInfo.processing', 'Extracting information...'));
+      setErrorMessage(null);
+      setResults([]);
+      setFiles([]);
+      cleanupDownloadUrl();
+      setDownloadUrl(null);
+      setDownloadFilename('');
+
+      try {
+        const aggregated: PdfInfoReportEntry[] = [];
+        const generatedAt = Date.now();
+
+        for (const file of selectedFiles) {
+          if (cancelRequested.current) break;
+
+          const formData = new FormData();
+          formData.append('fileInput', file);
+
+          try {
+            const response = await apiClient.post('/api/v1/security/get-info-on-pdf', formData, {
+              headers: { 'Content-Type': 'multipart/form-data' },
+            });
+
+            const stub = selectors.getStirlingFileStub(file.fileId);
+            const entry: PdfInfoReportEntry = {
+              fileId: file.fileId,
+              fileName: file.name,
+              fileSize: file.size ?? null,
+              lastModified: file.lastModified ?? null,
+              thumbnailUrl: stub?.thumbnailUrl ?? null,
+              data: response.data ?? {},
+              error: null,
+              summaryGeneratedAt: generatedAt,
+            };
+            aggregated.push(entry);
+          } catch (error) {
+            const stub = selectors.getStirlingFileStub(file.fileId);
+            aggregated.push({
+              fileId: file.fileId,
+              fileName: file.name,
+              fileSize: file.size ?? null,
+              lastModified: file.lastModified ?? null,
+              thumbnailUrl: stub?.thumbnailUrl ?? null,
+              data: {},
+              error: extractErrorMessage(error),
+              summaryGeneratedAt: generatedAt,
+            });
+          }
+        }
+
+        if (!cancelRequested.current) {
+          setResults(aggregated);
+          if (aggregated.length > 0) {
+            // Build V1-compatible JSON: use backend payloads directly.
+            const payloads = aggregated
+              .filter((e) => !e.error)
+              .map((e) => e.data);
+            const content = payloads.length === 1 ? payloads[0] : payloads;
+            const json = JSON.stringify(content, null, 2);
+            const resultFile = new File([json], INFO_JSON_FILENAME, { type: 'application/json' });
+            setFiles([resultFile]);
+          }
+
+          const anyError = aggregated.some((item) => item.error);
+          if (anyError) {
+            setErrorMessage(t('getPdfInfo.error.partial', 'Some files could not be processed.'));
+          }
+          setStatus(t('getPdfInfo.status.complete', 'Extraction complete'));
+        }
+      } catch (e) {
+        console.error('[getPdfInfo] unexpected failure', e);
+        setErrorMessage(t('getPdfInfo.error.unexpected', 'Unexpected error during extraction.'));
+      } finally {
+        setIsLoading(false);
+      }
+    },
+    [cleanupDownloadUrl, selectors, t]
+  );
+
+  const cancelOperation = useCallback(() => {
+    if (isLoading) {
+      cancelRequested.current = true;
+      setIsLoading(false);
+      setStatus(t('operationCancelled', 'Operation cancelled'));
+    }
+  }, [isLoading, t]);
+
+  const undoOperation = useCallback(async () => {
+    resetResults();
+  }, [resetResults]);
+
+  useEffect(() => {
+    return () => {
+      cleanupDownloadUrl();
+    };
+  }, [cleanupDownloadUrl]);
+
+  return useMemo<GetPdfInfoOperationHook>(
+    () => ({
+      files,
+      thumbnails: [],
+      isGeneratingThumbnails: false,
+      downloadUrl,
+      downloadFilename,
+      isLoading,
+      status,
+      errorMessage,
+      progress: null,
+      executeOperation,
+      resetResults,
+      clearError,
+      cancelOperation,
+      undoOperation,
+      results,
+    }),
+    [
+      cancelOperation,
+      clearError,
+      downloadFilename,
+      downloadUrl,
+      errorMessage,
+      executeOperation,
+      files,
+      isLoading,
+      resetResults,
+      results,
+      status,
+    ]
+  );
+};
+
+
diff --git a/frontend/src/core/hooks/tools/getPdfInfo/useGetPdfInfoParameters.ts b/frontend/src/core/hooks/tools/getPdfInfo/useGetPdfInfoParameters.ts
new file mode 100644
index 000000000..488484809
--- /dev/null
+++ b/frontend/src/core/hooks/tools/getPdfInfo/useGetPdfInfoParameters.ts
@@ -0,0 +1,19 @@
+import { BaseParameters } from '@app/types/parameters';
+import { useBaseParameters, BaseParametersHook } from '@app/hooks/tools/shared/useBaseParameters';
+
+export interface GetPdfInfoParameters extends BaseParameters {
+  // No parameters needed
+}
+
+export const defaultParameters: GetPdfInfoParameters = {};
+
+export type GetPdfInfoParametersHook = BaseParametersHook<GetPdfInfoParameters>;
+
+export const useGetPdfInfoParameters = (): GetPdfInfoParametersHook => {
+  return useBaseParameters({
+    defaultParameters,
+    endpointName: 'get-info-on-pdf',
+  });
+};
+
+
diff --git a/frontend/src/core/hooks/tools/removeAnnotations/useRemoveAnnotationsOperation.ts b/frontend/src/core/hooks/tools/removeAnnotations/useRemoveAnnotationsOperation.ts
index 4078b2b07..e4b176c8d 100644
--- a/frontend/src/core/hooks/tools/removeAnnotations/useRemoveAnnotationsOperation.ts
+++ b/frontend/src/core/hooks/tools/removeAnnotations/useRemoveAnnotationsOperation.ts
@@ -1,10 +1,10 @@
 import { useTranslation } from 'react-i18next';
-import { useToolOperation, ToolType } from '@app/hooks/tools/shared/useToolOperation';
+import { useToolOperation, ToolType, CustomProcessorResult } from '@app/hooks/tools/shared/useToolOperation';
 import { createStandardErrorHandler } from '@app/utils/toolErrorHandler';
 import { RemoveAnnotationsParameters, defaultParameters } from '@app/hooks/tools/removeAnnotations/useRemoveAnnotationsParameters';
 import { PDFDocument, PDFName, PDFRef, PDFDict } from 'pdf-lib';
 // Client-side PDF processing using PDF-lib
-const removeAnnotationsProcessor = async (_parameters: RemoveAnnotationsParameters, files: File[]): Promise<File[]> => {
+const removeAnnotationsProcessor = async (_parameters: RemoveAnnotationsParameters, files: File[]): Promise<CustomProcessorResult> => {
   const processedFiles: File[] = [];
 
   for (const file of files) {
@@ -75,7 +75,10 @@ const removeAnnotationsProcessor = async (_parameters: RemoveAnnotationsParamete
     }
   }
 
-  return processedFiles;
+  return {
+    files: processedFiles,
+    consumedAllInputs: false,
+  };
 };
 
 // Static configuration object
diff --git a/frontend/src/core/hooks/tools/shared/useBaseTool.ts b/frontend/src/core/hooks/tools/shared/useBaseTool.ts
index aad6556ea..1b8db3bd1 100644
--- a/frontend/src/core/hooks/tools/shared/useBaseTool.ts
+++ b/frontend/src/core/hooks/tools/shared/useBaseTool.ts
@@ -47,6 +47,10 @@ export function useBaseTool<TParams, TParamsHook extends BaseParametersHook<TPar
   const { selectedFiles } = useFileSelection();
   const previousFileCount = useRef(selectedFiles.length);
 
+  // Prevent reset immediately after operation completes (when consumeFiles auto-selects outputs)
+  const skipNextSelectionResetRef = useRef(false);
+  const previousSelectionRef = useRef<string>('');
+
   // Tool-specific hooks
   const params = useParams();
   const operation = useOperation();
@@ -54,19 +58,45 @@ export function useBaseTool<TParams, TParamsHook extends BaseParametersHook<TPar
   // Endpoint validation using parameters hook
   const { enabled: endpointEnabled, loading: endpointLoading } = useEndpointEnabled(params.getEndpointName());
 
+  // Standard computed state - defined early so it's available in useEffects
+  const hasFiles = selectedFiles.length >= minFiles;
+  const hasResults = operation.files.length > 0 || operation.downloadUrl !== null;
+  const settingsCollapsed = !hasFiles || hasResults;
+
   // Reset results when parameters change
   useEffect(() => {
     operation.resetResults();
     onPreviewFile?.(null);
   }, [params.parameters]);
 
-  // Reset results when selected files change
+  // When operation completes, flag the next selection change to skip reset
+  // (consumeFiles auto-selects outputs immediately after processing)
   useEffect(() => {
-    if (selectedFiles.length > 0) {
-      operation.resetResults();
-      onPreviewFile?.(null);
+    if (hasResults) {
+      skipNextSelectionResetRef.current = true;
     }
-  }, [selectedFiles.length]);
+  }, [hasResults]);
+
+  // Reset results when user manually changes file selection
+  useEffect(() => {
+    if (selectedFiles.length === 0) return;
+
+    const currentSelection = selectedFiles.map(f => f.fileId).sort().join(',');
+
+    if (currentSelection === previousSelectionRef.current) return; // No change
+
+    // Skip reset if this is the auto-selection after operation completed
+    if (skipNextSelectionResetRef.current) {
+      skipNextSelectionResetRef.current = false;
+      previousSelectionRef.current = currentSelection;
+      return;
+    }
+
+    // User manually selected different files - reset results
+    previousSelectionRef.current = currentSelection;
+    operation.resetResults();
+    onPreviewFile?.(null);
+  }, [selectedFiles]);
 
   // Reset parameters when transitioning from 0 files to at least 1 file
   useEffect(() => {
@@ -101,6 +131,7 @@ export function useBaseTool<TParams, TParamsHook extends BaseParametersHook<TPar
   }, [onPreviewFile, toolName]);
 
   const handleSettingsReset = useCallback(() => {
+    skipNextSelectionResetRef.current = false;
     operation.resetResults();
     onPreviewFile?.(null);
   }, [operation, onPreviewFile]);
@@ -110,11 +141,6 @@ export function useBaseTool<TParams, TParamsHook extends BaseParametersHook<TPar
     onPreviewFile?.(null);
   }, [operation, onPreviewFile]);
 
-  // Standard computed state
-  const hasFiles = selectedFiles.length >= minFiles;
-  const hasResults = operation.files.length > 0 || operation.downloadUrl !== null;
-  const settingsCollapsed = !hasFiles || hasResults;
-
   return {
     // File management
     selectedFiles,
diff --git a/frontend/src/core/hooks/tools/shared/useToolApiCalls.ts b/frontend/src/core/hooks/tools/shared/useToolApiCalls.ts
index a8e6a88a0..1ab8925f1 100644
--- a/frontend/src/core/hooks/tools/shared/useToolApiCalls.ts
+++ b/frontend/src/core/hooks/tools/shared/useToolApiCalls.ts
@@ -4,6 +4,7 @@ import apiClient from '@app/services/apiClient'; // Our configured instance
 import { processResponse, ResponseHandler } from '@app/utils/toolResponseProcessor';
 import { isEmptyOutput } from '@app/services/errorUtils';
 import type { ProcessingProgress } from '@app/hooks/tools/shared/useToolState';
+import type { StirlingFile, FileId } from '@app/types/fileContext';
 
 export interface ApiCallsConfig<TParams = void> {
   endpoint: string | ((params: TParams) => string);
@@ -18,14 +19,14 @@ export const useToolApiCalls = <TParams = void>() => {
 
   const processFiles = useCallback(async (
     params: TParams,
-    validFiles: File[],
+    validFiles: StirlingFile[],
     config: ApiCallsConfig<TParams>,
     onProgress: (progress: ProcessingProgress) => void,
     onStatus: (status: string) => void,
-    markFileError?: (fileId: string) => void,
-  ): Promise<{ outputFiles: File[]; successSourceIds: string[] }> => {
+    markFileError?: (fileId: FileId) => void,
+  ): Promise<{ outputFiles: File[]; successSourceIds: FileId[] }> => {
     const processedFiles: File[] = [];
-    const successSourceIds: string[] = [];
+    const successSourceIds: FileId[] = [];
     const failedFiles: string[] = [];
     const total = validFiles.length;
 
@@ -35,7 +36,7 @@ export const useToolApiCalls = <TParams = void>() => {
     for (let i = 0; i < validFiles.length; i++) {
       const file = validFiles[i];
 
-      console.debug('[processFiles] Start', { index: i, total, name: file.name, fileId: (file as any).fileId });
+      console.debug('[processFiles] Start', { index: i, total, name: file.name, fileId: file.fileId });
       onProgress({ current: i + 1, total, currentFileName: file.name });
       onStatus(`Processing ${file.name} (${i + 1}/${total})`);
 
@@ -47,7 +48,7 @@ export const useToolApiCalls = <TParams = void>() => {
           responseType: 'blob',
           cancelToken: cancelTokenRef.current?.token,
         });
-        console.debug('[processFiles] Response OK', { name: file.name, status: (response as any)?.status });
+        console.debug('[processFiles] Response OK', { name: file.name, status: response.status });
 
         // Forward to shared response processor (uses tool-specific responseHandler if provided)
         const responseFiles = await processResponse(
@@ -63,7 +64,7 @@ export const useToolApiCalls = <TParams = void>() => {
           console.warn('[processFiles] Empty output treated as failure', { name: file.name });
           failedFiles.push(file.name);
           try {
-            (markFileError as any)?.((file as any).fileId);
+            markFileError?.(file.fileId);
           } catch (e) {
             console.debug('markFileError', e);
           }
@@ -71,7 +72,7 @@ export const useToolApiCalls = <TParams = void>() => {
         }
         processedFiles.push(...responseFiles);
         // record source id as successful
-        successSourceIds.push((file as any).fileId);
+        successSourceIds.push(file.fileId);
         console.debug('[processFiles] Success', { name: file.name, produced: responseFiles.length });
 
       } catch (error) {
@@ -82,7 +83,7 @@ export const useToolApiCalls = <TParams = void>() => {
         failedFiles.push(file.name);
         // mark errored file so UI can highlight
         try {
-          (markFileError as any)?.((file as any).fileId);
+          markFileError?.(file.fileId);
         } catch (e) {
           console.debug('markFileError', e);
         }
diff --git a/frontend/src/core/hooks/tools/shared/useToolOperation.ts b/frontend/src/core/hooks/tools/shared/useToolOperation.ts
index e1dccd1e7..4804032d0 100644
--- a/frontend/src/core/hooks/tools/shared/useToolOperation.ts
+++ b/frontend/src/core/hooks/tools/shared/useToolOperation.ts
@@ -8,6 +8,7 @@ import { useToolResources } from '@app/hooks/tools/shared/useToolResources';
 import { extractErrorMessage } from '@app/utils/toolErrorHandler';
 import { StirlingFile, extractFiles, FileId, StirlingFileStub, createStirlingFile } from '@app/types/fileContext';
 import { FILE_EVENTS } from '@app/services/errorUtils';
+import { getFilenameWithoutExtension } from '@app/utils/fileUtils';
 import { ResponseHandler } from '@app/utils/toolResponseProcessor';
 import { createChildStub, generateProcessedFileMetadata } from '@app/contexts/file/fileActions';
 import { ToolOperation } from '@app/types/file';
@@ -23,6 +24,20 @@ export enum ToolType {
   custom,
 }
 
+/**
+ * Result from custom processor with optional metadata about input consumption.
+ */
+export interface CustomProcessorResult {
+  /** Processed output files */
+  files: File[];
+  /**
+   * When true, marks all input files as successfully consumed regardless of output count.
+   * Use when operation combines N inputs into fewer outputs (e.g., 3 images → 1 PDF).
+   * When false/undefined, uses filename-based mapping to determine which inputs succeeded.
+   */
+  consumedAllInputs?: boolean;
+}
+
 /**
  * Configuration for tool operations defining processing behavior and API integration.
  *
@@ -98,8 +113,12 @@ export interface CustomToolOperationConfig<TParams> extends BaseToolOperationCon
    * Custom processing logic that completely bypasses standard file processing.
    * This tool handles all API calls, response processing, and file creation.
    * Use for tools with complex routing logic or non-standard processing requirements.
+   *
+   * Returns CustomProcessorResult with:
+   * - files: Processed output files
+   * - consumedAllInputs: true if operation combines N inputs → fewer outputs
    */
-  customProcessor: (params: TParams, files: File[]) => Promise<File[]>;
+  customProcessor: (params: TParams, files: File[]) => Promise<CustomProcessorResult>;
 }
 
 export type ToolOperationConfig<TParams = void> = SingleFileToolOperationConfig<TParams> | MultiFileToolOperationConfig<TParams> | CustomToolOperationConfig<TParams>;
@@ -172,17 +191,17 @@ export const useToolOperation = <TParams>(
     }
 
     // Handle zero-byte inputs explicitly: mark as error and continue with others
-    const zeroByteFiles = selectedFiles.filter(file => (file as any)?.size === 0);
+    const zeroByteFiles = selectedFiles.filter(file => file.size === 0);
     if (zeroByteFiles.length > 0) {
       try {
         for (const f of zeroByteFiles) {
-          (fileActions.markFileError as any)((f as any).fileId);
+          fileActions.markFileError(f.fileId);
         }
       } catch (e) {
         console.log('markFileError', e);
       }
     }
-    const validFiles = selectedFiles.filter(file => (file as any)?.size > 0);
+    const validFiles: StirlingFile[] = selectedFiles.filter(file => file.size > 0);
     if (validFiles.length === 0) {
       actions.setError(t('noValidFiles', 'No valid files to process'));
       return;
@@ -215,7 +234,7 @@ export const useToolOperation = <TParams>(
 
       try {
       let processedFiles: File[];
-        let successSourceIds: string[] = [];
+        let successSourceIds: FileId[] = [];
 
       // Use original files directly (no PDF metadata injection - history stored in IndexedDB)
       const filesForAPI = extractFiles(validFiles);
@@ -233,14 +252,14 @@ export const useToolOperation = <TParams>(
           console.debug('[useToolOperation] Multi-file start', { count: filesForAPI.length });
           const result = await processFiles(
             params,
-            filesForAPI,
+            validFiles,
             apiCallsConfig,
             actions.setProgress,
             actions.setStatus,
-            fileActions.markFileError as any
+            fileActions.markFileError
           );
           processedFiles = result.outputFiles;
-          successSourceIds = result.successSourceIds as any;
+          successSourceIds = result.successSourceIds;
           console.debug('[useToolOperation] Multi-file results', { outputFiles: processedFiles.length, successSources: result.successSourceIds.length });
           break;
         }
@@ -268,30 +287,40 @@ export const useToolOperation = <TParams>(
             processedFiles = await extractZipFiles(response.data);
           }
           // Assume all inputs succeeded together unless server provided an error earlier
-          successSourceIds = validFiles.map(f => (f as any).fileId) as any;
+          successSourceIds = validFiles.map(f => f.fileId);
           break;
         }
 
         case ToolType.custom: {
           actions.setStatus('Processing files...');
-          processedFiles = await config.customProcessor(params, filesForAPI);
-          // Try to map outputs back to inputs by filename (before extension)
-          const inputBaseNames = new Map<string, string>();
-          for (const f of validFiles) {
-            const base = (f.name || '').replace(/\.[^.]+$/, '').toLowerCase();
-            inputBaseNames.set(base, (f as any).fileId);
-          }
-          const mappedSuccess: string[] = [];
-          for (const out of processedFiles) {
-            const base = (out.name || '').replace(/\.[^.]+$/, '').toLowerCase();
-            const id = inputBaseNames.get(base);
-            if (id) mappedSuccess.push(id);
-          }
-          // Fallback to naive alignment if names don't match
-          if (mappedSuccess.length === 0) {
-            successSourceIds = validFiles.slice(0, processedFiles.length).map(f => (f as any).fileId) as any;
+          const result = await config.customProcessor(params, filesForAPI);
+
+          processedFiles = result.files;
+          const consumedAllInputs = result.consumedAllInputs || false;
+
+          // If consumedAllInputs flag is set, mark all inputs as successful
+          // (used for operations that combine N inputs into fewer outputs)
+          if (consumedAllInputs) {
+            successSourceIds = validFiles.map(f => f.fileId);
           } else {
-            successSourceIds = mappedSuccess as any;
+            // Try to map outputs back to inputs by filename (before extension)
+            const inputBaseNames = new Map<string, FileId>();
+            for (const f of validFiles) {
+              const base = getFilenameWithoutExtension(f.name || '');
+              inputBaseNames.set(base, f.fileId);
+            }
+            const mappedSuccess: FileId[] = [];
+            for (const out of processedFiles) {
+              const base = getFilenameWithoutExtension(out.name || '');
+              const id = inputBaseNames.get(base);
+              if (id) mappedSuccess.push(id);
+            }
+            // Fallback to naive alignment if names don't match
+            if (mappedSuccess.length === 0) {
+              successSourceIds = validFiles.slice(0, processedFiles.length).map(f => f.fileId);
+            } else {
+              successSourceIds = mappedSuccess;
+            }
           }
           break;
         }
@@ -299,16 +328,16 @@ export const useToolOperation = <TParams>(
 
       // Normalize error flags across tool types: mark failures, clear successes
       try {
-        const allInputIds = validFiles.map(f => (f as any).fileId) as unknown as string[];
-        const okSet = new Set((successSourceIds as unknown as string[]) || []);
+        const allInputIds = validFiles.map(f => f.fileId);
+        const okSet = new Set(successSourceIds);
         // Clear errors on successes
         for (const okId of okSet) {
-          try { (fileActions.clearFileError as any)(okId); } catch (_e) { void _e; }
+          try { fileActions.clearFileError(okId); } catch (_e) { void _e; }
         }
         // Mark errors on inputs that didn't succeed
         for (const id of allInputIds) {
           if (!okSet.has(id)) {
-            try { (fileActions.markFileError as any)(id); } catch (_e) { void _e; }
+            try { fileActions.markFileError(id); } catch (_e) { void _e; }
           }
         }
       } catch (_e) { void _e; }
@@ -316,12 +345,12 @@ export const useToolOperation = <TParams>(
       if (externalErrorFileIds.length > 0) {
         // If backend told us which sources failed, prefer that mapping
         successSourceIds = validFiles
-          .map(f => (f as any).fileId)
-          .filter(id => !externalErrorFileIds.includes(id)) as any;
+          .map(f => f.fileId)
+          .filter(id => !externalErrorFileIds.includes(id));
         // Also mark failed IDs immediately
         try {
           for (const badId of externalErrorFileIds) {
-            (fileActions.markFileError as any)(badId);
+            fileActions.markFileError(badId as FileId);
           }
         } catch (_e) { void _e; }
       }
@@ -370,7 +399,7 @@ export const useToolOperation = <TParams>(
         );
         // Always create child stubs linking back to the successful source inputs
         const successInputStubs = successSourceIds
-          .map((id) => selectors.getStirlingFileStub(id as any))
+          .map((id) => selectors.getStirlingFileStub(id))
           .filter(Boolean) as StirlingFileStub[];
 
         if (successInputStubs.length !== processedFiles.length) {
@@ -396,7 +425,7 @@ export const useToolOperation = <TParams>(
           return createStirlingFile(file, childStub.id);
         });
         // Build consumption arrays aligned to the successful source IDs
-        const toConsumeInputIds = successSourceIds.filter((id: string) => inputFileIds.includes(id as any)) as unknown as FileId[];
+        const toConsumeInputIds = successSourceIds.filter((id) => inputFileIds.includes(id));
         // Outputs and stubs are already ordered by success sequence
         console.debug('[useToolOperation] Consuming files', { inputCount: inputFileIds.length, toConsume: toConsumeInputIds.length });
         const outputFileIds = await consumeFiles(toConsumeInputIds, outputStirlingFiles, outputStirlingFileStubs);
@@ -413,25 +442,27 @@ export const useToolOperation = <TParams>(
     } catch (error: any) {
       // Centralized 422 handler: mark provided IDs in errorFileIds
       try {
-        const status = (error?.response?.status as number | undefined);
-        if (status === 422) {
+        const status = error?.response?.status;
+        if (typeof status === 'number' && status === 422) {
           const payload = error?.response?.data;
-          let parsed: any = payload;
+          let parsed: unknown = payload;
           if (typeof payload === 'string') {
             try { parsed = JSON.parse(payload); } catch { parsed = payload; }
-          } else if (payload && typeof (payload as any).text === 'function') {
+          } else if (payload && typeof (payload as Blob).text === 'function') {
             // Blob or Response-like object from axios when responseType='blob'
             const text = await (payload as Blob).text();
             try { parsed = JSON.parse(text); } catch { parsed = text; }
           }
-          let ids: string[] | undefined = Array.isArray(parsed?.errorFileIds) ? parsed.errorFileIds : undefined;
+          let ids: string[] | undefined = Array.isArray((parsed as { errorFileIds?: unknown })?.errorFileIds)
+            ? (parsed as { errorFileIds: string[] }).errorFileIds
+            : undefined;
           if (!ids && typeof parsed === 'string') {
             const match = parsed.match(/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/g);
             if (match && match.length > 0) ids = Array.from(new Set(match));
           }
           if (ids && ids.length > 0) {
             for (const badId of ids) {
-              try { (fileActions.markFileError as any)(badId); } catch (_e) { void _e; }
+              try { fileActions.markFileError(badId as FileId); } catch (_e) { void _e; }
             }
             actions.setStatus('Process failed due to invalid/corrupted file(s)');
             // Avoid duplicating toast messaging here
diff --git a/frontend/src/core/hooks/tools/sign/useSavedSignatures.ts b/frontend/src/core/hooks/tools/sign/useSavedSignatures.ts
index 655038a3f..b878dcd0d 100644
--- a/frontend/src/core/hooks/tools/sign/useSavedSignatures.ts
+++ b/frontend/src/core/hooks/tools/sign/useSavedSignatures.ts
@@ -1,7 +1,9 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { signatureStorageService, type StorageType } from '@app/services/signatureStorageService';
+import { useAppConfig } from '@app/contexts/AppConfigContext';
 
-export const MAX_SAVED_SIGNATURES = 10;
+export const MAX_SAVED_SIGNATURES_BACKEND = 20; // Backend limit per user
+export const MAX_SAVED_SIGNATURES_LOCALSTORAGE = 10; // LocalStorage limit
 
 export type SavedSignatureType = 'canvas' | 'image' | 'text';
 export type SignatureScope = 'personal' | 'shared' | 'localStorage';
@@ -49,6 +51,8 @@ export const useSavedSignatures = () => {
   const [savedSignatures, setSavedSignatures] = useState<SavedSignature[]>([]);
   const [storageType, setStorageType] = useState<StorageType | null>(null);
   const [isLoading, setIsLoading] = useState(true);
+  const { config } = useAppConfig();
+  const isAdmin = config?.isAdmin ?? false;
 
   // Load signatures and detect storage type on mount
   useEffect(() => {
@@ -97,7 +101,9 @@ export const useSavedSignatures = () => {
     return () => window.removeEventListener('storage', syncFromStorage);
   }, [storageType]);
 
-  const isAtCapacity = savedSignatures.length >= MAX_SAVED_SIGNATURES;
+  // Different limits for backend vs localStorage
+  const maxLimit = storageType === 'backend' ? MAX_SAVED_SIGNATURES_BACKEND : MAX_SAVED_SIGNATURES_LOCALSTORAGE;
+  const isAtCapacity = savedSignatures.length >= maxLimit;
 
   const addSignature = useCallback(
     async (payload: SavedSignaturePayload, label?: string, scope?: SignatureScope): Promise<AddSignatureResult> => {
@@ -108,7 +114,7 @@ export const useSavedSignatures = () => {
         return { success: false, reason: 'invalid' };
       }
 
-      if (savedSignatures.length >= MAX_SAVED_SIGNATURES) {
+      if (isAtCapacity) {
         return { success: false, reason: 'limit' };
       }
 
@@ -146,17 +152,24 @@ export const useSavedSignatures = () => {
   const updateSignatureLabel = useCallback(async (id: string, nextLabel: string) => {
     try {
       await signatureStorageService.updateSignatureLabel(id, nextLabel);
-      setSavedSignatures(prev =>
-        prev.map(entry =>
-          entry.id === id
-            ? { ...entry, label: nextLabel.trim() || entry.label || 'Signature', updatedAt: Date.now() }
-            : entry
-        )
-      );
+      // Reload signatures to get updated data from backend
+      if (storageType === 'backend') {
+        const signatures = await signatureStorageService.loadSignatures();
+        setSavedSignatures(signatures);
+      } else {
+        // For localStorage, update in place
+        setSavedSignatures(prev =>
+          prev.map(entry =>
+            entry.id === id
+              ? { ...entry, label: nextLabel.trim() || entry.label || 'Signature', updatedAt: Date.now() }
+              : entry
+          )
+        );
+      }
     } catch (error) {
       console.error('[useSavedSignatures] Failed to update signature label:', error);
     }
-  }, []);
+  }, [storageType]);
 
   const replaceSignature = useCallback(
     async (id: string, payload: SavedSignaturePayload) => {
@@ -201,6 +214,7 @@ export const useSavedSignatures = () => {
   return {
     savedSignatures,
     isAtCapacity,
+    maxLimit,
     addSignature,
     removeSignature,
     updateSignatureLabel,
@@ -209,6 +223,7 @@ export const useSavedSignatures = () => {
     byTypeCounts,
     storageType,
     isLoading,
+    isAdmin,
   };
 };
 
diff --git a/frontend/src/core/hooks/useServerExperience.ts b/frontend/src/core/hooks/useServerExperience.ts
index 8dd60069a..7b78a58d4 100644
--- a/frontend/src/core/hooks/useServerExperience.ts
+++ b/frontend/src/core/hooks/useServerExperience.ts
@@ -64,8 +64,11 @@ export function useServerExperience(): ServerExperienceValue {
 
   const loginEnabled = config?.enableLogin !== false;
   const configIsAdmin = Boolean(config?.isAdmin);
-  const effectiveIsAdmin = configIsAdmin || (!loginEnabled && selfReportedAdmin);
-  const hasPaidLicense = config?.license === 'PRO' || config?.license === 'ENTERPRISE';
+  // For no-login servers, treat everyone as a regular user (no effective admin)
+  // Commented out the previous self-reported admin path to avoid elevating users.
+  // const effectiveIsAdmin = configIsAdmin || (!loginEnabled && selfReportedAdmin);
+  const effectiveIsAdmin = loginEnabled ? configIsAdmin : false;
+  const hasPaidLicense = config?.license === 'SERVER' || config?.license === 'PRO' || config?.license === 'ENTERPRISE';
 
   const setSelfReportedAdmin = useCallback((value: boolean) => {
     setSelfReportedAdminState(value);
diff --git a/frontend/src/core/i18n.ts b/frontend/src/core/i18n.ts
index e3f3f7bd2..badc72949 100644
--- a/frontend/src/core/i18n.ts
+++ b/frontend/src/core/i18n.ts
@@ -105,33 +105,94 @@ i18n.on('languageChanged', (lng) => {
   document.documentElement.lang = lng;
 });
 
+export function normalizeLanguageCode(languageCode: string): string {
+  // Replace underscores with hyphens to align with i18next/translation file naming
+  const hyphenated = languageCode.replace(/_/g, '-');
+  const [base, ...rest] = hyphenated.split('-');
+
+  if (rest.length === 0) {
+    return base.toLowerCase();
+  }
+
+  const normalizedParts = rest.map(part => (part.length <= 3 ? part.toUpperCase() : part));
+  return [base.toLowerCase(), ...normalizedParts].join('-');
+}
+
+/**
+ * Convert language codes to underscore format (e.g., en-GB → en_GB)
+ * Used for backend API communication which expects underscore format
+ */
+export function toUnderscoreFormat(languageCode: string): string {
+  return languageCode.replace(/-/g, '_');
+}
+
+/**
+ * Convert array of language codes to underscore format
+ */
+export function toUnderscoreLanguages(languages: string[]): string[] {
+  return languages.map(toUnderscoreFormat);
+}
+
 /**
  * Updates the supported languages list dynamically based on config
  * If configLanguages is null/empty, all languages remain available
- * Otherwise, only specified languages plus 'en-GB' fallback are enabled
+ * Otherwise, only the specified languages are enabled with the first valid
+ * option (preferring en-GB when present) used as the fallback language.
+ *
+ * @param configLanguages - Optional array of language codes from server config (ui.languages)
+ * @param defaultLocale - Optional default language for new users (system.defaultLocale)
  */
-export function updateSupportedLanguages(configLanguages?: string[] | null) {
+export function updateSupportedLanguages(configLanguages?: string[] | null, defaultLocale?: string | null) {
+  // Normalize and validate default locale if provided
+  const normalizedDefault = defaultLocale ? normalizeLanguageCode(defaultLocale) : null;
+  const validDefault = normalizedDefault && normalizedDefault in supportedLanguages ? normalizedDefault : null;
+
   if (!configLanguages || configLanguages.length === 0) {
     // No filter specified - keep all languages
+    // But still apply default locale if provided and user has no preference
+    if (validDefault) {
+      applyDefaultLocale(validDefault);
+    }
     return;
   }
 
-  // Ensure fallback language is always included
-  const languagesToSupport = new Set(['en-GB', ...configLanguages]);
+  const validLanguages = configLanguages
+    .map(normalizeLanguageCode)
+    .filter(lang => lang in supportedLanguages);
 
-  // Filter to only valid language codes that exist in our translations
-  const validLanguages = Array.from(languagesToSupport).filter(
-    lang => lang in supportedLanguages
-  );
+  // If no valid languages were provided, keep existing configuration
+  if (validLanguages.length === 0) {
+    return;
+  }
 
-  if (validLanguages.length > 0) {
-    i18n.options.supportedLngs = validLanguages;
+  // Determine fallback: prefer validDefault if in the list, then en-GB, then first valid language
+  const fallback = validDefault && validLanguages.includes(validDefault)
+    ? validDefault
+    : validLanguages.includes('en-GB')
+      ? 'en-GB'
+      : validLanguages[0];
 
-    // If current language is not in the new supported list, switch to fallback
-    const currentLang = i18n.language;
-    if (currentLang && !validLanguages.includes(currentLang)) {
-      i18n.changeLanguage('en-GB');
-    }
+  i18n.options.supportedLngs = validLanguages;
+  i18n.options.fallbackLng = fallback;
+
+  // If current language is not in the new supported list, switch to fallback
+  const currentLang = normalizeLanguageCode(i18n.language || '');
+  if (currentLang && !validLanguages.includes(currentLang)) {
+    i18n.changeLanguage(fallback);
+  } else if (validDefault && !localStorage.getItem('i18nextLng')) {
+    // User has no saved preference - apply server default
+    i18n.changeLanguage(validDefault);
+  }
+}
+
+/**
+ * Apply server default locale when user has no saved language preference
+ * This respects the priority: localStorage > defaultLocale > browser detection > fallback
+ */
+function applyDefaultLocale(defaultLocale: string) {
+  // Only apply if user has no saved preference
+  if (!localStorage.getItem('i18nextLng')) {
+    i18n.changeLanguage(defaultLocale);
   }
 }
 
diff --git a/frontend/src/core/pages/HomePage.tsx b/frontend/src/core/pages/HomePage.tsx
index b629e86a5..c22a9624d 100644
--- a/frontend/src/core/pages/HomePage.tsx
+++ b/frontend/src/core/pages/HomePage.tsx
@@ -59,17 +59,21 @@ export default function HomePage() {
   const prevFileCountRef = useRef(activeFiles.length);
 
   // Auto-switch to viewer when going from 0 to 1 file
+  // Skip this if PDF Text Editor is active - it handles its own empty state
   useEffect(() => {
     const prevCount = prevFileCountRef.current;
     const currentCount = activeFiles.length;
 
     if (prevCount === 0 && currentCount === 1) {
-      actions.setWorkbench('viewer');
-      setActiveFileIndex(0);
+      // PDF Text Editor handles its own empty state with a dropzone
+      if (selectedToolKey !== 'pdfTextEditor') {
+        actions.setWorkbench('viewer');
+        setActiveFileIndex(0);
+      }
     }
 
     prevFileCountRef.current = currentCount;
-  }, [activeFiles.length, actions, setActiveFileIndex]);
+  }, [activeFiles.length, actions, setActiveFileIndex, selectedToolKey]);
 
   const brandAltText = t("home.mobile.brandAlt", "Stirling PDF logo");
   const brandIconSrc = useLogoPath();
diff --git a/frontend/src/core/services/accountService.ts b/frontend/src/core/services/accountService.ts
index 72d9f1873..cc8c2527f 100644
--- a/frontend/src/core/services/accountService.ts
+++ b/frontend/src/core/services/accountService.ts
@@ -56,4 +56,14 @@ export const accountService = {
     formData.append('newPassword', newPassword);
     await apiClient.post('/api/v1/user/change-password-on-login', formData);
   },
+
+  /**
+   * Change username
+   */
+  async changeUsername(newUsername: string, currentPassword: string): Promise<void> {
+    const formData = new FormData();
+    formData.append('currentPasswordChangeUsername', currentPassword);
+    formData.append('newUsername', newUsername);
+    await apiClient.post('/api/v1/user/change-username', formData);
+  },
 };
diff --git a/frontend/src/core/services/auditService.ts b/frontend/src/core/services/auditService.ts
index ac2da176b..30951b67b 100644
--- a/frontend/src/core/services/auditService.ts
+++ b/frontend/src/core/services/auditService.ts
@@ -49,7 +49,9 @@ const auditService = {
    * Get audit system status
    */
   async getSystemStatus(): Promise<AuditSystemStatus> {
-    const response = await apiClient.get<any>('/api/v1/proprietary/ui-data/audit-dashboard');
+    const response = await apiClient.get('/api/v1/proprietary/ui-data/audit-dashboard', {
+      suppressErrorToast: true,
+    });
     const data = response.data;
 
     // Map V1 response to expected format
diff --git a/frontend/src/core/services/signatureStorageService.ts b/frontend/src/core/services/signatureStorageService.ts
index 365a0cbc6..63dabe909 100644
--- a/frontend/src/core/services/signatureStorageService.ts
+++ b/frontend/src/core/services/signatureStorageService.ts
@@ -14,7 +14,6 @@ interface SignatureStorageCapabilities {
 class SignatureStorageService {
   private capabilities: SignatureStorageCapabilities | null = null;
   private detectionPromise: Promise<SignatureStorageCapabilities> | null = null;
-  private blobUrls: Set<string> = new Set();
 
   /**
    * Detect if backend supports signature storage API
@@ -83,9 +82,6 @@ class SignatureStorageService {
    * Load all signatures
    */
   async loadSignatures(): Promise<SavedSignature[]> {
-    // Clean up old blob URLs before loading new ones
-    this.cleanup();
-
     const capabilities = await this.detectCapabilities();
 
     if (capabilities.supportsBackend) {
@@ -130,9 +126,7 @@ class SignatureStorageService {
     const capabilities = await this.detectCapabilities();
 
     if (capabilities.supportsBackend) {
-      // Backend only stores images - labels not supported for backend signatures
-      console.log('[SignatureStorage] Label updates not supported for backend signatures');
-      return;
+      await this._updateLabelInBackend(id, label);
     } else {
       this._updateLabelInLocalStorage(id, label);
     }
@@ -144,7 +138,7 @@ class SignatureStorageService {
       const response = await apiClient.get<SavedSignature[]>('/api/v1/proprietary/signatures');
       const signatures = response.data;
 
-      // Fetch image data for each signature and convert to blob URLs
+      // Fetch image data for each signature and convert to data URLs
       const signaturePromises = signatures.map(async (sig) => {
         if (sig.dataUrl && sig.dataUrl.startsWith('/api/v1/general/signatures/')) {
           try {
@@ -153,14 +147,20 @@ class SignatureStorageService {
               responseType: 'arraybuffer',
             });
 
-            // Convert to blob URL
+            // Convert to data URL (base64) for both display and use
             const blob = new Blob([imageResponse.data], {
               type: imageResponse.headers['content-type'] || 'image/png',
             });
-            const blobUrl = URL.createObjectURL(blob);
-            this.blobUrls.add(blobUrl);
 
-            return { ...sig, dataUrl: blobUrl };
+            const dataUrl = await new Promise<string>((resolve, reject) => {
+              const reader = new FileReader();
+              reader.onloadend = () => resolve(reader.result as string);
+              reader.onerror = reject;
+              reader.readAsDataURL(blob);
+            });
+
+            // Use data URL for everything - more reliable than blob URLs
+            return { ...sig, dataUrl };
           } catch (error) {
             console.error(`[SignatureStorage] Failed to load image for ${sig.id}:`, error);
             return sig; // Return original if image fetch fails
@@ -184,6 +184,10 @@ class SignatureStorageService {
     await apiClient.delete(`/api/v1/proprietary/signatures/${id}`);
   }
 
+  private async _updateLabelInBackend(id: string, label: string): Promise<void> {
+    await apiClient.post(`/api/v1/proprietary/signatures/${id}/label`, { label });
+  }
+
   // LocalStorage methods
   private readonly STORAGE_KEY = 'stirling:saved-signatures:v1';
 
@@ -267,16 +271,6 @@ class SignatureStorageService {
 
     return { migrated, failed };
   }
-
-  /**
-   * Clean up blob URLs to prevent memory leaks
-   */
-  cleanup(): void {
-    this.blobUrls.forEach(url => {
-      URL.revokeObjectURL(url);
-    });
-    this.blobUrls.clear();
-  }
 }
 
 export const signatureStorageService = new SignatureStorageService();
diff --git a/frontend/src/core/setupTests.ts b/frontend/src/core/setupTests.ts
index 3ebb22fda..0e5e9737a 100644
--- a/frontend/src/core/setupTests.ts
+++ b/frontend/src/core/setupTests.ts
@@ -1,6 +1,40 @@
 import '@testing-library/jest-dom';
 import { vi } from 'vitest';
 
+// Mock localStorage for tests
+class LocalStorageMock implements Storage {
+  private store: Record<string, string> = {};
+
+  get length(): number {
+    return Object.keys(this.store).length;
+  }
+
+  clear(): void {
+    this.store = {};
+  }
+
+  getItem(key: string): string | null {
+    return this.store[key] ?? null;
+  }
+
+  key(index: number): string | null {
+    return Object.keys(this.store)[index] ?? null;
+  }
+
+  removeItem(key: string): void {
+    delete this.store[key];
+  }
+
+  setItem(key: string, value: string): void {
+    this.store[key] = value;
+  }
+}
+
+Object.defineProperty(window, 'localStorage', {
+  value: new LocalStorageMock(),
+  writable: true,
+});
+
 // Mock i18next for tests
 vi.mock('react-i18next', () => ({
   useTranslation: () => ({
diff --git a/frontend/src/core/styles/theme.css b/frontend/src/core/styles/theme.css
index 30991cf30..c43b330b0 100644
--- a/frontend/src/core/styles/theme.css
+++ b/frontend/src/core/styles/theme.css
@@ -256,6 +256,7 @@
   --header-selected-bg: #1E88E5; /* light mode selected header matches dark */
   --header-selected-fg: #FFFFFF;
   --file-card-bg: #FFFFFF;  /* file card background (light/dark paired) */
+  --accordion-item-bg: #E8EAED;  /* accordion item background - more distinguishable */
 
   /* shadows */
   --drop-shadow-color: rgba(0, 0, 0, 0.08);
@@ -519,6 +520,7 @@
   --header-selected-fg: #FFFFFF;
   /* file card background (dark) */
   --file-card-bg: #1F2329;
+  --accordion-item-bg: #373D45;  /* accordion item background - more distinguishable */
 
   /* shadows */
   --drop-shadow-color: rgba(255, 255, 255, 0.08);
@@ -615,6 +617,41 @@
   border-color: var(--landing-drop-inner-paper-border) !important;
 }
 
+/* Plan section card borders - only override in dark mode */
+[data-mantine-color-scheme="dark"] .plan-card {
+  --paper-border-color: rgb(158, 158, 158) !important;
+}
+
+[data-mantine-color-scheme="dark"] .plan-card [data-size="sm"] {
+  color: rgb(221, 221, 221) !important;
+}
+
+/* Current plan badge - use light mode green in dark mode */
+[data-mantine-color-scheme="dark"] .current-plan-badge {
+  background-color: var(--color-green-300) !important;
+}
+
+/* Plan section button colors */
+.plan-button:not(:disabled):not([data-disabled]) {
+  background-color: #0A8BFF !important;
+}
+
+[data-mantine-color-scheme="dark"] .plan-button:not(:disabled):not([data-disabled]) {
+  background-color: #1C598E !important;
+}
+
+/* Lighter grey for disabled plan buttons */
+.plan-button:disabled,
+.plan-button[data-disabled] {
+  background-color: #7e7e7e !important;
+  color: white;
+}
+
+[data-mantine-color-scheme="dark"] .plan-button:disabled,
+[data-mantine-color-scheme="dark"] .plan-button[data-disabled] {
+  background-color: #6b7280 !important;
+}
+
 /* Smooth transitions for theme switching */
 * {
   transition: background-color 0.2s ease, border-color 0.2s ease, color 0.2s ease;
diff --git a/frontend/src/core/testing/serverExperienceSimulations.ts b/frontend/src/core/testing/serverExperienceSimulations.ts
index f136ce489..4bb372545 100644
--- a/frontend/src/core/testing/serverExperienceSimulations.ts
+++ b/frontend/src/core/testing/serverExperienceSimulations.ts
@@ -38,7 +38,7 @@ const FREE_LICENSE_INFO: LicenseInfo = {
 
 const BASE_NO_LOGIN_CONFIG: AppConfig = {
   enableAnalytics: true,
-  appVersion: '2.0.0',
+  appVersion: '2.1.3',
   serverCertificateEnabled: false,
   enableAlphaFunctionality: false,
   serverPort: 8080,
diff --git a/frontend/src/core/tools/Convert.tsx b/frontend/src/core/tools/Convert.tsx
index 51353cad4..82852f36d 100644
--- a/frontend/src/core/tools/Convert.tsx
+++ b/frontend/src/core/tools/Convert.tsx
@@ -23,6 +23,10 @@ const Convert = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
 
   const { enabled: endpointEnabled, loading: endpointLoading } = useEndpointEnabled(convertParams.getEndpointName());
 
+  // Prevent reset immediately after operation completes (when consumeFiles auto-selects outputs)
+  const skipNextSelectionResetRef = useRef(false);
+  const previousSelectionRef = useRef<string>('');
+
   const scrollToBottom = () => {
     if (scrollContainerRef.current) {
       scrollContainerRef.current.scrollTo({
@@ -33,24 +37,49 @@ const Convert = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   };
 
   const hasFiles = selectedFiles.length > 0;
-  const hasResults = convertOperation.downloadUrl !== null;
+  const hasResults = convertOperation.files.length > 0 || convertOperation.downloadUrl !== null;
   const settingsCollapsed = hasResults;
 
+  // When operation completes, flag the next selection change to skip reset
   useEffect(() => {
+    if (hasResults) {
+      skipNextSelectionResetRef.current = true;
+    }
+  }, [hasResults]);
+
+  // Reset results when user manually changes file selection
+  useEffect(() => {
+    const currentSelection = selectedFiles.map(f => f.fileId).sort().join(',');
+
+    if (currentSelection === previousSelectionRef.current) return; // No change
+
+    // Skip reset if this is the auto-selection after operation completed
+    // Don't analyze file types - would change parameters and trigger another reset
+    if (skipNextSelectionResetRef.current) {
+      skipNextSelectionResetRef.current = false;
+      previousSelectionRef.current = currentSelection;
+      return;
+    }
+
+    // User manually selected different files
     if (selectedFiles.length > 0) {
+      previousSelectionRef.current = currentSelection;
       convertParams.analyzeFileTypes(selectedFiles);
+      if (hasResults) {
+        convertOperation.resetResults();
+        onPreviewFile?.(null);
+      }
     } else {
-      // Only reset when there are no active files at all
-      // If there are active files but no selected files, keep current format (user filtered by format)
+      previousSelectionRef.current = '';
       if (activeFiles.length === 0) {
         convertParams.resetParameters();
       }
     }
-  }, [selectedFiles, activeFiles, convertParams.analyzeFileTypes, convertParams.resetParameters]);
+  }, [selectedFiles]);
 
   useEffect(() => {
-    // Only clear results if we're not currently processing and parameters changed
-    if (!convertOperation.isLoading) {
+    // Reset when user changes conversion parameters (but not during operation)
+    if (!convertOperation.isLoading && !skipNextSelectionResetRef.current) {
       convertOperation.resetResults();
       onPreviewFile?.(null);
     }
@@ -87,6 +116,7 @@ const Convert = ({ onPreviewFile, onComplete, onError }: BaseToolProps) => {
   };
 
   const handleSettingsReset = () => {
+    skipNextSelectionResetRef.current = false;
     convertOperation.resetResults();
     onPreviewFile?.(null);
   };
diff --git a/frontend/src/core/tools/GetPdfInfo.tsx b/frontend/src/core/tools/GetPdfInfo.tsx
new file mode 100644
index 000000000..aa35fe16b
--- /dev/null
+++ b/frontend/src/core/tools/GetPdfInfo.tsx
@@ -0,0 +1,188 @@
+import { useEffect, useMemo, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import PictureAsPdfIcon from '@mui/icons-material/PictureAsPdf';
+import LinkIcon from '@mui/icons-material/Link';
+import { Stack, Group, Divider, Text, UnstyledButton } from '@mantine/core';
+import { createToolFlow } from '@app/components/tools/shared/createToolFlow';
+import { useBaseTool } from '@app/hooks/tools/shared/useBaseTool';
+import { BaseToolProps, ToolComponent } from '@app/types/tool';
+import { useGetPdfInfoParameters, defaultParameters } from '@app/hooks/tools/getPdfInfo/useGetPdfInfoParameters';
+import GetPdfInfoResults from '@app/components/tools/getPdfInfo/GetPdfInfoResults';
+import { useGetPdfInfoOperation, GetPdfInfoOperationHook } from '@app/hooks/tools/getPdfInfo/useGetPdfInfoOperation';
+import GetPdfInfoReportView from '@app/components/tools/getPdfInfo/GetPdfInfoReportView';
+import { useToolWorkflow } from '@app/contexts/ToolWorkflowContext';
+import { useNavigationActions, useNavigationState } from '@app/contexts/NavigationContext';
+import type { PdfInfoReportData } from '@app/types/getPdfInfo';
+
+const CHAPTERS = [
+  { id: 'summary', labelKey: 'getPdfInfo.summary.title', fallback: 'PDF Summary' },
+  { id: 'metadata', labelKey: 'getPdfInfo.sections.metadata', fallback: 'Metadata' },
+  { id: 'formFields', labelKey: 'getPdfInfo.sections.formFields', fallback: 'Form Fields' },
+  { id: 'basicInfo', labelKey: 'getPdfInfo.sections.basicInfo', fallback: 'Basic Info' },
+  { id: 'documentInfo', labelKey: 'getPdfInfo.sections.documentInfo', fallback: 'Document Info' },
+  { id: 'compliance', labelKey: 'getPdfInfo.sections.compliance', fallback: 'Compliance' },
+  { id: 'encryption', labelKey: 'getPdfInfo.sections.encryption', fallback: 'Encryption' },
+  { id: 'permissions', labelKey: 'getPdfInfo.sections.permissions', fallback: 'Permissions' },
+  { id: 'toc', labelKey: 'getPdfInfo.sections.tableOfContents', fallback: 'Table of Contents' },
+  { id: 'other', labelKey: 'getPdfInfo.sections.other', fallback: 'Other' },
+  { id: 'perPage', labelKey: 'getPdfInfo.sections.perPageInfo', fallback: 'Per Page Info' },
+];
+
+const GetPdfInfo = (props: BaseToolProps) => {
+  const { t } = useTranslation();
+  const { actions: navigationActions } = useNavigationActions();
+  const navigationState = useNavigationState();
+  const {
+    registerCustomWorkbenchView,
+    unregisterCustomWorkbenchView,
+    setCustomWorkbenchViewData,
+    clearCustomWorkbenchViewData,
+  } = useToolWorkflow();
+
+  const REPORT_VIEW_ID = 'getPdfInfoReport';
+  const REPORT_WORKBENCH_ID = 'custom:getPdfInfoReport' as const;
+  const reportIcon = useMemo(() => <PictureAsPdfIcon fontSize="small" />, []);
+
+  const base = useBaseTool(
+    'getPdfInfo',
+    useGetPdfInfoParameters,
+    useGetPdfInfoOperation,
+    props
+  );
+
+  const operation = base.operation as GetPdfInfoOperationHook;
+  const hasResults = operation.results.length > 0;
+  const showResultsStep = hasResults || base.operation.isLoading || !!base.operation.errorMessage;
+
+  useEffect(() => {
+    registerCustomWorkbenchView({
+      id: REPORT_VIEW_ID,
+      workbenchId: REPORT_WORKBENCH_ID,
+      label: t('getPdfInfo.report.shortTitle', 'PDF Information'),
+      icon: reportIcon,
+      component: GetPdfInfoReportView,
+    });
+
+    return () => {
+      clearCustomWorkbenchViewData(REPORT_VIEW_ID);
+      unregisterCustomWorkbenchView(REPORT_VIEW_ID);
+    };
+  }, [
+    clearCustomWorkbenchViewData,
+    registerCustomWorkbenchView,
+    reportIcon,
+    t,
+    unregisterCustomWorkbenchView,
+  ]);
+
+  const reportData = useMemo<PdfInfoReportData | null>(() => {
+    if (operation.results.length === 0) return null;
+    const generatedAt = operation.results[0].summaryGeneratedAt ?? Date.now();
+    return {
+      generatedAt,
+      entries: operation.results,
+    };
+  }, [operation.results]);
+
+  const lastReportGeneratedAtRef = useRef<number | null>(null);
+  useEffect(() => {
+    if (reportData) {
+      setCustomWorkbenchViewData(REPORT_VIEW_ID, reportData);
+      const generatedAt = reportData.generatedAt ?? null;
+      const isNewReport = generatedAt && generatedAt !== lastReportGeneratedAtRef.current;
+      if (isNewReport) {
+        lastReportGeneratedAtRef.current = generatedAt;
+        if (navigationState.selectedTool === 'getPdfInfo' && navigationState.workbench !== REPORT_WORKBENCH_ID) {
+          navigationActions.setWorkbench(REPORT_WORKBENCH_ID);
+        }
+      }
+    } else {
+      clearCustomWorkbenchViewData(REPORT_VIEW_ID);
+      lastReportGeneratedAtRef.current = null;
+    }
+  }, [
+    clearCustomWorkbenchViewData,
+    navigationActions,
+    navigationState.selectedTool,
+    navigationState.workbench,
+    reportData,
+    setCustomWorkbenchViewData,
+  ]);
+
+  return createToolFlow({
+    files: {
+      selectedFiles: base.selectedFiles,
+      isCollapsed: hasResults,
+    },
+    steps: [
+      {
+        title: t('getPdfInfo.indexTitle', 'Index'),
+        isVisible: Boolean(reportData),
+        isCollapsed: false,
+        content: (
+          <Stack gap={0}>
+            {CHAPTERS.map((c, idx) => (
+              <Stack key={c.id} gap={0}>
+                <UnstyledButton
+                  onClick={() => {
+                    if (!reportData) return;
+                    setCustomWorkbenchViewData(REPORT_VIEW_ID, { ...reportData, scrollTo: c.id });
+                    if (navigationState.workbench !== REPORT_WORKBENCH_ID) {
+                      navigationActions.setWorkbench(REPORT_WORKBENCH_ID);
+                    }
+                  }}
+                  style={{ width: '100%', textAlign: 'left', padding: '8px 4px' }}
+                >
+                  <Group justify="flex-start" gap="sm">
+                    <LinkIcon fontSize="small" style={{ opacity: 0.7 }} />
+                    <Text size="md" c="dimmed">
+                      {t(c.labelKey, c.fallback)}
+                    </Text>
+                  </Group>
+                </UnstyledButton>
+                {idx < CHAPTERS.length - 1 && <Divider my={6} />}
+              </Stack>
+            ))}
+          </Stack>
+        ),
+      },
+      {
+        title: t('getPdfInfo.results', 'Results'),
+        isVisible: showResultsStep,
+        isCollapsed: false,
+        content: (
+          <GetPdfInfoResults
+            operation={operation}
+            isLoading={base.operation.isLoading}
+            errorMessage={base.operation.errorMessage}
+          />
+        ),
+      },
+    ],
+    executeButton: {
+      text: t('getPdfInfo.submit', 'Generate'),
+      loadingText: t('loading', 'Loading...'),
+      onClick: base.handleExecute,
+      disabled:
+        !base.params.validateParameters() ||
+        !base.hasFiles ||
+        base.operation.isLoading ||
+        !base.endpointEnabled,
+      isVisible: true,
+    },
+    review: {
+      isVisible: false,
+      operation: base.operation,
+      title: t('getPdfInfo.results', 'Results'),
+      onUndo: base.handleUndo,
+    },
+  });
+};
+
+const GetPdfInfoTool = GetPdfInfo as ToolComponent;
+GetPdfInfoTool.tool = () => useGetPdfInfoOperation;
+GetPdfInfoTool.getDefaultParameters = () => ({ ...defaultParameters });
+
+export default GetPdfInfoTool;
+
+
diff --git a/frontend/src/proprietary/tools/pdfTextEditor/PdfTextEditor.tsx b/frontend/src/core/tools/pdfTextEditor/PdfTextEditor.tsx
similarity index 76%
rename from frontend/src/proprietary/tools/pdfTextEditor/PdfTextEditor.tsx
rename to frontend/src/core/tools/pdfTextEditor/PdfTextEditor.tsx
index 6337c23fd..422b06603 100644
--- a/frontend/src/proprietary/tools/pdfTextEditor/PdfTextEditor.tsx
+++ b/frontend/src/core/tools/pdfTextEditor/PdfTextEditor.tsx
@@ -3,14 +3,16 @@ import { useTranslation } from 'react-i18next';
 import DescriptionIcon from '@mui/icons-material/DescriptionOutlined';
 
 import { useToolWorkflow } from '@app/contexts/ToolWorkflowContext';
-import { useFileSelection } from '@app/contexts/FileContext';
+import { useFileSelection, useFileManagement, useFileContext } from '@app/contexts/FileContext';
 import { useNavigationActions, useNavigationState } from '@app/contexts/NavigationContext';
+import { createStirlingFilesAndStubs } from '@app/services/fileStubHelpers';
 import { BaseToolProps, ToolComponent } from '@app/types/tool';
+import { getDefaultWorkbench } from '@app/types/workbench';
 import { CONVERSION_ENDPOINTS } from '@app/constants/convertConstants';
 import apiClient from '@app/services/apiClient';
 import { downloadBlob, downloadTextAsFile } from '@app/utils/downloadUtils';
 import { getFilenameFromHeaders } from '@app/utils/fileResponseUtils';
-import { pdfWorkerManager } from '@core/services/pdfWorkerManager';
+import { pdfWorkerManager } from '@app/services/pdfWorkerManager';
 import { Util } from 'pdfjs-dist/legacy/build/pdf.mjs';
 import {
   PdfJsonDocument,
@@ -208,7 +210,8 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
   } = useToolWorkflow();
   const { actions: navigationActions } = useNavigationActions();
   const navigationState = useNavigationState();
-  const { registerUnsavedChangesChecker, unregisterUnsavedChangesChecker } = navigationActions;
+  const { addFiles } = useFileManagement();
+  const { consumeFiles, selectors } = useFileContext();
 
   const [loadedDocument, setLoadedDocument] = useState<PdfJsonDocument | null>(null);
   const [groupsByPage, setGroupsByPage] = useState<TextGroup[][]>([]);
@@ -217,6 +220,8 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
   const [fileName, setFileName] = useState('');
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   const [isGeneratingPdf, setIsGeneratingPdf] = useState(false);
+  const [isSavingToWorkbench, setIsSavingToWorkbench] = useState(false);
+  const [shouldNavigateAfterSave, setShouldNavigateAfterSave] = useState(false);
   const [isConverting, setIsConverting] = useState(false);
   const [conversionProgress, setConversionProgress] = useState<ConversionProgress | null>(null);
   const [forceSingleTextElement, setForceSingleTextElement] = useState(true);
@@ -233,7 +238,9 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
   const originalImagesRef = useRef<PdfJsonImageElement[][]>([]);
   const originalGroupsRef = useRef<TextGroup[][]>([]);
   const imagesByPageRef = useRef<PdfJsonImageElement[][]>([]);
+  const lastLoadedFileRef = useRef<File | null>(null);
   const autoLoadKeyRef = useRef<string | null>(null);
+  const sourceFileIdRef = useRef<string | null>(null);
   const loadRequestIdRef = useRef(0);
   const latestPdfRequestIdRef = useRef<number | null>(null);
   const loadedDocumentRef = useRef<PdfJsonDocument | null>(null);
@@ -245,6 +252,10 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
   const pagePreviewsRef = useRef<Map<number, string>>(pagePreviews);
   const previewScaleRef = useRef<Map<number, number>>(new Map());
   const cachedJobIdRef = useRef<string | null>(null);
+  const previousCachedJobIdRef = useRef<string | null>(null);
+  const cacheRecoveryInProgressRef = useRef(false);
+  const cacheRecoveryAttemptsRef = useRef(0);
+  const recoverCacheAndReloadRef = useRef<() => Promise<boolean>>(async () => false);
 
   // Keep ref in sync with state for access in async callbacks
   useEffect(() => {
@@ -273,12 +284,36 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
     };
   }, []);
 
+  const isCacheUnavailableError = useCallback((error: any): boolean => {
+    const status = error?.response?.status;
+    // Treat any 410 as cache unavailable, since responseType: 'blob' makes
+    // it impossible to reliably check the JSON body
+    return status === 410;
+  }, []);
+
   const dirtyPages = useMemo(
     () => getDirtyPages(groupsByPage, imagesByPage, originalGroupsRef.current, originalImagesRef.current),
     [groupsByPage, imagesByPage],
   );
   const hasChanges = useMemo(() => dirtyPages.some(Boolean), [dirtyPages]);
   const hasDocument = loadedDocument !== null;
+
+  // Sync hasChanges to navigation context so navigation guards can block
+  useEffect(() => {
+    navigationActions.setHasUnsavedChanges(hasChanges);
+    return () => {
+      navigationActions.setHasUnsavedChanges(false);
+    };
+  }, [hasChanges, navigationActions]);
+
+  // Navigate to files view AFTER the unsaved changes state is properly cleared
+  useEffect(() => {
+    if (shouldNavigateAfterSave && !navigationState.hasUnsavedChanges) {
+      setShouldNavigateAfterSave(false);
+      navigationActions.setToolAndWorkbench(null, getDefaultWorkbench());
+    }
+  }, [shouldNavigateAfterSave, navigationState.hasUnsavedChanges, navigationActions]);
+
   const viewLabel = useMemo(() => t('pdfTextEditor.viewLabel', 'PDF Editor'), [t]);
   const { selectedFiles } = useFileSelection();
 
@@ -293,6 +328,9 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
       loadedImagePagesRef.current = new Set();
       loadingImagePagesRef.current = new Set();
       setSelectedPage(0);
+      setIsLazyMode(false);
+      setCachedJobId(null);
+      cachedJobIdRef.current = null;
       return;
     }
     const cloned = deepCloneDocument(document);
@@ -342,11 +380,14 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
   }, []);
 
   useEffect(() => {
-    const previousJobId = cachedJobIdRef.current;
+    // Clear old cached job when job ID changes
+    const previousJobId = previousCachedJobIdRef.current;
     if (previousJobId && previousJobId !== cachedJobId) {
+      console.log(`[PdfTextEditor] Clearing old cache for jobId: ${previousJobId}, new jobId: ${cachedJobId}`);
       clearCachedJob(previousJobId);
     }
-    cachedJobIdRef.current = cachedJobId;
+    // Update the previous jobId ref for next time
+    previousCachedJobIdRef.current = cachedJobId;
   }, [cachedJobId, clearCachedJob]);
 
   const initializePdfPreview = useCallback(
@@ -466,6 +507,11 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
         );
       } catch (error) {
         console.error(`[loadImagesForPage] Failed to load images for page ${pageNumber}:`, error);
+        if (isCacheUnavailableError(error)) {
+          console.log('[loadImagesForPage] Cache expired, triggering automatic recovery...');
+          // Automatically recover by reloading the file
+          void recoverCacheAndReloadRef.current();
+        }
       } finally {
         loadingImagePagesRef.current.delete(pageIndex);
         setLoadingImagePages((prev) => {
@@ -475,7 +521,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
         });
       }
     },
-    [isLazyMode, cachedJobId],
+    [isLazyMode, cachedJobId, isCacheUnavailableError],
   );
 
   const handleLoadFile = useCallback(
@@ -484,6 +530,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
         return;
       }
 
+      lastLoadedFileRef.current = file;
       const requestId = loadRequestIdRef.current + 1;
       loadRequestIdRef.current = requestId;
 
@@ -532,59 +579,35 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
             message: 'Starting conversion...',
           });
 
-          let jobComplete = false;
-          let attempts = 0;
-          const maxAttempts = 600;
+        let jobComplete = false;
+        let attempts = 0;
+        const maxAttempts = 600;
+        let pollDelay = 500;
 
-          while (!jobComplete && attempts < maxAttempts) {
-            await new Promise((resolve) => setTimeout(resolve, 1000));
-            attempts += 1;
+        while (!jobComplete && attempts < maxAttempts) {
+          await new Promise((resolve) => setTimeout(resolve, pollDelay));
+          attempts += 1;
+          if (pollDelay < 10000) {
+            pollDelay = Math.min(10000, Math.floor(pollDelay * 1.5));
+          }
 
             try {
               const statusResponse = await apiClient.get(`/api/v1/general/job/${jobId}`);
               const jobStatus = statusResponse.data;
               console.log(`Job status (attempt ${attempts}):`, jobStatus);
 
-              if (jobStatus.notes && jobStatus.notes.length > 0) {
-                const lastNote = jobStatus.notes[jobStatus.notes.length - 1];
-                console.log('Latest note:', lastNote);
-                const matchWithCount = lastNote.match(
-                  /\[(\d+)%\]\s+(\w+):\s+(.+?)\s+\((\d+)\/(\d+)\)/,
-                );
-                if (matchWithCount) {
-                  const percent = parseInt(matchWithCount[1], 10);
-                  const stage = matchWithCount[2];
-                  const message = matchWithCount[3];
-                  const current = parseInt(matchWithCount[4], 10);
-                  const total = parseInt(matchWithCount[5], 10);
-                  setConversionProgress({
-                    percent,
-                    stage,
-                    message,
-                    current,
-                    total,
-                  });
-                } else {
-                  const match = lastNote.match(/\[(\d+)%\]\s+(\w+):\s+(.+)/);
-                  if (match) {
-                    const percent = parseInt(match[1], 10);
-                    const stage = match[2];
-                    const message = match[3];
-                    setConversionProgress({
-                      percent,
-                      stage,
-                      message,
-                    });
-                  }
-                }
-              } else if (jobStatus.progress !== undefined) {
-                const percent = Math.min(Math.max(jobStatus.progress, 0), 100);
-                setConversionProgress({
-                  percent,
-                  stage: jobStatus.stage || 'processing',
-                  message: jobStatus.note || 'Converting PDF to JSON...',
-                });
-              }
+              const percent = Math.min(Math.max(jobStatus.progress ?? 0, 0), 100);
+              const stage = jobStatus.stage || 'processing';
+              const message = jobStatus.note || 'Converting PDF to JSON...';
+              const current = jobStatus.current ?? undefined;
+              const total = jobStatus.total ?? undefined;
+              setConversionProgress({
+                percent,
+                stage,
+                message,
+                current,
+                total,
+              });
 
               if (jobStatus.complete) {
                 if (jobStatus.error) {
@@ -678,7 +701,9 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
         setLoadedDocument(parsed);
         resetToDocument(parsed, groupingMode);
         setIsLazyMode(shouldUseLazyMode);
-        setCachedJobId(shouldUseLazyMode ? pendingJobId : null);
+        const newJobId = shouldUseLazyMode ? pendingJobId : null;
+        setCachedJobId(newJobId);
+        cachedJobIdRef.current = newJobId;
         setFileName(file.name);
         setErrorMessage(null);
       } catch (error: any) {
@@ -696,6 +721,9 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
         setLoadedDocument(null);
         resetToDocument(null, groupingMode);
         clearPdfPreview();
+        setIsLazyMode(false);
+        setCachedJobId(null);
+        cachedJobIdRef.current = null;
 
         if (isPdf) {
           const errorMsg =
@@ -720,6 +748,53 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
     [groupingMode, resetToDocument, t],
   );
 
+  const recoverCacheAndReload = useCallback(async () => {
+    if (cacheRecoveryInProgressRef.current) {
+      return false;
+    }
+    if (cacheRecoveryAttemptsRef.current >= 2) {
+      console.warn('[PdfTextEditor] Cache recovery limit reached');
+      return false;
+    }
+    cacheRecoveryAttemptsRef.current += 1;
+    const file = lastLoadedFileRef.current;
+    if (!file) {
+      console.warn('[PdfTextEditor] No file available for cache recovery');
+      return false;
+    }
+    cacheRecoveryInProgressRef.current = true;
+    try {
+      console.log('[PdfTextEditor] Automatically reloading file due to cache expiration...');
+      await handleLoadFile(file);
+      console.log('[PdfTextEditor] Cache recovery successful');
+      return true;
+    } catch (error) {
+      console.error('[PdfTextEditor] Cache recovery failed', error);
+      return false;
+    } finally {
+      cacheRecoveryInProgressRef.current = false;
+    }
+  }, [handleLoadFile]);
+
+  useEffect(() => {
+    recoverCacheAndReloadRef.current = recoverCacheAndReload;
+  }, [recoverCacheAndReload]);
+
+  // Wrapper for loading files from the dropzone - adds to workbench first
+  const handleLoadFileFromDropzone = useCallback(
+    async (file: File) => {
+      // Add the file to the workbench so it appears in the file list
+      const addedFiles = await addFiles([file]);
+      // Capture the file ID for save-to-workbench functionality
+      if (addedFiles.length > 0 && addedFiles[0].fileId) {
+        sourceFileIdRef.current = addedFiles[0].fileId;
+      }
+      // Then load it into the editor
+      void handleLoadFile(file);
+    },
+    [addFiles, handleLoadFile],
+  );
+
   const handleSelectPage = useCallback((pageIndex: number) => {
     setSelectedPage(pageIndex);
     // Trigger lazy loading for images on the selected page
@@ -1019,7 +1094,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
         try {
           const payload = buildPayload();
           if (!payload) {
-            return;
+            throw new Error('Failed to build payload');
           }
 
           const { document, filename } = payload;
@@ -1038,7 +1113,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
           const baseName = sanitizeBaseName(filename).replace(/-edited$/u, '');
           const expectedName = `${baseName || 'document'}.pdf`;
           const response = await apiClient.post(
-            `/api/v1/convert/pdf/text-editor/partial/${cachedJobId}?filename=${encodeURIComponent(expectedName)}`,
+            `/api/v1/convert/pdf/text-editor/partial/${cachedJobIdRef.current}?filename=${encodeURIComponent(expectedName)}`,
             partialDocument,
             {
               responseType: 'blob',
@@ -1062,6 +1137,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
             '[handleGeneratePdf] Incremental export failed, falling back to full export',
             incrementalError,
           );
+          // Fall through to full export below
         }
       }
 
@@ -1122,6 +1198,229 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
     t,
   ]);
 
+  // Save changes to workbench (replaces the original file with edited version)
+  const handleSaveToWorkbench = useCallback(async () => {
+    setIsSavingToWorkbench(true);
+    
+    try {
+      if (!sourceFileIdRef.current) {
+        console.warn('[PdfTextEditor] No source file ID available for save to workbench');
+        // Fall back to generating PDF download if no source file
+        await handleGeneratePdf(true);
+        return;
+      }
+
+      const parentStub = selectors.getStirlingFileStub(sourceFileIdRef.current as any);
+      if (!parentStub) {
+        console.warn('[PdfTextEditor] Could not find parent stub for save to workbench');
+        await handleGeneratePdf(true);
+        return;
+      }
+
+      const ensureImagesForPages = async (pageIndices: number[]) => {
+        const uniqueIndices = Array.from(new Set(pageIndices)).filter((index) => index >= 0);
+        if (uniqueIndices.length === 0) {
+          return;
+        }
+
+        for (const index of uniqueIndices) {
+          if (!loadedImagePagesRef.current.has(index)) {
+            await loadImagesForPage(index);
+          }
+        }
+
+        const maxWaitTime = 15000;
+        const pollInterval = 150;
+        const startWait = Date.now();
+        while (Date.now() - startWait < maxWaitTime) {
+          const allLoaded = uniqueIndices.every(
+            (index) =>
+              loadedImagePagesRef.current.has(index) &&
+              imagesByPageRef.current[index] !== undefined,
+          );
+          const anyLoading = uniqueIndices.some((index) =>
+            loadingImagePagesRef.current.has(index),
+          );
+          if (allLoaded && !anyLoading) {
+            return;
+          }
+          await new Promise((resolve) => setTimeout(resolve, pollInterval));
+        }
+
+        const missing = uniqueIndices.filter(
+          (index) => !loadedImagePagesRef.current.has(index),
+        );
+        if (missing.length > 0) {
+          throw new Error(
+            `Failed to load images for pages ${missing.map((i) => i + 1).join(', ')}`,
+          );
+        }
+      };
+
+      const currentDoc = loadedDocumentRef.current;
+      const totalPages = currentDoc?.pages?.length ?? 0;
+      const currentDirtyPages = getDirtyPages(groupsByPage, imagesByPage, originalGroupsRef.current, originalImagesRef.current);
+      const dirtyPageIndices = currentDirtyPages
+        .map((isDirty, index) => (isDirty ? index : -1))
+        .filter((index) => index >= 0);
+
+      let pdfBlob: Blob;
+      let downloadName: string;
+
+      const canUseIncremental =
+        isLazyMode &&
+        cachedJobId &&
+        dirtyPageIndices.length > 0 &&
+        dirtyPageIndices.length < totalPages;
+
+      if (canUseIncremental) {
+        await ensureImagesForPages(dirtyPageIndices);
+
+        try {
+          const payload = buildPayload();
+          if (!payload) {
+            throw new Error('Failed to build payload');
+          }
+
+          const { document, filename } = payload;
+          const dirtyPageSet = new Set(dirtyPageIndices);
+          const partialPages =
+            document.pages?.filter((_, index) => dirtyPageSet.has(index)) ?? [];
+
+          const partialDocument: PdfJsonDocument = {
+            metadata: document.metadata,
+            xmpMetadata: document.xmpMetadata,
+            fonts: document.fonts,
+            lazyImages: true,
+            pages: partialPages,
+          };
+
+          const baseName = sanitizeBaseName(filename).replace(/-edited$/u, '');
+          const expectedName = `${baseName || 'document'}.pdf`;
+          const response = await apiClient.post(
+            `/api/v1/convert/pdf/text-editor/partial/${cachedJobId}?filename=${encodeURIComponent(expectedName)}`,
+            partialDocument,
+            {
+              responseType: 'blob',
+            },
+          );
+
+          const contentDisposition = response.headers?.['content-disposition'] ?? '';
+          const detectedName = getFilenameFromHeaders(contentDisposition);
+          downloadName = detectedName || expectedName;
+          pdfBlob = response.data;
+        } catch (incrementalError) {
+          console.warn(
+            '[handleSaveToWorkbench] Incremental export failed, falling back to full export',
+            incrementalError,
+          );
+          // Fall through to full export
+          if (isLazyMode && totalPages > 0) {
+            const allPageIndices = Array.from({ length: totalPages }, (_, index) => index);
+            await ensureImagesForPages(allPageIndices);
+          }
+
+          const payload = buildPayload();
+          if (!payload) {
+            throw new Error('Failed to build payload');
+          }
+
+          const { document, filename } = payload;
+          const serialized = JSON.stringify(document);
+          const jsonFile = new File([serialized], filename, { type: 'application/json' });
+
+          const formData = new FormData();
+          formData.append('fileInput', jsonFile);
+          const response = await apiClient.post(CONVERSION_ENDPOINTS['text-editor-pdf'], formData, {
+            responseType: 'blob',
+          });
+
+          const contentDisposition = response.headers?.['content-disposition'] ?? '';
+          const detectedName = getFilenameFromHeaders(contentDisposition);
+          const baseName = sanitizeBaseName(filename).replace(/-edited$/u, '');
+          downloadName = detectedName || `${baseName || 'document'}.pdf`;
+          pdfBlob = response.data;
+        }
+      } else {
+        if (isLazyMode && totalPages > 0) {
+          const allPageIndices = Array.from({ length: totalPages }, (_, index) => index);
+          await ensureImagesForPages(allPageIndices);
+        }
+
+        const payload = buildPayload();
+        if (!payload) {
+          throw new Error('Failed to build payload');
+        }
+
+        const { document, filename } = payload;
+        const serialized = JSON.stringify(document);
+        const jsonFile = new File([serialized], filename, { type: 'application/json' });
+
+        const formData = new FormData();
+        formData.append('fileInput', jsonFile);
+        const response = await apiClient.post(CONVERSION_ENDPOINTS['text-editor-pdf'], formData, {
+          responseType: 'blob',
+        });
+
+        const contentDisposition = response.headers?.['content-disposition'] ?? '';
+        const detectedName = getFilenameFromHeaders(contentDisposition);
+        const baseName = sanitizeBaseName(filename).replace(/-edited$/u, '');
+        downloadName = detectedName || `${baseName || 'document'}.pdf`;
+        pdfBlob = response.data;
+      }
+
+      // Create the new PDF file
+      const pdfFile = new File([pdfBlob], downloadName, { type: 'application/pdf' });
+
+      // Create StirlingFile and stub for the output
+      const { stirlingFiles, stubs } = await createStirlingFilesAndStubs(
+        [pdfFile],
+        parentStub,
+        'pdfTextEditor',
+      );
+
+      // Replace the original file with the edited version
+      await consumeFiles([sourceFileIdRef.current as any], stirlingFiles, stubs);
+
+      // Update the source file ID to point to the new file
+      sourceFileIdRef.current = stubs[0].id;
+
+      // Clear the unsaved changes flag - this will trigger the useEffect to navigate
+      // once React has processed the state update
+      navigationActions.setHasUnsavedChanges(false);
+      setErrorMessage(null);
+      
+      // Set flag to trigger navigation after state update is processed
+      setShouldNavigateAfterSave(true);
+    } catch (error: any) {
+      console.error('Failed to save to workbench', error);
+      const message =
+        error?.response?.data ||
+        error?.message ||
+        t('pdfTextEditor.errors.pdfConversion', 'Unable to save changes to workbench.');
+      const msgString = typeof message === 'string' ? message : String(message);
+      setErrorMessage(msgString);
+      if (onError) {
+        onError(msgString);
+      }
+    } finally {
+      setIsSavingToWorkbench(false);
+    }
+  }, [
+    buildPayload,
+    cachedJobId,
+    consumeFiles,
+    groupsByPage,
+    handleGeneratePdf,
+    imagesByPage,
+    isLazyMode,
+    loadImagesForPage,
+    navigationActions,
+    onError,
+    selectors,
+    t,
+  ]);
+
   const requestPagePreview = useCallback(
     async (pageIndex: number, scale: number) => {
       if (!hasVectorPreview || !pdfDocumentRef.current) {
@@ -1260,6 +1559,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
     fileName,
     errorMessage,
     isGeneratingPdf,
+    isSavingToWorkbench,
     isConverting,
     conversionProgress,
     hasChanges,
@@ -1278,15 +1578,19 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
       // Generate PDF without triggering tool completion
       await handleGeneratePdf(true);
     },
+    onSaveToWorkbench: handleSaveToWorkbench,
     onForceSingleTextElementChange: setForceSingleTextElement,
     onGroupingModeChange: setGroupingMode,
     onMergeGroups: handleMergeGroups,
     onUngroupGroup: handleUngroupGroup,
+    onLoadFile: handleLoadFileFromDropzone,
   }), [
     handleMergeGroups,
     handleUngroupGroup,
     handleImageTransform,
+    handleSaveToWorkbench,
     imagesByPage,
+    isSavingToWorkbench,
     pagePreviews,
     dirtyPages,
     errorMessage,
@@ -1311,6 +1615,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
     groupingMode,
     requestPagePreview,
     setForceSingleTextElement,
+    handleLoadFileFromDropzone,
   ]);
 
   const latestViewDataRef = useRef<PdfTextEditorViewData>(viewData);
@@ -1326,6 +1631,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
   useEffect(() => {
     if (selectedFiles.length === 0) {
       autoLoadKeyRef.current = null;
+      sourceFileIdRef.current = null;
       return;
     }
 
@@ -1344,6 +1650,8 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
     }
 
     autoLoadKeyRef.current = fileKey;
+    // Capture the source file ID for save-to-workbench functionality
+    sourceFileIdRef.current = (file as any).fileId ?? null;
     void handleLoadFile(file);
   }, [selectedFiles, navigationState.selectedTool, handleLoadFile]);
 
@@ -1366,6 +1674,7 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
     }, 0);
   }, [navigationActions, navigationState.selectedTool]);
 
+  // Register workbench view (re-runs when dependencies change)
   useEffect(() => {
     registerCustomWorkbenchView({
       id: WORKBENCH_VIEW_ID,
@@ -1376,49 +1685,34 @@ const PdfTextEditor = ({ onComplete, onError }: BaseToolProps) => {
     });
     setLeftPanelView('hidden');
     setCustomWorkbenchViewData(WORKBENCH_VIEW_ID, latestViewDataRef.current);
-
-    return () => {
-      // Clear backend cache if we were using lazy loading
-      clearCachedJob(cachedJobIdRef.current);
-      clearCustomWorkbenchViewData(WORKBENCH_VIEW_ID);
-      unregisterCustomWorkbenchView(WORKBENCH_VIEW_ID);
-      setLeftPanelView('toolPicker');
-    };
   }, [
-    clearCachedJob,
-    clearCustomWorkbenchViewData,
     registerCustomWorkbenchView,
     setCustomWorkbenchViewData,
     setLeftPanelView,
     viewLabel,
-    unregisterCustomWorkbenchView,
   ]);
 
+  // Cleanup ONLY on component unmount (not on re-renders)
+  useEffect(() => {
+    return () => {
+      // Clear backend cache when leaving the tool
+      const jobId = cachedJobIdRef.current;
+      if (jobId) {
+        console.log(`[PdfTextEditor] Cleaning up cached document on unmount: ${jobId}`);
+        apiClient.post(`/api/v1/convert/pdf/text-editor/clear-cache/${jobId}`).catch((error) => {
+          console.warn('[PdfTextEditor] Failed to clear cache on unmount:', error);
+        });
+      }
+      clearCustomWorkbenchViewData(WORKBENCH_VIEW_ID);
+      unregisterCustomWorkbenchView(WORKBENCH_VIEW_ID);
+      setLeftPanelView('toolPicker');
+    };
+  }, []); // Empty deps = cleanup only on unmount
+
   // Note: Compare tool doesn't auto-force workbench, and neither should we
   // The workbench should be set when the tool is selected via proper channels
   // (tool registry, tool picker, etc.) - not forced here
 
-  // Keep hasChanges in a ref for the checker to access
-  const hasChangesRef = useRef(hasChanges);
-  useEffect(() => {
-    hasChangesRef.current = hasChanges;
-    console.log('[PdfTextEditor] hasChanges updated to:', hasChanges);
-  }, [hasChanges]);
-
-  // Register unsaved changes checker for navigation guard
-  useEffect(() => {
-    const checker = () => {
-      console.log('[PdfTextEditor] Checking unsaved changes:', hasChangesRef.current);
-      return hasChangesRef.current;
-    };
-    registerUnsavedChangesChecker(checker);
-    console.log('[PdfTextEditor] Registered unsaved changes checker');
-    return () => {
-      console.log('[PdfTextEditor] Unregistered unsaved changes checker');
-      unregisterUnsavedChangesChecker();
-    };
-  }, [registerUnsavedChangesChecker, unregisterUnsavedChangesChecker]);
-
   const lastSentViewDataRef = useRef<PdfTextEditorViewData | null>(null);
 
   useEffect(() => {
diff --git a/frontend/src/proprietary/tools/pdfTextEditor/fontAnalysis.ts b/frontend/src/core/tools/pdfTextEditor/fontAnalysis.ts
similarity index 100%
rename from frontend/src/proprietary/tools/pdfTextEditor/fontAnalysis.ts
rename to frontend/src/core/tools/pdfTextEditor/fontAnalysis.ts
diff --git a/frontend/src/proprietary/tools/pdfTextEditor/pdfTextEditorTypes.ts b/frontend/src/core/tools/pdfTextEditor/pdfTextEditorTypes.ts
similarity index 98%
rename from frontend/src/proprietary/tools/pdfTextEditor/pdfTextEditorTypes.ts
rename to frontend/src/core/tools/pdfTextEditor/pdfTextEditorTypes.ts
index 8439bb4c1..3dd45a465 100644
--- a/frontend/src/proprietary/tools/pdfTextEditor/pdfTextEditorTypes.ts
+++ b/frontend/src/core/tools/pdfTextEditor/pdfTextEditorTypes.ts
@@ -221,8 +221,11 @@ export interface PdfTextEditorViewData {
   onDownloadJson: () => void;
   onGeneratePdf: () => void;
   onGeneratePdfForNavigation: () => Promise<void>;
+  onSaveToWorkbench: () => Promise<void>;
+  isSavingToWorkbench: boolean;
   onForceSingleTextElementChange: (value: boolean) => void;
   onGroupingModeChange: (value: 'auto' | 'paragraph' | 'singleLine') => void;
   onMergeGroups: (pageIndex: number, groupIds: string[]) => boolean;
   onUngroupGroup: (pageIndex: number, groupId: string) => boolean;
+  onLoadFile: (file: File) => void;
 }
diff --git a/frontend/src/proprietary/tools/pdfTextEditor/pdfTextEditorUtils.ts b/frontend/src/core/tools/pdfTextEditor/pdfTextEditorUtils.ts
similarity index 100%
rename from frontend/src/proprietary/tools/pdfTextEditor/pdfTextEditorUtils.ts
rename to frontend/src/core/tools/pdfTextEditor/pdfTextEditorUtils.ts
diff --git a/frontend/src/core/types/getPdfInfo.ts b/frontend/src/core/types/getPdfInfo.ts
new file mode 100644
index 000000000..f489cd99a
--- /dev/null
+++ b/frontend/src/core/types/getPdfInfo.ts
@@ -0,0 +1,273 @@
+/** Metadata section from PDF */
+export interface PdfMetadata {
+  Title?: string | null;
+  Author?: string | null;
+  Subject?: string | null;
+  Keywords?: string | null;
+  Creator?: string | null;
+  Producer?: string | null;
+  CreationDate?: string | null;
+  ModificationDate?: string | null;
+  [key: string]: unknown;
+}
+
+/** Basic info section */
+export interface PdfBasicInfo {
+  FileSizeInBytes?: number;
+  WordCount?: number;
+  ParagraphCount?: number;
+  CharacterCount?: number;
+  Compression?: boolean;
+  CompressionType?: string;
+  Language?: string | null;
+  'Number of pages'?: number;
+  TotalImages?: number;
+  [key: string]: unknown;
+}
+
+/** Document info section */
+export interface PdfDocumentInfo {
+  'PDF version'?: string;
+  Trapped?: string | null;
+  'Page Mode'?: string;
+  [key: string]: unknown;
+}
+
+/** Encryption section */
+export interface PdfEncryption {
+  IsEncrypted?: boolean;
+  EncryptionAlgorithm?: string;
+  KeyLength?: number;
+  [key: string]: unknown;
+}
+
+/** Permissions section - values are "Allowed" or "Not Allowed" */
+export interface PdfPermissions {
+  'Document Assembly'?: 'Allowed' | 'Not Allowed';
+  'Extracting Content'?: 'Allowed' | 'Not Allowed';
+  'Extracting for accessibility'?: 'Allowed' | 'Not Allowed';
+  'Form Filling'?: 'Allowed' | 'Not Allowed';
+  'Modifying'?: 'Allowed' | 'Not Allowed';
+  'Modifying annotations'?: 'Allowed' | 'Not Allowed';
+  'Printing'?: 'Allowed' | 'Not Allowed';
+  [key: string]: 'Allowed' | 'Not Allowed' | undefined;
+}
+
+/** Compliance section */
+export interface PdfCompliance {
+  'IsPDF/ACompliant'?: boolean;
+  'PDF/AConformanceLevel'?: string;
+  'IsPDF/AValidated'?: boolean;
+  'IsPDF/XCompliant'?: boolean;
+  'IsPDF/ECompliant'?: boolean;
+  'IsPDF/VTCompliant'?: boolean;
+  'IsPDF/UACompliant'?: boolean;
+  'IsPDF/BCompliant'?: boolean;
+  'IsPDF/SECCompliant'?: boolean;
+  [key: string]: unknown;
+}
+
+/** Font info within a page */
+export interface PdfFontInfo {
+  Name?: string;
+  IsEmbedded?: boolean;
+  Subtype?: string;
+  ItalicAngle?: number;
+  IsItalic?: boolean;
+  IsBold?: boolean;
+  IsFixedPitch?: boolean;
+  IsSerif?: boolean;
+  IsSymbolic?: boolean;
+  IsScript?: boolean;
+  IsNonsymbolic?: boolean;
+  FontFamily?: string;
+  FontWeight?: number;
+  Count?: number;
+}
+
+/** Image info within a page */
+export interface PdfImageInfo {
+  Width?: number;
+  Height?: number;
+  Name?: string;
+  ColorSpace?: string;
+}
+
+/** Link info within a page */
+export interface PdfLinkInfo {
+  URI?: string;
+}
+
+/** Annotations info within a page */
+export interface PdfAnnotationsInfo {
+  AnnotationsCount?: number;
+  SubtypeCount?: number;
+  ContentsCount?: number;
+  [key: string]: unknown;
+}
+
+/** Size/dimensions info within a page */
+export interface PdfSizeInfo {
+  'Width (px)'?: string;
+  'Height (px)'?: string;
+  'Width (in)'?: string;
+  'Height (in)'?: string;
+  'Width (cm)'?: string;
+  'Height (cm)'?: string;
+  'Standard Page'?: string;
+  [key: string]: unknown;
+}
+
+/** XObject counts within a page */
+export interface PdfXObjectCounts {
+  Image?: number;
+  Form?: number;
+  Other?: number;
+  [key: string]: unknown;
+}
+
+/** ICC Profile info */
+export interface PdfICCProfile {
+  'ICC Profile Length'?: number;
+}
+
+/** Page-level information */
+export interface PdfPageInfo {
+  Size?: PdfSizeInfo;
+  Rotation?: number;
+  'Page Orientation'?: string;
+  MediaBox?: string;
+  CropBox?: string;
+  BleedBox?: string;
+  TrimBox?: string;
+  ArtBox?: string;
+  'Text Characters Count'?: number;
+  Annotations?: PdfAnnotationsInfo;
+  Images?: PdfImageInfo[];
+  Links?: PdfLinkInfo[];
+  Fonts?: PdfFontInfo[];
+  'Color Spaces & ICC Profiles'?: PdfICCProfile[];
+  XObjectCounts?: PdfXObjectCounts;
+  Multimedia?: Record<string, unknown>[];
+}
+
+/** Per-page info section (keyed by "Page 1", "Page 2", etc.) */
+export interface PdfPerPageInfo {
+  [pageLabel: string]: PdfPageInfo;
+}
+
+/** Embedded file info */
+export interface PdfEmbeddedFileInfo {
+  Name?: string;
+  FileSize?: number;
+}
+
+/** Attachment info */
+export interface PdfAttachmentInfo {
+  Name?: string;
+  Description?: string;
+}
+
+/** JavaScript info */
+export interface PdfJavaScriptInfo {
+  'JS Name'?: string;
+  'JS Script Length'?: number;
+}
+
+/** Layer info */
+export interface PdfLayerInfo {
+  Name?: string;
+}
+
+/** Structure tree element */
+export interface PdfStructureTreeElement {
+  Type?: string;
+  Content?: string;
+  Children?: PdfStructureTreeElement[];
+}
+
+/** Other section with miscellaneous data */
+export interface PdfOtherInfo {
+  Attachments?: PdfAttachmentInfo[];
+  EmbeddedFiles?: PdfEmbeddedFileInfo[];
+  JavaScript?: PdfJavaScriptInfo[];
+  Layers?: PdfLayerInfo[];
+  StructureTree?: PdfStructureTreeElement[];
+  'Bookmarks/Outline/TOC'?: PdfTocEntry[];
+  XMPMetadata?: string | null;
+}
+
+/** Table of contents bookmark entry */
+export interface PdfTocEntry {
+  Title?: string;
+  [key: string]: unknown;
+}
+
+/** Summary data section */
+export interface PdfSummaryData {
+  encrypted?: boolean;
+  restrictedPermissions?: string[];
+  restrictedPermissionsCount?: number;
+  standardCompliance?: string;
+  standardPurpose?: string;
+  standardValidationPassed?: boolean;
+}
+
+/** Form fields section */
+export type PdfFormFields = Record<string, string>;
+
+/** Parsed sections with normalized keys for frontend use */
+export interface ParsedPdfSections {
+  metadata?: PdfMetadata | null;
+  formFields?: PdfFormFields | null;
+  basicInfo?: PdfBasicInfo | null;
+  documentInfo?: PdfDocumentInfo | null;
+  compliance?: PdfCompliance | null;
+  encryption?: PdfEncryption | null;
+  permissions?: PdfPermissions | null;
+  toc?: PdfTocEntry[] | null;
+  other?: PdfOtherInfo | null;
+  perPage?: PdfPerPageInfo | null;
+  summaryData?: PdfSummaryData | null;
+}
+
+/** Raw backend response structure */
+export interface PdfInfoBackendData {
+  Metadata?: PdfMetadata;
+  FormFields?: PdfFormFields;
+  BasicInfo?: PdfBasicInfo;
+  DocumentInfo?: PdfDocumentInfo;
+  Compliancy?: PdfCompliance;
+  Encryption?: PdfEncryption;
+  Permissions?: PdfPermissions;
+  Other?: PdfOtherInfo;
+  PerPageInfo?: PdfPerPageInfo;
+  SummaryData?: PdfSummaryData;
+  // Legacy/alternative keys for backwards compatibility
+  'Form Fields'?: PdfFormFields;
+  'Basic Info'?: PdfBasicInfo;
+  'Document Info'?: PdfDocumentInfo;
+  Compliance?: PdfCompliance;
+  'Bookmarks/Outline/TOC'?: PdfTocEntry[];
+  'Table of Contents'?: PdfTocEntry[];
+  'Per Page Info'?: PdfPerPageInfo;
+}
+
+export interface PdfInfoReportEntry {
+  fileId: string;
+  fileName: string;
+  fileSize: number | null;
+  lastModified: number | null;
+  thumbnailUrl?: string | null;
+  data: PdfInfoBackendData;
+  error: string | null;
+  summaryGeneratedAt?: number;
+}
+
+export interface PdfInfoReportData {
+  generatedAt: number;
+  entries: PdfInfoReportEntry[];
+}
+
+export const INFO_JSON_FILENAME = 'response.json';
+export const INFO_PDF_FILENAME = 'pdf-information-report.pdf';
diff --git a/frontend/src/core/types/toolId.ts b/frontend/src/core/types/toolId.ts
index 9a8dee3ba..be434027d 100644
--- a/frontend/src/core/types/toolId.ts
+++ b/frontend/src/core/types/toolId.ts
@@ -55,6 +55,7 @@ export const CORE_REGULAR_TOOL_IDS = [
   'replaceColor',
   'showJS',
   'bookletImposition',
+  'pdfTextEditor',
 ] as const;
 
 export const CORE_SUPER_TOOL_IDS = [
diff --git a/frontend/src/core/utils/automationExecutor.ts b/frontend/src/core/utils/automationExecutor.ts
index 760a86d7b..2651784e1 100644
--- a/frontend/src/core/utils/automationExecutor.ts
+++ b/frontend/src/core/utils/automationExecutor.ts
@@ -1,4 +1,4 @@
-import axios from 'axios';
+import apiClient from '@app/services/apiClient';
 import { ToolRegistry } from '@app/data/toolsTaxonomy';
 import { ToolId } from '@app/types/toolId';
 import { AUTOMATION_CONSTANTS } from '@app/constants/automation';
@@ -58,7 +58,7 @@ const executeApiRequest = async (
   filePrefix: string,
   preserveBackendFilename?: boolean
 ): Promise<File[]> => {
-  const response = await axios.post(endpoint, formData, {
+  const response = await apiClient.post(endpoint, formData, {
     responseType: 'blob',
     timeout: AUTOMATION_CONSTANTS.OPERATION_TIMEOUT
   });
@@ -158,8 +158,8 @@ export const executeToolOperationWithPrefix = async (
   try {
     // Check if tool uses custom processor (like Convert tool)
     if (config.customProcessor) {
-      const resultFiles = await config.customProcessor(parameters, files);
-      return resultFiles;
+      const result = await config.customProcessor(parameters, files);
+      return result.files;
     }
 
     // Execute based on tool type
diff --git a/frontend/src/core/utils/automationFileProcessor.ts b/frontend/src/core/utils/automationFileProcessor.ts
index b07fe961b..311848bfd 100644
--- a/frontend/src/core/utils/automationFileProcessor.ts
+++ b/frontend/src/core/utils/automationFileProcessor.ts
@@ -2,7 +2,7 @@
  * File processing utilities specifically for automation workflows
  */
 
-import axios from 'axios';
+import apiClient from '@app/services/apiClient';
 import { zipFileService } from '@app/services/zipFileService';
 import { ResourceManager } from '@app/utils/resourceManager';
 import { AUTOMATION_CONSTANTS } from '@app/constants/automation';
@@ -97,7 +97,7 @@ export class AutomationFileProcessor {
     options: AutomationProcessingOptions = {}
   ): Promise<AutomationProcessingResult> {
     try {
-      const response = await axios.post(endpoint, formData, {
+      const response = await apiClient.post(endpoint, formData, {
         responseType: options.responseType || 'blob',
         timeout: options.timeout || AUTOMATION_CONSTANTS.OPERATION_TIMEOUT
       });
@@ -139,7 +139,7 @@ export class AutomationFileProcessor {
     options: AutomationProcessingOptions = {}
   ): Promise<AutomationProcessingResult> {
     try {
-      const response = await axios.post(endpoint, formData, {
+      const response = await apiClient.post(endpoint, formData, {
         responseType: options.responseType || 'blob',
         timeout: options.timeout || AUTOMATION_CONSTANTS.OPERATION_TIMEOUT
       });
diff --git a/frontend/src/core/utils/convertUtils.ts b/frontend/src/core/utils/convertUtils.ts
index ef2836058..b1e87161b 100644
--- a/frontend/src/core/utils/convertUtils.ts
+++ b/frontend/src/core/utils/convertUtils.ts
@@ -60,6 +60,18 @@ export const isWebFormat = (extension: string): boolean => {
   return ['html', 'zip'].includes(extension.toLowerCase());
 };
 
+/**
+ * Checks if the given extension is an office format (Word, Excel, PowerPoint, OpenOffice)
+ * These formats use LibreOffice for conversion and require individual file processing
+ */
+export const isOfficeFormat = (extension: string): boolean => {
+  return [
+    'docx', 'doc', 'odt',  // Word processors
+    'xlsx', 'xls', 'ods',  // Spreadsheets
+    'pptx', 'ppt', 'odp'   // Presentations
+  ].includes(extension.toLowerCase());
+};
+
 /**
  * Gets available target extensions for a given source extension
  * Extracted from useConvertParameters to be reusable in automation settings
diff --git a/frontend/src/core/utils/fileUtils.ts b/frontend/src/core/utils/fileUtils.ts
index 0f1471401..4061884b5 100644
--- a/frontend/src/core/utils/fileUtils.ts
+++ b/frontend/src/core/utils/fileUtils.ts
@@ -52,6 +52,29 @@ export function detectFileExtension(filename: string): string {
   return extension;
 }
 
+/**
+ * Removes the file extension from a filename
+ * @param filename - The filename to process
+ * @param options - Options for processing
+ * @param options.preserveCase - If true, preserves original case. If false (default), converts to lowercase
+ * @returns Filename without extension
+ * @example
+ * getFilenameWithoutExtension('document.pdf') // 'document'
+ * getFilenameWithoutExtension('my.file.name.txt') // 'my.file.name'
+ * getFilenameWithoutExtension('REPORT.PDF', { preserveCase: true }) // 'REPORT'
+ */
+export function getFilenameWithoutExtension(
+  filename: string,
+  options: { preserveCase?: boolean } = {}
+): string {
+  if (!filename || typeof filename !== 'string') return '';
+
+  const { preserveCase = false } = options;
+  const withoutExtension = filename.replace(/\.[^.]+$/, '');
+
+  return preserveCase ? withoutExtension : withoutExtension.toLowerCase();
+}
+
 /**
  * Checks if a file is a PDF based on extension and MIME type
  * @param file - File or file-like object with name and type properties
diff --git a/frontend/src/core/utils/urlMapping.ts b/frontend/src/core/utils/urlMapping.ts
index aa2a3c57c..9cc5d1839 100644
--- a/frontend/src/core/utils/urlMapping.ts
+++ b/frontend/src/core/utils/urlMapping.ts
@@ -97,6 +97,7 @@ export const URL_TO_TOOL_MAP: Record<string, ToolId> = {
   '/automate': 'automate',
   '/sign': 'sign',
   '/add-text': 'addText',
+  '/pdf-text-editor': 'pdfTextEditor',
 
   // Developer tools
   '/dev-api': 'devApi',
diff --git a/frontend/src/desktop/components/SetupWizard/DesktopAuthLayout.tsx b/frontend/src/desktop/components/SetupWizard/DesktopAuthLayout.tsx
new file mode 100644
index 000000000..92558857b
--- /dev/null
+++ b/frontend/src/desktop/components/SetupWizard/DesktopAuthLayout.tsx
@@ -0,0 +1,72 @@
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import LoginRightCarousel from '@app/components/shared/LoginRightCarousel';
+import buildLoginSlides from '@app/components/shared/loginSlides';
+import styles from '@app/routes/authShared/AuthLayout.module.css';
+import { useLogoVariant } from '@app/hooks/useLogoVariant';
+
+interface DesktopAuthLayoutProps {
+  children: React.ReactNode;
+}
+
+export const DesktopAuthLayout: React.FC<DesktopAuthLayoutProps> = ({ children }) => {
+  const { t } = useTranslation();
+  const cardRef = useRef<HTMLDivElement | null>(null);
+  const [hideRightPanel, setHideRightPanel] = useState(false);
+  const logoVariant = useLogoVariant();
+  const imageSlides = useMemo(() => buildLoginSlides(logoVariant, t), [logoVariant, t]);
+
+  // Force light mode on auth pages
+  useEffect(() => {
+    const htmlElement = document.documentElement;
+    const previousColorScheme = htmlElement.getAttribute('data-mantine-color-scheme');
+
+    // Set light mode
+    htmlElement.setAttribute('data-mantine-color-scheme', 'light');
+
+    // Cleanup: restore previous theme when leaving auth pages
+    return () => {
+      if (previousColorScheme) {
+        htmlElement.setAttribute('data-mantine-color-scheme', previousColorScheme);
+      }
+    };
+  }, []);
+
+  useEffect(() => {
+    const update = () => {
+      // Use viewport to avoid hysteresis when the card is already in single-column mode
+      const viewportWidth = window.innerWidth;
+      const viewportHeight = window.innerHeight;
+      const cardWidthIfTwoCols = Math.min(1180, viewportWidth * 0.96); // matches min(73.75rem, 96vw)
+      const columnWidth = cardWidthIfTwoCols / 2;
+      const tooNarrow = columnWidth < 470;
+      const tooShort = viewportHeight < 740;
+      setHideRightPanel(tooNarrow || tooShort);
+    };
+    update();
+    window.addEventListener('resize', update);
+    window.addEventListener('orientationchange', update);
+    return () => {
+      window.removeEventListener('resize', update);
+      window.removeEventListener('orientationchange', update);
+    };
+  }, []);
+
+  return (
+    <div className={styles.authContainer}>
+      <div
+        ref={cardRef}
+        className={`${styles.authCard} ${!hideRightPanel ? styles.authCardTwoColumns : ''}`}
+      >
+        <div className={styles.authLeftPanel}>
+          <div className={styles.authContent}>
+            {children}
+          </div>
+        </div>
+        {!hideRightPanel && (
+          <LoginRightCarousel imageSlides={imageSlides} initialSeconds={5} slideSeconds={8} />
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/frontend/src/desktop/components/SetupWizard/DesktopOAuthButtons.tsx b/frontend/src/desktop/components/SetupWizard/DesktopOAuthButtons.tsx
new file mode 100644
index 000000000..49b55a386
--- /dev/null
+++ b/frontend/src/desktop/components/SetupWizard/DesktopOAuthButtons.tsx
@@ -0,0 +1,110 @@
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { authService, UserInfo } from '@app/services/authService';
+import { buildOAuthCallbackHtml } from '@app/utils/oauthCallbackHtml';
+import { BASE_PATH } from '@app/constants/app';
+import '@app/routes/authShared/auth.css';
+
+export type OAuthProvider = 'google' | 'github' | 'keycloak' | 'azure' | 'apple' | 'oidc';
+
+interface DesktopOAuthButtonsProps {
+  onOAuthSuccess: (userInfo: UserInfo) => Promise<void>;
+  onError: (error: string) => void;
+  isDisabled: boolean;
+  serverUrl: string;
+  providers: OAuthProvider[];
+}
+
+export const DesktopOAuthButtons: React.FC<DesktopOAuthButtonsProps> = ({
+  onOAuthSuccess,
+  onError,
+  isDisabled,
+  serverUrl,
+  providers,
+}) => {
+  const { t } = useTranslation();
+  const [oauthLoading, setOauthLoading] = useState(false);
+
+  const handleOAuthLogin = async (provider: OAuthProvider) => {
+    // Prevent concurrent OAuth attempts
+    if (oauthLoading || isDisabled) {
+      return;
+    }
+
+    try {
+      setOauthLoading(true);
+
+      // Build callback page HTML with translations and dark mode support
+      const successHtml = buildOAuthCallbackHtml({
+        title: t('oauth.success.title', 'Authentication Successful'),
+        message: t('oauth.success.message', 'You can close this window and return to Stirling PDF.'),
+        isError: false,
+      });
+
+      const errorHtml = buildOAuthCallbackHtml({
+        title: t('oauth.error.title', 'Authentication Failed'),
+        message: t('oauth.error.message', 'Authentication was not successful. You can close this window and try again.'),
+        isError: true,
+        errorPlaceholder: true, // {error} will be replaced by Rust
+      });
+
+      const userInfo = await authService.loginWithOAuth(provider, serverUrl, successHtml, errorHtml);
+
+      // Call the onOAuthSuccess callback to complete setup
+      await onOAuthSuccess(userInfo);
+    } catch (error) {
+      console.error('OAuth login failed:', error);
+
+      const errorMessage = error instanceof Error
+        ? error.message
+        : t('setup.login.error.oauthFailed', 'OAuth login failed. Please try again.');
+
+      onError(errorMessage);
+      setOauthLoading(false);
+    }
+  };
+
+  const providerConfig: Record<OAuthProvider, { label: string; file: string }> = {
+    google: { label: 'Google', file: 'google.svg' },
+    github: { label: 'GitHub', file: 'github.svg' },
+    keycloak: { label: 'Keycloak', file: 'keycloak.svg' },
+    azure: { label: 'Microsoft', file: 'microsoft.svg' },
+    apple: { label: 'Apple', file: 'apple.svg' },
+    oidc: { label: 'OpenID', file: 'oidc.svg' },
+  };
+
+  if (providers.length === 0) {
+    return null;
+  }
+
+  return (
+    <div className="oauth-container-vertical">
+      {providers
+        .filter((providerId) => providerId in providerConfig)
+        .map((providerId) => {
+          const provider = providerConfig[providerId];
+          return (
+            <button
+              key={providerId}
+              onClick={() => handleOAuthLogin(providerId)}
+              disabled={isDisabled || oauthLoading}
+              className="oauth-button-vertical"
+              title={provider.label}
+            >
+              <img
+                src={`${BASE_PATH}/Login/${provider.file}`}
+                alt={provider.label}
+                className="oauth-icon-tiny"
+              />
+              {provider.label}
+            </button>
+          );
+        })}
+      {oauthLoading && (
+        <p style={{ margin: '0.5rem 0', fontSize: '0.875rem', color: '#6b7280', textAlign: 'center' }}>
+          {t('setup.login.oauthPending', 'Opening browser for authentication...')}
+        </p>
+      )}
+    </div>
+  );
+};
diff --git a/frontend/src/desktop/components/SetupWizard/LoginForm.tsx b/frontend/src/desktop/components/SetupWizard/LoginForm.tsx
deleted file mode 100644
index 4ad388822..000000000
--- a/frontend/src/desktop/components/SetupWizard/LoginForm.tsx
+++ /dev/null
@@ -1,225 +0,0 @@
-import React, { useState } from 'react';
-import { Stack, TextInput, PasswordInput, Button, Text, Divider, Group, Collapse, Anchor, Box } from '@mantine/core';
-import { useTranslation } from 'react-i18next';
-import { authService } from '@app/services/authService';
-import { STIRLING_SAAS_URL } from '@app/constants/connection';
-import { buildOAuthCallbackHtml } from '@app/utils/oauthCallbackHtml';
-import { BASE_PATH } from '@app/constants/app';
-
-interface LoginFormProps {
-  serverUrl: string;
-  isSaaS?: boolean;
-  onLogin: (username: string, password: string) => Promise<void>;
-  loading: boolean;
-}
-
-export const LoginForm: React.FC<LoginFormProps> = ({ serverUrl, isSaaS = false, onLogin, loading }) => {
-  const { t } = useTranslation();
-  const [username, setUsername] = useState('');
-  const [password, setPassword] = useState('');
-  const [validationError, setValidationError] = useState<string | null>(null);
-  const [oauthLoading, setOauthLoading] = useState(false);
-  const [showInstructions, setShowInstructions] = useState(false);
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-
-    // Validation
-    if (!username.trim()) {
-      setValidationError(isSaaS
-        ? t('setup.login.error.emptyEmail', 'Please enter your email')
-        : t('setup.login.error.emptyUsername', 'Please enter your username'));
-      return;
-    }
-
-    if (!password) {
-      setValidationError(t('setup.login.error.emptyPassword', 'Please enter your password'));
-      return;
-    }
-
-    setValidationError(null);
-    await onLogin(username.trim(), password);
-  };
-
-  const handleOAuthLogin = async (provider: 'google' | 'github') => {
-    // Prevent concurrent OAuth attempts
-    if (oauthLoading || loading) {
-      return;
-    }
-
-    try {
-      setOauthLoading(true);
-      setValidationError(null);
-
-      // For SaaS, use configured SaaS URL; for self-hosted, derive from serverUrl
-      const authServerUrl = isSaaS
-        ? STIRLING_SAAS_URL
-        : serverUrl; // Self-hosted might have its own auth
-
-      // Build callback page HTML with translations and dark mode support
-      const successHtml = buildOAuthCallbackHtml({
-        title: t('oauth.success.title', 'Authentication Successful'),
-        message: t('oauth.success.message', 'You can close this window and return to Stirling PDF.'),
-        isError: false,
-      });
-
-      const errorHtml = buildOAuthCallbackHtml({
-        title: t('oauth.error.title', 'Authentication Failed'),
-        message: t('oauth.error.message', 'Authentication was not successful. You can close this window and try again.'),
-        isError: true,
-        errorPlaceholder: true, // {error} will be replaced by Rust
-      });
-
-      const userInfo = await authService.loginWithOAuth(provider, authServerUrl, successHtml, errorHtml);
-
-      // Call the onLogin callback to complete setup (username/password not needed for OAuth)
-      await onLogin(userInfo.username, '');
-    } catch (error) {
-      console.error('OAuth login failed:', error);
-
-      const errorMessage = error instanceof Error
-        ? error.message
-        : t('setup.login.error.oauthFailed', 'OAuth login failed. Please try again.');
-
-      setValidationError(errorMessage);
-      setOauthLoading(false);
-    }
-  };
-
-  return (
-    <form onSubmit={handleSubmit}>
-      <Stack gap="md">
-        <Text size="sm" c="dimmed">
-          {t('setup.login.connectingTo', 'Connecting to:')} <strong>{isSaaS ? 'stirling.com' : serverUrl}</strong>
-        </Text>
-
-        {/* Login requirement note for self-hosted servers */}
-        {!isSaaS && (
-          <Box>
-            <Text size="xs" c="dimmed">
-              {t('setup.login.serverRequirement', 'Note: The server must have login enabled.')}{' '}
-              <Anchor
-                size="xs"
-                onClick={() => setShowInstructions(!showInstructions)}
-                style={{ cursor: 'pointer' }}
-              >
-                {showInstructions
-                  ? t('setup.login.hideInstructions', 'Hide instructions')
-                  : t('setup.login.showInstructions', 'How to enable?')}
-              </Anchor>
-            </Text>
-
-            <Collapse in={showInstructions}>
-              <Box mt="xs" p="sm" style={{ backgroundColor: 'var(--mantine-color-gray-0)', borderRadius: '4px' }}>
-                <Text size="xs" c="dimmed">
-                  {t('setup.login.instructions', 'To enable login on your Stirling PDF server:')}
-                </Text>
-                <Text size="xs" mt="xs" c="dimmed">
-                  {t('setup.login.instructionsEnvVar', 'Set the environment variable:')}
-                </Text>
-                <Text size="xs" mt="4px" ff="monospace" c="dark">
-                  SECURITY_ENABLELOGIN=true
-                </Text>
-                <Text size="xs" mt="xs" c="dimmed">
-                  {t('setup.login.instructionsOrYml', 'Or in settings.yml:')}
-                </Text>
-                <Text size="xs" mt="4px" ff="monospace" c="dark">
-                  security.enableLogin: true
-                </Text>
-                <Text size="xs" mt="xs" c="dimmed">
-                  {t('setup.login.instructionsRestart', 'Then restart your server for the changes to take effect.')}
-                </Text>
-              </Box>
-            </Collapse>
-          </Box>
-        )}
-
-        {/* OAuth Login Buttons - Only show for SaaS */}
-        {isSaaS && (
-          <>
-            <Stack gap="xs">
-              <Group grow>
-                <Button
-                  variant="default"
-                  leftSection={<img src={`${BASE_PATH}/Login/google.svg`} alt="Google" width={18} height={18} />}
-                  onClick={() => handleOAuthLogin('google')}
-                  disabled={loading || oauthLoading}
-                  styles={{
-                    root: { height: '42px' },
-                  }}
-                >
-                  {t('setup.login.signInWith', 'Sign in with')} Google
-                </Button>
-
-                <Button
-                  variant="default"
-                  leftSection={<img src={`${BASE_PATH}/Login/github.svg`} alt="GitHub" width={18} height={18} />}
-                  onClick={() => handleOAuthLogin('github')}
-                  disabled={loading || oauthLoading}
-                  styles={{
-                    root: { height: '42px' },
-                  }}
-                >
-                  {t('setup.login.signInWith', 'Sign in with')} GitHub
-                </Button>
-              </Group>
-
-              {oauthLoading && (
-                <Text size="sm" c="dimmed" ta="center">
-                  {t('setup.login.oauthPending', 'Opening browser for authentication...')}
-                </Text>
-              )}
-            </Stack>
-
-            <Divider label={t('setup.login.orContinueWith', 'Or continue with email')} labelPosition="center" />
-          </>
-        )}
-
-        <TextInput
-          label={isSaaS
-            ? t('setup.login.email.label', 'Email')
-            : t('setup.login.username.label', 'Username')}
-          placeholder={isSaaS
-            ? t('setup.login.email.placeholder', 'Enter your email')
-            : t('setup.login.username.placeholder', 'Enter your username')}
-          value={username}
-          onChange={(e) => {
-            setUsername(e.target.value);
-            setValidationError(null);
-          }}
-          disabled={loading}
-          required
-        />
-
-        <PasswordInput
-          label={t('setup.login.password.label', 'Password')}
-          placeholder={t('setup.login.password.placeholder', 'Enter your password')}
-          value={password}
-          onChange={(e) => {
-            setPassword(e.target.value);
-            setValidationError(null);
-          }}
-          disabled={loading}
-          required
-        />
-
-        {validationError && (
-          <Text c="red" size="sm">
-            {validationError}
-          </Text>
-        )}
-
-        <Button
-          type="submit"
-          loading={loading}
-          disabled={loading}
-          mt="md"
-          fullWidth
-          color="#AF3434"
-        >
-          {t('setup.login.submit', 'Login')}
-        </Button>
-      </Stack>
-    </form>
-  );
-};
diff --git a/frontend/src/desktop/components/SetupWizard/ModeSelection.tsx b/frontend/src/desktop/components/SetupWizard/ModeSelection.tsx
deleted file mode 100644
index 8242fa5ed..000000000
--- a/frontend/src/desktop/components/SetupWizard/ModeSelection.tsx
+++ /dev/null
@@ -1,72 +0,0 @@
-import React from 'react';
-import { Stack, Button, Text } from '@mantine/core';
-import { useTranslation } from 'react-i18next';
-import CloudIcon from '@mui/icons-material/Cloud';
-import ComputerIcon from '@mui/icons-material/Computer';
-
-interface ModeSelectionProps {
-  onSelect: (mode: 'saas' | 'selfhosted') => void;
-  loading: boolean;
-}
-
-export const ModeSelection: React.FC<ModeSelectionProps> = ({ onSelect, loading }) => {
-  const { t } = useTranslation();
-
-  return (
-    <Stack gap="md">
-      <Button
-        size="xl"
-        variant="default"
-        onClick={() => onSelect('saas')}
-        disabled={loading}
-        leftSection={<CloudIcon />}
-        styles={{
-          root: {
-            height: 'auto',
-            padding: '1.25rem',
-          },
-          inner: {
-            justifyContent: 'flex-start',
-          },
-          section: {
-            marginRight: '1rem',
-          },
-        }}
-      >
-        <div style={{ textAlign: 'left', flex: 1 }}>
-          <Text fw={600} size="md">{t('setup.mode.saas.title', 'Use SaaS')}</Text>
-          <Text size="sm" c="dimmed" fw={400}>
-            {t('setup.mode.saas.description', 'Sign in to Stirling PDF cloud service')}
-          </Text>
-        </div>
-      </Button>
-
-      <Button
-        size="xl"
-        variant="default"
-        onClick={() => onSelect('selfhosted')}
-        disabled={loading}
-        leftSection={<ComputerIcon />}
-        styles={{
-          root: {
-            height: 'auto',
-            padding: '1.25rem',
-          },
-          inner: {
-            justifyContent: 'flex-start',
-          },
-          section: {
-            marginRight: '1rem',
-          },
-        }}
-      >
-        <div style={{ textAlign: 'left', flex: 1 }}>
-          <Text fw={600} size="md">{t('setup.mode.selfhosted.title', 'Self-Hosted Server')}</Text>
-          <Text size="sm" c="dimmed" fw={400}>
-            {t('setup.mode.selfhosted.description', 'Connect to your own Stirling PDF server with your personal account')}
-          </Text>
-        </div>
-      </Button>
-    </Stack>
-  );
-};
diff --git a/frontend/src/desktop/components/SetupWizard/SaaSLoginScreen.tsx b/frontend/src/desktop/components/SetupWizard/SaaSLoginScreen.tsx
new file mode 100644
index 000000000..6acd28858
--- /dev/null
+++ b/frontend/src/desktop/components/SetupWizard/SaaSLoginScreen.tsx
@@ -0,0 +1,111 @@
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import LoginHeader from '@app/routes/login/LoginHeader';
+import ErrorMessage from '@app/routes/login/ErrorMessage';
+import EmailPasswordForm from '@app/routes/login/EmailPasswordForm';
+import DividerWithText from '@app/components/shared/DividerWithText';
+import { DesktopOAuthButtons } from '@app/components/SetupWizard/DesktopOAuthButtons';
+import { SelfHostedLink } from '@app/components/SetupWizard/SelfHostedLink';
+import { UserInfo } from '@app/services/authService';
+import '@app/routes/authShared/auth.css';
+
+interface SaaSLoginScreenProps {
+  serverUrl: string;
+  onLogin: (username: string, password: string) => Promise<void>;
+  onOAuthSuccess: (userInfo: UserInfo) => Promise<void>;
+  onSelfHostedClick: () => void;
+  onSwitchToSignup: () => void;
+  loading: boolean;
+  error: string | null;
+}
+
+export const SaaSLoginScreen: React.FC<SaaSLoginScreenProps> = ({
+  serverUrl,
+  onLogin,
+  onOAuthSuccess,
+  onSelfHostedClick,
+  onSwitchToSignup,
+  loading,
+  error,
+}) => {
+  const { t } = useTranslation();
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [validationError, setValidationError] = useState<string | null>(null);
+
+  const handleEmailPasswordSubmit = async () => {
+    // Validation
+    if (!email.trim()) {
+      setValidationError(t('setup.login.error.emptyEmail', 'Please enter your email'));
+      return;
+    }
+
+    if (!password) {
+      setValidationError(t('setup.login.error.emptyPassword', 'Please enter your password'));
+      return;
+    }
+
+    setValidationError(null);
+    await onLogin(email.trim(), password);
+  };
+
+  const handleOAuthError = (errorMessage: string) => {
+    setValidationError(errorMessage);
+  };
+
+  const displayError = error || validationError;
+
+  return (
+    <>
+      <LoginHeader title={t('setup.saas.title', 'Sign in to Stirling Cloud')} />
+
+      <ErrorMessage error={displayError} />
+
+      <DesktopOAuthButtons
+        onOAuthSuccess={onOAuthSuccess}
+        onError={handleOAuthError}
+        isDisabled={loading}
+        serverUrl={serverUrl}
+        providers={['google', 'github']}
+      />
+
+      <DividerWithText
+        text={t('setup.login.orContinueWith', 'Or continue with email')}
+        respondsToDarkMode={false}
+        opacity={0.4}
+      />
+
+      <EmailPasswordForm
+        email={email}
+        password={password}
+        setEmail={(value) => {
+          setEmail(value);
+          setValidationError(null);
+        }}
+        setPassword={(value) => {
+          setPassword(value);
+          setValidationError(null);
+        }}
+        onSubmit={handleEmailPasswordSubmit}
+        isSubmitting={loading}
+        submitButtonText={t('setup.login.submit', 'Login')}
+      />
+
+      <div className="navigation-link-container" style={{ marginTop: '0.5rem', textAlign: 'right' }}>
+        <button
+          type="button"
+          onClick={() => {
+            setValidationError(null);
+            onSwitchToSignup();
+          }}
+          className="navigation-link-button"
+          disabled={loading}
+        >
+          {t('signup.signUp', 'Sign Up')}
+        </button>
+      </div>
+
+      <SelfHostedLink onClick={onSelfHostedClick} disabled={loading} />
+    </>
+  );
+};
diff --git a/frontend/src/desktop/components/SetupWizard/SaaSSignupScreen.tsx b/frontend/src/desktop/components/SetupWizard/SaaSSignupScreen.tsx
new file mode 100644
index 000000000..6ad330926
--- /dev/null
+++ b/frontend/src/desktop/components/SetupWizard/SaaSSignupScreen.tsx
@@ -0,0 +1,104 @@
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import LoginHeader from '@app/routes/login/LoginHeader';
+import ErrorMessage from '@app/routes/login/ErrorMessage';
+import SignupForm from '@app/routes/signup/SignupForm';
+import { useSignupFormValidation, SignupFieldErrors } from '@app/routes/signup/SignupFormValidation';
+import { authService } from '@app/services/authService';
+import '@app/routes/authShared/auth.css';
+
+interface SaaSSignupScreenProps {
+  loading: boolean;
+  error: string | null;
+  onLogin: (username: string, password: string) => Promise<void>;
+  onSwitchToLogin: () => void;
+}
+
+export const SaaSSignupScreen: React.FC<SaaSSignupScreenProps> = ({
+  loading,
+  error,
+  onLogin: _onLogin,
+  onSwitchToLogin: _onSwitchToLogin,
+}) => {
+  const { t } = useTranslation();
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [validationError, setValidationError] = useState<string | null>(null);
+  const [signupFieldErrors, setSignupFieldErrors] = useState<SignupFieldErrors>({});
+  const [signupSuccessMessage, setSignupSuccessMessage] = useState<string | null>(null);
+  const [isSignupSubmitting, setIsSignupSubmitting] = useState(false);
+  const { validateSignupForm } = useSignupFormValidation();
+
+  const displayError = error || validationError;
+
+  const handleSignupSubmit = async () => {
+    setValidationError(null);
+    setSignupSuccessMessage(null);
+    setSignupFieldErrors({});
+
+    const validation = validateSignupForm(email, password, confirmPassword);
+    if (!validation.isValid) {
+      setValidationError(validation.error);
+      setSignupFieldErrors(validation.fieldErrors || {});
+      return;
+    }
+
+    try {
+      setIsSignupSubmitting(true);
+      await authService.signUpSaas(email.trim(), password);
+      setSignupSuccessMessage(t('signup.checkEmailConfirmation', 'Check your email for a confirmation link to complete your registration.'));
+      setSignupFieldErrors({});
+      setValidationError(null);
+    } catch (err) {
+      setSignupSuccessMessage(null);
+      const message = err instanceof Error ? err.message : t('signup.unexpectedError', { message: 'Unknown error' });
+      setValidationError(message);
+    } finally {
+      setIsSignupSubmitting(false);
+    }
+  };
+
+  return (
+    <>
+      <LoginHeader
+        title={t('signup.title', 'Create an account')}
+        subtitle={t('signup.subtitle', 'Join Stirling PDF')}
+      />
+
+      <ErrorMessage error={displayError} />
+      {signupSuccessMessage && (
+        <div className="success-message">
+          <p className="success-message-text">{signupSuccessMessage}</p>
+        </div>
+      )}
+
+      <SignupForm
+        email={email}
+        password={password}
+        confirmPassword={confirmPassword}
+        setEmail={(value) => {
+          setEmail(value);
+          setValidationError(null);
+          setSignupFieldErrors({});
+        }}
+        setPassword={(value) => {
+          setPassword(value);
+          setValidationError(null);
+          setSignupFieldErrors({});
+        }}
+        setConfirmPassword={(value) => {
+          setConfirmPassword(value);
+          setValidationError(null);
+          setSignupFieldErrors({});
+        }}
+        onSubmit={handleSignupSubmit}
+        isSubmitting={loading || isSignupSubmitting}
+        fieldErrors={signupFieldErrors}
+        showName={false}
+        showTerms={false}
+      />
+
+    </>
+  );
+};
diff --git a/frontend/src/desktop/components/SetupWizard/SelfHostedLink.tsx b/frontend/src/desktop/components/SetupWizard/SelfHostedLink.tsx
new file mode 100644
index 000000000..6a184cc58
--- /dev/null
+++ b/frontend/src/desktop/components/SetupWizard/SelfHostedLink.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import '@app/routes/authShared/auth.css';
+
+interface SelfHostedLinkProps {
+  onClick: () => void;
+  disabled?: boolean;
+}
+
+export const SelfHostedLink: React.FC<SelfHostedLinkProps> = ({ onClick, disabled = false }) => {
+  const { t } = useTranslation();
+
+  return (
+    <div className="navigation-link-container" style={{ marginTop: '1.5rem' }}>
+      <button
+        type="button"
+        onClick={onClick}
+        disabled={disabled}
+        className="navigation-link-button"
+      >
+        {t('setup.selfhosted.link', 'or connect to a self hosted account')}
+      </button>
+    </div>
+  );
+};
diff --git a/frontend/src/desktop/components/SetupWizard/SelfHostedLoginScreen.tsx b/frontend/src/desktop/components/SetupWizard/SelfHostedLoginScreen.tsx
new file mode 100644
index 000000000..9a68b9156
--- /dev/null
+++ b/frontend/src/desktop/components/SetupWizard/SelfHostedLoginScreen.tsx
@@ -0,0 +1,105 @@
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Text } from '@mantine/core';
+import LoginHeader from '@app/routes/login/LoginHeader';
+import ErrorMessage from '@app/routes/login/ErrorMessage';
+import EmailPasswordForm from '@app/routes/login/EmailPasswordForm';
+import DividerWithText from '@app/components/shared/DividerWithText';
+import { DesktopOAuthButtons, OAuthProvider } from '@app/components/SetupWizard/DesktopOAuthButtons';
+import { UserInfo } from '@app/services/authService';
+import '@app/routes/authShared/auth.css';
+
+interface SelfHostedLoginScreenProps {
+  serverUrl: string;
+  enabledOAuthProviders?: string[];
+  onLogin: (username: string, password: string) => Promise<void>;
+  onOAuthSuccess: (userInfo: UserInfo) => Promise<void>;
+  loading: boolean;
+  error: string | null;
+}
+
+export const SelfHostedLoginScreen: React.FC<SelfHostedLoginScreenProps> = ({
+  serverUrl,
+  enabledOAuthProviders,
+  onLogin,
+  onOAuthSuccess,
+  loading,
+  error,
+}) => {
+  const { t } = useTranslation();
+  const [username, setUsername] = useState('');
+  const [password, setPassword] = useState('');
+  const [validationError, setValidationError] = useState<string | null>(null);
+
+  const handleSubmit = async () => {
+    // Validation
+    if (!username.trim()) {
+      setValidationError(t('setup.login.error.emptyUsername', 'Please enter your username'));
+      return;
+    }
+
+    if (!password) {
+      setValidationError(t('setup.login.error.emptyPassword', 'Please enter your password'));
+      return;
+    }
+
+    setValidationError(null);
+    await onLogin(username.trim(), password);
+  };
+
+  const handleOAuthError = (errorMessage: string) => {
+    setValidationError(errorMessage);
+  };
+
+  const displayError = error || validationError;
+
+  return (
+    <>
+      <LoginHeader
+        title={t('setup.selfhosted.title', 'Sign in to Server')}
+        subtitle={t('setup.selfhosted.subtitle', 'Enter your server credentials')}
+      />
+
+      <ErrorMessage error={displayError} />
+
+      <Text size="sm" mb="md">
+        {t('setup.login.connectingTo', 'Connecting to:')} <Text span fw="500">{serverUrl}</Text>
+      </Text>
+
+      {/* Show OAuth buttons if providers are available */}
+      {enabledOAuthProviders && enabledOAuthProviders.length > 0 && (
+        <>
+          <DesktopOAuthButtons
+            onOAuthSuccess={onOAuthSuccess}
+            onError={handleOAuthError}
+            isDisabled={loading}
+            serverUrl={serverUrl}
+            providers={enabledOAuthProviders as OAuthProvider[]}
+          />
+
+          <DividerWithText
+            text={t('setup.login.orContinueWith', 'Or continue with email')}
+            respondsToDarkMode={false}
+            opacity={0.4}
+          />
+        </>
+      )}
+
+      <EmailPasswordForm
+        email={username}
+        password={password}
+        setEmail={(value) => {
+          setUsername(value);
+          setValidationError(null);
+        }}
+        setPassword={(value) => {
+          setPassword(value);
+          setValidationError(null);
+        }}
+        onSubmit={handleSubmit}
+        isSubmitting={loading}
+        submitButtonText={t('setup.login.submit', 'Login')}
+      />
+    </>
+  );
+};
diff --git a/frontend/src/desktop/components/SetupWizard/ServerSelection.tsx b/frontend/src/desktop/components/SetupWizard/ServerSelection.tsx
index 3ca5ea65b..f8a0d4f9e 100644
--- a/frontend/src/desktop/components/SetupWizard/ServerSelection.tsx
+++ b/frontend/src/desktop/components/SetupWizard/ServerSelection.tsx
@@ -1,8 +1,9 @@
 import React, { useState } from 'react';
-import { Stack, Button, TextInput } from '@mantine/core';
+import { Stack, Button, TextInput, Alert, Text } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { ServerConfig } from '@app/services/connectionModeService';
 import { connectionModeService } from '@app/services/connectionModeService';
+import LocalIcon from '@app/components/shared/LocalIcon';
 
 interface ServerSelectionProps {
   onSelect: (config: ServerConfig) => void;
@@ -14,11 +15,13 @@ export const ServerSelection: React.FC<ServerSelectionProps> = ({ onSelect, load
   const [customUrl, setCustomUrl] = useState('');
   const [testing, setTesting] = useState(false);
   const [testError, setTestError] = useState<string | null>(null);
+  const [securityDisabled, setSecurityDisabled] = useState(false);
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
 
-    const url = customUrl.trim();
+    // Normalize URL: trim and remove trailing slashes
+    const url = customUrl.trim().replace(/\/+$/, '');
 
     if (!url) {
       setTestError(t('setup.server.error.emptyUrl', 'Please enter a server URL'));
@@ -28,6 +31,7 @@ export const ServerSelection: React.FC<ServerSelectionProps> = ({ onSelect, load
     // Test connection before proceeding
     setTesting(true);
     setTestError(null);
+    setSecurityDisabled(false);
 
     try {
       const isReachable = await connectionModeService.testConnection(url);
@@ -38,9 +42,67 @@ export const ServerSelection: React.FC<ServerSelectionProps> = ({ onSelect, load
         return;
       }
 
-      // Connection successful
+      // Fetch OAuth providers and check if login is enabled
+      let enabledProviders: string[] = [];
+      try {
+        const response = await fetch(`${url}/api/v1/proprietary/ui-data/login`);
+
+        // Check if security is disabled (status 403 or error response)
+        if (!response.ok) {
+          if (response.status === 403 || response.status === 401) {
+            setSecurityDisabled(true);
+            setTesting(false);
+            return;
+          }
+          // Other error statuses - show generic error
+          setTestError(
+            t('setup.server.error.configFetch', 'Failed to fetch server configuration (status {{status}})', {
+              status: response.status
+            })
+          );
+          setTesting(false);
+          return;
+        }
+
+        const data = await response.json();
+        console.log('Login UI data:', data);
+
+        // Check if the response indicates security is disabled
+        if (data.enableLogin === false || data.securityEnabled === false) {
+          setSecurityDisabled(true);
+          setTesting(false);
+          return;
+        }
+
+        // Extract provider IDs from authorization URLs
+        // Example: "/oauth2/authorization/google" → "google"
+        enabledProviders = Object.keys(data.providerList || {})
+          .map(key => key.split('/').pop())
+          .filter((id): id is string => id !== undefined);
+
+        console.log('[ServerSelection] Detected OAuth providers:', enabledProviders);
+      } catch (err) {
+        console.error('[ServerSelection] Failed to fetch login configuration', err);
+
+        // Check if it's a security disabled error
+        if (err instanceof Error && (err.message.includes('403') || err.message.includes('401'))) {
+          setSecurityDisabled(true);
+          setTesting(false);
+          return;
+        }
+
+        // For any other error (network, CORS, invalid JSON, etc.), show error and don't proceed
+        setTestError(
+          t('setup.server.error.configFetch', 'Failed to fetch server configuration. Please check the URL and try again.')
+        );
+        setTesting(false);
+        return;
+      }
+
+      // Connection successful - pass URL and OAuth providers
       onSelect({
         url,
+        enabledOAuthProviders: enabledProviders.length > 0 ? enabledProviders : undefined,
       });
     } catch (error) {
       console.error('Connection test failed:', error);
@@ -64,6 +126,7 @@ export const ServerSelection: React.FC<ServerSelectionProps> = ({ onSelect, load
           onChange={(e) => {
             setCustomUrl(e.target.value);
             setTestError(null);
+            setSecurityDisabled(false);
           }}
           disabled={loading || testing}
           error={testError}
@@ -73,6 +136,28 @@ export const ServerSelection: React.FC<ServerSelectionProps> = ({ onSelect, load
           )}
         />
 
+        {securityDisabled && (
+          <Alert
+            variant="light"
+            color="orange"
+            icon={<LocalIcon icon="warning-rounded" width="1.25rem" height="1.25rem" />}
+            title={t('setup.server.error.securityDisabled.title', 'Login Not Enabled')}
+          >
+            <Stack gap="sm">
+              <Text size="sm">
+                {t('setup.server.error.securityDisabled.body', 'This server does not have login enabled. To connect to this server, you must enable authentication:')}
+              </Text>
+              <Text size="sm" component="div">
+                <ol style={{ margin: 0, paddingLeft: '1.5rem' }}>
+                  <li>{t('setup.server.error.securityDisabled.step1', 'Set DOCKER_ENABLE_SECURITY=true in your environment')}</li>
+                  <li>{t('setup.server.error.securityDisabled.step2', 'Or set security.enableLogin=true in settings.yml')}</li>
+                  <li>{t('setup.server.error.securityDisabled.step3', 'Restart the server')}</li>
+                </ol>
+              </Text>
+            </Stack>
+          </Alert>
+        )}
+
         <Button
           type="submit"
           loading={testing || loading}
diff --git a/frontend/src/desktop/components/SetupWizard/ServerSelectionScreen.tsx b/frontend/src/desktop/components/SetupWizard/ServerSelectionScreen.tsx
new file mode 100644
index 000000000..48ad5b810
--- /dev/null
+++ b/frontend/src/desktop/components/SetupWizard/ServerSelectionScreen.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import LoginHeader from '@app/routes/login/LoginHeader';
+import ErrorMessage from '@app/routes/login/ErrorMessage';
+import { ServerSelection } from '@app/components/SetupWizard/ServerSelection';
+import { ServerConfig } from '@app/services/connectionModeService';
+import '@app/routes/authShared/auth.css';
+
+interface ServerSelectionScreenProps {
+  onSelect: (config: ServerConfig) => void;
+  loading: boolean;
+  error: string | null;
+}
+
+export const ServerSelectionScreen: React.FC<ServerSelectionScreenProps> = ({
+  onSelect,
+  loading,
+  error,
+}) => {
+  const { t } = useTranslation();
+
+  return (
+    <>
+      <LoginHeader
+        title={t('setup.server.title', 'Connect to Server')}
+        subtitle={t('setup.server.subtitle', 'Enter your self-hosted server URL')}
+      />
+
+      <ErrorMessage error={error} />
+
+      <ServerSelection onSelect={onSelect} loading={loading} />
+    </>
+  );
+};
diff --git a/frontend/src/desktop/components/SetupWizard/SetupWizard.css b/frontend/src/desktop/components/SetupWizard/SetupWizard.css
deleted file mode 100644
index 023494550..000000000
--- a/frontend/src/desktop/components/SetupWizard/SetupWizard.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.setup-container {
-  position: relative;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  background: linear-gradient(135deg,
-    light-dark(#f5f5f5, #1a1a1a) 0%,
-    light-dark(#e8e8e8, #0d0d0d) 100%
-  );
-  padding: 2rem;
-}
-
-.setup-wrapper {
-  width: 100%;
-  max-width: 600px;
-}
-
-.setup-card {
-  background-color: light-dark(var(--mantine-color-white), var(--mantine-color-dark-6));
-  box-shadow: 0 20px 60px light-dark(rgba(0, 0, 0, 0.12), rgba(0, 0, 0, 0.4));
-}
diff --git a/frontend/src/desktop/components/SetupWizard/index.tsx b/frontend/src/desktop/components/SetupWizard/index.tsx
index c05e503de..9fbd0e6cc 100644
--- a/frontend/src/desktop/components/SetupWizard/index.tsx
+++ b/frontend/src/desktop/components/SetupWizard/index.tsx
@@ -1,19 +1,21 @@
 import React, { useState } from 'react';
-import { Container, Paper, Stack, Title, Text, Button, Image } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
-import { ModeSelection } from '@app/components/SetupWizard/ModeSelection';
-import { ServerSelection } from '@app/components/SetupWizard/ServerSelection';
-import { LoginForm } from '@app/components/SetupWizard/LoginForm';
-import { connectionModeService, ServerConfig } from '@app/services/connectionModeService';
-import { authService } from '@app/services/authService';
+import { DesktopAuthLayout } from '@app/components/SetupWizard/DesktopAuthLayout';
+import { SaaSLoginScreen } from '@app/components/SetupWizard/SaaSLoginScreen';
+import { SaaSSignupScreen } from '@app/components/SetupWizard/SaaSSignupScreen';
+import { ServerSelectionScreen } from '@app/components/SetupWizard/ServerSelectionScreen';
+import { SelfHostedLoginScreen } from '@app/components/SetupWizard/SelfHostedLoginScreen';
+import { ServerConfig, connectionModeService } from '@app/services/connectionModeService';
+import { authService, UserInfo } from '@app/services/authService';
 import { tauriBackendService } from '@app/services/tauriBackendService';
-import { useLogoPath } from '@app/hooks/useLogoPath';
 import { STIRLING_SAAS_URL } from '@desktop/constants/connection';
-import '@app/components/SetupWizard/SetupWizard.css';
+import { listen } from '@tauri-apps/api/event';
+import { useEffect } from 'react';
+import '@app/routes/authShared/auth.css';
 
 enum SetupStep {
-  ModeSelection,
   SaaSLogin,
+  SaaSSignup,
   ServerSelection,
   SelfHostedLogin,
 }
@@ -24,25 +26,11 @@ interface SetupWizardProps {
 
 export const SetupWizard: React.FC<SetupWizardProps> = ({ onComplete }) => {
   const { t } = useTranslation();
-  const logoPath = useLogoPath();
-  const [activeStep, setActiveStep] = useState<SetupStep>(SetupStep.ModeSelection);
-  const [serverConfig, setServerConfig] = useState<ServerConfig | null>(null);
+  const [activeStep, setActiveStep] = useState<SetupStep>(SetupStep.SaaSLogin);
+  const [serverConfig, setServerConfig] = useState<ServerConfig | null>({ url: STIRLING_SAAS_URL });
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
 
-  const handleModeSelection = (mode: 'saas' | 'selfhosted') => {
-    setError(null);
-
-    if (mode === 'saas') {
-      // For SaaS, go directly to login screen with SaaS URL
-      setServerConfig({ url: STIRLING_SAAS_URL });
-      setActiveStep(SetupStep.SaaSLogin);
-    } else {
-      // For self-hosted, show server selection first
-      setActiveStep(SetupStep.ServerSelection);
-    }
-  };
-
   const handleSaaSLogin = async (username: string, password: string) => {
     if (!serverConfig) {
       setError('No SaaS server configured');
@@ -70,6 +58,42 @@ export const SetupWizard: React.FC<SetupWizardProps> = ({ onComplete }) => {
     }
   };
 
+  const handleSaaSLoginOAuth = async (_userInfo: UserInfo) => {
+    if (!serverConfig) {
+      setError('No SaaS server configured');
+      return;
+    }
+
+    try {
+      setLoading(true);
+      setError(null);
+
+      // OAuth already completed by authService.loginWithOAuth
+      await connectionModeService.switchToSaaS(serverConfig.url);
+      tauriBackendService.startBackend().catch(console.error);
+      onComplete();
+    } catch (err) {
+      console.error('SaaS OAuth login completion failed:', err);
+      setError(err instanceof Error ? err.message : 'Failed to complete SaaS login');
+      setLoading(false);
+    }
+  };
+
+  const handleSelfHostedClick = () => {
+    setError(null);
+    setActiveStep(SetupStep.ServerSelection);
+  };
+
+  const handleSwitchToSignup = () => {
+    setError(null);
+    setActiveStep(SetupStep.SaaSSignup);
+  };
+
+  const handleSwitchToLogin = () => {
+    setError(null);
+    setActiveStep(SetupStep.SaaSLogin);
+  };
+
   const handleServerSelection = (config: ServerConfig) => {
     setServerConfig(config);
     setError(null);
@@ -97,120 +121,136 @@ export const SetupWizard: React.FC<SetupWizardProps> = ({ onComplete }) => {
     }
   };
 
+  const handleSelfHostedOAuthSuccess = async (_userInfo: UserInfo) => {
+    if (!serverConfig) {
+      setError('No server configured');
+      return;
+    }
+
+    try {
+      setLoading(true);
+      setError(null);
+
+      // OAuth already completed by authService.loginWithOAuth
+      await connectionModeService.switchToSelfHosted(serverConfig);
+      await tauriBackendService.initializeExternalBackend();
+      onComplete();
+    } catch (err) {
+      console.error('Self-hosted OAuth login completion failed:', err);
+      setError(err instanceof Error ? err.message : 'Failed to complete login');
+      setLoading(false);
+    }
+  };
+
+  useEffect(() => {
+    const unsubscribePromise = listen<string>('deep-link', async (event) => {
+      const url = event.payload;
+      if (!url) return;
+
+      try {
+        const parsed = new URL(url);
+
+        // Supabase sends tokens in the URL hash
+        const hash = parsed.hash.replace(/^#/, '');
+        const params = new URLSearchParams(hash);
+        const accessToken = params.get('access_token');
+        const type = params.get('type') || parsed.searchParams.get('type');
+
+        if (!type || (type !== 'signup' && type !== 'recovery' && type !== 'magiclink')) {
+          return;
+        }
+
+        if (!accessToken) {
+          console.error('[SetupWizard] Deep link missing access_token');
+          return;
+        }
+
+        setLoading(true);
+        setError(null);
+
+        await authService.completeSupabaseSession(accessToken, serverConfig?.url || STIRLING_SAAS_URL);
+        await connectionModeService.switchToSaaS(serverConfig?.url || STIRLING_SAAS_URL);
+        tauriBackendService.startBackend().catch(console.error);
+        onComplete();
+      } catch (err) {
+        console.error('[SetupWizard] Failed to handle deep link', err);
+        setError(err instanceof Error ? err.message : 'Failed to complete signup');
+        setLoading(false);
+      }
+    });
+
+    return () => {
+      void unsubscribePromise.then((unsub) => unsub());
+    };
+  }, [onComplete, serverConfig?.url]);
+
   const handleBack = () => {
     setError(null);
-    if (activeStep === SetupStep.SaaSLogin) {
-      setActiveStep(SetupStep.ModeSelection);
-      setServerConfig(null);
-    } else if (activeStep === SetupStep.SelfHostedLogin) {
+    if (activeStep === SetupStep.SelfHostedLogin) {
       setActiveStep(SetupStep.ServerSelection);
     } else if (activeStep === SetupStep.ServerSelection) {
-      setActiveStep(SetupStep.ModeSelection);
-      setServerConfig(null);
-    }
-  };
-
-  const getStepTitle = () => {
-    switch (activeStep) {
-      case SetupStep.ModeSelection:
-        return t('setup.welcome', 'Welcome to Stirling PDF');
-      case SetupStep.SaaSLogin:
-        return t('setup.saas.title', 'Sign in to Stirling Cloud');
-      case SetupStep.ServerSelection:
-        return t('setup.server.title', 'Connect to Server');
-      case SetupStep.SelfHostedLogin:
-        return t('setup.selfhosted.title', 'Sign in to Server');
-      default:
-        return '';
-    }
-  };
-
-  const getStepSubtitle = () => {
-    switch (activeStep) {
-      case SetupStep.ModeSelection:
-        return t('setup.description', 'Get started by choosing how you want to use Stirling PDF');
-      case SetupStep.SaaSLogin:
-        return t('setup.saas.subtitle', 'Sign in with your Stirling account');
-      case SetupStep.ServerSelection:
-        return t('setup.server.subtitle', 'Enter your self-hosted server URL');
-      case SetupStep.SelfHostedLogin:
-        return t('setup.selfhosted.subtitle', 'Enter your server credentials');
-      default:
-        return '';
+      setActiveStep(SetupStep.SaaSLogin);
+      setServerConfig({ url: STIRLING_SAAS_URL });
+    } else if (activeStep === SetupStep.SaaSSignup) {
+      setActiveStep(SetupStep.SaaSLogin);
     }
   };
 
   return (
-    <div className="setup-container">
-      <Container size="sm" className="setup-wrapper">
-        <Paper shadow="xl" p="xl" radius="lg" className="setup-card">
-          <Stack gap="lg">
-            {/* Logo Header */}
-            <Stack gap="xs" align="center">
-              <Image
-                src={logoPath}
-                alt="Stirling PDF"
-                h={64}
-                fit="contain"
-              />
-              <Title order={1} ta="center" style={{ fontSize: '2rem', fontWeight: 800 }}>
-                {getStepTitle()}
-              </Title>
-              <Text size="sm" c="dimmed" ta="center">
-                {getStepSubtitle()}
-              </Text>
-            </Stack>
+    <DesktopAuthLayout>
+      {/* Step Content */}
+      {activeStep === SetupStep.SaaSLogin && (
+        <SaaSLoginScreen
+          serverUrl={serverConfig?.url || STIRLING_SAAS_URL}
+          onLogin={handleSaaSLogin}
+          onOAuthSuccess={handleSaaSLoginOAuth}
+          onSelfHostedClick={handleSelfHostedClick}
+          onSwitchToSignup={handleSwitchToSignup}
+          loading={loading}
+          error={error}
+        />
+      )}
 
-            {/* Error Message */}
-            {error && (
-              <Paper p="md" bg="red.0" style={{ border: '1px solid var(--mantine-color-red-3)' }}>
-                <Text size="sm" c="red.7" ta="center">
-                  {error}
-                </Text>
-              </Paper>
-            )}
+      {activeStep === SetupStep.SaaSSignup && (
+        <SaaSSignupScreen
+          loading={loading}
+          error={error}
+          onLogin={handleSaaSLogin}
+          onSwitchToLogin={handleSwitchToLogin}
+        />
+      )}
 
-            {/* Step Content */}
-            {activeStep === SetupStep.ModeSelection && (
-              <ModeSelection onSelect={handleModeSelection} loading={loading} />
-            )}
+      {activeStep === SetupStep.ServerSelection && (
+        <ServerSelectionScreen
+          onSelect={handleServerSelection}
+          loading={loading}
+          error={error}
+        />
+      )}
 
-            {activeStep === SetupStep.SaaSLogin && (
-              <LoginForm
-                serverUrl={serverConfig?.url || ''}
-                isSaaS={true}
-                onLogin={handleSaaSLogin}
-                loading={loading}
-              />
-            )}
+      {activeStep === SetupStep.SelfHostedLogin && (
+        <SelfHostedLoginScreen
+          serverUrl={serverConfig?.url || ''}
+          enabledOAuthProviders={serverConfig?.enabledOAuthProviders}
+          onLogin={handleSelfHostedLogin}
+          onOAuthSuccess={handleSelfHostedOAuthSuccess}
+          loading={loading}
+          error={error}
+        />
+      )}
 
-            {activeStep === SetupStep.ServerSelection && (
-              <ServerSelection onSelect={handleServerSelection} loading={loading} />
-            )}
-
-            {activeStep === SetupStep.SelfHostedLogin && (
-              <LoginForm
-                serverUrl={serverConfig?.url || ''}
-                isSaaS={false}
-                onLogin={handleSelfHostedLogin}
-                loading={loading}
-              />
-            )}
-
-            {/* Back Button */}
-            {activeStep > SetupStep.ModeSelection && !loading && (
-              <Button
-                variant="subtle"
-                onClick={handleBack}
-                fullWidth
-                mt="md"
-              >
-                {t('common.back', 'Back')}
-              </Button>
-            )}
-          </Stack>
-        </Paper>
-      </Container>
-    </div>
+      {/* Back Button */}
+      {activeStep > SetupStep.SaaSLogin && !loading && (
+        <div className="navigation-link-container" style={{ marginTop: '1.5rem' }}>
+          <button
+            type="button"
+            onClick={handleBack}
+            className="navigation-link-button"
+          >
+            {t('common.back', 'Back')}
+          </button>
+        </div>
+      )}
+    </DesktopAuthLayout>
   );
 };
diff --git a/frontend/src/desktop/constants/connection.ts b/frontend/src/desktop/constants/connection.ts
index e43f286d5..2a7379a2e 100644
--- a/frontend/src/desktop/constants/connection.ts
+++ b/frontend/src/desktop/constants/connection.ts
@@ -6,6 +6,12 @@
 // The SaaS authentication server
 export const STIRLING_SAAS_URL: string = import.meta.env.VITE_SAAS_SERVER_URL || '';
 
+// SaaS signup URL for creating new cloud accounts
+export const STIRLING_SAAS_SIGNUP_URL: string = import.meta.env.VITE_SAAS_SIGNUP_URL || '';
+
 // Supabase publishable key from environment variable
 // Used for SaaS authentication
 export const SUPABASE_KEY: string = import.meta.env.VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY || 'sb_publishable_UHz2SVRF5mvdrPHWkRteyA_yNlZTkYb';
+
+// Desktop deep link callback for Supabase email confirmations
+export const DESKTOP_DEEP_LINK_CALLBACK = 'stirlingpdf://auth/callback';
diff --git a/frontend/src/desktop/services/apiClient.ts b/frontend/src/desktop/services/apiClient.ts
index 8773afc5e..257099c80 100644
--- a/frontend/src/desktop/services/apiClient.ts
+++ b/frontend/src/desktop/services/apiClient.ts
@@ -14,7 +14,7 @@ import { getApiBaseUrl } from '@app/services/apiClientConfig';
 const apiClient = create({
   baseURL: getApiBaseUrl(),
   responseType: 'json',
-  withCredentials: true,
+  withCredentials: false, // Desktop doesn't need credentials
 });
 
 // Setup interceptors (desktop-specific auth and backend ready checks)
diff --git a/frontend/src/desktop/services/apiClientSetup.ts b/frontend/src/desktop/services/apiClientSetup.ts
index d01c0d997..ee9cbcf55 100644
--- a/frontend/src/desktop/services/apiClientSetup.ts
+++ b/frontend/src/desktop/services/apiClientSetup.ts
@@ -48,13 +48,21 @@ export function setupApiInterceptors(client: AxiosInstance): void {
       // Debug logging
       console.debug(`[apiClientSetup] Request to: ${extendedConfig.url}`);
 
-      // Add auth token for remote requests
+      // Add auth token for remote requests and enable credentials
       const isRemote = await operationRouter.isSelfHostedMode();
       if (isRemote) {
+        // Self-hosted mode: enable credentials for session management
+        extendedConfig.withCredentials = true;
+
         const token = await authService.getAuthToken();
         if (token) {
           extendedConfig.headers.Authorization = `Bearer ${token}`;
+        } else {
+          console.warn('[apiClientSetup] Self-hosted mode but no auth token available');
         }
+      } else {
+        // SaaS mode: disable credentials (security disabled on local backend)
+        extendedConfig.withCredentials = false;
       }
 
       // Backend readiness check (for local backend)
@@ -85,7 +93,9 @@ export function setupApiInterceptors(client: AxiosInstance): void {
 
   // Response interceptor: Handle auth errors
   client.interceptors.response.use(
-    (response) => response,
+    (response) => {
+      return response;
+    },
     async (error) => {
       const originalRequest = error.config as ExtendedRequestConfig;
 
diff --git a/frontend/src/desktop/services/authService.ts b/frontend/src/desktop/services/authService.ts
index 76f8aa157..710518f36 100644
--- a/frontend/src/desktop/services/authService.ts
+++ b/frontend/src/desktop/services/authService.ts
@@ -1,6 +1,6 @@
 import { invoke } from '@tauri-apps/api/core';
 import axios from 'axios';
-import { STIRLING_SAAS_URL, SUPABASE_KEY } from '@app/constants/connection';
+import { DESKTOP_DEEP_LINK_CALLBACK, STIRLING_SAAS_URL, SUPABASE_KEY } from '@app/constants/connection';
 
 export interface UserInfo {
   username: string;
@@ -25,6 +25,7 @@ export class AuthService {
   private static instance: AuthService;
   private authStatus: AuthStatus = 'unauthenticated';
   private userInfo: UserInfo | null = null;
+  private cachedToken: string | null = null;
   private authListeners = new Set<(status: AuthStatus, userInfo: UserInfo | null) => void>();
 
   static getInstance(): AuthService {
@@ -38,13 +39,32 @@ export class AuthService {
    * Save token to all storage locations and notify listeners
    */
   private async saveTokenEverywhere(token: string): Promise<void> {
-    // Save to Tauri store
-    await invoke('save_auth_token', { token });
-    console.log('[Desktop AuthService] Token saved to Tauri store');
+    // Validate token before caching
+    if (!token || token.trim().length === 0) {
+      console.warn('[Desktop AuthService] Attempted to save invalid/empty token');
+      throw new Error('Invalid token');
+    }
 
-    // Sync to localStorage for web layer
-    localStorage.setItem('stirling_jwt', token);
-    console.log('[Desktop AuthService] Token saved to localStorage');
+    try {
+      // Save to Tauri store
+      await invoke('save_auth_token', { token });
+      console.log('[Desktop AuthService] ✅ Token saved to Tauri store');
+    } catch (error) {
+      console.error('[Desktop AuthService] ❌ Failed to save token to Tauri store:', error);
+      // Don't throw - we can still use localStorage
+    }
+
+    try {
+      // Sync to localStorage for web layer
+      localStorage.setItem('stirling_jwt', token);
+      console.log('[Desktop AuthService] ✅ Token saved to localStorage');
+    } catch (error) {
+      console.error('[Desktop AuthService] ❌ Failed to save token to localStorage:', error);
+    }
+
+    // Cache the valid token in memory
+    this.cachedToken = token;
+    console.log('[Desktop AuthService] ✅ Token cached in memory');
 
     // Notify other parts of the system
     window.dispatchEvent(new CustomEvent('jwt-available'));
@@ -56,20 +76,25 @@ export class AuthService {
    */
   private async getTokenFromAnySource(): Promise<string | null> {
     // Try Tauri store first
-    console.log('[Desktop AuthService] Retrieving token from Tauri store...');
-    const token = await invoke<string | null>('get_auth_token');
+    try {
+      const token = await invoke<string | null>('get_auth_token');
 
-    if (token) {
-      console.log(`[Desktop AuthService] Token found in Tauri store (length: ${token.length})`);
-      return token;
+      if (token) {
+        console.log(`[Desktop AuthService] ✅ Token found in Tauri store (length: ${token.length})`);
+        return token;
+      }
+
+      console.log('[Desktop AuthService] ℹ️ No token in Tauri store, checking localStorage...');
+    } catch (error) {
+      console.error('[Desktop AuthService] ❌ Failed to read from Tauri store:', error);
     }
 
-    console.log('[Desktop AuthService] No token in Tauri store');
-
     // Fallback to localStorage
     const localStorageToken = localStorage.getItem('stirling_jwt');
     if (localStorageToken) {
-      console.log('[Desktop AuthService] Token found in localStorage (length:', localStorageToken.length, ')');
+      console.log(`[Desktop AuthService] ✅ Token found in localStorage (length: ${localStorageToken.length})`);
+    } else {
+      console.log('[Desktop AuthService] ❌ No token found in any storage');
     }
 
     return localStorageToken;
@@ -79,6 +104,10 @@ export class AuthService {
    * Clear token from all storage locations
    */
   private async clearTokenEverywhere(): Promise<void> {
+    // Invalidate cache
+    this.cachedToken = null;
+    console.log('[Desktop AuthService] Cache invalidated');
+
     await invoke('clear_auth_token');
     localStorage.removeItem('stirling_jwt');
   }
@@ -102,6 +131,67 @@ export class AuthService {
     this.notifyListeners();
   }
 
+  async completeSupabaseSession(accessToken: string, serverUrl: string): Promise<UserInfo> {
+    if (!accessToken || !accessToken.trim()) {
+      throw new Error('Invalid access token');
+    }
+    if (!SUPABASE_KEY) {
+      throw new Error('VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY is not configured');
+    }
+
+    await this.saveTokenEverywhere(accessToken);
+
+    const userInfo = await this.fetchSupabaseUserInfo(serverUrl, accessToken);
+
+    await invoke('save_user_info', {
+      username: userInfo.username,
+      email: userInfo.email || null,
+    });
+
+    this.setAuthStatus('authenticated', userInfo);
+    return userInfo;
+  }
+
+  async signUpSaas(email: string, password: string): Promise<void> {
+    if (!STIRLING_SAAS_URL) {
+      throw new Error('VITE_SAAS_SERVER_URL is not configured');
+    }
+    if (!SUPABASE_KEY) {
+      throw new Error('VITE_SUPABASE_PUBLISHABLE_DEFAULT_KEY is not configured');
+    }
+
+    const redirectParam = encodeURIComponent(DESKTOP_DEEP_LINK_CALLBACK);
+    const signupUrl = `${STIRLING_SAAS_URL.replace(/\/$/, '')}/auth/v1/signup?redirect_to=${redirectParam}`;
+
+    try {
+      const response = await axios.post(
+        signupUrl,
+        { email, password, email_redirect_to: DESKTOP_DEEP_LINK_CALLBACK },
+        {
+          headers: {
+            'Content-Type': 'application/json;charset=UTF-8',
+            apikey: SUPABASE_KEY,
+            Authorization: `Bearer ${SUPABASE_KEY}`,
+          },
+        }
+      );
+
+      if (response.status >= 400) {
+        throw new Error('Sign up failed');
+      }
+    } catch (error) {
+      if (axios.isAxiosError(error)) {
+        const message =
+          error.response?.data?.error_description ||
+          error.response?.data?.msg ||
+          error.response?.data?.message ||
+          error.message;
+        throw new Error(message || 'Sign up failed');
+      }
+      throw error instanceof Error ? error : new Error('Sign up failed');
+    }
+  }
+
   async login(serverUrl: string, username: string, password: string): Promise<UserInfo> {
     try {
       console.log('Logging in to:', serverUrl);
@@ -183,7 +273,22 @@ export class AuthService {
 
   async getAuthToken(): Promise<string | null> {
     try {
-      return await this.getTokenFromAnySource();
+      // Return cached token if available
+      if (this.cachedToken) {
+        console.debug('[Desktop AuthService] ✅ Returning cached token');
+        return this.cachedToken;
+      }
+
+      console.debug('[Desktop AuthService] Cache miss, fetching from storage...');
+      const token = await this.getTokenFromAnySource();
+
+      // Cache the token if valid
+      if (token && token.trim().length > 0) {
+        this.cachedToken = token;
+        console.log('[Desktop AuthService] ✅ Token cached in memory after retrieval');
+      }
+
+      return token;
     } catch (error) {
       console.error('[Desktop AuthService] Failed to get auth token:', error);
       return null;
diff --git a/frontend/src/desktop/services/connectionModeService.ts b/frontend/src/desktop/services/connectionModeService.ts
index f01dbc40a..cf454a50b 100644
--- a/frontend/src/desktop/services/connectionModeService.ts
+++ b/frontend/src/desktop/services/connectionModeService.ts
@@ -5,6 +5,7 @@ export type ConnectionMode = 'saas' | 'selfhosted';
 
 export interface ServerConfig {
   url: string;
+  enabledOAuthProviders?: string[];
 }
 
 export interface ConnectionConfig {
diff --git a/frontend/src/desktop/services/tauriHttpClient.ts b/frontend/src/desktop/services/tauriHttpClient.ts
index 89c87bfbb..b5bbceb93 100644
--- a/frontend/src/desktop/services/tauriHttpClient.ts
+++ b/frontend/src/desktop/services/tauriHttpClient.ts
@@ -61,7 +61,7 @@ class TauriHttpClient {
     headers: {},
     timeout: 120000,
     responseType: 'json',
-    withCredentials: true,
+    withCredentials: false, // Desktop doesn't need credentials (backend has allowCredentials=false)
   };
 
   public interceptors: Interceptors = {
@@ -173,14 +173,15 @@ class TauriHttpClient {
     }
 
     try {
-      // Debug logging
-      console.debug(`[tauriHttpClient] Fetch request:`, { url, method });
+      // Convert withCredentials to fetch API's credentials option
+      const credentials: RequestCredentials = finalConfig.withCredentials ? 'include' : 'omit';
 
       // Make the request using Tauri's native HTTP client (standard Fetch API)
       const response = await fetch(url, {
         method,
         headers,
         body,
+        credentials,
       });
 
       // Parse response based on responseType
diff --git a/frontend/src/proprietary/auth/oauthTypes.ts b/frontend/src/proprietary/auth/oauthTypes.ts
new file mode 100644
index 000000000..2d38f1b3e
--- /dev/null
+++ b/frontend/src/proprietary/auth/oauthTypes.ts
@@ -0,0 +1,24 @@
+/**
+ * Known OAuth providers with dedicated UI support.
+ * Custom providers are also supported - the backend determines availability.
+ */
+export const KNOWN_OAUTH_PROVIDERS = [
+  'github',
+  'google',
+  'apple',
+  'azure',
+  'keycloak',
+  'cloudron',
+  'authentik',
+  'oidc',
+] as const;
+
+export type KnownOAuthProvider = typeof KNOWN_OAUTH_PROVIDERS[number];
+
+/**
+ * OAuth provider ID - can be any known provider or custom string.
+ * The backend configuration determines which providers are available.
+ *
+ * @example 'github' | 'google' | 'mycompany' | 'authentik'
+ */
+export type OAuthProvider = KnownOAuthProvider | (string & {});
diff --git a/frontend/src/proprietary/auth/springAuthClient.test.ts b/frontend/src/proprietary/auth/springAuthClient.test.ts
index 5c6af7a75..e3db60338 100644
--- a/frontend/src/proprietary/auth/springAuthClient.test.ts
+++ b/frontend/src/proprietary/auth/springAuthClient.test.ts
@@ -343,7 +343,7 @@ describe('SpringAuthClient', () => {
       });
 
       const result = await springAuth.signInWithOAuth({
-        provider: 'github',
+        provider: '/oauth2/authorization/github',
         options: { redirectTo: '/auth/callback' },
       });
 
diff --git a/frontend/src/proprietary/auth/springAuthClient.ts b/frontend/src/proprietary/auth/springAuthClient.ts
index 2f1aa36cb..f77e34cb6 100644
--- a/frontend/src/proprietary/auth/springAuthClient.ts
+++ b/frontend/src/proprietary/auth/springAuthClient.ts
@@ -10,6 +10,7 @@
 import apiClient from '@app/services/apiClient';
 import { AxiosError } from 'axios';
 import { BASE_PATH } from '@app/constants/app';
+import { type OAuthProvider } from '@app/auth/oauthTypes';
 
 // Helper to extract error message from axios error
 function getErrorMessage(error: unknown, fallback: string): string {
@@ -59,6 +60,7 @@ export interface User {
   enabled?: boolean;
   is_anonymous?: boolean;
   isFirstLogin?: boolean;
+  authenticationType?: string;
   app_metadata?: Record<string, any>;
 }
 
@@ -248,26 +250,30 @@ class SpringAuthClient {
   }
 
   /**
-   * Sign in with OAuth provider (GitHub, Google, etc.)
-   * This redirects to the Spring OAuth2 authorization endpoint
+   * Sign in with OAuth/SAML provider (GitHub, Google, Authentik, etc.)
+   * This redirects to the Spring OAuth2/SAML2 authorization endpoint
+   *
+   * @param params.provider - Full auth path from backend (e.g., '/oauth2/authorization/google', '/saml2/authenticate/stirling')
+   *                          The backend provides the complete path including the auth type and provider ID
    */
   async signInWithOAuth(params: {
-    provider: 'github' | 'google' | 'apple' | 'azure' | 'keycloak' | 'oidc';
+    provider: OAuthProvider;
     options?: { redirectTo?: string; queryParams?: Record<string, any> };
   }): Promise<{ error: AuthError | null }> {
     try {
       const redirectPath = normalizeRedirectPath(params.options?.redirectTo);
       persistRedirectPath(redirectPath);
 
-      // Redirect to Spring OAuth2 endpoint (Vite will proxy to backend)
-      const redirectUrl = `/oauth2/authorization/${params.provider}`;
-      // console.log('[SpringAuth] Redirecting to OAuth:', redirectUrl);
+      // Use the full path provided by the backend
+      // This supports both OAuth2 (/oauth2/authorization/...) and SAML2 (/saml2/authenticate/...)
+      const redirectUrl = params.provider;
+      // console.log('[SpringAuth] Redirecting to SSO:', redirectUrl);
       // Use window.location.assign for full page navigation
       window.location.assign(redirectUrl);
       return { error: null };
     } catch (error) {
       return {
-        error: { message: error instanceof Error ? error.message : 'OAuth redirect failed' },
+        error: { message: error instanceof Error ? error.message : 'SSO redirect failed' },
       };
     }
   }
diff --git a/frontend/src/proprietary/components/shared/ChangeUserPasswordModal.tsx b/frontend/src/proprietary/components/shared/ChangeUserPasswordModal.tsx
new file mode 100644
index 000000000..9e0cd222c
--- /dev/null
+++ b/frontend/src/proprietary/components/shared/ChangeUserPasswordModal.tsx
@@ -0,0 +1,283 @@
+import { useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+  ActionIcon,
+  Button,
+  Checkbox,
+  CloseButton,
+  Group,
+  Modal,
+  PasswordInput,
+  Stack,
+  Text,
+  Tooltip,
+} from '@mantine/core';
+import LocalIcon from '@app/components/shared/LocalIcon';
+import { alert } from '@app/components/toast';
+import { ChangeUserPasswordRequest, User, userManagementService } from '@app/services/userManagementService';
+import { Z_INDEX_OVER_CONFIG_MODAL } from '@app/styles/zIndex';
+
+interface ChangeUserPasswordModalProps {
+  opened: boolean;
+  onClose: () => void;
+  user: User | null;
+  onSuccess: () => void;
+  mailEnabled: boolean;
+}
+
+function generateSecurePassword() {
+  const charset = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz0123456789@$!%*?&';
+  const length = 14;
+  let password = '';
+  const charsetLength = charset.length;
+  const uint8Array = new Uint8Array(length);
+  window.crypto.getRandomValues(uint8Array);
+  // To avoid modulo bias, discard values >= 256 - (256 % charsetLength)
+  for (let i = 0; password.length < length; ) {
+    const randomByte = uint8Array[i];
+    i++;
+    if (randomByte >= Math.floor(256 / charsetLength) * charsetLength) {
+      // Discard and generate a new random value
+      if (i >= uint8Array.length) {
+        // Exhausted the array, fill a new one
+        window.crypto.getRandomValues(uint8Array);
+        i = 0;
+      }
+      continue;
+    }
+    const randomIndex = randomByte % charsetLength;
+    password += charset[randomIndex];
+  }
+  return password;
+}
+
+export default function ChangeUserPasswordModal({ opened, onClose, user, onSuccess, mailEnabled }: ChangeUserPasswordModalProps) {
+  const { t } = useTranslation();
+  const [form, setForm] = useState({
+    newPassword: '',
+    confirmPassword: '',
+    generateRandom: false,
+    sendEmail: false,
+    includePassword: false,
+    forcePasswordChange: false,
+  });
+  const [processing, setProcessing] = useState(false);
+
+  const disabled = !user;
+
+  const handleGeneratePassword = () => {
+    const generated = generateSecurePassword();
+    setForm((prev) => ({ ...prev, newPassword: generated, confirmPassword: generated, generateRandom: true }));
+  };
+
+  const handleCopyPassword = async () => {
+    if (!form.newPassword) return;
+    try {
+      await navigator.clipboard.writeText(form.newPassword);
+      alert({ alertType: 'success', title: t('workspace.people.changePassword.copiedToClipboard', 'Password copied to clipboard') });
+    } catch (_error) {
+      alert({ alertType: 'error', title: t('workspace.people.changePassword.copyFailed', 'Failed to copy password') });
+    }
+  };
+
+  const resetState = () => {
+    setForm({
+      newPassword: '',
+      confirmPassword: '',
+      generateRandom: false,
+      sendEmail: false,
+      includePassword: false,
+      forcePasswordChange: false,
+    });
+  };
+
+  const handleClose = () => {
+    if (processing) return;
+    resetState();
+    onClose();
+  };
+
+  const handleSubmit = async () => {
+    if (!user) return;
+
+    if (!form.generateRandom && !form.newPassword.trim()) {
+      alert({ alertType: 'error', title: t('workspace.people.changePassword.passwordRequired', 'Please enter a new password') });
+      return;
+    }
+
+    if (!form.generateRandom && form.newPassword !== form.confirmPassword) {
+      alert({ alertType: 'error', title: t('workspace.people.changePassword.passwordMismatch', 'Passwords do not match') });
+      return;
+    }
+
+    const payload: ChangeUserPasswordRequest = {
+      username: user.username,
+      newPassword: form.newPassword, // Always send the password (frontend generates it when generateRandom is true)
+      generateRandom: false, // Not needed since we're generating on frontend
+      sendEmail: form.sendEmail,
+      includePassword: form.includePassword,
+      forcePasswordChange: form.forcePasswordChange,
+    };
+
+    try {
+      setProcessing(true);
+      await userManagementService.changeUserPassword(payload);
+      alert({ alertType: 'success', title: t('workspace.people.changePassword.success', 'Password updated successfully') });
+      onSuccess();
+      handleClose();
+    } catch (error: any) {
+      const errorMessage = error.response?.data?.message || error.response?.data?.error || error.message || t('workspace.people.changePassword.error', 'Failed to update password');
+      alert({ alertType: 'error', title: errorMessage });
+    } finally {
+      setProcessing(false);
+    }
+  };
+
+  useEffect(() => {
+    if (opened) {
+      setForm({
+        newPassword: '',
+        confirmPassword: '',
+        generateRandom: false,
+        sendEmail: false,
+        includePassword: false,
+        forcePasswordChange: false,
+      });
+    }
+  }, [opened, user?.username]);
+
+  // Check if username is a valid email format
+  const isValidEmail = (email: string | undefined) => {
+    if (!email) return false;
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    return emailRegex.test(email);
+  };
+
+  const canEmail = mailEnabled && isValidEmail(user?.username);
+  const passwordPreview = useMemo(() => form.newPassword && form.generateRandom ? form.newPassword : '', [form.generateRandom, form.newPassword]);
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      size="md"
+      zIndex={Z_INDEX_OVER_CONFIG_MODAL}
+      centered
+      padding="xl"
+      withCloseButton={false}
+    >
+      <div style={{ position: 'relative' }}>
+        <CloseButton
+          onClick={handleClose}
+          size="lg"
+          disabled={processing}
+          style={{
+            position: 'absolute',
+            top: -8,
+            right: -8,
+            zIndex: 1,
+          }}
+        />
+        <Stack gap="lg" pt="md">
+          <Stack gap="md" align="center">
+            <LocalIcon icon="lock" width="3rem" height="3rem" style={{ color: 'var(--mantine-color-gray-6)' }} />
+            <Text size="xl" fw={600} ta="center">
+              {t('workspace.people.changePassword.title', 'Change password')}
+            </Text>
+            <Text size="sm" c="dimmed" ta="center">
+              {t('workspace.people.changePassword.subtitle', 'Update the password for')} <strong>{user?.username}</strong>
+            </Text>
+          </Stack>
+
+          <Stack gap="sm">
+            <PasswordInput
+              label={t('workspace.people.changePassword.newPassword', 'New password')}
+              placeholder={t('workspace.people.changePassword.placeholder', 'Enter a new password')}
+              value={form.newPassword}
+              onChange={(event) => setForm({ ...form, newPassword: event.currentTarget.value, generateRandom: false })}
+              disabled={processing || disabled || form.generateRandom}
+              data-autofocus
+            />
+            <PasswordInput
+              label={t('workspace.people.changePassword.confirmPassword', 'Confirm password')}
+              placeholder={t('workspace.people.changePassword.confirmPlaceholder', 'Re-enter the new password')}
+              value={form.confirmPassword}
+              onChange={(event) => setForm({ ...form, confirmPassword: event.currentTarget.value, generateRandom: false })}
+              disabled={processing || disabled || form.generateRandom}
+              error={!form.generateRandom && form.confirmPassword && form.newPassword !== form.confirmPassword ? t('workspace.people.changePassword.passwordMismatch', 'Passwords do not match') : undefined}
+            />
+            <Group justify="space-between">
+              <Checkbox
+                label={t('workspace.people.changePassword.generateRandom', 'Generate secure password')}
+                checked={form.generateRandom}
+                disabled={processing || disabled}
+                onChange={(event) => {
+                  const checked = event.currentTarget.checked;
+                  setForm((prev) => ({ ...prev, generateRandom: checked }));
+                  if (event.currentTarget.checked) {
+                    handleGeneratePassword();
+                  }
+                }}
+              />
+              {passwordPreview && (
+                <Group gap="xs" align="center">
+                  <Text size="xs" c="dimmed">
+                    {t('workspace.people.changePassword.generatedPreview', 'Generated password:')} <strong>{passwordPreview}</strong>
+                  </Text>
+                  <Tooltip label={t('workspace.people.changePassword.copyTooltip', 'Copy to clipboard')}>
+                    <ActionIcon
+                      size="sm"
+                      variant="subtle"
+                      color="gray"
+                      onClick={handleCopyPassword}
+                      disabled={processing}
+                    >
+                      <LocalIcon icon="content-copy" width="0.9rem" height="0.9rem" />
+                    </ActionIcon>
+                  </Tooltip>
+                </Group>
+              )}
+            </Group>
+          </Stack>
+
+          <Stack gap="xs">
+            <Checkbox
+              label={t('workspace.people.changePassword.sendEmail', 'Email the user about this change')}
+              checked={canEmail && form.sendEmail}
+              onChange={(event) => setForm({ ...form, sendEmail: event.currentTarget.checked })}
+              disabled={!canEmail || processing}
+            />
+            <Checkbox
+              label={t('workspace.people.changePassword.includePassword', 'Include the new password in the email')}
+              checked={canEmail && form.sendEmail && form.includePassword}
+              onChange={(event) => setForm({ ...form, includePassword: event.currentTarget.checked })}
+              disabled={!canEmail || !form.sendEmail || processing}
+            />
+            <Checkbox
+              label={t('workspace.people.changePassword.forcePasswordChange', 'Force user to change password on next login')}
+              checked={form.forcePasswordChange}
+              onChange={(event) => setForm({ ...form, forcePasswordChange: event.currentTarget.checked })}
+              disabled={processing || disabled}
+            />
+            {!canEmail && (
+              <Text size="xs" c="dimmed">
+                {mailEnabled
+                  ? t('workspace.people.changePassword.emailUnavailable', "This user's email is not a valid email address. Notifications are disabled.")
+                  : t('workspace.people.changePassword.smtpDisabled', 'Email notifications require SMTP to be enabled in settings.')}
+              </Text>
+            )}
+            {canEmail && !form.includePassword && form.sendEmail && (
+              <Text size="xs" c="dimmed">
+                {t('workspace.people.changePassword.notifyOnly', 'An email will be sent without the password, letting the user know an admin changed it.')}
+              </Text>
+            )}
+          </Stack>
+
+          <Button onClick={handleSubmit} loading={processing} fullWidth size="md" disabled={disabled} mt="md">
+            {t('workspace.people.changePassword.submit', 'Update password')}
+          </Button>
+        </Stack>
+      </div>
+    </Modal>
+  );
+}
diff --git a/frontend/src/proprietary/components/shared/UpgradeBanner.tsx b/frontend/src/proprietary/components/shared/UpgradeBanner.tsx
index 966a82f2e..51441f228 100644
--- a/frontend/src/proprietary/components/shared/UpgradeBanner.tsx
+++ b/frontend/src/proprietary/components/shared/UpgradeBanner.tsx
@@ -13,7 +13,7 @@ import {
   UPGRADE_BANNER_ALERT_EVENT,
 } from '@core/constants/events';
 import { useServerExperience } from '@app/hooks/useServerExperience';
-import { hasSeenStep } from '@core/components/onboarding/orchestrator/onboardingStorage';
+import { isOnboardingCompleted } from '@core/components/onboarding/orchestrator/onboardingStorage';
 
 const FRIENDLY_LAST_SEEN_KEY = 'upgradeBannerFriendlyLastShownAt';
 const WEEK_IN_MS = 7 * 24 * 60 * 60 * 1000;
@@ -26,6 +26,7 @@ const UpgradeBanner: React.FC = () => {
   const onAuthRoute = isAuthRoute(location.pathname);
   const { openCheckout } = useCheckout();
   const {
+    loginEnabled,
     totalUsers,
     userCountResolved,
     userCountLoading,
@@ -34,9 +35,11 @@ const UpgradeBanner: React.FC = () => {
     licenseLoading,
     freeTierLimit,
     overFreeTierLimit,
+    weeklyActiveUsers,
     scenarioKey,
   } = useServerExperience();
-  const onboardingComplete = hasSeenStep('welcome');
+  const onboardingComplete = isOnboardingCompleted();
+  console.log('onboardingComplete', onboardingComplete);
   const [friendlyVisible, setFriendlyVisible] = useState(() => {
     if (typeof window === 'undefined') return false;
     const lastShownRaw = window.localStorage.getItem(FRIENDLY_LAST_SEEN_KEY);
@@ -296,8 +299,18 @@ const UpgradeBanner: React.FC = () => {
     );
   };
 
+  const suppressForNoLogin =
+    !loginEnabled ||
+    (!loginEnabled && (weeklyActiveUsers ?? Number.POSITIVE_INFINITY) > 5);
+
   // Don't show on auth routes or if neither banner type should show
-  if (onAuthRoute || (!friendlyVisible && !shouldEvaluateUrgent)) {
+  // Also suppress entirely for no-login servers (treat them as regular users only)
+  // and, per request, never surface upgrade messaging there when WAU > 5.
+  if (
+    onAuthRoute ||
+    suppressForNoLogin ||
+    (!friendlyVisible && !shouldEvaluateUrgent)
+  ) {
     return null;
   }
 
diff --git a/frontend/src/proprietary/components/shared/config/configNavSections.tsx b/frontend/src/proprietary/components/shared/config/configNavSections.tsx
index 6a64e5fbc..0073696f9 100644
--- a/frontend/src/proprietary/components/shared/config/configNavSections.tsx
+++ b/frontend/src/proprietary/components/shared/config/configNavSections.tsx
@@ -16,6 +16,8 @@ import AdminEndpointsSection from '@app/components/shared/config/configSections/
 import AdminAuditSection from '@app/components/shared/config/configSections/AdminAuditSection';
 import AdminUsageSection from '@app/components/shared/config/configSections/AdminUsageSection';
 import ApiKeys from '@app/components/shared/config/configSections/ApiKeys';
+import AccountSection from '@app/components/shared/config/configSections/AccountSection';
+import GeneralSection from '@app/components/shared/config/configSections/GeneralSection';
 
 /**
  * Hook version of proprietary config nav sections with proper i18n support
@@ -30,6 +32,23 @@ export const useConfigNavSections = (
   // Get the core sections (just Preferences)
   const sections = useCoreConfigNavSections(isAdmin, runningEE, loginEnabled);
 
+  // Add account management under Preferences
+  const preferencesSection = sections.find((section) => section.items.some((item) => item.key === 'general'));
+  if (preferencesSection) {
+    preferencesSection.items = preferencesSection.items.map((item) =>
+      item.key === 'general' ? { ...item, component: <GeneralSection /> } : item
+    );
+
+    if (loginEnabled) {
+      preferencesSection.items.push({
+        key: 'account',
+        label: t('account.accountSettings', 'Account'),
+        icon: 'person-rounded',
+        component: <AccountSection />
+      });
+    }
+  }
+
   // Add Admin sections if user is admin OR if login is disabled (but mark as disabled)
   if (isAdmin || !loginEnabled) {
     const requiresLogin = !loginEnabled;
@@ -220,6 +239,23 @@ export const createConfigNavSections = (
   // Get the core sections (just Preferences)
   const sections = createCoreConfigNavSections(isAdmin, runningEE, loginEnabled);
 
+  // Add account management under Preferences
+  const preferencesSection = sections.find((section) => section.items.some((item) => item.key === 'general'));
+  if (preferencesSection) {
+    preferencesSection.items = preferencesSection.items.map((item) =>
+      item.key === 'general' ? { ...item, component: <GeneralSection /> } : item
+    );
+
+    if (loginEnabled) {
+      preferencesSection.items.push({
+        key: 'account',
+        label: 'Account',
+        icon: 'person-rounded',
+        component: <AccountSection />
+      });
+    }
+  }
+
   // Add Admin sections if user is admin OR if login is disabled (but mark as disabled)
   if (isAdmin || !loginEnabled) {
     const requiresLogin = !loginEnabled;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/AccountSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AccountSection.tsx
new file mode 100644
index 000000000..95a9ee57f
--- /dev/null
+++ b/frontend/src/proprietary/components/shared/config/configSections/AccountSection.tsx
@@ -0,0 +1,293 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import { Alert, Button, Group, Modal, Paper, PasswordInput, Stack, Text, TextInput } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import LocalIcon from '@app/components/shared/LocalIcon';
+import { alert as showToast } from '@app/components/toast';
+import { useAuth } from '@app/auth/UseSession';
+import { accountService } from '@app/services/accountService';
+import { Z_INDEX_OVER_CONFIG_MODAL } from '@app/styles/zIndex';
+
+const AccountSection: React.FC = () => {
+  const { t } = useTranslation();
+  const { user, signOut } = useAuth();
+  const [passwordModalOpen, setPasswordModalOpen] = useState(false);
+  const [usernameModalOpen, setUsernameModalOpen] = useState(false);
+
+  const [currentPassword, setCurrentPassword] = useState('');
+  const [newPassword, setNewPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [passwordError, setPasswordError] = useState('');
+  const [passwordSubmitting, setPasswordSubmitting] = useState(false);
+
+  const [currentPasswordForUsername, setCurrentPasswordForUsername] = useState('');
+  const [newUsername, setNewUsername] = useState('');
+  const [usernameError, setUsernameError] = useState('');
+  const [usernameSubmitting, setUsernameSubmitting] = useState(false);
+
+  const authTypeFromMetadata = useMemo(() => {
+    const metadata = user?.app_metadata as { authType?: string; authenticationType?: string } | undefined;
+    return metadata?.authenticationType ?? metadata?.authType;
+  }, [user?.app_metadata]);
+
+  const normalizedAuthType = useMemo(
+    () => (user?.authenticationType ?? authTypeFromMetadata ?? '').toLowerCase(),
+    [authTypeFromMetadata, user?.authenticationType]
+  );
+  const isSsoUser = useMemo(() => ['sso', 'oauth2', 'saml2'].includes(normalizedAuthType), [normalizedAuthType]);
+
+  const userIdentifier = useMemo(() => user?.email || user?.username || '', [user?.email, user?.username]);
+
+  const redirectToLogin = useCallback(() => {
+    window.location.assign('/login');
+  }, []);
+
+  const handleLogout = useCallback(async () => {
+    try {
+      await signOut();
+    } finally {
+      redirectToLogin();
+    }
+  }, [redirectToLogin, signOut]);
+
+  const handlePasswordSubmit = async (event: React.FormEvent) => {
+    event.preventDefault();
+
+    if (isSsoUser) {
+      setPasswordError(t('settings.security.password.ssoDisabled', 'Password changes are managed by your identity provider.'));
+      return;
+    }
+
+    if (!currentPassword || !newPassword || !confirmPassword) {
+      setPasswordError(t('settings.security.password.required', 'All fields are required.'));
+      return;
+    }
+
+    if (newPassword !== confirmPassword) {
+      setPasswordError(t('settings.security.password.mismatch', 'New passwords do not match.'));
+      return;
+    }
+
+    try {
+      setPasswordSubmitting(true);
+      setPasswordError('');
+
+      await accountService.changePassword(currentPassword, newPassword);
+
+      showToast({
+        alertType: 'success',
+        title: t('settings.security.password.success', 'Password updated successfully. Please sign in again.'),
+      });
+
+      setCurrentPassword('');
+      setNewPassword('');
+      setConfirmPassword('');
+      setPasswordModalOpen(false);
+      await handleLogout();
+    } catch (err) {
+      const axiosError = err as { response?: { data?: { message?: string } } };
+      setPasswordError(
+        axiosError.response?.data?.message ||
+          t('settings.security.password.error', 'Unable to update password. Please verify your current password and try again.')
+      );
+    } finally {
+      setPasswordSubmitting(false);
+    }
+  };
+
+  const handleUsernameSubmit = async (event: React.FormEvent) => {
+    event.preventDefault();
+
+    if (isSsoUser) {
+      setUsernameError(t('changeCreds.ssoManaged', 'Your account is managed by your identity provider.'));
+      return;
+    }
+
+    if (!currentPasswordForUsername || !newUsername) {
+      setUsernameError(t('settings.security.password.required', 'All fields are required.'));
+      return;
+    }
+
+    try {
+      setUsernameSubmitting(true);
+      setUsernameError('');
+
+      await accountService.changeUsername(newUsername, currentPasswordForUsername);
+
+      showToast({
+        alertType: 'success',
+        title: t('changeCreds.credsUpdated', 'Account updated'),
+        body: t('changeCreds.description', 'Changes saved. Please log in again.'),
+      });
+
+      setNewUsername('');
+      setCurrentPasswordForUsername('');
+      setUsernameModalOpen(false);
+      await handleLogout();
+    } catch (err) {
+      const axiosError = err as { response?: { data?: { message?: string } } };
+      setUsernameError(
+        axiosError.response?.data?.message ||
+          t('changeCreds.error', 'Unable to update username. Please verify your password and try again.')
+      );
+    } finally {
+      setUsernameSubmitting(false);
+    }
+  };
+
+  return (
+    <Stack gap="md">
+      <div>
+        <Text fw={600} size="lg">
+          {t('account.accountSettings', 'Account')}
+        </Text>
+        <Text size="sm" c="dimmed">
+          {t('changeCreds.header', 'Update Your Account Details')}
+        </Text>
+      </div>
+
+      <Paper withBorder p="md" radius="md">
+        <Stack gap="sm">
+          <Text size="sm" c="dimmed">
+            {userIdentifier
+              ? t('settings.general.user', 'User') + ': ' + userIdentifier
+              : t('account.accountSettings', 'Account Settings')}
+          </Text>
+
+          <Stack gap="xs">
+            {isSsoUser && (
+              <Alert icon={<LocalIcon icon="info" width="1rem" height="1rem" />} color="blue" variant="light">
+                {t('changeCreds.ssoManaged', 'Your account is managed by your identity provider.')}
+              </Alert>
+            )}
+
+            <Group gap="sm" wrap="wrap">
+              {!isSsoUser && (
+                <Button leftSection={<LocalIcon icon="key-rounded" />} onClick={() => setPasswordModalOpen(true)}>
+                  {t('settings.security.password.update', 'Update password')}
+                </Button>
+              )}
+
+              {!isSsoUser && (
+                <Button
+                  variant="light"
+                  leftSection={<LocalIcon icon="edit-rounded" />}
+                  onClick={() => setUsernameModalOpen(true)}
+                >
+                  {t('account.changeUsername', 'Change username')}
+                </Button>
+              )}
+
+              <Button variant="outline" color="red" leftSection={<LocalIcon icon="logout-rounded" />} onClick={handleLogout}>
+                {t('settings.general.logout', 'Log out')}
+              </Button>
+            </Group>
+          </Stack>
+        </Stack>
+      </Paper>
+
+      <Modal
+        opened={passwordModalOpen}
+        onClose={() => setPasswordModalOpen(false)}
+        title={t('settings.security.title', 'Change password')}
+        withinPortal
+        zIndex={Z_INDEX_OVER_CONFIG_MODAL}
+      >
+        <form onSubmit={handlePasswordSubmit}>
+          <Stack gap="md">
+            <Text size="sm" c="dimmed">
+              {t('settings.security.password.subtitle', 'Change your password. You will be logged out after updating.')}
+            </Text>
+
+            {passwordError && (
+              <Alert icon={<LocalIcon icon="error-rounded" width="1rem" height="1rem" />} color="red" variant="light">
+                {passwordError}
+              </Alert>
+            )}
+
+            <PasswordInput
+              label={t('settings.security.password.current', 'Current password')}
+              placeholder={t('settings.security.password.currentPlaceholder', 'Enter your current password')}
+              value={currentPassword}
+              onChange={(event) => setCurrentPassword(event.currentTarget.value)}
+              required
+            />
+
+            <PasswordInput
+              label={t('settings.security.password.new', 'New password')}
+              placeholder={t('settings.security.password.newPlaceholder', 'Enter a new password')}
+              value={newPassword}
+              onChange={(event) => setNewPassword(event.currentTarget.value)}
+              required
+            />
+
+            <PasswordInput
+              label={t('settings.security.password.confirm', 'Confirm new password')}
+              placeholder={t('settings.security.password.confirmPlaceholder', 'Re-enter your new password')}
+              value={confirmPassword}
+              onChange={(event) => setConfirmPassword(event.currentTarget.value)}
+              required
+            />
+
+            <Group justify="flex-end" gap="sm">
+              <Button variant="default" onClick={() => setPasswordModalOpen(false)}>
+                {t('common.cancel', 'Cancel')}
+              </Button>
+              <Button type="submit" loading={passwordSubmitting} leftSection={<LocalIcon icon="save-rounded" />}>
+                {t('settings.security.password.update', 'Update password')}
+              </Button>
+            </Group>
+          </Stack>
+        </form>
+      </Modal>
+
+      <Modal
+        opened={usernameModalOpen}
+        onClose={() => setUsernameModalOpen(false)}
+        title={t('account.changeUsername', 'Change username')}
+        withinPortal
+        zIndex={Z_INDEX_OVER_CONFIG_MODAL}
+      >
+        <form onSubmit={handleUsernameSubmit}>
+          <Stack gap="md">
+            <Text size="sm" c="dimmed">
+              {t('changeCreds.changeUsername', 'Update your username. You will be logged out after updating.')}
+            </Text>
+
+            {usernameError && (
+              <Alert icon={<LocalIcon icon="error-rounded" width="1rem" height="1rem" />} color="red" variant="light">
+                {usernameError}
+              </Alert>
+            )}
+
+            <TextInput
+              label={t('changeCreds.newUsername', 'New Username')}
+              placeholder={t('changeCreds.newUsername', 'New Username')}
+              value={newUsername}
+              onChange={(event) => setNewUsername(event.currentTarget.value)}
+              required
+            />
+
+            <PasswordInput
+              label={t('changeCreds.oldPassword', 'Current Password')}
+              placeholder={t('changeCreds.oldPassword', 'Current Password')}
+              value={currentPasswordForUsername}
+              onChange={(event) => setCurrentPasswordForUsername(event.currentTarget.value)}
+              required
+            />
+
+            <Group justify="flex-end" gap="sm">
+              <Button variant="default" onClick={() => setUsernameModalOpen(false)}>
+                {t('common.cancel', 'Cancel')}
+              </Button>
+              <Button type="submit" loading={usernameSubmitting} leftSection={<LocalIcon icon="save-rounded" />}>
+                {t('common.save', 'Save')}
+              </Button>
+            </Group>
+          </Stack>
+        </form>
+      </Modal>
+    </Stack>
+  );
+};
+
+export default AccountSection;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/AdminAuditSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AdminAuditSection.tsx
index c7142b3d2..1f71b090d 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/AdminAuditSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/AdminAuditSection.tsx
@@ -23,8 +23,14 @@ const AdminAuditSection: React.FC = () => {
         setError(null);
         const status = await auditService.getSystemStatus();
         setSystemStatus(status);
-      } catch (err) {
-        setError(err instanceof Error ? err.message : 'Failed to load audit system status');
+      } catch (err: any) {
+        // Check if this is a permission/license error (403/404)
+        const status = err?.response?.status;
+        if (status === 403 || status === 404) {
+          setError('enterprise-license-required');
+        } else {
+          setError(err instanceof Error ? err.message : 'Failed to load audit system status');
+        }
       } finally {
         setLoading(false);
       }
@@ -56,6 +62,16 @@ const AdminAuditSection: React.FC = () => {
   }
 
   if (error) {
+    if (error === 'enterprise-license-required') {
+      return (
+        <Alert color="blue" title={t('audit.enterpriseRequired', 'Enterprise License Required')}>
+          {t(
+            'audit.enterpriseRequiredMessage',
+            'The audit logging system is an enterprise feature. Please upgrade to an enterprise license to access audit logs and analytics.'
+          )}
+        </Alert>
+      );
+    }
     return (
       <Alert color="red" title={t('audit.error.title', 'Error loading audit system')}>
         {error}
diff --git a/frontend/src/proprietary/components/shared/config/configSections/AdminGeneralSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AdminGeneralSection.tsx
index faebf4d48..75f8516e9 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/AdminGeneralSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/AdminGeneralSection.tsx
@@ -1,6 +1,6 @@
-import { useEffect, useState, useRef, useCallback } from 'react';
+import { useEffect, useState, useRef, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { TextInput, Switch, Button, Stack, Paper, Text, Loader, Group, MultiSelect, Badge, SegmentedControl } from '@mantine/core';
+import { TextInput, Switch, Button, Stack, Paper, Text, Loader, Group, MultiSelect, Badge, SegmentedControl, Select } from '@mantine/core';
 import { alert } from '@app/components/toast';
 import RestartConfirmationModal from '@app/components/shared/config/RestartConfirmationModal';
 import { useRestartServer } from '@app/components/shared/config/useRestartServer';
@@ -11,6 +11,8 @@ import { useLoginRequired } from '@app/hooks/useLoginRequired';
 import LoginRequiredBanner from '@app/components/shared/config/LoginRequiredBanner';
 import { usePreferences } from '@app/contexts/PreferencesContext';
 import { useUnsavedChanges } from '@app/contexts/UnsavedChangesContext';
+import { supportedLanguages, toUnderscoreFormat, toUnderscoreLanguages } from '@app/i18n';
+import { Z_INDEX_CONFIG_MODAL } from '@app/styles/zIndex';
 
 interface GeneralSettingsData {
   ui: {
@@ -49,6 +51,12 @@ export default function AdminGeneralSection() {
   const { restartModalOpened, showRestartModal, closeRestartModal, restartServer } = useRestartServer();
   const { preferences, updatePreference } = usePreferences();
   const { setIsDirty, markClean } = useUnsavedChanges();
+  const languageOptions = useMemo(
+    () => Object.entries(supportedLanguages)
+      .map(([code, label]) => ({ value: toUnderscoreFormat(code), label: `${label} (${code})` }))
+      .sort((a, b) => a.label.localeCompare(b.label)),
+    []
+  );
   
   // Track original settings for dirty detection
   const [originalSettingsSnapshot, setOriginalSettingsSnapshot] = useState<string>('');
@@ -73,9 +81,11 @@ export default function AdminGeneralSection() {
         apiClient.get('/api/v1/admin/settings/section/premium')
       ]);
 
-      const ui = uiResponse.data || {};
-      const system = systemResponse.data || {};
-      const premium = premiumResponse.data || {};
+      const ui = { ...(uiResponse.data || {}) };
+      const system = { ...(systemResponse.data || {}) };
+      const premium = { ...(premiumResponse.data || {}) };
+
+      ui.languages = Array.isArray(ui.languages) ? toUnderscoreLanguages(ui.languages) : [];
 
       const result: any = {
         ui,
@@ -152,6 +162,21 @@ export default function AdminGeneralSection() {
     }
   });
 
+  const selectedLanguages = useMemo(
+    () => toUnderscoreLanguages(settings.ui?.languages || []),
+    [settings.ui?.languages]
+  );
+
+  // Filter default locale options based on available languages setting
+  const defaultLocaleOptions = useMemo(() => {
+    // If no languages are selected (empty), show all languages
+    if (!selectedLanguages || selectedLanguages.length === 0) {
+      return languageOptions;
+    }
+    // Otherwise, only show languages that are in the selected list
+    return languageOptions.filter(option => selectedLanguages.includes(option.value));
+  }, [selectedLanguages, languageOptions]);
+
   useEffect(() => {
     // Only fetch real settings if login is enabled
     if (loginEnabled) {
@@ -369,30 +394,19 @@ export default function AdminGeneralSection() {
                 </Group>
               }
               description={t('admin.settings.general.languages.description', 'Limit which languages are available (empty = all languages)')}
-              value={settings.ui?.languages || []}
+              value={selectedLanguages}
               onChange={(value) => setSettings({ ...settings, ui: { ...settings.ui, languages: value } })}
-              data={[
-                { value: 'de_DE', label: 'Deutsch' },
-                { value: 'es_ES', label: 'Español' },
-                { value: 'fr_FR', label: 'Français' },
-                { value: 'it_IT', label: 'Italiano' },
-                { value: 'pl_PL', label: 'Polski' },
-                { value: 'pt_BR', label: 'Português (Brasil)' },
-                { value: 'ru_RU', label: 'Русский' },
-                { value: 'zh_CN', label: '简体中文' },
-                { value: 'ja_JP', label: '日本語' },
-                { value: 'ko_KR', label: '한국어' },
-              ]}
+              data={languageOptions}
               searchable
               clearable
               placeholder={t('admin.settings.general.languages.placeholder', 'Select languages')}
-              comboboxProps={{ zIndex: 1400 }}
+              comboboxProps={{ zIndex: Z_INDEX_CONFIG_MODAL }}
               disabled={!loginEnabled}
             />
           </div>
 
           <div>
-            <TextInput
+            <Select
               label={
                 <Group gap="xs">
                   <span>{t('admin.settings.general.defaultLocale.label', 'Default Locale')}</span>
@@ -400,9 +414,13 @@ export default function AdminGeneralSection() {
                 </Group>
               }
               description={t('admin.settings.general.defaultLocale.description', 'The default language for new users (e.g., en_US, es_ES)')}
-              value={ settings.system?.defaultLocale || ''}
-              onChange={(e) => setSettings({ ...settings, system: { ...settings.system, defaultLocale: e.target.value } })}
-              placeholder="en_US"
+              value={settings.system?.defaultLocale || ''}
+              onChange={(value) => setSettings({ ...settings, system: { ...settings.system, defaultLocale: value || '' } })}
+              data={defaultLocaleOptions}
+              searchable
+              clearable
+              placeholder="en_GB"
+              comboboxProps={{ zIndex: Z_INDEX_CONFIG_MODAL }}
               disabled={!loginEnabled}
             />
           </div>
diff --git a/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
index 2c86c9ced..0b47cf148 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/AdminPlanSection.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useEffect, useMemo } from 'react';
-import { Divider, Loader, Alert, Group, Text, Collapse, Button, TextInput, Stack, Paper, SegmentedControl, FileButton } from '@mantine/core';
+import { Divider, Loader, Alert } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { usePlans } from '@app/hooks/usePlans';
 import licenseService, { PlanTierGroup, mapLicenseToTier } from '@app/services/licenseService';
@@ -7,30 +7,25 @@ import { useCheckout } from '@app/contexts/CheckoutContext';
 import { useLicense } from '@app/contexts/LicenseContext';
 import AvailablePlansSection from '@app/components/shared/config/configSections/plan/AvailablePlansSection';
 import StaticPlanSection from '@app/components/shared/config/configSections/plan/StaticPlanSection';
+import LicenseKeySection from '@app/components/shared/config/configSections/plan/LicenseKeySection';
 import { alert } from '@app/components/toast';
-import LocalIcon from '@app/components/shared/LocalIcon';
 import { InfoBanner } from '@app/components/shared/InfoBanner';
 import { useLicenseAlert } from '@app/hooks/useLicenseAlert';
-import { isSupabaseConfigured } from '@app/services/supabaseClient';
 import { getPreferredCurrency, setCachedCurrency } from '@app/utils/currencyDetection';
 import { useLoginRequired } from '@app/hooks/useLoginRequired';
 import LoginRequiredBanner from '@core/components/shared/config/LoginRequiredBanner';
+import { isSupabaseConfigured } from '@app/services/supabaseClient';
 
 const AdminPlanSection: React.FC = () => {
   const { t, i18n } = useTranslation();
   const { loginEnabled, validateLoginEnabled } = useLoginRequired();
   const { openCheckout } = useCheckout();
-  const { licenseInfo, refetchLicense } = useLicense();
+  const { licenseInfo } = useLicense();
   const [currency, setCurrency] = useState<string>(() => {
     // Initialize with auto-detected currency on first render
     return getPreferredCurrency(i18n.language);
   });
   const [useStaticVersion, setUseStaticVersion] = useState(false);
-  const [showLicenseKey, setShowLicenseKey] = useState(false);
-  const [licenseKeyInput, setLicenseKeyInput] = useState<string>('');
-  const [savingLicense, setSavingLicense] = useState(false);
-  const [inputMethod, setInputMethod] = useState<'text' | 'file'>('text');
-  const [licenseFile, setLicenseFile] = useState<File | null>(null);
   const { plans, loading, error, refetch } = usePlans(currency);
   const licenseAlert = useLicenseAlert();
 
@@ -43,69 +38,6 @@ const AdminPlanSection: React.FC = () => {
     }
   }, [error]);
 
-  const handleSaveLicense = async () => {
-    // Block save if login is disabled
-    if (!validateLoginEnabled()) {
-      return;
-    }
-
-    try {
-      setSavingLicense(true);
-
-      let response;
-
-      if (inputMethod === 'file' && licenseFile) {
-        // Upload file
-        response = await licenseService.saveLicenseFile(licenseFile);
-      } else if (inputMethod === 'text' && licenseKeyInput.trim()) {
-        // Save key string (allow empty string to clear/remove license)
-        response = await licenseService.saveLicenseKey(licenseKeyInput.trim());
-      } else {
-        alert({
-          alertType: 'error',
-          title: t('admin.error', 'Error'),
-          body: t('admin.settings.premium.noInput', 'Please provide a license key or file'),
-        });
-        return;
-      }
-
-      if (response.success) {
-        // Refresh license context to update all components
-        await refetchLicense();
-
-        const successMessage = inputMethod === 'file'
-          ? t('admin.settings.premium.file.successMessage', 'License file uploaded and activated successfully')
-          : t('admin.settings.premium.key.successMessage', 'License key activated successfully');
-
-        alert({
-          alertType: 'success',
-          title: t('success', 'Success'),
-          body: successMessage,
-        });
-
-        // Clear inputs
-        setLicenseKeyInput('');
-        setLicenseFile(null);
-        setInputMethod('text'); // Reset to default
-      } else {
-        alert({
-          alertType: 'error',
-          title: t('admin.error', 'Error'),
-          body: response.error || t('admin.settings.saveError', 'Failed to save license'),
-        });
-      }
-    } catch (error) {
-      console.error('Failed to save license:', error);
-      alert({
-        alertType: 'error',
-        title: t('admin.error', 'Error'),
-        body: t('admin.settings.saveError', 'Failed to save license'),
-      });
-    } finally {
-      setSavingLicense(false);
-    }
-  };
-
   const currencyOptions = [
     { value: 'gbp', label: 'British pound (GBP, £)' },
     { value: 'usd', label: 'US dollar (USD, $)' },
@@ -280,169 +212,7 @@ const AdminPlanSection: React.FC = () => {
       <Divider />
 
       {/* License Key Section */}
-      <div>
-        <Button
-          variant="subtle"
-          leftSection={<LocalIcon icon={showLicenseKey ? "expand-less-rounded" : "expand-more-rounded"} width="1.25rem" height="1.25rem" />}
-          onClick={() => setShowLicenseKey(!showLicenseKey)}
-        >
-          {t('admin.settings.premium.licenseKey.toggle', 'Got a license key or certificate file?')}
-        </Button>
-
-        <Collapse in={showLicenseKey} mt="md">
-          <Stack gap="md">
-            <Alert
-              variant="light"
-              color="blue"
-              icon={<LocalIcon icon="info-rounded" width="1rem" height="1rem" />}
-            >
-              <Text size="sm">
-                {t('admin.settings.premium.licenseKey.info', 'If you have a license key or certificate file from a direct purchase, you can enter it here to activate premium or enterprise features.')}
-              </Text>
-            </Alert>
-
-            {/* Severe warning if license already exists */}
-            {licenseInfo?.licenseKey && (
-              <Alert
-                variant="light"
-                color="red"
-                icon={<LocalIcon icon="warning-rounded" width="1rem" height="1rem" />}
-                title={t('admin.settings.premium.key.overwriteWarning.title', '⚠️ Warning: Existing License Detected')}
-              >
-                <Stack gap="xs">
-                  <Text size="sm" fw={600}>
-                    {t('admin.settings.premium.key.overwriteWarning.line1', 'Overwriting your current license key cannot be undone.')}
-                  </Text>
-                  <Text size="sm">
-                    {t('admin.settings.premium.key.overwriteWarning.line2', 'Your previous license will be permanently lost unless you have backed it up elsewhere.')}
-                  </Text>
-                  <Text size="sm" fw={500}>
-                    {t('admin.settings.premium.key.overwriteWarning.line3', 'Important: Keep license keys private and secure. Never share them publicly.')}
-                  </Text>
-                </Stack>
-              </Alert>
-            )}
-
-            {/* Show current license source */}
-            {licenseInfo?.licenseKey && (
-              <Alert
-                variant="light"
-                color="green"
-                icon={<LocalIcon icon="check-circle-rounded" width="1rem" height="1rem" />}
-              >
-                <Stack gap="xs">
-                  <Text size="sm" fw={500}>
-                    {t('admin.settings.premium.currentLicense.title', 'Active License')}
-                  </Text>
-                  <Text size="xs">
-                    {licenseInfo.licenseKey.startsWith('file:')
-                      ? t('admin.settings.premium.currentLicense.file', 'Source: License file ({{path}})', {
-                          path: licenseInfo.licenseKey.substring(5)
-                        })
-                      : t('admin.settings.premium.currentLicense.key', 'Source: License key')}
-                  </Text>
-                  <Text size="xs">
-                    {t('admin.settings.premium.currentLicense.type', 'Type: {{type}}', {
-                      type: licenseInfo.licenseType
-                    })}
-                  </Text>
-                </Stack>
-              </Alert>
-            )}
-
-            {/* Input method selector */}
-            <SegmentedControl
-              value={inputMethod}
-              onChange={(value) => {
-                setInputMethod(value as 'text' | 'file');
-                // Clear opposite input when switching
-                if (value === 'text') setLicenseFile(null);
-                if (value === 'file') setLicenseKeyInput('');
-              }}
-              data={[
-                {
-                  label: t('admin.settings.premium.inputMethod.text', 'License Key'),
-                  value: 'text'
-                },
-                {
-                  label: t('admin.settings.premium.inputMethod.file', 'Certificate File'),
-                  value: 'file'
-                }
-              ]}
-              disabled={!loginEnabled || savingLicense}
-            />
-
-            {/* Input area */}
-            <Paper withBorder p="md" radius="md">
-              <Stack gap="md">
-                {inputMethod === 'text' ? (
-                  /* Existing text input */
-                  <TextInput
-                    label={t('admin.settings.premium.key.label', 'License Key')}
-                    description={t('admin.settings.premium.key.description', 'Enter your premium or enterprise license key. Premium features will be automatically enabled when a key is provided.')}
-                    value={licenseKeyInput}
-                    onChange={(e) => setLicenseKeyInput(e.target.value)}
-                    placeholder={licenseInfo?.licenseKey || '00000000-0000-0000-0000-000000000000'}
-                    type="password"
-                    disabled={!loginEnabled || savingLicense}
-                  />
-                ) : (
-                  /* File upload */
-                  <div>
-                    <Text size="sm" fw={500} mb="xs">
-                      {t('admin.settings.premium.file.label', 'License Certificate File')}
-                    </Text>
-                    <Text size="xs" c="dimmed" mb="md">
-                      {t('admin.settings.premium.file.description', 'Upload your .lic or .cert license file')}
-                    </Text>
-                    <FileButton
-                      onChange={setLicenseFile}
-                      accept=".lic,.cert"
-                      disabled={!loginEnabled || savingLicense}
-                    >
-                      {(props) => (
-                        <Button
-                          {...props}
-                          variant="outline"
-                          leftSection={<LocalIcon icon="upload-file-rounded" width="1rem" height="1rem" />}
-                          disabled={!loginEnabled || savingLicense}
-                        >
-                          {licenseFile
-                            ? licenseFile.name
-                            : t('admin.settings.premium.file.choose', 'Choose License File')}
-                        </Button>
-                      )}
-                    </FileButton>
-                    {licenseFile && (
-                      <Text size="xs" c="dimmed" mt="xs">
-                        {t('admin.settings.premium.file.selected', 'Selected: {{filename}} ({{size}})', {
-                          filename: licenseFile.name,
-                          size: (licenseFile.size / 1024).toFixed(2) + ' KB'
-                        })}
-                      </Text>
-                    )}
-                  </div>
-                )}
-
-                <Group justify="flex-end">
-                  <Button
-                    onClick={handleSaveLicense}
-                    loading={savingLicense}
-                    size="sm"
-                    disabled={
-                      !loginEnabled ||
-                      (inputMethod === 'text' && !licenseKeyInput.trim()) ||
-                      (inputMethod === 'file' && !licenseFile)
-                    }
-                  >
-                    {t('admin.settings.save', 'Save Changes')}
-                  </Button>
-                </Group>
-              </Stack>
-            </Paper>
-          </Stack>
-        </Collapse>
-      </div>
+      <LicenseKeySection currentLicenseInfo={licenseInfo ?? undefined} />
     </div>
   );
 };
diff --git a/frontend/src/proprietary/components/shared/config/configSections/AdminSecuritySection.tsx b/frontend/src/proprietary/components/shared/config/configSections/AdminSecuritySection.tsx
index 8934f4c45..19721b760 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/AdminSecuritySection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/AdminSecuritySection.tsx
@@ -13,7 +13,6 @@ import LoginRequiredBanner from '@app/components/shared/config/LoginRequiredBann
 
 interface SecuritySettingsData {
   enableLogin?: boolean;
-  csrfDisabled?: boolean;
   loginMethod?: string;
   loginAttemptCount?: number;
   loginResetTimeMinutes?: number;
@@ -123,7 +122,6 @@ export default function AdminSecuritySection() {
       const deltaSettings: Record<string, any> = {
         // Security settings
         'security.enableLogin': securitySettings.enableLogin,
-        'security.csrfDisabled': securitySettings.csrfDisabled,
         'security.loginMethod': securitySettings.loginMethod,
         'security.loginAttemptCount': securitySettings.loginAttemptCount,
         'security.loginResetTimeMinutes': securitySettings.loginResetTimeMinutes,
@@ -282,23 +280,6 @@ export default function AdminSecuritySection() {
               disabled={!loginEnabled}
             />
           </div>
-
-          <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
-            <div>
-              <Text fw={500} size="sm">{t('admin.settings.security.csrfDisabled.label', 'Disable CSRF Protection')}</Text>
-              <Text size="xs" c="dimmed" mt={4}>
-                {t('admin.settings.security.csrfDisabled.description', 'Disable Cross-Site Request Forgery protection (not recommended)')}
-              </Text>
-            </div>
-            <Group gap="xs">
-              <Switch
-                checked={settings?.csrfDisabled || false}
-                onChange={(e) => setSettings({ ...settings, csrfDisabled: e.target.checked })}
-                disabled={!loginEnabled}
-              />
-              <PendingBadge show={isFieldPending('csrfDisabled')} />
-            </Group>
-          </div>
         </Stack>
       </Paper>
 
diff --git a/frontend/src/proprietary/components/shared/config/configSections/GeneralSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/GeneralSection.tsx
deleted file mode 100644
index 7894319cb..000000000
--- a/frontend/src/proprietary/components/shared/config/configSections/GeneralSection.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import React from 'react';
-import { Stack, Text, Button } from '@mantine/core';
-import { useTranslation } from 'react-i18next';
-import { useAuth } from '@app/auth/UseSession';
-import { useNavigate } from 'react-router-dom';
-import CoreGeneralSection from '@core/components/shared/config/configSections/GeneralSection';
-
-/**
- * Proprietary extension of GeneralSection that adds account management
- */
-const GeneralSection: React.FC = () => {
-  const { t } = useTranslation();
-  const { signOut, user } = useAuth();
-  const navigate = useNavigate();
-
-  const handleLogout = async () => {
-    try {
-      await signOut();
-      navigate('/login');
-    } catch (error) {
-      console.error('Logout error:', error);
-    }
-  };
-
-  return (
-    <Stack gap="lg">
-      <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'flex-start' }}>
-        <div>
-          <Text fw={600} size="lg">{t('settings.general.title', 'General')}</Text>
-          <Text size="sm" c="dimmed">
-            {t('settings.general.description', 'Configure general application preferences.')}
-          </Text>
-        </div>
-
-        {user && (
-          <Stack gap="xs" align="flex-end">
-            <Text size="sm" c="dimmed">
-              {t('settings.general.user', 'User')}: <strong>{user.email || user.username}</strong>
-            </Text>
-            <Button color="red" variant="outline" size="xs" onClick={handleLogout}>
-              {t('settings.general.logout', 'Log out')}
-            </Button>
-          </Stack>
-        )}
-      </div>
-
-      {/* Render core general section preferences (without title since we show it above) */}
-      <CoreGeneralSection hideTitle />
-    </Stack>
-  );
-};
-
-export default GeneralSection;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/PeopleSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/PeopleSection.tsx
index 9c4f56ba0..a43ac3078 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/PeopleSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/PeopleSection.tsx
@@ -30,6 +30,7 @@ import LoginRequiredBanner from '@app/components/shared/config/LoginRequiredBann
 import { useNavigate } from 'react-router-dom';
 import UpdateSeatsButton from '@app/components/shared/UpdateSeatsButton';
 import { useLicense } from '@app/contexts/LicenseContext';
+import ChangeUserPasswordModal from '@app/components/shared/ChangeUserPasswordModal';
 
 export default function PeopleSection() {
   const { t } = useTranslation();
@@ -43,8 +44,11 @@ export default function PeopleSection() {
   const [searchQuery, setSearchQuery] = useState('');
   const [inviteModalOpened, setInviteModalOpened] = useState(false);
   const [editUserModalOpened, setEditUserModalOpened] = useState(false);
+  const [changePasswordModalOpened, setChangePasswordModalOpened] = useState(false);
+  const [passwordUser, setPasswordUser] = useState<User | null>(null);
   const [selectedUser, setSelectedUser] = useState<User | null>(null);
   const [processing, setProcessing] = useState(false);
+  const [mailEnabled, setMailEnabled] = useState(false);
 
   // License information
   const [licenseInfo, setLicenseInfo] = useState<{
@@ -119,6 +123,7 @@ export default function PeopleSection() {
           premiumEnabled: adminData.premiumEnabled,
           totalUsers: adminData.totalUsers,
         });
+        setMailEnabled(adminData.mailEnabled);
       } else {
         // Provide example data when login is disabled
         const exampleUsers: User[] = [
@@ -179,6 +184,7 @@ export default function PeopleSection() {
 
         setUsers(exampleUsers);
         setTeams(exampleTeams);
+        setMailEnabled(false);
 
         // Example license information
         setLicenseInfo({
@@ -267,6 +273,16 @@ export default function PeopleSection() {
     setEditUserModalOpened(true);
   };
 
+  const openChangePasswordModal = (user: User) => {
+    setPasswordUser(user);
+    setChangePasswordModalOpened(true);
+  };
+
+  const closeChangePasswordModal = () => {
+    setChangePasswordModalOpened(false);
+    setPasswordUser(null);
+  };
+
   const closeEditModal = () => {
     setEditUserModalOpened(false);
     setSelectedUser(null);
@@ -514,7 +530,6 @@ export default function PeopleSection() {
                     <Tooltip label={user.team.name} disabled={user.team.name.length <= 20} zIndex={Z_INDEX_OVER_CONFIG_MODAL}>
                       <Text
                         size="sm"
-                        c="dimmed"
                         maw={150}
                         style={{
                           overflow: 'hidden',
@@ -526,7 +541,7 @@ export default function PeopleSection() {
                       </Text>
                     </Tooltip>
                   ) : (
-                    <Text size="sm" c="dimmed">—</Text>
+                    <Text size="sm">—</Text>
                   )}
                 </Table.Td>
                   <Table.Td>
@@ -549,7 +564,7 @@ export default function PeopleSection() {
                         withArrow
                         zIndex={Z_INDEX_OVER_CONFIG_MODAL + 10}
                       >
-                        <ActionIcon variant="subtle" color="gray" size="sm">
+                        <ActionIcon variant="subtle"size="sm">
                           <LocalIcon icon="info" width="1rem" height="1rem" />
                         </ActionIcon>
                       </Tooltip>
@@ -557,12 +572,25 @@ export default function PeopleSection() {
                       {/* Actions menu */}
                       <Menu position="bottom-end" withinPortal>
                         <Menu.Target>
-                          <ActionIcon variant="subtle" color="gray" disabled={!loginEnabled}>
+                          <ActionIcon variant="subtle"  disabled={!loginEnabled}>
                             <LocalIcon icon="more-vert" width="1rem" height="1rem" />
                           </ActionIcon>
                         </Menu.Target>
                         <Menu.Dropdown style={{ zIndex: Z_INDEX_OVER_CONFIG_MODAL }}>
-                          <Menu.Item onClick={() => openEditModal(user)} disabled={!loginEnabled}>{t('workspace.people.editRole')}</Menu.Item>
+                          <Menu.Item
+                            leftSection={<LocalIcon icon="edit" width="1rem" height="1rem" />}
+                            onClick={() => openEditModal(user)}
+                            disabled={!loginEnabled}
+                          >
+                            {t('workspace.people.editRole')}
+                          </Menu.Item>
+                          <Menu.Item
+                            leftSection={<LocalIcon icon="lock" width="1rem" height="1rem" />}
+                            onClick={() => openChangePasswordModal(user)}
+                            disabled={!loginEnabled}
+                          >
+                            {t('workspace.people.changePassword.action', 'Change password')}
+                          </Menu.Item>
                           <Menu.Item
                             leftSection={user.enabled ? <LocalIcon icon="person-off" width="1rem" height="1rem" /> : <LocalIcon icon="person-check" width="1rem" height="1rem" />}
                             onClick={() => handleToggleEnabled(user)}
@@ -591,6 +619,14 @@ export default function PeopleSection() {
         onSuccess={fetchData}
       />
 
+      <ChangeUserPasswordModal
+        opened={changePasswordModalOpened}
+        onClose={closeChangePasswordModal}
+        user={passwordUser}
+        onSuccess={fetchData}
+        mailEnabled={mailEnabled}
+      />
+
       {/* Edit User Modal */}
       <Modal
         opened={editUserModalOpened}
diff --git a/frontend/src/proprietary/components/shared/config/configSections/TeamDetailsSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/TeamDetailsSection.tsx
index 8a61e7be5..c4f91d969 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/TeamDetailsSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/TeamDetailsSection.tsx
@@ -22,6 +22,7 @@ import { alert } from '@app/components/toast';
 import { teamService, Team } from '@app/services/teamService';
 import { User, userManagementService } from '@app/services/userManagementService';
 import { Z_INDEX_OVER_CONFIG_MODAL } from '@app/styles/zIndex';
+import ChangeUserPasswordModal from '@app/components/shared/ChangeUserPasswordModal';
 
 interface TeamDetailsSectionProps {
   teamId: number;
@@ -38,6 +39,8 @@ export default function TeamDetailsSection({ teamId, onBack }: TeamDetailsSectio
   const [userLastRequest, setUserLastRequest] = useState<Record<string, number>>({});
   const [addMemberModalOpened, setAddMemberModalOpened] = useState(false);
   const [changeTeamModalOpened, setChangeTeamModalOpened] = useState(false);
+  const [changePasswordModalOpened, setChangePasswordModalOpened] = useState(false);
+  const [passwordUser, setPasswordUser] = useState<User | null>(null);
   const [selectedUser, setSelectedUser] = useState<User | null>(null);
   const [selectedUserId, setSelectedUserId] = useState<string>('');
   const [selectedTeamId, setSelectedTeamId] = useState<string>('');
@@ -47,6 +50,7 @@ export default function TeamDetailsSection({ teamId, onBack }: TeamDetailsSectio
   const [licenseInfo, setLicenseInfo] = useState<{
     availableSlots: number;
   } | null>(null);
+  const [mailEnabled, setMailEnabled] = useState(false);
 
   useEffect(() => {
     fetchTeamDetails();
@@ -70,6 +74,7 @@ export default function TeamDetailsSection({ teamId, onBack }: TeamDetailsSectio
       setLicenseInfo({
         availableSlots: adminData.availableSlots,
       });
+      setMailEnabled(adminData.mailEnabled);
     } catch (error) {
       console.error('Failed to fetch team details:', error);
       alert({ alertType: 'error', title: t('workspace.teams.loadError', 'Failed to load team details') });
@@ -172,6 +177,16 @@ export default function TeamDetailsSection({ teamId, onBack }: TeamDetailsSectio
     setChangeTeamModalOpened(true);
   };
 
+  const openChangePasswordModal = (user: User) => {
+    setPasswordUser(user);
+    setChangePasswordModalOpened(true);
+  };
+
+  const closeChangePasswordModal = () => {
+    setChangePasswordModalOpened(false);
+    setPasswordUser(null);
+  };
+
   const handleChangeTeam = async () => {
     if (!selectedUser || !selectedTeamId) {
       alert({ alertType: 'error', title: t('workspace.teams.changeTeam.selectTeamRequired', 'Please select a team') });
@@ -398,6 +413,13 @@ export default function TeamDetailsSection({ teamId, onBack }: TeamDetailsSectio
                           >
                             {t('workspace.teams.changeTeam.label', 'Change Team')}
                           </Menu.Item>
+                          <Menu.Item
+                            leftSection={<LocalIcon icon="lock" width="1rem" height="1rem" />}
+                            onClick={() => openChangePasswordModal(user)}
+                            disabled={processing}
+                          >
+                            {t('workspace.people.changePassword.action', 'Change password')}
+                          </Menu.Item>
                           {team.name !== 'Internal' && team.name !== 'Default' && (
                             <Menu.Item
                               leftSection={<LocalIcon icon="person-remove" width="1rem" height="1rem" />}
@@ -427,6 +449,14 @@ export default function TeamDetailsSection({ teamId, onBack }: TeamDetailsSectio
           </Table.Tbody>
       </Table>
 
+      <ChangeUserPasswordModal
+        opened={changePasswordModalOpened}
+        onClose={closeChangePasswordModal}
+        user={passwordUser}
+        onSuccess={fetchTeamDetails}
+        mailEnabled={mailEnabled}
+      />
+
       {/* Add Member Modal */}
       <Modal
         opened={addMemberModalOpened}
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/AvailablePlansSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/AvailablePlansSection.tsx
index a3b8800d1..9aed2ff7d 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/plan/AvailablePlansSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/AvailablePlansSection.tsx
@@ -5,6 +5,7 @@ import licenseService, { PlanTier, PlanTierGroup, LicenseInfo, mapLicenseToTier
 import PlanCard from '@app/components/shared/config/configSections/plan/PlanCard';
 import FeatureComparisonTable from '@app/components/shared/config/configSections/plan/FeatureComparisonTable';
 import { Z_INDEX_OVER_CONFIG_MODAL } from '@app/styles/zIndex';
+import { isCurrentTier as checkIsCurrentTier, isDowngrade as checkIsDowngrade } from '@app/utils/planTierUtils';
 
 interface AvailablePlansSectionProps {
   plans: PlanTier[];
@@ -43,28 +44,12 @@ const AvailablePlansSection: React.FC<AvailablePlansSectionProps> = ({
 
   // Determine if the current tier matches (checks both Stripe subscription and license)
   const isCurrentTier = (tierGroup: PlanTierGroup): boolean => {
-    // Check license tier match
-    if (currentTier && tierGroup.tier === currentTier) {
-      return true;
-    }
-    return false;
+    return checkIsCurrentTier(currentTier, tierGroup.tier);
   };
 
   // Determine if selecting this plan would be a downgrade
   const isDowngrade = (tierGroup: PlanTierGroup): boolean => {
-    if (!currentTier) return false;
-
-    // Define tier hierarchy: enterprise > server > free
-    const tierHierarchy: Record<string, number> = {
-      'enterprise': 3,
-      'server': 2,
-      'free': 1
-    };
-
-    const currentLevel = tierHierarchy[currentTier] || 0;
-    const targetLevel = tierHierarchy[tierGroup.tier] || 0;
-
-    return currentLevel > targetLevel;
+    return checkIsDowngrade(currentTier, tierGroup.tier);
   };
 
   return (
@@ -103,7 +88,7 @@ const AvailablePlansSection: React.FC<AvailablePlansSectionProps> = ({
           display: 'grid',
           gridTemplateColumns: 'repeat(3, 1fr)',
           gap: '1rem',
-          marginBottom: '0.5rem',
+          marginBottom: '0.1rem',
         }}
       >
         {groupedPlans.map((group) => (
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/LicenseKeySection.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/LicenseKeySection.tsx
new file mode 100644
index 000000000..e5e90d048
--- /dev/null
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/LicenseKeySection.tsx
@@ -0,0 +1,273 @@
+import React, { useState } from 'react';
+import { Button, Collapse, Alert, TextInput, Paper, Stack, Group, Text, SegmentedControl, FileButton } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import LocalIcon from '@app/components/shared/LocalIcon';
+import { alert } from '@app/components/toast';
+import { LicenseInfo } from '@app/services/licenseService';
+import licenseService from '@app/services/licenseService';
+import { useLicense } from '@app/contexts/LicenseContext';
+import { useLoginRequired } from '@app/hooks/useLoginRequired';
+
+interface LicenseKeySectionProps {
+  currentLicenseInfo?: LicenseInfo;
+}
+
+const LicenseKeySection: React.FC<LicenseKeySectionProps> = ({ currentLicenseInfo }) => {
+  const { t } = useTranslation();
+  const { refetchLicense } = useLicense();
+  const { loginEnabled, validateLoginEnabled } = useLoginRequired();
+  const [showLicenseKey, setShowLicenseKey] = useState(false);
+  const [licenseKeyInput, setLicenseKeyInput] = useState<string>('');
+  const [savingLicense, setSavingLicense] = useState(false);
+  const [inputMethod, setInputMethod] = useState<'text' | 'file'>('text');
+  const [licenseFile, setLicenseFile] = useState<File | null>(null);
+
+  const handleSaveLicense = async () => {
+    // Block save if login is disabled
+    if (!validateLoginEnabled()) {
+      return;
+    }
+
+    try {
+      setSavingLicense(true);
+
+      let response;
+
+      if (inputMethod === 'file' && licenseFile) {
+        // Upload file
+        response = await licenseService.saveLicenseFile(licenseFile);
+      } else if (inputMethod === 'text' && licenseKeyInput.trim()) {
+        // Save key string
+        response = await licenseService.saveLicenseKey(licenseKeyInput.trim());
+      } else {
+        alert({
+          alertType: 'error',
+          title: t('admin.error', 'Error'),
+          body: t('admin.settings.premium.noInput', 'Please provide a license key or file'),
+        });
+        return;
+      }
+
+      if (response.success) {
+        // Refresh license context to update all components
+        await refetchLicense();
+
+        const successMessage =
+          inputMethod === 'file'
+            ? t('admin.settings.premium.file.successMessage', 'License file uploaded and activated successfully')
+            : t('admin.settings.premium.key.successMessage', 'License key activated successfully');
+
+        alert({
+          alertType: 'success',
+          title: t('success', 'Success'),
+          body: successMessage,
+        });
+
+        // Clear inputs
+        setLicenseKeyInput('');
+        setLicenseFile(null);
+        setInputMethod('text'); // Reset to default
+      } else {
+        alert({
+          alertType: 'error',
+          title: t('admin.error', 'Error'),
+          body: response.error || t('admin.settings.saveError', 'Failed to save license'),
+        });
+      }
+    } catch (error) {
+      console.error('Failed to save license:', error);
+      alert({
+        alertType: 'error',
+        title: t('admin.error', 'Error'),
+        body: t('admin.settings.saveError', 'Failed to save license'),
+      });
+    } finally {
+      setSavingLicense(false);
+    }
+  };
+
+  return (
+    <div>
+      <Button
+        variant="subtle"
+        leftSection={
+          <LocalIcon
+            icon={showLicenseKey ? 'expand-less-rounded' : 'expand-more-rounded'}
+            width="1.25rem"
+            height="1.25rem"
+          />
+        }
+        onClick={() => setShowLicenseKey(!showLicenseKey)}
+      >
+        {t('admin.settings.premium.licenseKey.toggle', 'Got a license key or certificate file?')}
+      </Button>
+
+      <Collapse in={showLicenseKey} mt="md">
+        <Stack gap="md">
+          <Alert variant="light" color="blue" icon={<LocalIcon icon="info-rounded" width="1rem" height="1rem" />}>
+            <Text size="sm">
+              {t(
+                'admin.settings.premium.licenseKey.info',
+                'If you have a license key or certificate file from a direct purchase, you can enter it here to activate premium or enterprise features.'
+              )}
+            </Text>
+          </Alert>
+
+          {/* Severe warning if license already exists */}
+          {currentLicenseInfo?.licenseKey && (
+            <Alert
+              variant="light"
+              color="red"
+              icon={<LocalIcon icon="warning-rounded" width="1rem" height="1rem" />}
+              title={t('admin.settings.premium.key.overwriteWarning.title', '⚠️ Warning: Existing License Detected')}
+            >
+              <Stack gap="xs">
+                <Text size="sm" fw={600}>
+                  {t(
+                    'admin.settings.premium.key.overwriteWarning.line1',
+                    'Overwriting your current license key cannot be undone.'
+                  )}
+                </Text>
+                <Text size="sm">
+                  {t(
+                    'admin.settings.premium.key.overwriteWarning.line2',
+                    'Your previous license will be permanently lost unless you have backed it up elsewhere.'
+                  )}
+                </Text>
+                <Text size="sm" fw={500}>
+                  {t(
+                    'admin.settings.premium.key.overwriteWarning.line3',
+                    'Important: Keep license keys private and secure. Never share them publicly.'
+                  )}
+                </Text>
+              </Stack>
+            </Alert>
+          )}
+
+          {/* Show current license source */}
+          {currentLicenseInfo?.licenseKey && (
+            <Alert
+              variant="light"
+              color="green"
+              icon={<LocalIcon icon="check-circle-rounded" width="1rem" height="1rem" />}
+            >
+              <Stack gap="xs">
+                <Text size="sm" fw={500}>
+                  {t('admin.settings.premium.currentLicense.title', 'Active License')}
+                </Text>
+                <Text size="xs">
+                  {currentLicenseInfo.licenseKey.startsWith('file:')
+                    ? t('admin.settings.premium.currentLicense.file', 'Source: License file ({{path}})', {
+                        path: currentLicenseInfo.licenseKey.substring(5),
+                      })
+                    : t('admin.settings.premium.currentLicense.key', 'Source: License key')}
+                </Text>
+                <Text size="xs">
+                  {t('admin.settings.premium.currentLicense.type', 'Type: {{type}}', {
+                    type: currentLicenseInfo.licenseType,
+                  })}
+                </Text>
+              </Stack>
+            </Alert>
+          )}
+
+          {/* Input method selector */}
+          <SegmentedControl
+            value={inputMethod}
+            onChange={(value) => {
+              setInputMethod(value as 'text' | 'file');
+              // Clear opposite input when switching
+              if (value === 'text') setLicenseFile(null);
+              if (value === 'file') setLicenseKeyInput('');
+            }}
+            data={[
+              {
+                label: t('admin.settings.premium.inputMethod.text', 'License Key'),
+                value: 'text',
+              },
+              {
+                label: t('admin.settings.premium.inputMethod.file', 'Certificate File'),
+                value: 'file',
+              },
+            ]}
+            disabled={!loginEnabled || savingLicense}
+          />
+
+          {/* Input area */}
+          <Paper withBorder p="md" radius="md">
+            <Stack gap="md">
+              {inputMethod === 'text' ? (
+                /* Text input */
+                <TextInput
+                  label={t('admin.settings.premium.key.label', 'License Key')}
+                  description={t(
+                    'admin.settings.premium.key.description',
+                    'Enter your premium or enterprise license key. Premium features will be automatically enabled when a key is provided.'
+                  )}
+                  value={licenseKeyInput}
+                  onChange={(e) => setLicenseKeyInput(e.target.value)}
+                  placeholder={currentLicenseInfo?.licenseKey || '00000000-0000-0000-0000-000000000000'}
+                  type="password"
+                  disabled={!loginEnabled || savingLicense}
+                />
+              ) : (
+                /* File upload */
+                <div>
+                  <Text size="sm" fw={500} mb="xs">
+                    {t('admin.settings.premium.file.label', 'License Certificate File')}
+                  </Text>
+                  <Text size="xs" c="dimmed" mb="md">
+                    {t('admin.settings.premium.file.description', 'Upload your .lic or .cert license file')}
+                  </Text>
+                  <FileButton
+                    onChange={setLicenseFile}
+                    accept=".lic,.cert"
+                    disabled={!loginEnabled || savingLicense}
+                  >
+                    {(props) => (
+                      <Button
+                        {...props}
+                        variant="outline"
+                        leftSection={<LocalIcon icon="upload-file-rounded" width="1rem" height="1rem" />}
+                        disabled={!loginEnabled || savingLicense}
+                      >
+                        {licenseFile
+                          ? licenseFile.name
+                          : t('admin.settings.premium.file.choose', 'Choose License File')}
+                      </Button>
+                    )}
+                  </FileButton>
+                  {licenseFile && (
+                    <Text size="xs" c="dimmed" mt="xs">
+                      {t('admin.settings.premium.file.selected', 'Selected: {{filename}} ({{size}})', {
+                        filename: licenseFile.name,
+                        size: (licenseFile.size / 1024).toFixed(2) + ' KB',
+                      })}
+                    </Text>
+                  )}
+                </div>
+              )}
+
+              <Group justify="flex-end">
+                <Button
+                  onClick={handleSaveLicense}
+                  loading={savingLicense}
+                  size="sm"
+                  disabled={
+                    !loginEnabled ||
+                    (inputMethod === 'text' && !licenseKeyInput.trim()) ||
+                    (inputMethod === 'file' && !licenseFile)
+                  }
+                >
+                  {t('admin.settings.save', 'Save Changes')}
+                </Button>
+              </Group>
+            </Stack>
+          </Paper>
+        </Stack>
+      </Collapse>
+    </div>
+  );
+};
+
+export default LicenseKeySection;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/PlanCard.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/PlanCard.tsx
index 7dff90f8e..b2dce9c65 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/plan/PlanCard.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/PlanCard.tsx
@@ -6,6 +6,7 @@ import { PricingBadge } from '@app/components/shared/stripeCheckout/components/P
 import { PriceDisplay } from '@app/components/shared/stripeCheckout/components/PriceDisplay';
 import { calculateDisplayPricing } from '@app/components/shared/stripeCheckout/utils/pricingUtils';
 import { getBaseCardStyle } from '@app/components/shared/stripeCheckout/utils/cardStyles';
+import { isEnterpriseBlockedForFree as checkIsEnterpriseBlockedForFree } from '@app/utils/planTierUtils';
 
 interface PlanCardProps {
   planGroup: PlanTierGroup;
@@ -32,6 +33,7 @@ const PlanCard: React.FC<PlanCardProps> = ({ planGroup, isCurrentTier, isDowngra
         radius="md"
         withBorder
         style={getBaseCardStyle(isCurrentTier)}
+        className="plan-card"
       >
         {isCurrentTier && (
           <PricingBadge
@@ -67,7 +69,7 @@ const PlanCard: React.FC<PlanCardProps> = ({ planGroup, isCurrentTier, isDowngra
 
           <div style={{ flexGrow: 1 }} />
 
-          <Button variant="filled" disabled fullWidth>
+          <Button variant="filled" disabled fullWidth className="plan-button">
             {isCurrentTier
               ? t('plan.current', 'Current Plan')
               : t('plan.free.included', 'Included')}
@@ -82,7 +84,7 @@ const PlanCard: React.FC<PlanCardProps> = ({ planGroup, isCurrentTier, isDowngra
   const isEnterprise = planGroup.tier === 'enterprise';
 
   // Block enterprise for free tier users (must have server first)
-  const isEnterpriseBlockedForFree = isEnterprise && currentTier === 'free';
+  const isEnterpriseBlockedForFree = checkIsEnterpriseBlockedForFree(currentTier, planGroup.tier);
 
   // Calculate "From" pricing - show yearly price divided by 12 for lowest monthly equivalent
   const { displayPrice, displaySeatPrice, displayCurrency } = calculateDisplayPricing(
@@ -96,6 +98,7 @@ const PlanCard: React.FC<PlanCardProps> = ({ planGroup, isCurrentTier, isDowngra
       radius="md"
       withBorder
       style={getBaseCardStyle(isCurrentTier)}
+      className="plan-card"
     >
       {isCurrentTier ? (
         <PricingBadge
@@ -172,10 +175,11 @@ const PlanCard: React.FC<PlanCardProps> = ({ planGroup, isCurrentTier, isDowngra
           withArrow
         >
           <Button
-            variant={isCurrentTier ? 'filled' : isDowngrade ? 'filled' : isEnterpriseBlockedForFree ? 'light' : 'filled'}
+            variant="filled"
             fullWidth
             onClick={() => isCurrentTier && onManageClick ? onManageClick() : onUpgradeClick(planGroup)}
             disabled={!loginEnabled || isDowngrade || isEnterpriseBlockedForFree}
+            className="plan-button"
           >
             {isCurrentTier
               ? t('plan.manage', 'Manage')
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/StaticCheckoutModal.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/StaticCheckoutModal.tsx
new file mode 100644
index 000000000..b9f46bc7c
--- /dev/null
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/StaticCheckoutModal.tsx
@@ -0,0 +1,338 @@
+import React, { useState } from 'react';
+import { Modal, Text, Group, ActionIcon, Stack, Paper, Grid, TextInput, Button, Alert } from '@mantine/core';
+import { useTranslation } from 'react-i18next';
+import LocalIcon from '@app/components/shared/LocalIcon';
+import { EmailStage } from '@app/components/shared/stripeCheckout/stages/EmailStage';
+import { validateEmail } from '@app/components/shared/stripeCheckout/utils/checkoutUtils';
+import { getClickablePaperStyle } from '@app/components/shared/stripeCheckout/utils/cardStyles';
+import { STATIC_STRIPE_LINKS, buildStripeUrlWithEmail } from '@app/constants/staticStripeLinks';
+import { alert } from '@app/components/toast';
+import { Z_INDEX_OVER_CONFIG_MODAL } from '@app/styles/zIndex';
+import { useIsMobile } from '@app/hooks/useIsMobile';
+import licenseService from '@app/services/licenseService';
+import { useLicense } from '@app/contexts/LicenseContext';
+
+interface StaticCheckoutModalProps {
+  opened: boolean;
+  onClose: () => void;
+  planName: 'server' | 'enterprise';
+  isUpgrade?: boolean;
+}
+
+type Stage = 'email' | 'period-selection' | 'license-activation';
+
+const StaticCheckoutModal: React.FC<StaticCheckoutModalProps> = ({
+  opened,
+  onClose,
+  planName,
+  isUpgrade = false,
+}) => {
+  const { t } = useTranslation();
+  const isMobile = useIsMobile();
+  const { refetchLicense } = useLicense();
+
+  const [stage, setStage] = useState<Stage>('email');
+  const [email, setEmail] = useState('');
+  const [emailError, setEmailError] = useState('');
+  const [stageHistory, setStageHistory] = useState<Stage[]>([]);
+
+  // License activation state
+  const [licenseKey, setLicenseKey] = useState('');
+  const [savingLicense, setSavingLicense] = useState(false);
+  const [licenseActivated, setLicenseActivated] = useState(false);
+
+  const handleEmailSubmit = () => {
+    const validation = validateEmail(email);
+    if (validation.valid) {
+      setEmailError('');
+      setStageHistory([...stageHistory, 'email']);
+      setStage('period-selection');
+    } else {
+      setEmailError(validation.error);
+    }
+  };
+
+  const handlePeriodSelect = (period: 'monthly' | 'yearly') => {
+    const baseUrl = STATIC_STRIPE_LINKS[planName][period];
+    const urlWithEmail = buildStripeUrlWithEmail(baseUrl, email);
+
+    // Open Stripe checkout in new tab
+    window.open(urlWithEmail, '_blank');
+
+    // Transition to license activation stage
+    setStageHistory([...stageHistory, 'period-selection']);
+    setStage('license-activation');
+  };
+
+  const handleActivateLicense = async () => {
+    if (!licenseKey.trim()) {
+      alert({
+        alertType: 'error',
+        title: t('admin.error', 'Error'),
+        body: t('admin.settings.premium.noInput', 'Please provide a license key'),
+      });
+      return;
+    }
+
+    try {
+      setSavingLicense(true);
+      const response = await licenseService.saveLicenseKey(licenseKey.trim());
+
+      if (response.success) {
+        // Refresh license context to update all components
+        await refetchLicense();
+
+        setLicenseActivated(true);
+
+        alert({
+          alertType: 'success',
+          title: t('success', 'Success'),
+          body: t(
+            'admin.settings.premium.key.successMessage',
+            'License key activated successfully'
+          ),
+        });
+      } else {
+        alert({
+          alertType: 'error',
+          title: t('admin.error', 'Error'),
+          body: response.error || t('admin.settings.saveError', 'Failed to save license'),
+        });
+      }
+    } catch (error) {
+      console.error('Failed to save license:', error);
+      alert({
+        alertType: 'error',
+        title: t('admin.error', 'Error'),
+        body: t('admin.settings.saveError', 'Failed to save license'),
+      });
+    } finally {
+      setSavingLicense(false);
+    }
+  };
+
+  const handleGoBack = () => {
+    if (stageHistory.length > 0) {
+      const newHistory = [...stageHistory];
+      const previousStage = newHistory.pop();
+      setStageHistory(newHistory);
+      if (previousStage) {
+        setStage(previousStage);
+      }
+    }
+  };
+
+  const handleClose = () => {
+    // Reset state when closing
+    setStage('email');
+    setEmail('');
+    setEmailError('');
+    setStageHistory([]);
+    setLicenseKey('');
+    setSavingLicense(false);
+    setLicenseActivated(false);
+    onClose();
+  };
+
+  const getModalTitle = () => {
+    if (stage === 'email') {
+      if (isUpgrade) {
+        return t('plan.static.upgradeToEnterprise', 'Upgrade to Enterprise');
+      }
+      return planName === 'server'
+        ? t('plan.static.getLicense', 'Get Server License')
+        : t('plan.static.upgradeToEnterprise', 'Upgrade to Enterprise');
+    }
+    if (stage === 'period-selection') {
+      return t('plan.static.selectPeriod', 'Select Billing Period');
+    }
+    if (stage === 'license-activation') {
+      return t('plan.static.activateLicense', 'Activate Your License');
+    }
+    return '';
+  };
+
+  const renderContent = () => {
+    switch (stage) {
+      case 'email':
+        return (
+          <EmailStage
+            emailInput={email}
+            setEmailInput={setEmail}
+            emailError={emailError}
+            onSubmit={handleEmailSubmit}
+          />
+        );
+
+      case 'period-selection':
+        return (
+          <Stack gap="lg" style={{ padding: '1rem 2rem' }}>
+            <Grid gutter="xl" style={{ marginTop: '1rem' }}>
+              {/* Monthly Option */}
+              <Grid.Col span={6}>
+                <Paper
+                  withBorder
+                  p="xl"
+                  radius="md"
+                  style={getClickablePaperStyle()}
+                  onClick={() => handlePeriodSelect('monthly')}
+                >
+                  <Stack gap="md" style={{ height: '100%', minHeight: '120px' }} justify="space-between">
+                    <Text size="lg" fw={600}>
+                      {t('payment.monthly', 'Monthly')}
+                    </Text>
+                    <Text size="sm" c="dimmed">
+                      {t('plan.static.monthlyBilling', 'Monthly Billing')}
+                    </Text>
+                  </Stack>
+                </Paper>
+              </Grid.Col>
+
+              {/* Yearly Option */}
+              <Grid.Col span={6}>
+                <Paper
+                  withBorder
+                  p="xl"
+                  radius="md"
+                  style={getClickablePaperStyle()}
+                  onClick={() => handlePeriodSelect('yearly')}
+                >
+                  <Stack gap="md" style={{ height: '100%', minHeight: '120px' }} justify="space-between">
+                    <Text size="lg" fw={600}>
+                      {t('payment.yearly', 'Yearly')}
+                    </Text>
+                    <Text size="sm" c="dimmed">
+                      {t('plan.static.yearlyBilling', 'Yearly Billing')}
+                    </Text>
+                  </Stack>
+                </Paper>
+              </Grid.Col>
+            </Grid>
+          </Stack>
+        );
+
+      case 'license-activation':
+        return (
+          <Stack gap="lg" style={{ padding: '2rem', maxWidth: '600px', margin: '0 auto' }}>
+            <Alert
+              variant="light"
+              color="blue"
+              icon={<LocalIcon icon="info-rounded" width="1rem" height="1rem" />}
+            >
+              <Stack gap="sm">
+                <Text size="sm" fw={600}>
+                  {t('plan.static.licenseActivation.checkoutOpened', 'Checkout Opened in New Tab')}
+                </Text>
+                <Text size="sm">
+                  {t(
+                    'plan.static.licenseActivation.instructions',
+                    'Complete your purchase in the Stripe tab. Once your payment is complete, you will receive an email with your license key.'
+                  )}
+                </Text>
+              </Stack>
+            </Alert>
+
+            {licenseActivated ? (
+              <Alert
+                variant="light"
+                color="green"
+                icon={<LocalIcon icon="check-circle-rounded" width="1rem" height="1rem" />}
+                title={t('plan.static.licenseActivation.success', 'License Activated!')}
+              >
+                <Text size="sm">
+                  {t(
+                    'plan.static.licenseActivation.successMessage',
+                    'Your license has been successfully activated. You can now close this window.'
+                  )}
+                </Text>
+              </Alert>
+            ) : (
+              <Stack gap="md">
+                <Text size="sm" fw={500}>
+                  {t(
+                    'plan.static.licenseActivation.enterKey',
+                    'Enter your license key below to activate your plan:'
+                  )}
+                </Text>
+
+                <TextInput
+                  label={t('admin.settings.premium.key.label', 'License Key')}
+                  description={t(
+                    'plan.static.licenseActivation.keyDescription',
+                    'Paste the license key from your email'
+                  )}
+                  value={licenseKey}
+                  onChange={(e) => setLicenseKey(e.target.value)}
+                  placeholder="00000000-0000-0000-0000-000000000000"
+                  disabled={savingLicense}
+                  type="password"
+                />
+
+                <Group justify="space-between">
+                  <Button variant="subtle" onClick={handleClose} disabled={savingLicense}>
+                    {t('plan.static.licenseActivation.doLater', "I'll do this later")}
+                  </Button>
+                  <Button
+                    onClick={handleActivateLicense}
+                    loading={savingLicense}
+                    disabled={!licenseKey.trim()}
+                  >
+                    {t('plan.static.licenseActivation.activate', 'Activate License')}
+                  </Button>
+                </Group>
+              </Stack>
+            )}
+
+            {licenseActivated && (
+              <Group justify="flex-end">
+                <Button onClick={handleClose}>
+                  {t('common.close', 'Close')}
+                </Button>
+              </Group>
+            )}
+          </Stack>
+        );
+
+      default:
+        return null;
+    }
+  };
+
+  const canGoBack = stageHistory.length > 0 && stage !== 'license-activation';
+
+  return (
+    <Modal
+      opened={opened}
+      onClose={handleClose}
+      title={
+        <Group gap="sm" wrap="nowrap">
+          {canGoBack && (
+            <ActionIcon
+              variant="subtle"
+              size="lg"
+              onClick={handleGoBack}
+              aria-label={t('common.back', 'Back')}
+            >
+              <LocalIcon icon="arrow-back" width={20} height={20} />
+            </ActionIcon>
+          )}
+          <Text fw={600} size="lg">
+            {getModalTitle()}
+          </Text>
+        </Group>
+      }
+      size={isMobile ? '100%' : 600}
+      centered
+      radius="lg"
+      withCloseButton={true}
+      closeOnEscape={true}
+      closeOnClickOutside={false}
+      fullScreen={isMobile}
+      zIndex={Z_INDEX_OVER_CONFIG_MODAL}
+    >
+      {renderContent()}
+    </Modal>
+  );
+};
+
+export default StaticCheckoutModal;
diff --git a/frontend/src/proprietary/components/shared/config/configSections/plan/StaticPlanSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/plan/StaticPlanSection.tsx
index ba937263a..2847ef94e 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/plan/StaticPlanSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/plan/StaticPlanSection.tsx
@@ -1,20 +1,16 @@
-import React, { useState, useEffect } from 'react';
-import { Card, Text, Group, Stack, Badge, Button, Collapse, Alert, TextInput, Paper, Loader, Divider } from '@mantine/core';
+import React, { useState } from 'react';
+import { Card, Text, Stack, Button, Collapse, Divider, Tooltip } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
-import LocalIcon from '@app/components/shared/LocalIcon';
-import RestartConfirmationModal from '@app/components/shared/config/RestartConfirmationModal';
-import { useRestartServer } from '@app/components/shared/config/useRestartServer';
-import { useAdminSettings } from '@app/hooks/useAdminSettings';
-import PendingBadge from '@app/components/shared/config/PendingBadge';
 import { alert } from '@app/components/toast';
 import { LicenseInfo, mapLicenseToTier } from '@app/services/licenseService';
 import { PLAN_FEATURES, PLAN_HIGHLIGHTS } from '@app/constants/planConstants';
 import FeatureComparisonTable from '@app/components/shared/config/configSections/plan/FeatureComparisonTable';
-
-interface PremiumSettingsData {
-  key?: string;
-  enabled?: boolean;
-}
+import StaticCheckoutModal from '@app/components/shared/config/configSections/plan/StaticCheckoutModal';
+import LicenseKeySection from '@app/components/shared/config/configSections/plan/LicenseKeySection';
+import { STATIC_STRIPE_LINKS } from '@app/constants/staticStripeLinks';
+import { PricingBadge } from '@app/components/shared/stripeCheckout/components/PricingBadge';
+import { getBaseCardStyle } from '@app/components/shared/stripeCheckout/utils/cardStyles';
+import { isCurrentTier as checkIsCurrentTier, isDowngrade as checkIsDowngrade, isEnterpriseBlockedForFree } from '@app/utils/planTierUtils';
 
 interface StaticPlanSectionProps {
   currentLicenseInfo?: LicenseInfo;
@@ -22,38 +18,45 @@ interface StaticPlanSectionProps {
 
 const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInfo }) => {
   const { t } = useTranslation();
-  const [showLicenseKey, setShowLicenseKey] = useState(false);
   const [showComparison, setShowComparison] = useState(false);
 
-  // Premium/License key management
-  const { restartModalOpened, showRestartModal, closeRestartModal, restartServer } = useRestartServer();
-  const {
-    settings: premiumSettings,
-    setSettings: setPremiumSettings,
-    loading: premiumLoading,
-    saving: premiumSaving,
-    fetchSettings: fetchPremiumSettings,
-    saveSettings: savePremiumSettings,
-    isFieldPending,
-  } = useAdminSettings<PremiumSettingsData>({
-    sectionName: 'premium',
-  });
+  // Static checkout modal state
+  const [checkoutModalOpened, setCheckoutModalOpened] = useState(false);
+  const [selectedPlan, setSelectedPlan] = useState<'server' | 'enterprise'>('server');
+  const [isUpgrade, setIsUpgrade] = useState(false);
 
-  useEffect(() => {
-    fetchPremiumSettings();
-  }, []);
-
-  const handleSaveLicense = async () => {
-    try {
-      await savePremiumSettings();
-      showRestartModal();
-    } catch (_error) {
+  const handleOpenCheckout = (plan: 'server' | 'enterprise', upgrade: boolean) => {
+    // Prevent Free → Enterprise (must have Server first)
+    const currentTier = mapLicenseToTier(currentLicenseInfo || null);
+    if (currentTier === 'free' && plan === 'enterprise') {
       alert({
-        alertType: 'error',
-        title: t('admin.error', 'Error'),
-        body: t('admin.settings.saveError', 'Failed to save settings'),
+        alertType: 'warning',
+        title: t('plan.enterprise.requiresServer', 'Server Plan Required'),
+        body: t(
+          'plan.enterprise.requiresServerMessage',
+          'Please upgrade to the Server plan first before upgrading to Enterprise.'
+        ),
       });
+      return;
     }
+
+    setSelectedPlan(plan);
+    setIsUpgrade(upgrade);
+    setCheckoutModalOpened(true);
+  };
+
+  const handleManageBilling = () => {
+    // Show warning about email verification
+    alert({
+      alertType: 'warning',
+      title: t('plan.static.billingPortal.title', 'Email Verification Required'),
+      body: t(
+        'plan.static.billingPortal.message',
+        'You will need to verify your email address in the Stripe billing portal. Check your email for a login link.'
+      ),
+    });
+
+    window.open(STATIC_STRIPE_LINKS.billingPortal, '_blank');
   };
 
   const staticPlans = [
@@ -122,7 +125,7 @@ const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInf
             display: 'grid',
             gridTemplateColumns: 'repeat(3, 1fr)',
             gap: '1rem',
-            paddingBottom: '1rem',
+            paddingBottom: '0.1rem',
           }}
         >
           {staticPlans.map((plan) => (
@@ -131,53 +134,27 @@ const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInf
               padding="lg"
               radius="md"
               withBorder
-              style={{
-                position: 'relative',
-                display: 'flex',
-                flexDirection: 'column',
-                borderColor: plan.id === currentPlan.id ? 'var(--mantine-color-green-6)' : undefined,
-                borderWidth: plan.id === currentPlan.id ? '2px' : undefined,
-              }}
+              style={getBaseCardStyle(plan.id === currentPlan.id)}
+              className="plan-card"
             >
               {plan.id === currentPlan.id && (
-                <Badge
-                  color="green"
-                  variant="filled"
-                  size="sm"
-                  style={{ position: 'absolute', top: '1rem', right: '1rem' }}
-                >
-                  {t('plan.current', 'Current Plan')}
-                </Badge>
+                <PricingBadge
+                  type="current"
+                  label={t('plan.current', 'Current Plan')}
+                />
               )}
               {plan.popular && plan.id !== currentPlan.id && (
-                <Badge
-                  variant="filled"
-                  size="xs"
-                  style={{ position: 'absolute', top: '0.5rem', right: '0.5rem' }}
-                >
-                  {t('plan.popular', 'Popular')}
-                </Badge>
+                <PricingBadge
+                  type="popular"
+                  label={t('plan.popular', 'Popular')}
+                />
               )}
 
               <Stack gap="md" style={{ height: '100%' }}>
                 <div>
-                  <Text size="lg" fw={600}>
+                  <Text size="xl" fw={700} style={{ fontSize: '2rem' }}>
                     {plan.name}
                   </Text>
-                  <Group gap="xs" style={{ alignItems: 'baseline' }}>
-                    <Text size="xl" fw={700} style={{ fontSize: '2rem' }}>
-                      {plan.price === 0 && plan.id !== 'free'
-                        ? t('plan.customPricing', 'Custom')
-                        : plan.price === 0
-                          ? t('plan.free.name', 'Free')
-                          : `${plan.currency}${plan.price}`}
-                    </Text>
-                    {plan.period && (
-                      <Text size="sm" c="dimmed">
-                        {plan.period}
-                      </Text>
-                    )}
-                  </Group>
                   <Text size="xs" c="dimmed" mt="xs">
                     {typeof plan.maxUsers === 'string'
                       ? plan.maxUsers
@@ -195,18 +172,123 @@ const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInf
 
                 <div style={{ flexGrow: 1 }} />
 
-                <Button
-                  variant={plan.id === currentPlan.id ? 'light' : 'filled'}
-                  disabled={plan.id === currentPlan.id}
-                  fullWidth
-                  onClick={() =>
-                    window.open('https://www.stirling.com/contact', '_blank')
+                {/* Tier-based button logic */}
+                {(() => {
+                  const currentTier = mapLicenseToTier(currentLicenseInfo || null);
+                  const isCurrent = checkIsCurrentTier(currentTier, plan.id);
+                  const isDowngradePlan = checkIsDowngrade(currentTier, plan.id);
+
+                  // Free Plan
+                  if (plan.id === 'free') {
+                    return (
+                      <Button
+                        variant="filled"
+                        disabled
+                        fullWidth
+                        className="plan-button"
+                      >
+                        {isCurrent
+                          ? t('plan.current', 'Current Plan')
+                          : t('plan.free.included', 'Included')}
+                      </Button>
+                    );
                   }
-                >
-                  {plan.id === currentPlan.id
-                    ? t('plan.current', 'Current Plan')
-                    : t('plan.contact', 'Contact Us')}
-                </Button>
+
+                  // Server Plan
+                  if (plan.id === 'server') {
+                    if (currentTier === 'free') {
+                      return (
+                        <Button
+                          variant="filled"
+                          fullWidth
+                          onClick={() => handleOpenCheckout('server', false)}
+                          className="plan-button"
+                        >
+                          {t('plan.upgrade', 'Upgrade')}
+                        </Button>
+                      );
+                    }
+                    if (isCurrent) {
+                      return (
+                        <Button
+                          variant="filled"
+                          fullWidth
+                          onClick={handleManageBilling}
+                          className="plan-button"
+                        >
+                          {t('plan.manage', 'Manage')}
+                        </Button>
+                      );
+                    }
+                    if (isDowngradePlan) {
+                      return (
+                        <Button
+                          variant="filled"
+                          disabled
+                          fullWidth
+                          className="plan-button"
+                        >
+                          {t('plan.free.included', 'Included')}
+                        </Button>
+                      );
+                    }
+                  }
+
+                  // Enterprise Plan
+                  if (plan.id === 'enterprise') {
+                    if (isEnterpriseBlockedForFree(currentTier, plan.id)) {
+                      return (
+                        <Tooltip label={t('plan.enterprise.requiresServer', 'Requires Server plan')} position="top" withArrow>
+                          <Button
+                            variant="filled"
+                            disabled
+                            fullWidth
+                            className="plan-button"
+                          >
+                            {t('plan.enterprise.requiresServer', 'Requires Server')}
+                          </Button>
+                        </Tooltip>
+                      );
+                    }
+                    if (currentTier === 'server') {
+                      // TODO: Re-enable checkout flow when account syncing is ready
+                      // return (
+                      //   <Button
+                      //     variant="filled"
+                      //     fullWidth
+                      //     onClick={() => handleOpenCheckout('enterprise', true)}
+                      //     className="plan-button"
+                      //   >
+                      //     {t('plan.selectPlan', 'Select Plan')}
+                      //   </Button>
+                      // );
+                      return (
+                        <Button
+                          variant="filled"
+                          fullWidth
+                          disabled
+                          className="plan-button"
+                        >
+                          {t('plan.contact', 'Contact Us')}
+                        </Button>
+                      );
+                    }
+                    if (isCurrent) {
+                      return (
+                        <Button
+                          variant="filled"
+                          fullWidth
+                          onClick={handleManageBilling}
+                          className="plan-button"
+                        >
+                          {t('plan.manage', 'Manage')}
+                        </Button>
+                      );
+                    }
+                  }
+
+                  return null;
+                })()}
               </Stack>
             </Card>
           ))}
@@ -230,66 +312,14 @@ const StaticPlanSection: React.FC<StaticPlanSectionProps> = ({ currentLicenseInf
       <Divider />
 
       {/* License Key Section */}
-      <div>
-        <Button
-          variant="subtle"
-          leftSection={<LocalIcon icon={showLicenseKey ? "expand-less-rounded" : "expand-more-rounded"} width="1.25rem" height="1.25rem" />}
-          onClick={() => setShowLicenseKey(!showLicenseKey)}
-        >
-          {t('admin.settings.premium.licenseKey.toggle', 'Got a license key or certificate file?')}
-        </Button>
+      <LicenseKeySection currentLicenseInfo={currentLicenseInfo} />
 
-        <Collapse in={showLicenseKey} mt="md">
-          <Stack gap="md">
-            <Alert
-              variant="light"
-              color="blue"
-              icon={<LocalIcon icon="info-rounded" width="1rem" height="1rem" />}
-            >
-              <Text size="sm">
-                {t('admin.settings.premium.licenseKey.info', 'If you have a license key or certificate file from a direct purchase, you can enter it here to activate premium or enterprise features.')}
-              </Text>
-            </Alert>
-
-            {premiumLoading ? (
-              <Stack align="center" justify="center" h={100}>
-                <Loader size="md" />
-              </Stack>
-            ) : (
-              <Paper withBorder p="md" radius="md">
-                <Stack gap="md">
-                  <div>
-                    <TextInput
-                      label={
-                        <Group gap="xs">
-                          <span>{t('admin.settings.premium.key.label', 'License Key')}</span>
-                          <PendingBadge show={isFieldPending('key')} />
-                        </Group>
-                      }
-                      description={t('admin.settings.premium.key.description', 'Enter your premium or enterprise license key. Premium features will be automatically enabled when a key is provided.')}
-                      value={premiumSettings.key || ''}
-                      onChange={(e) => setPremiumSettings({ ...premiumSettings, key: e.target.value })}
-                      placeholder="00000000-0000-0000-0000-000000000000"
-                    />
-                  </div>
-
-                  <Group justify="flex-end">
-                    <Button onClick={handleSaveLicense} loading={premiumSaving} size="sm">
-                      {t('admin.settings.save', 'Save Changes')}
-                    </Button>
-                  </Group>
-                </Stack>
-              </Paper>
-            )}
-          </Stack>
-        </Collapse>
-      </div>
-
-      {/* Restart Confirmation Modal */}
-      <RestartConfirmationModal
-        opened={restartModalOpened}
-        onClose={closeRestartModal}
-        onRestart={restartServer}
+      {/* Static Checkout Modal */}
+      <StaticCheckoutModal
+        opened={checkoutModalOpened}
+        onClose={() => setCheckoutModalOpened(false)}
+        planName={selectedPlan}
+        isUpgrade={isUpgrade}
       />
     </div>
   );
diff --git a/frontend/src/proprietary/components/shared/stripeCheckout/components/PricingBadge.tsx b/frontend/src/proprietary/components/shared/stripeCheckout/components/PricingBadge.tsx
index af1e68e42..80a289914 100644
--- a/frontend/src/proprietary/components/shared/stripeCheckout/components/PricingBadge.tsx
+++ b/frontend/src/proprietary/components/shared/stripeCheckout/components/PricingBadge.tsx
@@ -17,6 +17,7 @@ export const PricingBadge: React.FC<PricingBadgeProps> = ({ type, label }) => {
       variant="filled"
       size={size}
       style={{ position: 'absolute', top: '0.5rem', right: '0.5rem' }}
+      className={type === 'current' ? 'current-plan-badge' : undefined}
     >
       {label}
     </Badge>
diff --git a/frontend/src/proprietary/constants/planConstants.ts b/frontend/src/proprietary/constants/planConstants.ts
index ab14a2c55..f7073d25c 100644
--- a/frontend/src/proprietary/constants/planConstants.ts
+++ b/frontend/src/proprietary/constants/planConstants.ts
@@ -19,6 +19,7 @@ export const PLAN_FEATURES = {
     { name: 'Editing text in pdfs', included: false },
     { name: 'Users limited to seats', included: false },
     { name: 'SSO', included: false },
+    { name: 'SAML', included: false },
     { name: 'Auditing', included: false },
     { name: 'Usage tracking', included: false },
     { name: 'Prometheus Support', included: false },
@@ -37,7 +38,8 @@ export const PLAN_FEATURES = {
     { name: 'External Database', included: true },
     { name: 'Editing text in pdfs', included: true },
     { name: 'Users limited to seats', included: false },
-    { name: 'SSO', included: false },
+    { name: 'SSO', included: true },
+    { name: 'SAML', included: false },
     { name: 'Auditing', included: false },
     { name: 'Usage tracking', included: false },
     { name: 'Prometheus Support', included: false },
@@ -57,6 +59,7 @@ export const PLAN_FEATURES = {
     { name: 'Editing text in pdfs', included: true },
     { name: 'Users limited to seats', included: true },
     { name: 'SSO', included: true },
+    { name: 'SAML', included: true },
     { name: 'Auditing', included: true },
     { name: 'Usage tracking', included: true },
     { name: 'Prometheus Support', included: true },
@@ -74,6 +77,7 @@ export const PLAN_HIGHLIGHTS = {
     'Self-hosted on your infrastructure',
     'Unlimited users',
     'Advanced integrations',
+    'SSO (OAuth2/OIDC)',
     'Editing text in PDFs',
     'Cancel anytime'
   ],
@@ -81,17 +85,18 @@ export const PLAN_HIGHLIGHTS = {
     'Self-hosted on your infrastructure',
     'Unlimited users',
     'Advanced integrations',
+    'SSO (OAuth2/OIDC)',
     'Editing text in PDFs',
     'Save with annual billing'
   ],
   ENTERPRISE_MONTHLY: [
-    'Enterprise features (SSO, Auditing)',
+    'Enterprise features (SAML, Auditing)',
     'Usage tracking & Prometheus',
     'Custom PDF metadata',
     'Per-seat licensing'
   ],
   ENTERPRISE_YEARLY: [
-    'Enterprise features (SSO, Auditing)',
+    'Enterprise features (SAML, Auditing)',
     'Usage tracking & Prometheus',
     'Custom PDF metadata',
     'Save with annual billing'
diff --git a/frontend/src/proprietary/constants/staticStripeLinks.ts b/frontend/src/proprietary/constants/staticStripeLinks.ts
new file mode 100644
index 000000000..3fb45b28c
--- /dev/null
+++ b/frontend/src/proprietary/constants/staticStripeLinks.ts
@@ -0,0 +1,56 @@
+/**
+ * Static Stripe payment links for offline/self-hosted environments
+ *
+ * These links are used when Supabase is not configured, allowing users to
+ * purchase licenses directly through Stripe hosted checkout pages.
+ *
+ * NOTE: These are test environment URLs. Replace with production URLs before release.
+ */
+
+export interface StaticStripeLinks {
+  server: {
+    monthly: string;
+    yearly: string;
+  };
+  enterprise: {
+    monthly: string;
+    yearly: string;
+  };
+  billingPortal: string;
+}
+// PRODCUTION LINKS FOR LIVE SERVER
+export const STATIC_STRIPE_LINKS: StaticStripeLinks = {
+  server: {
+    monthly: 'https://buy.stripe.com/fZu4gB8Nv6ysfAj0ts8Zq03',
+    yearly: 'https://buy.stripe.com/9B68wR6Fn0a40Fpcca8Zq02',
+  },
+  enterprise: {
+    monthly: '',
+    yearly: '',
+  },
+  billingPortal: 'https://billing.stripe.com/p/login/test_aFa5kv1Mz2s10Fr3Cp83C00',
+};
+
+// LINKS FOR TEST SERVER: 
+// export const STATIC_STRIPE_LINKS: StaticStripeLinks = {
+//   server: {
+//     monthly: 'https://buy.stripe.com/test_8x27sD4YL9Ut0Fr3Cp83C02',
+//     yearly: 'https://buy.stripe.com/test_4gMdR11Mz4A9ag17SF83C03',
+//   },
+//   enterprise: {
+//     monthly: 'https://buy.stripe.com/test_8x2cMX9f18Qp9bX0qd83C04',
+//     yearly: 'https://buy.stripe.com/test_6oU00b2QD2s173P6OB83C05',
+//   },
+//   billingPortal: 'https://billing.stripe.com/p/login/test_aFa5kv1Mz2s10Fr3Cp83C00',
+// };
+
+/**
+ * Builds a Stripe URL with a prefilled email parameter
+ * @param baseUrl - The base Stripe checkout URL
+ * @param email - The email address to prefill
+ * @returns The complete URL with encoded email parameter
+ */
+export function buildStripeUrlWithEmail(baseUrl: string, email: string): string {
+  const encodedEmail = encodeURIComponent(email);
+  return `${baseUrl}?locked_prefilled_email=${encodedEmail}`;
+}
diff --git a/frontend/src/proprietary/contexts/ServerExperienceContext.tsx b/frontend/src/proprietary/contexts/ServerExperienceContext.tsx
index 17ac572fc..92ce8148a 100644
--- a/frontend/src/proprietary/contexts/ServerExperienceContext.tsx
+++ b/frontend/src/proprietary/contexts/ServerExperienceContext.tsx
@@ -249,7 +249,7 @@ export function ServerExperienceProvider({ children }: { children: ReactNode })
   }, [fetchUserCounts]);
 
   const hasPaidLicense = useMemo(() => {
-    return config?.license === 'PRO' || config?.license === 'ENTERPRISE';
+    return config?.license === 'SERVER' || config?.license === 'PRO' || config?.license === 'ENTERPRISE';
   }, [config?.license]);
 
   const licenseKeyValid = useMemo(() => {
diff --git a/frontend/src/proprietary/data/useProprietaryToolRegistry.tsx b/frontend/src/proprietary/data/useProprietaryToolRegistry.tsx
index 154433438..7181598b9 100644
--- a/frontend/src/proprietary/data/useProprietaryToolRegistry.tsx
+++ b/frontend/src/proprietary/data/useProprietaryToolRegistry.tsx
@@ -1,13 +1,5 @@
 import { useMemo } from "react";
-import LocalIcon from "@app/components/shared/LocalIcon";
-import { useTranslation } from "react-i18next";
-import { getSynonyms } from "@app/utils/toolSynonyms";
-import PdfTextEditor from "@app/tools/pdfTextEditor/PdfTextEditor";
-import {
-  SubcategoryId,
-  ToolCategoryId,
-  type ProprietaryToolRegistry,
-} from "@app/data/toolsTaxonomy";
+import { type ProprietaryToolRegistry } from "@app/data/toolsTaxonomy";
 
 /**
  * Hook that provides the proprietary tool registry.
@@ -16,26 +8,5 @@ import {
  * and will be included in the main tool registry.
  */
 export function useProprietaryToolRegistry(): ProprietaryToolRegistry {
-  const { t } = useTranslation();
-
-  return useMemo<ProprietaryToolRegistry>(() => ({
-    pdfTextEditor: {
-      icon: <LocalIcon icon="edit-square-outline-rounded" width="1.5rem" height="1.5rem" />,
-      name: t("home.pdfTextEditor.title", "PDF Text Editor"),
-      component: PdfTextEditor,
-      description: t(
-        "home.pdfTextEditor.desc",
-        "Review and edit text and images in PDFs with grouped text editing and PDF regeneration"
-      ),
-      categoryId: ToolCategoryId.RECOMMENDED_TOOLS,
-      subcategoryId: SubcategoryId.GENERAL,
-      maxFiles: 1,
-      endpoints: ["text-editor-pdf"],
-      synonyms: getSynonyms(t, "pdfTextEditor"),
-      supportsAutomate: false,
-      automationSettings: null,
-      versionStatus: "alpha",
-      requiresPremium: true,
-    },
-  }), [t]);
+  return useMemo<ProprietaryToolRegistry>(() => ({}), []);
 }
diff --git a/frontend/src/proprietary/routes/Login.test.tsx b/frontend/src/proprietary/routes/Login.test.tsx
index 62679f22a..dc4e76419 100644
--- a/frontend/src/proprietary/routes/Login.test.tsx
+++ b/frontend/src/proprietary/routes/Login.test.tsx
@@ -7,6 +7,7 @@ import Login from '@app/routes/Login';
 import { useAuth } from '@app/auth/UseSession';
 import { springAuth } from '@app/auth/springAuthClient';
 import { PreferencesProvider } from '@app/contexts/PreferencesContext';
+import apiClient from '@app/services/apiClient';
 
 // Mock i18n to return fallback text
 vi.mock('react-i18next', () => ({
@@ -16,6 +17,22 @@ vi.mock('react-i18next', () => ({
       return key;
     },
   }),
+  initReactI18next: {
+    type: '3rdParty',
+    init: vi.fn(),
+  },
+}));
+
+// Mock i18n module to avoid initialization
+vi.mock('@app/i18n', () => ({
+  updateSupportedLanguages: vi.fn(),
+  supportedLanguages: { 'en-GB': 'English' },
+  rtlLanguages: [],
+  default: {
+    language: 'en-GB',
+    changeLanguage: vi.fn(),
+    options: {},
+  },
 }));
 
 // Mock useAuth hook
@@ -36,8 +53,13 @@ vi.mock('@app/hooks/useDocumentMeta', () => ({
   useDocumentMeta: vi.fn(),
 }));
 
-// Mock fetch for provider list
-global.fetch = vi.fn();
+// Mock apiClient for provider list
+vi.mock('@app/services/apiClient', () => ({
+  default: {
+    get: vi.fn(),
+    post: vi.fn(),
+  },
+}));
 
 const mockNavigate = vi.fn();
 const mockBackendProbeState = {
@@ -89,14 +111,13 @@ describe('Login', () => {
       refreshSession: vi.fn(),
     });
 
-    // Mock fetch for login UI data
-    vi.mocked(fetch).mockResolvedValue({
-      ok: true,
-      json: async () => ({
+    // Mock apiClient for login UI data
+    vi.mocked(apiClient.get).mockResolvedValue({
+      data: {
         enableLogin: true,
         providerList: {},
-      }),
-    } as Response);
+      },
+    });
   });
 
   it('should render login form', async () => {
@@ -239,6 +260,136 @@ describe('Login', () => {
     });
   });
 
+  it('should use actual provider ID for OAuth login (authentik)', async () => {
+    const user = userEvent.setup();
+
+    // Mock provider list with authentik
+    vi.mocked(apiClient.get).mockResolvedValue({
+      data: {
+        enableLogin: true,
+        providerList: {
+          '/oauth2/authorization/authentik': 'Authentik',
+        },
+      },
+    });
+
+    vi.mocked(springAuth.signInWithOAuth).mockResolvedValueOnce({
+      error: null,
+    });
+
+    render(
+      <TestWrapper>
+        <BrowserRouter>
+          <Login />
+        </BrowserRouter>
+      </TestWrapper>
+    );
+
+    // Wait for OAuth button to appear
+    await waitFor(() => {
+      const button = screen.queryByText('Authentik');
+      expect(button).toBeTruthy();
+    }, { timeout: 3000 });
+
+    const oauthButton = screen.getByText('Authentik');
+    await user.click(oauthButton);
+
+    await waitFor(() => {
+      // Should use full path directly, NOT map to 'oidc'
+      expect(springAuth.signInWithOAuth).toHaveBeenCalledWith({
+        provider: '/oauth2/authorization/authentik',
+        options: { redirectTo: '/auth/callback' }
+      });
+    });
+  });
+
+  it('should use actual provider ID for OAuth login (custom provider)', async () => {
+    const user = userEvent.setup();
+
+    // Mock provider list with custom provider 'mycompany'
+    vi.mocked(apiClient.get).mockResolvedValue({
+      data: {
+        enableLogin: true,
+        providerList: {
+          '/oauth2/authorization/mycompany': 'My Company SSO',
+        },
+      },
+    });
+
+    vi.mocked(springAuth.signInWithOAuth).mockResolvedValueOnce({
+      error: null,
+    });
+
+    render(
+      <TestWrapper>
+        <BrowserRouter>
+          <Login />
+        </BrowserRouter>
+      </TestWrapper>
+    );
+
+    // Wait for OAuth button to appear (will show 'Mycompany' as label)
+    await waitFor(() => {
+      const button = screen.queryByText('Mycompany');
+      expect(button).toBeTruthy();
+    }, { timeout: 3000 });
+
+    const oauthButton = screen.getByText('Mycompany');
+    await user.click(oauthButton);
+
+    await waitFor(() => {
+      // Should use full path directly - this is the critical fix
+      // Previously it would map unknown providers to 'oidc'
+      expect(springAuth.signInWithOAuth).toHaveBeenCalledWith({
+        provider: '/oauth2/authorization/mycompany',
+        options: { redirectTo: '/auth/callback' }
+      });
+    });
+  });
+
+  it('should use oidc provider ID when explicitly configured', async () => {
+    const user = userEvent.setup();
+
+    // Mock provider list with 'oidc'
+    vi.mocked(apiClient.get).mockResolvedValue({
+      data: {
+        enableLogin: true,
+        providerList: {
+          '/oauth2/authorization/oidc': 'OIDC',
+        },
+      },
+    });
+
+    vi.mocked(springAuth.signInWithOAuth).mockResolvedValueOnce({
+      error: null,
+    });
+
+    render(
+      <TestWrapper>
+        <BrowserRouter>
+          <Login />
+        </BrowserRouter>
+      </TestWrapper>
+    );
+
+    // Wait for OAuth button to appear
+    await waitFor(() => {
+      const button = screen.queryByText('OIDC');
+      expect(button).toBeTruthy();
+    }, { timeout: 3000 });
+
+    const oauthButton = screen.getByText('OIDC');
+    await user.click(oauthButton);
+
+    await waitFor(() => {
+      // Should use full path when explicitly configured
+      expect(springAuth.signInWithOAuth).toHaveBeenCalledWith({
+        provider: '/oauth2/authorization/oidc',
+        options: { redirectTo: '/auth/callback' }
+      });
+    });
+  });
+
   it('should show error on failed login', async () => {
     const user = userEvent.setup();
     const errorMessage = 'Invalid credentials';
@@ -359,13 +510,12 @@ describe('Login', () => {
   it('should redirect to home when login disabled', async () => {
     mockBackendProbeState.loginDisabled = true;
     mockProbe.mockResolvedValueOnce({ status: 'up', loginDisabled: true, loading: false });
-    vi.mocked(fetch).mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({
+    vi.mocked(apiClient.get).mockResolvedValueOnce({
+      data: {
         enableLogin: false,
         providerList: {},
-      }),
-    } as Response);
+      },
+    });
 
     render(
       <TestWrapper>
@@ -381,15 +531,14 @@ describe('Login', () => {
   });
 
   it('should handle OAuth provider click', async () => {
-    vi.mocked(fetch).mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({
+    vi.mocked(apiClient.get).mockResolvedValueOnce({
+      data: {
         enableLogin: true,
         providerList: {
           '/oauth2/authorization/github': 'GitHub',
         },
-      }),
-    } as Response);
+      },
+    });
 
     vi.mocked(springAuth.signInWithOAuth).mockResolvedValueOnce({
       error: null,
@@ -416,13 +565,12 @@ describe('Login', () => {
   });
 
   it('should show email form by default when no SSO providers', async () => {
-    vi.mocked(fetch).mockResolvedValueOnce({
-      ok: true,
-      json: async () => ({
+    vi.mocked(apiClient.get).mockResolvedValueOnce({
+      data: {
         enableLogin: true,
         providerList: {}, // No providers
-      }),
-    } as Response);
+      },
+    });
 
     render(
       <TestWrapper>
diff --git a/frontend/src/proprietary/routes/Login.tsx b/frontend/src/proprietary/routes/Login.tsx
index 4390131ca..d25b70c58 100644
--- a/frontend/src/proprietary/routes/Login.tsx
+++ b/frontend/src/proprietary/routes/Login.tsx
@@ -10,6 +10,8 @@ import AuthLayout from '@app/routes/authShared/AuthLayout';
 import { useBackendProbe } from '@app/hooks/useBackendProbe';
 import apiClient from '@app/services/apiClient';
 import { BASE_PATH } from '@app/constants/app';
+import { type OAuthProvider } from '@app/auth/oauthTypes';
+import { updateSupportedLanguages } from '@app/i18n';
 
 // Import login components
 import LoginHeader from '@app/routes/login/LoginHeader';
@@ -31,7 +33,7 @@ export default function Login() {
   const [showEmailForm, setShowEmailForm] = useState(false);
   const [email, setEmail] = useState(() => searchParams.get('email') ?? '');
   const [password, setPassword] = useState('');
-  const [enabledProviders, setEnabledProviders] = useState<string[]>([]);
+  const [enabledProviders, setEnabledProviders] = useState<OAuthProvider[]>([]);
   const [hasSSOProviders, setHasSSOProviders] = useState(false);
   const [_enableLogin, setEnableLogin] = useState<boolean | null>(null);
   const backendProbe = useBackendProbe();
@@ -102,12 +104,17 @@ export default function Login() {
         setIsFirstTimeSetup(data.firstTimeSetup ?? false);
         setShowDefaultCredentials(data.showDefaultCredentials ?? false);
 
-        // Extract provider IDs from the providerList map
-        // The keys are like "/oauth2/authorization/google" - extract the last part
-        const providerIds = Object.keys(data.providerList || {})
-          .map(key => key.split('/').pop())
-          .filter((id): id is string => id !== undefined);
-        setEnabledProviders(providerIds);
+        // Apply language configuration from server
+        if (data.languages || data.defaultLocale) {
+          updateSupportedLanguages(data.languages, data.defaultLocale);
+        }
+
+        // Use the full paths from providerList as provider identifiers
+        // The backend provides paths like "/oauth2/authorization/google" or "/saml2/authenticate/stirling"
+        // We'll use these full paths so the auth client knows where to redirect
+        const providerPaths = Object.keys(data.providerList || {});
+
+        setEnabledProviders(providerPaths);
       } catch (err) {
         console.error('[Login] Failed to fetch enabled providers:', err);
       }
@@ -225,16 +232,17 @@ export default function Login() {
     );
   }
 
-  const signInWithProvider = async (provider: 'github' | 'google' | 'apple' | 'azure' | 'keycloak' | 'oidc') => {
+  const signInWithProvider = async (provider: OAuthProvider) => {
     try {
       setIsSigningIn(true);
       setError(null);
 
-      console.log(`[Login] Signing in with ${provider}`);
+      console.log(`[Login] Signing in with provider: ${provider}`);
 
-      // Redirect to Spring OAuth2 endpoint
+      // Redirect to Spring OAuth2 endpoint using the actual provider ID from backend
+      // The backend returns the correct registration ID (e.g., 'authentik', 'oidc', 'keycloak')
       const { error } = await springAuth.signInWithOAuth({
-        provider,
+        provider: provider,
         options: { redirectTo: `${BASE_PATH}/auth/callback` }
       });
 
diff --git a/frontend/src/proprietary/routes/login/OAuthButtons.test.tsx b/frontend/src/proprietary/routes/login/OAuthButtons.test.tsx
new file mode 100644
index 000000000..62f121d68
--- /dev/null
+++ b/frontend/src/proprietary/routes/login/OAuthButtons.test.tsx
@@ -0,0 +1,291 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { MantineProvider } from '@mantine/core';
+import OAuthButtons from '@app/routes/login/OAuthButtons';
+
+// Mock i18n
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string, fallback?: string) => fallback || key,
+  }),
+}));
+
+const TestWrapper = ({ children }: { children: React.ReactNode }) => (
+  <MantineProvider>{children}</MantineProvider>
+);
+
+describe('OAuthButtons', () => {
+  const mockOnProviderClick = vi.fn();
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should render known providers with correct labels', () => {
+    const enabledProviders = ['google', 'github', 'authentik'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    // Check that known providers are rendered with their labels
+    expect(screen.getByText('Google')).toBeTruthy();
+    expect(screen.getByText('GitHub')).toBeTruthy();
+    expect(screen.getByText('Authentik')).toBeTruthy();
+  });
+
+  it('should render unknown provider with capitalized label and generic icon', () => {
+    const enabledProviders = ['mycompany'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    // Unknown provider should be capitalized
+    expect(screen.getByText('Mycompany')).toBeTruthy();
+
+    // Check that button has generic OIDC icon
+    const button = screen.getByText('Mycompany').closest('button');
+    expect(button).toBeTruthy();
+    const img = button?.querySelector('img');
+    expect(img?.src).toContain('oidc.svg');
+  });
+
+  it('should call onProviderClick with actual provider ID (not "oidc")', async () => {
+    const user = userEvent.setup();
+    const enabledProviders = ['mycompany'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    const button = screen.getByText('Mycompany');
+    await user.click(button);
+
+    // Should use actual provider ID 'mycompany', NOT 'oidc'
+    expect(mockOnProviderClick).toHaveBeenCalledWith('mycompany');
+  });
+
+  it('should call onProviderClick with "authentik" when authentik is clicked', async () => {
+    const user = userEvent.setup();
+    const enabledProviders = ['authentik'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    const button = screen.getByText('Authentik');
+    await user.click(button);
+
+    expect(mockOnProviderClick).toHaveBeenCalledWith('authentik');
+  });
+
+  it('should call onProviderClick with "oidc" when OIDC is explicitly configured', async () => {
+    const user = userEvent.setup();
+    const enabledProviders = ['oidc'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    const button = screen.getByText('OIDC');
+    await user.click(button);
+
+    expect(mockOnProviderClick).toHaveBeenCalledWith('oidc');
+  });
+
+  it('should disable buttons when isSubmitting is true', () => {
+    const enabledProviders = ['google', 'github'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={true}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    const googleButton = screen.getByText('Google').closest('button') as HTMLButtonElement;
+    const githubButton = screen.getByText('GitHub').closest('button') as HTMLButtonElement;
+
+    expect(googleButton.disabled).toBe(true);
+    expect(githubButton.disabled).toBe(true);
+  });
+
+  it('should render nothing when no providers are enabled', () => {
+    const { container } = render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={[]}
+        />
+      </TestWrapper>
+    );
+
+    // Should render null/nothing (excluding Mantine's style tags)
+    const hasContent = Array.from(container.children).some(
+      child => child.tagName.toLowerCase() !== 'style'
+    );
+    expect(hasContent).toBe(false);
+  });
+
+  it('should render multiple unknown providers with correct IDs', async () => {
+    const user = userEvent.setup();
+    const enabledProviders = ['company1', 'company2', 'company3'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    // All should be capitalized
+    expect(screen.getByText('Company1')).toBeTruthy();
+    expect(screen.getByText('Company2')).toBeTruthy();
+    expect(screen.getByText('Company3')).toBeTruthy();
+
+    // Click each and verify correct ID is passed
+    await user.click(screen.getByText('Company1'));
+    expect(mockOnProviderClick).toHaveBeenCalledWith('company1');
+
+    await user.click(screen.getByText('Company2'));
+    expect(mockOnProviderClick).toHaveBeenCalledWith('company2');
+
+    await user.click(screen.getByText('Company3'));
+    expect(mockOnProviderClick).toHaveBeenCalledWith('company3');
+  });
+
+  it('should use correct icon for known providers', () => {
+    const enabledProviders = ['google', 'github', 'authentik', 'keycloak'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    // Check that each known provider has its specific icon
+    const googleButton = screen.getByText('Google').closest('button');
+    expect(googleButton?.querySelector('img')?.src).toContain('google.svg');
+
+    const githubButton = screen.getByText('GitHub').closest('button');
+    expect(githubButton?.querySelector('img')?.src).toContain('github.svg');
+
+    const authentikButton = screen.getByText('Authentik').closest('button');
+    expect(authentikButton?.querySelector('img')?.src).toContain('authentik.svg');
+
+    const keycloakButton = screen.getByText('Keycloak').closest('button');
+    expect(keycloakButton?.querySelector('img')?.src).toContain('keycloak.svg');
+  });
+
+  it('should handle mixed known and unknown providers', async () => {
+    const user = userEvent.setup();
+    const enabledProviders = ['google', 'mycompany', 'authentik', 'custom'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    // Known providers with correct labels
+    expect(screen.getByText('Google')).toBeTruthy();
+    expect(screen.getByText('Authentik')).toBeTruthy();
+
+    // Unknown providers with capitalized labels
+    expect(screen.getByText('Mycompany')).toBeTruthy();
+    expect(screen.getByText('Custom')).toBeTruthy();
+
+    // Click each and verify IDs are preserved
+    await user.click(screen.getByText('Google'));
+    expect(mockOnProviderClick).toHaveBeenCalledWith('google');
+
+    await user.click(screen.getByText('Mycompany'));
+    expect(mockOnProviderClick).toHaveBeenCalledWith('mycompany');
+
+    await user.click(screen.getByText('Authentik'));
+    expect(mockOnProviderClick).toHaveBeenCalledWith('authentik');
+
+    await user.click(screen.getByText('Custom'));
+    expect(mockOnProviderClick).toHaveBeenCalledWith('custom');
+  });
+
+  it('should maintain provider ID consistency - critical for OAuth redirect', async () => {
+    const user = userEvent.setup();
+
+    // This test ensures the fix for GitHub issue #5141
+    // The provider ID used in the button click MUST match the backend registration ID
+    // Previously, unknown providers were mapped to 'oidc', breaking the OAuth flow
+
+    const enabledProviders = ['authentik', 'okta', 'auth0'];
+
+    render(
+      <TestWrapper>
+        <OAuthButtons
+          onProviderClick={mockOnProviderClick}
+          isSubmitting={false}
+          enabledProviders={enabledProviders}
+        />
+      </TestWrapper>
+    );
+
+    // Each provider should use its actual ID, not 'oidc'
+    await user.click(screen.getByText('Authentik'));
+    expect(mockOnProviderClick).toHaveBeenLastCalledWith('authentik');
+
+    await user.click(screen.getByText('Okta'));
+    expect(mockOnProviderClick).toHaveBeenLastCalledWith('okta');
+
+    await user.click(screen.getByText('Auth0'));
+    expect(mockOnProviderClick).toHaveBeenLastCalledWith('auth0');
+
+    // Verify none were called with 'oidc' instead of their actual ID
+    expect(mockOnProviderClick).not.toHaveBeenCalledWith('oidc');
+  });
+});
diff --git a/frontend/src/proprietary/routes/login/OAuthButtons.tsx b/frontend/src/proprietary/routes/login/OAuthButtons.tsx
index b0cd4a89e..4a9cc3cc3 100644
--- a/frontend/src/proprietary/routes/login/OAuthButtons.tsx
+++ b/frontend/src/proprietary/routes/login/OAuthButtons.tsx
@@ -1,27 +1,32 @@
 import { useTranslation } from 'react-i18next';
 import { BASE_PATH } from '@app/constants/app';
+import { type OAuthProvider } from '@app/auth/oauthTypes';
 
 // Debug flag to show all providers for UI testing
 // Set to true to see all SSO options regardless of backend configuration
 export const DEBUG_SHOW_ALL_PROVIDERS = false;
 
 // OAuth provider configuration - maps provider ID to display info
-export const oauthProviderConfig = {
+// Known providers get custom icons; unknown providers use generic SSO icon
+export const oauthProviderConfig: Record<string, { label: string; file: string }> = {
   google: { label: 'Google', file: 'google.svg' },
   github: { label: 'GitHub', file: 'github.svg' },
   apple: { label: 'Apple', file: 'apple.svg' },
   azure: { label: 'Microsoft', file: 'microsoft.svg' },
-  // microsoft and azure are the same, keycloak and oidc need their own icons
-  // These are commented out from debug view since they need proper icons or backend doesn't use them
-  // keycloak: { label: 'Keycloak', file: 'keycloak.svg' },
-  // oidc: { label: 'OIDC', file: 'oidc.svg' }
+  keycloak: { label: 'Keycloak', file: 'keycloak.svg' },
+  cloudron: { label: 'Cloudron', file: 'cloudron.svg' },
+  authentik: { label: 'Authentik', file: 'authentik.svg' },
+  oidc: { label: 'OIDC', file: 'oidc.svg' }
 };
 
+// Generic fallback for unknown providers
+const GENERIC_PROVIDER_ICON = 'oidc.svg';
+
 interface OAuthButtonsProps {
-  onProviderClick: (provider: 'github' | 'google' | 'apple' | 'azure' | 'keycloak' | 'oidc') => void
+  onProviderClick: (provider: OAuthProvider) => void
   isSubmitting: boolean
   layout?: 'vertical' | 'grid' | 'icons'
-  enabledProviders?: string[]  // List of enabled provider IDs from backend
+  enabledProviders?: OAuthProvider[]  // List of full auth paths from backend (e.g., '/oauth2/authorization/google', '/saml2/authenticate/stirling')
 }
 
 export default function OAuthButtons({ onProviderClick, isSubmitting, layout = 'vertical', enabledProviders = [] }: OAuthButtonsProps) {
@@ -32,13 +37,27 @@ export default function OAuthButtons({ onProviderClick, isSubmitting, layout = '
     ? Object.keys(oauthProviderConfig)
     : enabledProviders;
 
-  // Filter to only show enabled providers from backend
-  const providers = providersToShow
-    .filter(id => id in oauthProviderConfig)
-    .map(id => ({
-      id,
-      ...oauthProviderConfig[id as keyof typeof oauthProviderConfig]
-    }));
+  // Build provider list - extract provider ID from full path for display
+  const providers = providersToShow.map(pathOrId => {
+    // Extract provider ID from full path (e.g., '/saml2/authenticate/stirling' -> 'stirling')
+    const providerId = pathOrId.split('/').pop() || pathOrId;
+
+    if (providerId in oauthProviderConfig) {
+      // Known provider - use predefined icon and label
+      return {
+        id: pathOrId,  // Keep full path for redirect
+        providerId,    // Store extracted ID for display lookup
+        ...oauthProviderConfig[providerId]
+      };
+    }
+    // Unknown provider - use generic icon and capitalize ID for label
+    return {
+      id: pathOrId,  // Keep full path for redirect
+      providerId,    // Store extracted ID for display lookup
+      label: providerId.charAt(0).toUpperCase() + providerId.slice(1),
+      file: GENERIC_PROVIDER_ICON
+    };
+  });
 
   // If no providers are enabled, don't render anything
   if (providers.length === 0) {
@@ -51,7 +70,7 @@ export default function OAuthButtons({ onProviderClick, isSubmitting, layout = '
         {providers.map((p) => (
           <div key={p.id} title={`${t('login.signInWith', 'Sign in with')} ${p.label}`}>
             <button
-              onClick={() => onProviderClick(p.id as any)}
+              onClick={() => onProviderClick(p.id)}
               disabled={isSubmitting}
               className="oauth-button-icon"
               aria-label={`${t('login.signInWith', 'Sign in with')} ${p.label}`}
@@ -70,7 +89,7 @@ export default function OAuthButtons({ onProviderClick, isSubmitting, layout = '
         {providers.map((p) => (
           <div key={p.id} title={`${t('login.signInWith', 'Sign in with')} ${p.label}`}>
             <button
-              onClick={() => onProviderClick(p.id as any)}
+              onClick={() => onProviderClick(p.id)}
               disabled={isSubmitting}
               className="oauth-button-grid"
               aria-label={`${t('login.signInWith', 'Sign in with')} ${p.label}`}
@@ -88,7 +107,7 @@ export default function OAuthButtons({ onProviderClick, isSubmitting, layout = '
       {providers.map((p) => (
         <button
           key={p.id}
-          onClick={() => onProviderClick(p.id as any)}
+          onClick={() => onProviderClick(p.id)}
           disabled={isSubmitting}
           className="oauth-button-vertical"
           title={p.label}
diff --git a/frontend/src/proprietary/services/userManagementService.ts b/frontend/src/proprietary/services/userManagementService.ts
index a74d60d07..25d89056f 100644
--- a/frontend/src/proprietary/services/userManagementService.ts
+++ b/frontend/src/proprietary/services/userManagementService.ts
@@ -37,6 +37,7 @@ export interface AdminSettingsData {
   grandfatheredUserCount: number;
   licenseMaxUsers: number;
   premiumEnabled: boolean;
+  mailEnabled: boolean;
 }
 
 export interface CreateUserRequest {
@@ -97,6 +98,15 @@ export interface InviteToken {
   expiresAt: string;
 }
 
+export interface ChangeUserPasswordRequest {
+  username: string;
+  newPassword?: string;
+  generateRandom?: boolean;
+  sendEmail?: boolean;
+  includePassword?: boolean;
+  forcePasswordChange?: boolean;
+}
+
 /**
  * User Management Service
  * Provides functions to interact with user management backend APIs
@@ -254,4 +264,31 @@ export const userManagementService = {
     const response = await apiClient.post<{ deletedCount: number }>('/api/v1/invite/cleanup');
     return response.data;
   },
+
+  /**
+   * Change another user's password (admin only)
+   */
+  async changeUserPassword(data: ChangeUserPasswordRequest): Promise<void> {
+    const formData = new FormData();
+    formData.append('username', data.username);
+    if (data.newPassword) {
+      formData.append('newPassword', data.newPassword);
+    }
+    if (data.generateRandom !== undefined) {
+      formData.append('generateRandom', data.generateRandom.toString());
+    }
+    if (data.sendEmail !== undefined) {
+      formData.append('sendEmail', data.sendEmail.toString());
+    }
+    if (data.includePassword !== undefined) {
+      formData.append('includePassword', data.includePassword.toString());
+    }
+    if (data.forcePasswordChange !== undefined) {
+      formData.append('forcePasswordChange', data.forcePasswordChange.toString());
+    }
+
+    await apiClient.post('/api/v1/user/admin/changePasswordForUser', formData, {
+      suppressErrorToast: true, // Component will handle error display
+    } as any);
+  },
 };
diff --git a/frontend/src/proprietary/testing/serverExperienceSimulations.ts b/frontend/src/proprietary/testing/serverExperienceSimulations.ts
index 0aa745d54..022910d0a 100644
--- a/frontend/src/proprietary/testing/serverExperienceSimulations.ts
+++ b/frontend/src/proprietary/testing/serverExperienceSimulations.ts
@@ -48,9 +48,10 @@ const FREE_LICENSE_INFO: LicenseInfo = {
 
 const BASE_NO_LOGIN_CONFIG: AppConfig = {
   enableAnalytics: true,
-  appVersion: '2.0.0',
+  appVersion: '2.1.3',
   serverCertificateEnabled: false,
   enableAlphaFunctionality: false,
+  enableDesktopInstallSlide: true,
   serverPort: 8080,
   premiumEnabled: false,
   runningProOrHigher: false,
diff --git a/frontend/src/proprietary/types/proprietaryToolId.ts b/frontend/src/proprietary/types/proprietaryToolId.ts
index 92e3548a3..084cffa29 100644
--- a/frontend/src/proprietary/types/proprietaryToolId.ts
+++ b/frontend/src/proprietary/types/proprietaryToolId.ts
@@ -5,7 +5,6 @@
  */
 
 export const PROPRIETARY_REGULAR_TOOL_IDS = [
-  'pdfTextEditor',
 ] as const;
 
 export const PROPRIETARY_SUPER_TOOL_IDS = [
diff --git a/frontend/src/proprietary/utils/planTierUtils.ts b/frontend/src/proprietary/utils/planTierUtils.ts
new file mode 100644
index 000000000..e4fa12f62
--- /dev/null
+++ b/frontend/src/proprietary/utils/planTierUtils.ts
@@ -0,0 +1,40 @@
+/**
+ * Shared utilities for plan tier comparisons and button logic
+ */
+
+export type PlanTier = 'free' | 'server' | 'enterprise';
+
+const TIER_HIERARCHY: Record<PlanTier, number> = {
+  'free': 1,
+  'server': 2,
+  'enterprise': 3,
+};
+
+/**
+ * Get numeric level for a tier
+ */
+export function getTierLevel(tier: PlanTier | string | null | undefined): number {
+  if (!tier) return 1;
+  return TIER_HIERARCHY[tier as PlanTier] || 1;
+}
+
+/**
+ * Check if target tier is the current tier
+ */
+export function isCurrentTier(currentTier: PlanTier | string | null | undefined, targetTier: PlanTier | string): boolean {
+  return getTierLevel(currentTier) === getTierLevel(targetTier);
+}
+
+/**
+ * Check if target tier is a downgrade from current tier
+ */
+export function isDowngrade(currentTier: PlanTier | string | null | undefined, targetTier: PlanTier | string): boolean {
+  return getTierLevel(currentTier) > getTierLevel(targetTier);
+}
+
+/**
+ * Check if enterprise is blocked for free tier users
+ */
+export function isEnterpriseBlockedForFree(currentTier: PlanTier | string | null | undefined, targetTier: PlanTier | string): boolean {
+  return currentTier === 'free' && targetTier === 'enterprise';
+}
diff --git a/frontend/src/proprietary/utils/urlMapping.ts b/frontend/src/proprietary/utils/urlMapping.ts
index 13bc379fb..969686ef5 100644
--- a/frontend/src/proprietary/utils/urlMapping.ts
+++ b/frontend/src/proprietary/utils/urlMapping.ts
@@ -8,9 +8,7 @@ import { ToolId } from '@app/types/toolId';
 import { URL_TO_TOOL_MAP as CORE_URL_TO_TOOL_MAP } from '@core/utils/urlMapping';
 
 // Proprietary URL mappings
-const PROPRIETARY_URL_MAPPINGS: Record<string, ToolId> = {
-  '/pdf-text-editor': 'pdfTextEditor',
-};
+const PROPRIETARY_URL_MAPPINGS: Record<string, ToolId> = {};
 
 // Merge core and proprietary mappings
 export const URL_TO_TOOL_MAP: Record<string, ToolId> = {
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 0eb35e94c..56de53e37 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react-swc';
 import tsconfigPaths from 'vite-tsconfig-paths';
+import { viteStaticCopy } from 'vite-plugin-static-copy';
 
 export default defineConfig(({ mode }) => {
   // When DISABLE_ADDITIONAL_FEATURES is false (or unset), enable proprietary features
@@ -20,6 +21,15 @@ export default defineConfig(({ mode }) => {
       tsconfigPaths({
         projects: [tsconfigProject],
       }),
+      viteStaticCopy({
+        targets: [
+          {
+            //provides static pdfium so embedpdf can run without cdn
+            src: 'node_modules/@embedpdf/pdfium/dist/pdfium.wasm',
+            dest: 'pdfium'
+          }
+        ]
+      })
     ],
     server: {
       host: true,
@@ -45,12 +55,24 @@ export default defineConfig(({ mode }) => {
           secure: false,
           xfwd: true,
         },
+        '/saml2': {
+          target: 'http://localhost:8080',
+          changeOrigin: true,
+          secure: false,
+          xfwd: true,
+        },
         '/login/oauth2': {
           target: 'http://localhost:8080',
           changeOrigin: true,
           secure: false,
           xfwd: true,
         },
+        '/login/saml2': {
+          target: 'http://localhost:8080',
+          changeOrigin: true,
+          secure: false,
+          xfwd: true,
+        },
         '/swagger-ui': {
           target: 'http://localhost:8080',
           changeOrigin: true,
diff --git a/images/home-light.png b/images/home-light.png
index af30a3d37..4c2f29b30 100644
Binary files a/images/home-light.png and b/images/home-light.png differ
diff --git a/scripts/convert_properties_to_json.py b/scripts/convert_properties_to_json.py
deleted file mode 100644
index 991550fb6..000000000
--- a/scripts/convert_properties_to_json.py
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env python3
-"""
-Convert Java .properties files to JSON for react-i18next
-Preserves hierarchical structure and handles special cases
-"""
-
-import os
-import json
-import re
-from pathlib import Path
-
-def properties_to_dict(file_path):
-    """Convert .properties file to nested dictionary"""
-    result = {}
-    
-    with open(file_path, 'r', encoding='utf-8') as f:
-        for line_num, line in enumerate(f, 1):
-            line = line.strip()
-            
-            # Skip empty lines and comments
-            if not line or line.startswith('#'):
-                continue
-                
-            # Handle key=value pairs
-            if '=' in line:
-                key, value = line.split('=', 1)
-                key = key.strip()
-                value = value.strip()
-                
-                # Handle multiline values (ending with \)
-                while value.endswith('\\'):
-                    next_line = next(f, '').strip()
-                    value = value[:-1] + next_line
-                
-                # Create nested structure from dot notation
-                set_nested_value(result, key, value)
-    
-    return result
-
-def set_nested_value(dictionary, key_path, value):
-    """Set value in nested dictionary using dot notation"""
-    keys = key_path.split('.')
-    current = dictionary
-    
-    for key in keys[:-1]:
-        if key not in current:
-            current[key] = {}
-        elif not isinstance(current[key], dict):
-            # Convert existing string value to nested object
-            old_value = current[key]
-            current[key] = {"_value": old_value}
-        current = current[key]
-    
-    final_key = keys[-1]
-    if final_key in current and isinstance(current[final_key], dict):
-        # If the final key already exists as an object, store the value under "_value"
-        current[final_key]["_value"] = value
-    else:
-        current[final_key] = value
-
-def convert_all_properties():
-    """Convert all messages_*.properties files to JSON"""
-    
-    # Get project root
-    script_dir = Path(__file__).parent
-    project_root = script_dir.parent
-    resources_dir = project_root / 'src' / 'main' / 'resources'
-    output_dir = project_root / 'frontend' / 'public' / 'locales'
-    
-    # Create output directory
-    output_dir.mkdir(parents=True, exist_ok=True)
-    
-    # Find all .properties files
-    properties_files = list(resources_dir.glob('messages*.properties'))
-    
-    converted_count = 0
-    
-    for props_file in properties_files:
-        # Extract locale from filename
-        filename = props_file.name
-        if filename == 'messages.properties':
-            locale = 'en'  # Default locale
-        else:
-            # Extract locale from messages_en_US.properties format
-            locale_match = re.match(r'messages_(.+)\.properties', filename)
-            if locale_match:
-                locale = locale_match.group(1)
-                # Convert Java locale format to standard (en_US -> en-US)
-                locale = locale.replace('_', '-')
-            else:
-                continue
-        
-        print(f"Converting {filename} -> {locale}.json")
-        
-        # Convert to dictionary
-        data = properties_to_dict(props_file)
-        
-        # Create locale directory
-        locale_dir = output_dir / locale
-        locale_dir.mkdir(exist_ok=True)
-        
-        # Write translation.json (react-i18next default namespace)
-        output_file = locale_dir / 'translation.json'
-        with open(output_file, 'w', encoding='utf-8') as f:
-            json.dump(data, f, indent=2, ensure_ascii=False)
-        
-        converted_count += 1
-    
-    print(f"\nConverted {converted_count} language files to {output_dir}")
-    print("Languages available:", [d.name for d in output_dir.iterdir() if d.is_dir()])
-
-if __name__ == '__main__':
-    convert_all_properties()
\ No newline at end of file
diff --git a/scripts/counter_translation.py b/scripts/counter_translation.py
deleted file mode 100644
index 3d0d8f3b9..000000000
--- a/scripts/counter_translation.py
+++ /dev/null
@@ -1,219 +0,0 @@
-"""A script to update language progress status in README.md based on
-properties file comparison.
-
-This script compares default properties file with others in a directory to
-determine language progress.
-It then updates README.md based on provided progress list.
-
-Author: Ludy87
-
-Example:
-    To use this script, simply run it from command line:
-        $ python counter_translation.py
-"""  # noqa: D205
-
-import glob
-import os
-import re
-
-import tomlkit
-import tomlkit.toml_file
-
-
-def convert_to_multiline(data: tomlkit.TOMLDocument) -> tomlkit.TOMLDocument:
-    """Converts 'ignore' and 'missing' arrays to multiline arrays and sorts the first-level keys of the TOML document.
-    Enhances readability and consistency in the TOML file by ensuring arrays contain unique and sorted entries.
-
-    Parameters:
-        data (tomlkit.TOMLDocument): The original TOML document containing the data.
-
-    Returns:
-        tomlkit.TOMLDocument: A new TOML document with sorted keys and properly formatted arrays.
-    """  # noqa: D205
-    sorted_data = tomlkit.document()
-    for key in sorted(data.keys()):
-        value = data[key]
-        if isinstance(value, dict):
-            new_table = tomlkit.table()
-            for subkey in ("ignore", "missing"):
-                if subkey in value:
-                    # Convert the list to a set to remove duplicates, sort it, and convert to multiline for readability
-                    unique_sorted_array = sorted(set(value[subkey]))
-                    array = tomlkit.array()
-                    array.multiline(True)
-                    for item in unique_sorted_array:
-                        array.append(item)
-                    new_table[subkey] = array
-            sorted_data[key] = new_table
-        else:
-            # Add other types of data unchanged
-            sorted_data[key] = value
-    return sorted_data
-
-
-def write_readme(progress_list: list[tuple[str, int]]) -> None:
-    """Updates the progress status in the README.md file based
-    on the provided progress list.
-
-    Parameters:
-        progress_list (list[tuple[str, int]]): A list of tuples containing
-        language and progress percentage.
-
-    Returns:
-        None
-    """  # noqa: D205
-    with open("README.md", encoding="utf-8") as file:
-        content = file.readlines()
-
-    for i, line in enumerate(content[2:], start=2):
-        for progress in progress_list:
-            language, value = progress
-            if language in line:
-                if match := re.search(r"\!\[(\d+(\.\d+)?)%\]\(.*\)", line):
-                    content[i] = line.replace(
-                        match.group(0),
-                        f"![{value}%](https://geps.dev/progress/{value})",
-                    )
-
-    with open("README.md", "w", encoding="utf-8", newline="\n") as file:
-        file.writelines(content)
-
-
-def compare_files(
-    default_file_path, file_paths, ignore_translation_file
-) -> list[tuple[str, int]]:
-    """Compares the default properties file with other
-    properties files in the directory.
-
-    Parameters:
-        default_file_path (str): The path to the default properties file.
-        files_directory (str): The directory containing other properties files.
-
-    Returns:
-        list[tuple[str, int]]: A list of tuples containing
-        language and progress percentage.
-    """  # noqa: D205
-    num_lines = sum(
-        1
-        for line in open(default_file_path, encoding="utf-8")
-        if line.strip() and not line.strip().startswith("#")
-    )
-
-    result_list = []
-    sort_ignore_translation: tomlkit.TOMLDocument
-
-    # read toml
-    with open(ignore_translation_file, encoding="utf-8") as f:
-        sort_ignore_translation = tomlkit.parse(f.read())
-
-    for file_path in file_paths:
-        language = (
-            os.path.basename(file_path)
-            .split("messages_", 1)[1]
-            .split(".properties", 1)[0]
-        )
-
-        fails = 0
-        if "en_GB" in language or "en_US" in language:
-            result_list.append(("en_GB", 100))
-            result_list.append(("en_US", 100))
-            continue
-
-        if language not in sort_ignore_translation:
-            sort_ignore_translation[language] = tomlkit.table()
-
-        if (
-            "ignore" not in sort_ignore_translation[language]
-            or len(sort_ignore_translation[language].get("ignore", [])) < 1
-        ):
-            sort_ignore_translation[language]["ignore"] = tomlkit.array(
-                ["language.direction"]
-            )
-
-        # if "missing" not in sort_ignore_translation[language]:
-        #     sort_ignore_translation[language]["missing"] = tomlkit.array()
-        # elif "language.direction" in sort_ignore_translation[language]["missing"]:
-        #     sort_ignore_translation[language]["missing"].remove("language.direction")
-
-        with (
-            open(default_file_path, encoding="utf-8") as default_file,
-            open(file_path, encoding="utf-8") as file,
-        ):
-            for _ in range(5):
-                next(default_file)
-                try:
-                    next(file)
-                except StopIteration:
-                    fails = num_lines
-
-            for line_num, (line_default, line_file) in enumerate(
-                zip(default_file, file), start=6
-            ):
-                try:
-                    # Ignoring empty lines and lines start with #
-                    if line_default.strip() == "" or line_default.startswith("#"):
-                        continue
-                    default_key, default_value = line_default.split("=", 1)
-                    file_key, file_value = line_file.split("=", 1)
-                    if (
-                        default_value.strip() == file_value.strip()
-                        and default_key.strip()
-                        not in sort_ignore_translation[language]["ignore"]
-                    ):
-                        print(
-                            f"{language}: Line {line_num} is missing the translation."
-                        )
-                        # if default_key.strip() not in sort_ignore_translation[language]["missing"]:
-                        #     missing_array = tomlkit.array()
-                        #     missing_array.append(default_key.strip())
-                        #     missing_array.multiline(True)
-                        #     sort_ignore_translation[language]["missing"].extend(missing_array)
-                        fails += 1
-                    # elif default_key.strip() in sort_ignore_translation[language]["ignore"]:
-                    #     if default_key.strip() in sort_ignore_translation[language]["missing"]:
-                    #         sort_ignore_translation[language]["missing"].remove(default_key.strip())
-                    if default_value.strip() != file_value.strip():
-                        # if default_key.strip() in sort_ignore_translation[language]["missing"]:
-                        #     sort_ignore_translation[language]["missing"].remove(default_key.strip())
-                        if (
-                            default_key.strip()
-                            in sort_ignore_translation[language]["ignore"]
-                        ):
-                            sort_ignore_translation[language]["ignore"].remove(
-                                default_key.strip()
-                            )
-                except ValueError as e:
-                    print(f"Error processing line {line_num} in {file_path}: {e}")
-                    print(f"{line_default}|{line_file}")
-                    exit(1)
-                except IndexError:
-                    pass
-
-        print(f"{language}: {fails} out of {num_lines} lines are not translated.")
-        result_list.append(
-            (
-                language,
-                int((num_lines - fails) * 100 / num_lines),
-            )
-        )
-    ignore_translation = convert_to_multiline(sort_ignore_translation)
-    with open(ignore_translation_file, "w", encoding="utf-8", newline="\n") as file:
-        file.write(tomlkit.dumps(ignore_translation))
-
-    unique_data = list(set(result_list))
-    unique_data.sort(key=lambda x: x[1], reverse=True)
-
-    return unique_data
-
-
-if __name__ == "__main__":
-    directory = os.path.join(os.getcwd(), "app", "core", "src", "main", "resources")
-    messages_file_paths = glob.glob(os.path.join(directory, "messages_*.properties"))
-    reference_file = os.path.join(directory, "messages_en_GB.properties")
-
-    scripts_directory = os.path.join(os.getcwd(), "scripts")
-    translation_state_file = os.path.join(scripts_directory, "ignore_translation.toml")
-
-    write_readme(
-        compare_files(reference_file, messages_file_paths, translation_state_file)
-    )
diff --git a/scripts/counter_translation_v2.py b/scripts/counter_translation_v3.py
similarity index 91%
rename from scripts/counter_translation_v2.py
rename to scripts/counter_translation_v3.py
index 32b3075ad..d77ec285d 100644
--- a/scripts/counter_translation_v2.py
+++ b/scripts/counter_translation_v3.py
@@ -1,21 +1,21 @@
 """A script to update language progress status in README.md based on
-JSON translation file comparison.
+TOML translation file comparison.
 
-This script compares the default translation JSON file with others in the locales directory to
+This script compares the default translation TOML file with others in the locales directory to
 determine language progress.
 It then updates README.md based on provided progress list.
 
 Author: Ludy87
+Updated for TOML format
 
 Example:
     To use this script, simply run it from command line:
-        $ python counter_translation_v2.py
+        $ python counter_translation_v3.py
 """  # noqa: D205
 
 import glob
 import os
 import re
-import json
 
 import tomlkit
 import tomlkit.toml_file
@@ -80,14 +80,14 @@ def write_readme(progress_list: list[tuple[str, int]]) -> None:
         file.writelines(content)
 
 
-def parse_json_file(file_path):
+def parse_toml_file(file_path):
     """
-    Parses a JSON translation file and returns a flat dictionary of all keys.
-    :param file_path: Path to the JSON file.
+    Parses a TOML translation file and returns a flat dictionary of all keys.
+    :param file_path: Path to the TOML file.
     :return: Dictionary with flattened keys and values.
     """
     with open(file_path, "r", encoding="utf-8") as file:
-        data = json.load(file)
+        data = tomlkit.parse(file.read())
 
     def flatten_dict(d, parent_key="", sep="."):
         items = {}
@@ -105,19 +105,19 @@ def parse_json_file(file_path):
 def compare_files(
     default_file_path, file_paths, ignore_translation_file
 ) -> list[tuple[str, int]]:
-    """Compares the default JSON translation file with other
+    """Compares the default TOML translation file with other
     translation files in the locales directory.
 
     Parameters:
-        default_file_path (str): The path to the default translation JSON file.
-        file_paths (list): List of paths to translation JSON files.
+        default_file_path (str): The path to the default translation TOML file.
+        file_paths (list): List of paths to translation TOML files.
         ignore_translation_file (str): Path to the TOML file with ignore rules.
 
     Returns:
         list[tuple[str, int]]: A list of tuples containing
         language and progress percentage.
     """  # noqa: D205
-    default_keys = parse_json_file(default_file_path)
+    default_keys = parse_toml_file(default_file_path)
     num_keys = len(default_keys)
 
     result_list = []
@@ -152,7 +152,7 @@ def compare_files(
                 ["language.direction"]
             )
 
-        current_keys = parse_json_file(file_path)
+        current_keys = parse_toml_file(file_path)
 
         # Compare keys
         for default_key, default_value in default_keys.items():
@@ -193,12 +193,12 @@ def compare_files(
 
 if __name__ == "__main__":
     directory = os.path.join(os.getcwd(), "frontend", "public", "locales")
-    translation_file_paths = glob.glob(os.path.join(directory, "*", "translation.json"))
-    reference_file = os.path.join(directory, "en-GB", "translation.json")
+    translation_file_paths = glob.glob(os.path.join(directory, "*", "translation.toml"))
+    reference_file = os.path.join(directory, "en-GB", "translation.toml")
 
     scripts_directory = os.path.join(os.getcwd(), "scripts")
     translation_state_file = os.path.join(scripts_directory, "ignore_translation.toml")
 
     write_readme(
         compare_files(reference_file, translation_file_paths, translation_state_file)
-    )
\ No newline at end of file
+    )
diff --git a/scripts/translations/README.md b/scripts/translations/README.md
index a4f9f53d3..f7bcf46da 100644
--- a/scripts/translations/README.md
+++ b/scripts/translations/README.md
@@ -2,6 +2,12 @@
 
 This directory contains Python scripts for managing frontend translations in Stirling PDF. These tools help analyze, merge, validate, and manage translations against the en-GB golden truth file.
 
+## Current Format: TOML
+
+**Stirling PDF uses TOML format for translations** in `frontend/public/locales/{lang}/translation.toml`.
+
+**All scripts now support TOML format!**
+
 ## Quick Start - Automated Translation (RECOMMENDED)
 
 The **fastest and easiest way** to translate a language is using the automated pipeline:
@@ -168,9 +174,6 @@ Merges missing translations from en-GB into target language files and manages tr
 # Add missing translations from en-GB to French
 python scripts/translations/translation_merger.py fr-FR add-missing
 
-# Add without marking as [UNTRANSLATED]
-python scripts/translations/translation_merger.py fr-FR add-missing --no-mark-untranslated
-
 # Extract untranslated entries to a file
 python scripts/translations/translation_merger.py fr-FR extract-untranslated --output fr_untranslated.json
 
@@ -182,7 +185,7 @@ python scripts/translations/translation_merger.py fr-FR apply-translations --tra
 ```
 
 **Features:**
-- Adds missing keys from en-GB with optional [UNTRANSLATED] markers
+- Adds missing keys from en-GB (copies English text directly)
 - Extracts untranslated entries for external translation
 - Creates structured templates for AI translation
 - Applies translated content back to language files
@@ -436,7 +439,7 @@ Repeat steps 2-5 until 100% complete.
 
 #### Step 1: Add Missing Translations
 ```bash
-python scripts/translations/translation_merger.py fr-FR add-missing --mark-untranslated
+python scripts/translations/translation_merger.py fr-FR add-missing
 ```
 
 #### Step 2: Create AI Template
@@ -451,18 +454,15 @@ python scripts/translations/translation_merger.py fr-FR apply-translations --tra
 
 ## Translation File Structure
 
-Translation files are located in `frontend/public/locales/{language}/translation.json` with nested JSON structure:
+Translation files are located in `frontend/public/locales/{language}/translation.toml` with TOML structure:
 
-```json
-{
-  "addPageNumbers": {
-    "title": "Add Page Numbers",
-    "selectText": {
-      "1": "Select PDF file:",
-      "2": "Margin Size"
-    }
-  }
-}
+```toml
+[addPageNumbers]
+title = "Add Page Numbers"
+
+[addPageNumbers.selectText]
+"1" = "Select PDF file:"
+"2" = "Margin Size"
 ```
 
 Keys use dot notation internally (e.g., `addPageNumbers.selectText.1`).
@@ -478,7 +478,7 @@ All scripts preserve placeholders like `{n}`, `{total}`, `{filename}` in transla
 ### Automatic Backups
 Scripts create timestamped backups before modifying files:
 ```
-translation.backup.20241201_143022.json
+translation.backup.20241201_143022.toml
 ```
 
 ### Context-Aware Translation
@@ -520,7 +520,7 @@ ignore = [
 
 ### Critical Rules for Translation
 
-1. **NEVER skip entries**: Translate ALL entries in each batch to avoid [UNTRANSLATED] pollution
+1. **NEVER skip entries**: Translate ALL entries in each batch to ensure completeness
 2. **Use appropriate batch sizes**: 100 entries for systematic translation, unlimited for compact method
 3. **Skip validation for placeholders**: Use `--skip-validation` when batch contains `{{variable}}` patterns
 4. **Check progress between batches**: Use `--summary` flag to track completion percentage
@@ -564,13 +564,6 @@ python scripts/translations/json_validator.py --all-batches ar_AR
 - Regex patterns: Double all backslashes (`\d` → `\\d`)
 - Check for missing/extra commas at line reported in error
 
-#### [UNTRANSLATED] Pollution
-**Problem**: Hundreds of [UNTRANSLATED] markers from incomplete translation attempts
-**Solution**:
-- Only translate complete batches of manageable size
-- Use analyzer that counts [UNTRANSLATED] as missing translations
-- Restore from backup if pollution occurs
-
 #### Validation False Positives
 **Problem**: Validator flags legitimate `{{variable}}` placeholders as artifacts
 **Solution**: Use `--skip-validation` flag when applying batches with template variables
@@ -671,7 +664,7 @@ python scripts/translations/ai_translation_helper.py apply-batch de_batch_1.json
 - **Missing Files**: Scripts create new files when language directories don't exist
 - **Invalid JSON**: Clear error messages with line numbers
 - **Placeholder Mismatches**: Validation warnings for missing or extra placeholders
-- **[UNTRANSLATED] Entries**: Counted as missing translations to prevent pollution
+- **Legacy [UNTRANSLATED] Markers**: Detected and stripped for backwards compatibility
 - **Backup Failures**: Graceful handling with user notification
 
 ## Integration with Development
diff --git a/scripts/translations/ai_translation_helper.py b/scripts/translations/ai_translation_helper.py
index c879c229b..bb6fff5e9 100644
--- a/scripts/translations/ai_translation_helper.py
+++ b/scripts/translations/ai_translation_helper.py
@@ -3,6 +3,7 @@
 AI Translation Helper for Stirling PDF Frontend
 Provides utilities for AI-assisted translation workflows including
 batch processing, quality checks, and integration helpers.
+TOML format only.
 """
 
 import json
@@ -14,31 +15,33 @@ import argparse
 import re
 from datetime import datetime
 import csv
+import tomllib
+import tomli_w
 
 
 class AITranslationHelper:
     def __init__(self, locales_dir: str = "frontend/public/locales"):
         self.locales_dir = Path(locales_dir)
-        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.json"
+        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.toml"
 
-    def _load_json(self, file_path: Path) -> Dict:
-        """Load JSON file with error handling."""
+    def _load_translation_file(self, file_path: Path) -> Dict:
+        """Load TOML translation file."""
         try:
-            with open(file_path, 'r', encoding='utf-8') as f:
-                return json.load(f)
-        except (FileNotFoundError, json.JSONDecodeError) as e:
+            with open(file_path, 'rb') as f:
+                return tomllib.load(f)
+        except (FileNotFoundError, Exception) as e:
             print(f"Error loading {file_path}: {e}")
             return {}
 
-    def _save_json(self, data: Dict, file_path: Path) -> None:
-        """Save JSON file."""
-        with open(file_path, 'w', encoding='utf-8') as f:
-            json.dump(data, f, indent=2, ensure_ascii=False)
+    def _save_translation_file(self, data: Dict, file_path: Path) -> None:
+        """Save TOML translation file."""
+        with open(file_path, 'wb') as f:
+            tomli_w.dump(data, f)
 
     def create_ai_batch_file(self, languages: List[str], output_file: Path,
                             max_entries_per_language: int = 50) -> None:
         """Create a batch file for AI translation with multiple languages."""
-        golden_truth = self._load_json(self.golden_truth_file)
+        golden_truth = self._load_translation_file(self.golden_truth_file)
         batch_data = {
             'metadata': {
                 'created_at': datetime.now().isoformat(),
@@ -56,12 +59,14 @@ class AITranslationHelper:
         }
 
         for lang in languages:
-            lang_file = self.locales_dir / lang / "translation.json"
-            if not lang_file.exists():
-                # Create empty translation structure
-                lang_data = {}
+            lang_dir = self.locales_dir / lang
+            toml_file = lang_dir / "translation.toml"
+
+            if toml_file.exists():
+                lang_data = self._load_translation_file(toml_file)
             else:
-                lang_data = self._load_json(lang_file)
+                # No translation file found, create empty structure
+                lang_data = {}
 
             # Find untranslated entries
             untranslated = self._find_untranslated_entries(golden_truth, lang_data)
@@ -79,7 +84,9 @@ class AITranslationHelper:
                     'context': self._get_key_context(key)
                 }
 
-        self._save_json(batch_data, output_file)
+        # Always save batch files as JSON for compatibility
+        with open(output_file, 'w', encoding='utf-8') as f:
+            json.dump(batch_data, f, indent=2, ensure_ascii=False)
         total_entries = sum(len(lang_data) for lang_data in batch_data['translations'].values())
         print(f"Created AI batch file: {output_file}")
         print(f"Total entries to translate: {total_entries}")
@@ -173,7 +180,9 @@ class AITranslationHelper:
 
     def validate_ai_translations(self, batch_file: Path) -> Dict[str, List[str]]:
         """Validate AI translations for common issues."""
-        batch_data = self._load_json(batch_file)
+        # Batch files are always JSON
+        with open(batch_file, 'r', encoding='utf-8') as f:
+            batch_data = json.load(f)
         issues = {'errors': [], 'warnings': []}
 
         for lang, translations in batch_data.get('translations', {}).items():
@@ -209,7 +218,9 @@ class AITranslationHelper:
 
     def apply_ai_batch_translations(self, batch_file: Path, validate: bool = True) -> Dict[str, Any]:
         """Apply translations from AI batch file to individual language files."""
-        batch_data = self._load_json(batch_file)
+        # Batch files are always JSON
+        with open(batch_file, 'r', encoding='utf-8') as f:
+            batch_data = json.load(f)
         results = {'applied': {}, 'errors': [], 'warnings': []}
 
         if validate:
@@ -226,14 +237,15 @@ class AITranslationHelper:
                     print(f"  WARNING: {warning}")
 
         for lang, translations in batch_data.get('translations', {}).items():
-            lang_file = self.locales_dir / lang / "translation.json"
+            lang_dir = self.locales_dir / lang
+            toml_file = lang_dir / "translation.toml"
 
-            # Load existing data or create new
-            if lang_file.exists():
-                lang_data = self._load_json(lang_file)
+            if toml_file.exists():
+                lang_data = self._load_translation_file(toml_file)
             else:
+                # No translation file found, create new TOML file
                 lang_data = {}
-                lang_file.parent.mkdir(parents=True, exist_ok=True)
+                lang_dir.mkdir(parents=True, exist_ok=True)
 
             applied_count = 0
             for key, translation_data in translations.items():
@@ -243,7 +255,7 @@ class AITranslationHelper:
                     applied_count += 1
 
             if applied_count > 0:
-                self._save_json(lang_data, lang_file)
+                self._save_translation_file(lang_data, toml_file)
                 results['applied'][lang] = applied_count
                 print(f"Applied {applied_count} translations to {lang}")
 
@@ -265,7 +277,7 @@ class AITranslationHelper:
 
     def export_for_external_translation(self, languages: List[str], output_format: str = 'csv') -> None:
         """Export translations for external translation services."""
-        golden_truth = self._load_json(self.golden_truth_file)
+        golden_truth = self._load_translation_file(self.golden_truth_file)
         golden_flat = self._flatten_dict(golden_truth)
 
         if output_format == 'csv':
@@ -287,9 +299,11 @@ class AITranslationHelper:
                     }
 
                     for lang in languages:
-                        lang_file = self.locales_dir / lang / "translation.json"
-                        if lang_file.exists():
-                            lang_data = self._load_json(lang_file)
+                        lang_dir = self.locales_dir / lang
+                        toml_file = lang_dir / "translation.toml"
+
+                        if toml_file.exists():
+                            lang_data = self._load_translation_file(toml_file)
                             lang_flat = self._flatten_dict(lang_data)
                             value = lang_flat.get(key, '')
                             if value.startswith('[UNTRANSLATED]'):
@@ -316,21 +330,28 @@ class AITranslationHelper:
                 }
 
                 for lang in languages:
-                    lang_file = self.locales_dir / lang / "translation.json"
-                    if lang_file.exists():
-                        lang_data = self._load_json(lang_file)
+                    lang_dir = self.locales_dir / lang
+                    toml_file = lang_dir / "translation.toml"
+
+                    if toml_file.exists():
+                        lang_data = self._load_translation_file(toml_file)
                         lang_flat = self._flatten_dict(lang_data)
                         value = lang_flat.get(key, '')
                         if value.startswith('[UNTRANSLATED]'):
                             value = ''
                         export_data['translations'][key][lang] = value
 
-            self._save_json(export_data, output_file)
+            # Export files are always JSON
+            with open(output_file, 'w', encoding='utf-8') as f:
+                json.dump(export_data, f, indent=2, ensure_ascii=False)
             print(f"Exported to {output_file}")
 
 
 def main():
-    parser = argparse.ArgumentParser(description='AI Translation Helper')
+    parser = argparse.ArgumentParser(
+        description='AI Translation Helper',
+        epilog='Works with TOML translation files.'
+    )
     parser.add_argument('--locales-dir', default='frontend/public/locales',
                         help='Path to locales directory')
 
diff --git a/scripts/translations/auto_translate.py b/scripts/translations/auto_translate.py
index 505823f47..3e406433f 100644
--- a/scripts/translations/auto_translate.py
+++ b/scripts/translations/auto_translate.py
@@ -2,6 +2,7 @@
 """
 Automated Translation Pipeline
 Extracts, translates, merges, and beautifies translations for a language.
+TOML format only.
 """
 
 import json
@@ -12,6 +13,8 @@ import subprocess
 from pathlib import Path
 import time
 
+import tomllib
+
 
 def run_command(cmd, description=""):
     """Run a shell command and return success status."""
@@ -30,26 +33,35 @@ def run_command(cmd, description=""):
     return result.returncode == 0
 
 
-def extract_untranslated(language_code, batch_size=500):
+def find_translation_file(lang_dir):
+    """Find translation file in language directory."""
+    toml_file = lang_dir / "translation.toml"
+    if toml_file.exists():
+        return toml_file
+    return None
+
+def load_translation_file(file_path):
+    """Load TOML translation file."""
+    with open(file_path, 'rb') as f:
+        return tomllib.load(f)
+
+def extract_untranslated(language_code, batch_size=500, include_existing=False):
     """Extract untranslated entries and split into batches."""
-    print(f"\n🔍 Extracting untranslated entries for {language_code}...")
+    mode = "all untranslated (including existing)" if include_existing else "new (missing)"
+    print(f"\n🔍 Extracting {mode} entries for {language_code}...")
 
     # Load files
-    golden_path = Path(f'frontend/public/locales/en-GB/translation.json')
-    lang_path = Path(f'frontend/public/locales/{language_code}/translation.json')
+    golden_path = find_translation_file(Path('frontend/public/locales/en-GB'))
+    lang_path = find_translation_file(Path(f'frontend/public/locales/{language_code}'))
 
-    if not golden_path.exists():
-        print(f"Error: Golden truth file not found: {golden_path}")
+    if not golden_path:
+        print(f"Error: Golden truth file not found in frontend/public/locales/en-GB")
         return None
 
-    if not lang_path.exists():
-        print(f"Error: Language file not found: {lang_path}")
+    if not lang_path:
+        print(f"Error: Language file not found in frontend/public/locales/{language_code}")
         return None
 
-    def load_json(path):
-        with open(path, 'r', encoding='utf-8') as f:
-            return json.load(f)
-
     def flatten_dict(d, parent_key='', separator='.'):
         items = []
         for k, v in d.items():
@@ -60,8 +72,12 @@ def extract_untranslated(language_code, batch_size=500):
                 items.append((new_key, str(v)))
         return dict(items)
 
-    golden = load_json(golden_path)
-    lang_data = load_json(lang_path)
+    golden = load_translation_file(golden_path)
+    lang_data = load_translation_file(lang_path)
+
+    if not golden or not lang_data:
+        print(f"Error: Failed to load translation files")
+        return None
 
     golden_flat = flatten_dict(golden)
     lang_flat = flatten_dict(lang_data)
@@ -69,13 +85,19 @@ def extract_untranslated(language_code, batch_size=500):
     # Find untranslated
     untranslated = {}
     for key, value in golden_flat.items():
-        if (key not in lang_flat or
-            lang_flat.get(key) == value or
-            (isinstance(lang_flat.get(key), str) and lang_flat.get(key).startswith("[UNTRANSLATED]"))):
-            untranslated[key] = value
+        if include_existing:
+            # Include missing keys, keys with English values, and [UNTRANSLATED] keys
+            if (key not in lang_flat or
+                lang_flat.get(key) == value or
+                (isinstance(lang_flat.get(key), str) and lang_flat.get(key).startswith("[UNTRANSLATED]"))):
+                untranslated[key] = value
+        else:
+            # Only include missing keys (not in target file at all)
+            if key not in lang_flat:
+                untranslated[key] = value
 
     total = len(untranslated)
-    print(f"Found {total} untranslated entries")
+    print(f"Found {total} {mode} entries")
 
     if total == 0:
         print("✓ Language is already complete!")
@@ -186,7 +208,7 @@ def beautify_translations(language_code):
     """Beautify translation file to match en-GB structure."""
     print(f"\n✨ Beautifying {language_code} translation file...")
 
-    cmd = f'python3 scripts/translations/json_beautifier.py --language {language_code}'
+    cmd = f'python3 scripts/translations/toml_beautifier.py --language {language_code}'
 
     if not run_command(cmd):
         print(f"✗ Failed to beautify translations")
@@ -229,6 +251,8 @@ def main():
         description='Automated translation pipeline for Stirling PDF',
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""
+Note: This script works with TOML translation files.
+
 Examples:
   # Translate Spanish with API key in environment
   export OPENAI_API_KEY=your_key_here
@@ -251,6 +275,7 @@ Examples:
     parser.add_argument('--no-cleanup', action='store_true', help='Keep temporary batch files')
     parser.add_argument('--skip-verification', action='store_true', help='Skip final completion check')
     parser.add_argument('--timeout', type=int, default=600, help='Timeout per batch in seconds (default: 600 = 10 minutes)')
+    parser.add_argument('--include-existing', action='store_true', help='Also retranslate existing keys that match English (default: only translate missing keys)')
 
     args = parser.parse_args()
 
@@ -270,7 +295,7 @@ Examples:
 
     try:
         # Step 1: Extract and split
-        batch_files = extract_untranslated(args.language, args.batch_size)
+        batch_files = extract_untranslated(args.language, args.batch_size, args.include_existing)
         if batch_files is None:
             sys.exit(1)
 
diff --git a/scripts/translations/batch_translator.py b/scripts/translations/batch_translator.py
index aeb99a074..0085a51de 100644
--- a/scripts/translations/batch_translator.py
+++ b/scripts/translations/batch_translator.py
@@ -5,6 +5,8 @@ Automatically translates JSON batch files to target language while preserving:
 - Placeholders: {n}, {total}, {filename}, {{variable}}
 - HTML tags: <strong>, </strong>, etc.
 - Technical terms: PDF, API, OAuth2, SAML2, JWT, etc.
+
+Note: Works with JSON batch files. Translation files can be TOML or JSON format.
 """
 
 import json
@@ -206,9 +208,11 @@ def get_language_info(language_code: str) -> tuple:
 
 def main():
     parser = argparse.ArgumentParser(
-        description='Translate JSON batch files using OpenAI API',
+        description='Translate JSON batch files using OpenAI API (output supports TOML and JSON)',
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog="""
+Note: This script works with JSON batch files. The translation files it updates can be TOML or JSON.
+
 Examples:
   # Translate single batch file
   python batch_translator.py zh_CN_batch_1_of_4.json --api-key YOUR_KEY --language zh-CN
diff --git a/scripts/translations/bulk_auto_translate.py b/scripts/translations/bulk_auto_translate.py
new file mode 100644
index 000000000..ec854a2d7
--- /dev/null
+++ b/scripts/translations/bulk_auto_translate.py
@@ -0,0 +1,311 @@
+#!/usr/bin/env python3
+"""
+Bulk Auto-Translate All Languages
+Automatically translates all languages in parallel using OpenAI API.
+Supports concurrent translation with configurable thread pool.
+"""
+
+import argparse
+import os
+import sys
+import time
+from pathlib import Path
+from concurrent.futures import ThreadPoolExecutor, as_completed
+import subprocess
+from typing import List, Tuple, Optional
+import threading
+
+import tomllib
+
+
+# Thread-safe print lock
+print_lock = threading.Lock()
+
+
+def safe_print(*args, **kwargs):
+    """Thread-safe print function."""
+    with print_lock:
+        print(*args, **kwargs)
+
+
+def get_all_languages(locales_dir: Path) -> List[str]:
+    """Get all language codes from locales directory."""
+    languages = []
+
+    if not locales_dir.exists():
+        print(f"Error: Locales directory not found: {locales_dir}")
+        return []
+
+    for lang_dir in sorted(locales_dir.iterdir()):
+        if lang_dir.is_dir() and lang_dir.name != "en-GB":
+            toml_file = lang_dir / "translation.toml"
+            if toml_file.exists():
+                languages.append(lang_dir.name)
+
+    return languages
+
+
+def get_language_completion(locales_dir: Path, language: str) -> Optional[float]:
+    """Get completion percentage for a language."""
+    lang_dir = locales_dir / language
+    toml_file = lang_dir / "translation.toml"
+
+    if not toml_file.exists():
+        return None
+
+    try:
+        with open(toml_file, 'rb') as f:
+            target_data = tomllib.load(f)
+
+        # Load en-GB reference
+        en_gb_file = locales_dir / 'en-GB' / 'translation.toml'
+        with open(en_gb_file, 'rb') as f:
+            en_gb_data = tomllib.load(f)
+
+        # Flatten and count
+        def flatten(d, parent=''):
+            items = {}
+            for k, v in d.items():
+                key = f"{parent}.{k}" if parent else k
+                if isinstance(v, dict):
+                    items.update(flatten(v, key))
+                else:
+                    items[key] = v
+            return items
+
+        en_gb_flat = flatten(en_gb_data)
+        target_flat = flatten(target_data)
+
+        # Count translated (not equal to en-GB)
+        translated = sum(1 for k in en_gb_flat if k in target_flat and target_flat[k] != en_gb_flat[k])
+        total = len(en_gb_flat)
+
+        return (translated / total * 100) if total > 0 else 0.0
+
+    except Exception as e:
+        print(f"Warning: Could not calculate completion for {language}: {e}")
+        return None
+
+
+def translate_language(language: str, api_key: str, batch_size: int, timeout: int, skip_verification: bool, include_existing: bool) -> Tuple[str, bool, str]:
+    """
+    Translate a single language.
+    Returns: (language_code, success, message)
+    """
+    safe_print(f"[{language}] Starting translation...")
+
+    cmd = [
+        'python3', 'scripts/translations/auto_translate.py',
+        language,
+        '--api-key', api_key,
+        '--batch-size', str(batch_size),
+        '--timeout', str(timeout)
+    ]
+
+    if skip_verification:
+        cmd.append('--skip-verification')
+
+    if include_existing:
+        cmd.append('--include-existing')
+
+    try:
+        result = subprocess.run(
+            cmd,
+            capture_output=True,
+            text=True,
+            timeout=timeout * 5  # Overall timeout = 5x per-batch timeout
+        )
+
+        if result.returncode == 0:
+            # Check if nothing to translate
+            if "Nothing to translate!" in result.stdout:
+                safe_print(f"[{language}] ✓ Already complete")
+                return (language, True, "Already complete")
+            safe_print(f"[{language}] ✓ Success")
+            return (language, True, "Success")
+        else:
+            error_msg = result.stderr.strip() or result.stdout.strip() or "Unknown error"
+            safe_print(f"[{language}] ✗ Failed: {error_msg[:100]}")
+            return (language, False, error_msg[:200])  # Truncate long errors
+
+    except subprocess.TimeoutExpired:
+        safe_print(f"[{language}] ✗ Timeout exceeded")
+        return (language, False, "Timeout exceeded")
+    except Exception as e:
+        safe_print(f"[{language}] ✗ Error: {str(e)}")
+        return (language, False, str(e))
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Bulk auto-translate all languages using OpenAI API',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Examples:
+  # Translate all languages with 10 parallel threads
+  python3 bulk_auto_translate.py --parallel 10
+
+  # Translate only incomplete languages (< 95%)
+  python3 bulk_auto_translate.py --parallel 5 --threshold 95
+
+  # Translate specific languages only
+  python3 bulk_auto_translate.py --languages de-DE fr-FR es-ES --parallel 3
+
+  # Dry run to see what would be translated
+  python3 bulk_auto_translate.py --dry-run
+
+Note: Requires OPENAI_API_KEY environment variable or --api-key argument.
+"""
+    )
+
+    parser.add_argument('--api-key', help='OpenAI API key (or set OPENAI_API_KEY env var)')
+    parser.add_argument('--parallel', type=int, default=1,
+                        help='Number of parallel translation threads (default: 1)')
+    parser.add_argument('--batch-size', type=int, default=500,
+                        help='Entries per batch for translation (default: 500)')
+    parser.add_argument('--timeout', type=int, default=600,
+                        help='Timeout per batch in seconds (default: 600)')
+    parser.add_argument('--threshold', type=float, default=0.0,
+                        help='Only translate languages below this completion %% (default: 0 = all)')
+    parser.add_argument('--languages', nargs='+',
+                        help='Translate only specific languages (e.g., de-DE fr-FR)')
+    parser.add_argument('--locales-dir', default='frontend/public/locales',
+                        help='Path to locales directory')
+    parser.add_argument('--skip-verification', action='store_true',
+                        help='Skip final completion verification for each language')
+    parser.add_argument('--include-existing', action='store_true',
+                        help='Also retranslate existing keys that match English (default: only translate missing keys)')
+    parser.add_argument('--dry-run', action='store_true',
+                        help='Show what would be translated without actually translating')
+
+    args = parser.parse_args()
+
+    # Verify API key (unless dry run)
+    api_key = args.api_key or os.environ.get('OPENAI_API_KEY')
+    if not args.dry_run and not api_key:
+        print("Error: OpenAI API key required. Provide via --api-key or OPENAI_API_KEY environment variable")
+        sys.exit(1)
+
+    locales_dir = Path(args.locales_dir)
+
+    # Get languages to translate
+    if args.languages:
+        languages = args.languages
+        print(f"Translating specified languages: {', '.join(languages)}")
+    else:
+        languages = get_all_languages(locales_dir)
+        print(f"Found {len(languages)} languages (excluding en-GB)")
+
+    if not languages:
+        print("No languages to translate!")
+        sys.exit(0)
+
+    # Filter by completion threshold
+    if args.threshold > 0:
+        print(f"\nFiltering languages below {args.threshold}% completion...")
+        filtered = []
+        for lang in languages:
+            completion = get_language_completion(locales_dir, lang)
+            if completion is None:
+                filtered.append(lang)  # Include if can't determine
+                print(f"  {lang}: Unknown completion - will translate")
+            elif completion < args.threshold:
+                filtered.append(lang)
+                print(f"  {lang}: {completion:.1f}% - will translate")
+            else:
+                print(f"  {lang}: {completion:.1f}% - skipping (above threshold)")
+
+        languages = filtered
+
+        if not languages:
+            print("\nNo languages below threshold!")
+            sys.exit(0)
+
+    print(f"\n{'='*60}")
+    print(f"Bulk Translation Configuration")
+    print(f"{'='*60}")
+    print(f"Languages to translate: {len(languages)}")
+    print(f"Parallel threads: {args.parallel}")
+    print(f"Batch size: {args.batch_size}")
+    print(f"Timeout per batch: {args.timeout}s")
+    if args.threshold > 0:
+        print(f"Completion threshold: {args.threshold}%")
+    print(f"{'='*60}\n")
+
+    if args.dry_run:
+        print("DRY RUN - Languages that would be translated:")
+        for lang in languages:
+            completion = get_language_completion(locales_dir, lang)
+            comp_str = f"{completion:.1f}%" if completion is not None else "Unknown"
+            print(f"  - {lang} ({comp_str})")
+        print(f"\nTotal: {len(languages)} languages")
+        sys.exit(0)
+
+    start_time = time.time()
+
+    # Translate in parallel
+    results = {
+        'success': [],
+        'failed': [],
+        'already_complete': []
+    }
+
+    with ThreadPoolExecutor(max_workers=args.parallel) as executor:
+        futures = {
+            executor.submit(
+                translate_language,
+                lang,
+                api_key,
+                args.batch_size,
+                args.timeout,
+                args.skip_verification,
+                args.include_existing
+            ): lang
+            for lang in languages
+        }
+
+        for future in as_completed(futures):
+            language, success, message = future.result()
+
+            if success:
+                if message == "Already complete":
+                    results['already_complete'].append(language)
+                else:
+                    results['success'].append(language)
+            else:
+                results['failed'].append((language, message))
+
+    elapsed = time.time() - start_time
+
+    # Print summary
+    print("\n" + "="*60)
+    print("Bulk Translation Summary")
+    print("="*60)
+    print(f"Total languages: {len(languages)}")
+    print(f"Successful: {len(results['success'])}")
+    print(f"Already complete: {len(results['already_complete'])}")
+    print(f"Failed: {len(results['failed'])}")
+    print(f"Time elapsed: {elapsed:.1f} seconds ({elapsed/60:.1f} minutes)")
+    print("="*60)
+
+    if results['success']:
+        print(f"\n✅ Successfully translated ({len(results['success'])}):")
+        for lang in sorted(results['success']):
+            print(f"  - {lang}")
+
+    if results['already_complete']:
+        print(f"\n✓ Already complete ({len(results['already_complete'])}):")
+        for lang in sorted(results['already_complete']):
+            print(f"  - {lang}")
+
+    if results['failed']:
+        print(f"\n❌ Failed ({len(results['failed'])}):")
+        for lang, msg in sorted(results['failed']):
+            print(f"  - {lang}: {msg}")
+        sys.exit(1)
+
+    print("\n✅ Bulk translation completed successfully!")
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/translations/compact_translator.py b/scripts/translations/compact_translator.py
index 59efcbe9c..efe22f9f8 100644
--- a/scripts/translations/compact_translator.py
+++ b/scripts/translations/compact_translator.py
@@ -2,41 +2,37 @@
 """
 Compact Translation Extractor for Character-Limited AI Translation
 Outputs untranslated entries in minimal JSON format with whitespace stripped.
+TOML format only.
 """
 
 import json
 import sys
 from pathlib import Path
 import argparse
-try:
-    import tomllib  # Python 3.11+
-except ImportError:
-    try:
-        import toml as tomllib_fallback
-        tomllib = None
-    except ImportError:
-        tomllib = None
-        tomllib_fallback = None
+import tomllib  # Python 3.11+ (stdlib)
 
 
 class CompactTranslationExtractor:
     def __init__(self, locales_dir: str = "frontend/public/locales", ignore_file: str = "scripts/ignore_translation.toml"):
         self.locales_dir = Path(locales_dir)
-        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.json"
-        self.golden_truth = self._load_json(self.golden_truth_file)
+        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.toml"
+        if not self.golden_truth_file.exists():
+            print(f"Error: en-GB translation file not found at {self.golden_truth_file}", file=sys.stderr)
+            sys.exit(1)
+        self.golden_truth = self._load_translation_file(self.golden_truth_file)
         self.ignore_file = Path(ignore_file)
         self.ignore_patterns = self._load_ignore_patterns()
 
-    def _load_json(self, file_path: Path) -> dict:
-        """Load JSON file with error handling."""
+    def _load_translation_file(self, file_path: Path) -> dict:
+        """Load TOML translation file."""
         try:
-            with open(file_path, 'r', encoding='utf-8') as f:
-                return json.load(f)
+            with open(file_path, 'rb') as f:
+                return tomllib.load(f)
         except FileNotFoundError:
             print(f"Error: File not found: {file_path}", file=sys.stderr)
             sys.exit(1)
-        except json.JSONDecodeError as e:
-            print(f"Error: Invalid JSON in {file_path}: {e}", file=sys.stderr)
+        except Exception as e:
+            print(f"Error: Invalid TOML file {file_path}: {e}", file=sys.stderr)
             sys.exit(1)
 
     def _load_ignore_patterns(self) -> dict:
@@ -45,40 +41,13 @@ class CompactTranslationExtractor:
             return {}
 
         try:
-            if tomllib:
-                with open(self.ignore_file, 'rb') as f:
-                    ignore_data = tomllib.load(f)
-            elif tomllib_fallback:
-                ignore_data = tomllib_fallback.load(self.ignore_file)
-            else:
-                ignore_data = self._parse_simple_toml()
-
+            with open(self.ignore_file, 'rb') as f:
+                ignore_data = tomllib.load(f)
             return {lang: set(data.get('ignore', [])) for lang, data in ignore_data.items()}
         except Exception as e:
             print(f"Warning: Could not load ignore file {self.ignore_file}: {e}", file=sys.stderr)
             return {}
 
-    def _parse_simple_toml(self) -> dict:
-        """Simple TOML parser for ignore patterns (fallback)."""
-        ignore_data = {}
-        current_section = None
-
-        with open(self.ignore_file, 'r', encoding='utf-8') as f:
-            for line in f:
-                line = line.strip()
-                if not line or line.startswith('#'):
-                    continue
-
-                if line.startswith('[') and line.endswith(']'):
-                    current_section = line[1:-1]
-                    ignore_data[current_section] = {'ignore': []}
-                elif line.strip().startswith("'") and current_section:
-                    item = line.strip().strip("',")
-                    if item:
-                        ignore_data[current_section]['ignore'].append(item)
-
-        return ignore_data
-
     def _flatten_dict(self, d: dict, parent_key: str = '', separator: str = '.') -> dict:
         """Flatten nested dictionary into dot-notation keys."""
         items = []
@@ -92,13 +61,14 @@ class CompactTranslationExtractor:
 
     def get_untranslated_entries(self, language: str) -> dict:
         """Get all untranslated entries for a language in compact format."""
-        target_file = self.locales_dir / language / "translation.json"
+        lang_dir = self.locales_dir / language
+        target_file = lang_dir / "translation.toml"
 
         if not target_file.exists():
             print(f"Error: Translation file not found for language: {language}", file=sys.stderr)
             sys.exit(1)
 
-        target_data = self._load_json(target_file)
+        target_data = self._load_translation_file(target_file)
         golden_flat = self._flatten_dict(self.golden_truth)
         target_flat = self._flatten_dict(target_data)
 
@@ -145,7 +115,9 @@ class CompactTranslationExtractor:
 
 
 def main():
-    parser = argparse.ArgumentParser(description='Extract untranslated entries in compact format for AI translation')
+    parser = argparse.ArgumentParser(
+        description='Extract untranslated entries in compact format for AI translation (TOML format only)'
+    )
     parser.add_argument('language', help='Language code (e.g., de-DE, fr-FR)')
     parser.add_argument('--locales-dir', default='frontend/public/locales', help='Path to locales directory')
     parser.add_argument('--ignore-file', default='scripts/ignore_translation.toml', help='Path to ignore patterns file')
diff --git a/scripts/translations/json_validator.py b/scripts/translations/json_validator.py
deleted file mode 100644
index 0ad20fad1..000000000
--- a/scripts/translations/json_validator.py
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/usr/bin/env python3
-"""
-JSON Validator for Translation Files
-
-Validates JSON syntax in translation files and reports detailed error information.
-Useful for validating batch translation files before merging.
-
-Usage:
-    python3 json_validator.py <file_or_pattern>
-    python3 json_validator.py ar_AR_batch_*.json
-    python3 json_validator.py ar_AR_batch_1_of_3.json
-    python3 json_validator.py --all-batches ar_AR
-"""
-
-import json
-import sys
-import argparse
-import glob
-from pathlib import Path
-
-
-def get_line_context(file_path, line_num, context_lines=3):
-    """Get lines around the error for context"""
-    try:
-        with open(file_path, 'r', encoding='utf-8') as f:
-            lines = f.readlines()
-
-        start = max(0, line_num - context_lines - 1)
-        end = min(len(lines), line_num + context_lines)
-
-        context = []
-        for i in range(start, end):
-            marker = ">>> " if i == line_num - 1 else "    "
-            context.append(f"{marker}{i+1:4d}: {lines[i].rstrip()}")
-
-        return "\n".join(context)
-    except Exception as e:
-        return f"Could not read context: {e}"
-
-
-def get_character_context(file_path, char_pos, context_chars=100):
-    """Get characters around the error position"""
-    try:
-        with open(file_path, 'r', encoding='utf-8') as f:
-            content = f.read()
-
-        start = max(0, char_pos - context_chars)
-        end = min(len(content), char_pos + context_chars)
-
-        before = content[start:char_pos]
-        error_char = content[char_pos] if char_pos < len(content) else "EOF"
-        after = content[char_pos+1:end]
-
-        return {
-            'before': before,
-            'error_char': error_char,
-            'after': after,
-            'display': f"{before}[{error_char}]{after}"
-        }
-    except Exception as e:
-        return None
-
-
-def validate_json_file(file_path):
-    """Validate a single JSON file and return detailed error info"""
-    result = {
-        'file': str(file_path),
-        'valid': False,
-        'error': None,
-        'line': None,
-        'column': None,
-        'position': None,
-        'context': None,
-        'char_context': None,
-        'entry_count': 0
-    }
-
-    try:
-        with open(file_path, 'r', encoding='utf-8') as f:
-            data = json.load(f)
-
-        result['valid'] = True
-        result['entry_count'] = len(data) if isinstance(data, dict) else 0
-
-    except json.JSONDecodeError as e:
-        result['error'] = e.msg
-        result['line'] = e.lineno
-        result['column'] = e.colno
-        result['position'] = e.pos
-        result['context'] = get_line_context(file_path, e.lineno)
-        result['char_context'] = get_character_context(file_path, e.pos)
-
-    except FileNotFoundError:
-        result['error'] = "File not found"
-
-    except Exception as e:
-        result['error'] = str(e)
-
-    return result
-
-
-def print_validation_result(result, verbose=True):
-    """Print validation result in a formatted way"""
-    file_name = Path(result['file']).name
-
-    if result['valid']:
-        print(f"✓ {file_name}: Valid JSON ({result['entry_count']} entries)")
-    else:
-        print(f"✗ {file_name}: Invalid JSON")
-        print(f"  Error: {result['error']}")
-
-        if result['line']:
-            print(f"  Location: Line {result['line']}, Column {result['column']} (character {result['position']})")
-
-        if verbose and result['context']:
-            print(f"\n  Context:")
-            for line in result['context'].split('\n'):
-                print(f"  {line}")
-
-        if verbose and result['char_context']:
-            print(f"\n  Character context:")
-            print(f"  ...{result['char_context']['display'][-150:]}...")
-            print(f"  Error character: {repr(result['char_context']['error_char'])}")
-
-        print()
-
-
-def get_common_fixes(error_msg):
-    """Suggest common fixes based on error message"""
-    fixes = []
-
-    if "Expecting ',' delimiter" in error_msg:
-        fixes.append("Missing comma between JSON entries")
-        fixes.append("Check for unescaped quotes inside string values")
-
-    if "Invalid \\escape" in error_msg or "Invalid escape" in error_msg:
-        fixes.append("Unescaped backslash in string (use \\\\ for literal backslash)")
-        fixes.append("Common in regex patterns: \\d should be \\\\d")
-
-    if "Expecting property name" in error_msg:
-        fixes.append("Missing or extra comma")
-        fixes.append("Trailing comma before closing brace")
-
-    if "Expecting value" in error_msg:
-        fixes.append("Missing value after colon")
-        fixes.append("Extra comma")
-
-    return fixes
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description='Validate JSON syntax in translation files',
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        epilog="""
-Examples:
-  Validate single file:
-    python3 json_validator.py ar_AR_batch_1_of_3.json
-
-  Validate all batches for a language:
-    python3 json_validator.py --all-batches ar_AR
-
-  Validate pattern:
-    python3 json_validator.py "ar_AR_batch_*.json"
-
-  Validate multiple files:
-    python3 json_validator.py file1.json file2.json file3.json
-        """
-    )
-
-    parser.add_argument(
-        'files',
-        nargs='*',
-        help='JSON file(s) to validate (supports wildcards)'
-    )
-
-    parser.add_argument(
-        '--all-batches',
-        metavar='LANGUAGE',
-        help='Validate all batch files for a language (e.g., ar_AR)'
-    )
-
-    parser.add_argument(
-        '--quiet',
-        action='store_true',
-        help='Only show files with errors'
-    )
-
-    parser.add_argument(
-        '--brief',
-        action='store_true',
-        help='Brief output without context'
-    )
-
-    args = parser.parse_args()
-
-    # Determine which files to validate
-    files_to_validate = []
-
-    if args.all_batches:
-        pattern = f"{args.all_batches}_batch_*.json"
-        files_to_validate = glob.glob(pattern)
-        if not files_to_validate:
-            print(f"No batch files found matching: {pattern}")
-            return 1
-    elif args.files:
-        for file_pattern in args.files:
-            if '*' in file_pattern or '?' in file_pattern:
-                files_to_validate.extend(glob.glob(file_pattern))
-            else:
-                files_to_validate.append(file_pattern)
-    else:
-        parser.print_help()
-        return 1
-
-    if not files_to_validate:
-        print("No files to validate")
-        return 1
-
-    # Sort files for consistent output
-    files_to_validate.sort()
-
-    print(f"Validating {len(files_to_validate)} file(s)...\n")
-
-    # Validate each file
-    results = []
-    for file_path in files_to_validate:
-        result = validate_json_file(file_path)
-        results.append(result)
-
-        if not args.quiet or not result['valid']:
-            print_validation_result(result, verbose=not args.brief)
-
-    # Summary
-    valid_count = sum(1 for r in results if r['valid'])
-    invalid_count = len(results) - valid_count
-
-    print("=" * 60)
-    print(f"Summary: {valid_count} valid, {invalid_count} invalid")
-
-    # Show common fixes for errors
-    if invalid_count > 0:
-        all_errors = [r['error'] for r in results if r['error']]
-        unique_error_types = set(all_errors)
-
-        print("\nCommon fixes:")
-        fixes_shown = set()
-        for error in unique_error_types:
-            fixes = get_common_fixes(error)
-            for fix in fixes:
-                if fix not in fixes_shown:
-                    print(f"  • {fix}")
-                    fixes_shown.add(fix)
-
-    return 0 if invalid_count == 0 else 1
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/scripts/translations/json_beautifier.py b/scripts/translations/toml_beautifier.py
similarity index 86%
rename from scripts/translations/json_beautifier.py
rename to scripts/translations/toml_beautifier.py
index 41c65afda..a0e1f95cb 100644
--- a/scripts/translations/json_beautifier.py
+++ b/scripts/translations/toml_beautifier.py
@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 """
-JSON Beautifier and Structure Fixer for Stirling PDF Frontend
-Restructures translation JSON files to match en-GB structure and key order exactly.
+TOML Beautifier and Structure Fixer for Stirling PDF Frontend
+Restructures translation TOML files to match en-GB structure and key order exactly.
 """
 
-import json
 import os
 import sys
 from pathlib import Path
@@ -12,34 +11,38 @@ from typing import Dict, Any, List
 import argparse
 from collections import OrderedDict
 
+import tomllib
+import tomli_w
 
-class JSONBeautifier:
+
+class TOMLBeautifier:
     def __init__(self, locales_dir: str = "frontend/public/locales"):
         self.locales_dir = Path(locales_dir)
-        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.json"
-        self.golden_structure = self._load_json(self.golden_truth_file)
+        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.toml"
+        self.golden_structure = self._load_toml(self.golden_truth_file)
 
-    def _load_json(self, file_path: Path) -> Dict:
-        """Load JSON file with error handling."""
+    def _load_toml(self, file_path: Path) -> Dict:
+        """Load TOML file with error handling."""
         try:
-            with open(file_path, 'r', encoding='utf-8') as f:
-                return json.load(f, object_pairs_hook=OrderedDict)
+            with open(file_path, 'rb') as f:
+                return tomllib.load(f)
         except FileNotFoundError:
             print(f"Error: File not found: {file_path}")
             sys.exit(1)
-        except json.JSONDecodeError as e:
-            print(f"Error: Invalid JSON in {file_path}: {e}")
+        except Exception as e:
+            print(f"Error: Invalid TOML in {file_path}: {e}")
             sys.exit(1)
 
-    def _save_json(self, data: Dict, file_path: Path, backup: bool = True) -> None:
-        """Save JSON file with proper formatting."""
+    def _save_toml(self, data: Dict, file_path: Path, backup: bool = False) -> None:
+        """Save TOML file with proper formatting."""
         if backup and file_path.exists():
-            backup_path = file_path.with_suffix(f'.backup.restructured.json')
-            file_path.rename(backup_path)
+            backup_path = file_path.with_suffix(f'.backup.restructured.toml')
+            import shutil
+            shutil.copy2(file_path, backup_path)
             print(f"Backup created: {backup_path}")
 
-        with open(file_path, 'w', encoding='utf-8') as f:
-            json.dump(data, f, indent=2, ensure_ascii=False, separators=(',', ': '))
+        with open(file_path, 'wb') as f:
+            tomli_w.dump(data, f)
 
     def _flatten_dict(self, d: Dict, parent_key: str = '', separator: str = '.') -> Dict[str, Any]:
         """Flatten nested dictionary into dot-notation keys."""
@@ -93,7 +96,7 @@ class JSONBeautifier:
             return {}
 
         # Load the target file
-        target_data = self._load_json(target_file)
+        target_data = self._load_toml(target_file)
 
         # Flatten the target translations
         flat_target = self._flatten_dict(target_data)
@@ -103,7 +106,7 @@ class JSONBeautifier:
 
         return restructured
 
-    def beautify_and_restructure(self, target_file: Path, backup: bool = True) -> Dict[str, Any]:
+    def beautify_and_restructure(self, target_file: Path, backup: bool = False) -> Dict[str, Any]:
         """Main function to beautify and restructure a translation file."""
         lang_code = target_file.parent.name
         print(f"Restructuring {lang_code} translation file...")
@@ -112,7 +115,7 @@ class JSONBeautifier:
         restructured_data = self.restructure_translation_file(target_file)
 
         # Save the restructured file
-        self._save_json(restructured_data, target_file, backup)
+        self._save_toml(restructured_data, target_file, backup)
 
         # Analyze the results
         flat_golden = self._flatten_dict(self.golden_structure)
@@ -163,7 +166,7 @@ class JSONBeautifier:
 
     def validate_key_order(self, target_file: Path) -> Dict[str, Any]:
         """Validate that keys appear in the same order as en-GB."""
-        target_data = self._load_json(target_file)
+        target_data = self._load_toml(target_file)
 
         def get_key_order(obj: Dict, path: str = '') -> List[str]:
             keys = []
@@ -198,23 +201,26 @@ class JSONBeautifier:
 
 
 def main():
-    parser = argparse.ArgumentParser(description='Beautify and restructure translation JSON files')
+    parser = argparse.ArgumentParser(
+        description='Beautify and restructure translation TOML files',
+        epilog='Works with TOML format translation files.'
+    )
     parser.add_argument('--locales-dir', default='frontend/public/locales',
                         help='Path to locales directory')
     parser.add_argument('--language', help='Restructure specific language only')
     parser.add_argument('--all-languages', action='store_true',
                         help='Restructure all language files')
-    parser.add_argument('--no-backup', action='store_true',
-                        help='Skip backup creation')
+    parser.add_argument('--backup', action='store_true',
+                        help='Create backup files before modifying')
     parser.add_argument('--validate-only', action='store_true',
                         help='Only validate structure, do not modify files')
 
     args = parser.parse_args()
 
-    beautifier = JSONBeautifier(args.locales_dir)
+    beautifier = TOMLBeautifier(args.locales_dir)
 
     if args.language:
-        target_file = Path(args.locales_dir) / args.language / "translation.json"
+        target_file = Path(args.locales_dir) / args.language / "translation.toml"
         if not target_file.exists():
             print(f"Error: Translation file not found for language: {args.language}")
             sys.exit(1)
@@ -225,7 +231,7 @@ def main():
             print(f"  Order preserved: {order_result['order_preserved']}")
             print(f"  Common keys: {order_result['common_keys_count']}/{order_result['golden_keys_count']}")
         else:
-            result = beautifier.beautify_and_restructure(target_file, backup=not args.no_backup)
+            result = beautifier.beautify_and_restructure(target_file, backup=args.backup)
             print(f"\nResults for {result['language']}:")
             print(f"  Keys preserved: {result['preserved_keys']}/{result['total_reference_keys']}")
             if result['structure_match']['total_issues'] > 0:
@@ -237,13 +243,13 @@ def main():
         results = []
         for lang_dir in Path(args.locales_dir).iterdir():
             if lang_dir.is_dir() and lang_dir.name != "en-GB":
-                translation_file = lang_dir / "translation.json"
+                translation_file = lang_dir / "translation.toml"
                 if translation_file.exists():
                     if args.validate_only:
                         order_result = beautifier.validate_key_order(translation_file)
                         print(f"{lang_dir.name}: Order preserved = {order_result['order_preserved']}")
                     else:
-                        result = beautifier.beautify_and_restructure(translation_file, backup=not args.no_backup)
+                        result = beautifier.beautify_and_restructure(translation_file, backup=args.backup)
                         results.append(result)
 
         if not args.validate_only and results:
@@ -259,4 +265,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()
diff --git a/scripts/translations/toml_validator.py b/scripts/translations/toml_validator.py
new file mode 100644
index 000000000..e7018050e
--- /dev/null
+++ b/scripts/translations/toml_validator.py
@@ -0,0 +1,198 @@
+#!/usr/bin/env python3
+"""
+TOML Validator for Translation Files
+
+Validates TOML syntax in translation files and reports detailed error information.
+Useful for validating translation files before merging.
+
+Usage:
+    python3 toml_validator.py <file_or_pattern>
+    python3 toml_validator.py ar_AR_batch_*.toml
+    python3 toml_validator.py ar_AR_batch_1_of_3.toml
+    python3 toml_validator.py --all-batches ar_AR
+"""
+
+import sys
+import argparse
+import glob
+from pathlib import Path
+
+import tomllib
+
+
+def get_line_context(file_path, line_num, context_lines=3):
+    """Get lines around the error for context"""
+    try:
+        with open(file_path, 'r', encoding='utf-8') as f:
+            lines = f.readlines()
+
+        start = max(0, line_num - context_lines - 1)
+        end = min(len(lines), line_num + context_lines)
+
+        context = []
+        for i in range(start, end):
+            marker = ">>> " if i == line_num - 1 else "    "
+            context.append(f"{marker}{i+1:4d}: {lines[i].rstrip()}")
+
+        return "\n".join(context)
+    except Exception as e:
+        return f"Could not read context: {e}"
+
+
+def get_character_context(file_path, char_pos, context_chars=100):
+    """Get characters around the error position"""
+    try:
+        with open(file_path, 'r', encoding='utf-8') as f:
+            content = f.read()
+
+        start = max(0, char_pos - context_chars)
+        end = min(len(content), char_pos + context_chars)
+
+        before = content[start:char_pos]
+        error_char = content[char_pos] if char_pos < len(content) else "EOF"
+        after = content[char_pos+1:end]
+
+        return {
+            'before': before,
+            'error_char': error_char,
+            'after': after,
+            'display': f"{before}[{error_char}]{after}"
+        }
+    except Exception as e:
+        return None
+
+
+def count_keys(data, prefix=''):
+    """Recursively count all keys in nested TOML structure"""
+    count = 0
+    if isinstance(data, dict):
+        for key, value in data.items():
+            if isinstance(value, dict):
+                count += count_keys(value, f"{prefix}.{key}" if prefix else key)
+            else:
+                count += 1
+    return count
+
+
+def validate_toml_file(file_path):
+    """Validate a single TOML file and return detailed error info"""
+    result = {
+        'file': str(file_path),
+        'valid': False,
+        'error': None,
+        'line': None,
+        'context': None,
+        'entry_count': 0
+    }
+
+    try:
+        with open(file_path, 'rb') as f:
+            data = tomllib.load(f)
+
+        result['valid'] = True
+        result['entry_count'] = count_keys(data)
+
+    except Exception as e:
+        error_msg = str(e)
+        result['error'] = error_msg
+
+        # Try to extract line number from error message
+        import re
+        line_match = re.search(r'line (\d+)', error_msg, re.IGNORECASE)
+        if line_match:
+            line_num = int(line_match.group(1))
+            result['line'] = line_num
+            result['context'] = get_line_context(file_path, line_num)
+
+    except FileNotFoundError:
+        result['error'] = "File not found"
+
+    return result
+
+
+def print_validation_result(result, brief=False, quiet=False):
+    """Print validation result in human-readable format"""
+    if result['valid']:
+        if not quiet:
+            print(f"✓ {result['file']}")
+            if not brief:
+                print(f"  Valid TOML with {result['entry_count']} entries")
+    else:
+        print(f"✗ {result['file']}")
+        print(f"  Error: {result['error']}")
+
+        if result['line']:
+            print(f"  Line: {result['line']}")
+
+        if result['context'] and not brief:
+            print(f"\n  Context:")
+            print(f"  {result['context'].replace(chr(10), chr(10) + '  ')}")
+
+        if not brief:
+            print(f"\n  Common fixes:")
+            print(f"  - Check for missing quotes around keys or values")
+            print(f"  - Ensure proper escaping of special characters")
+            print(f"  - Verify table header syntax: [section.subsection]")
+            print(f"  - Check for duplicate keys in the same table")
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Validate TOML translation files')
+    parser.add_argument('files', nargs='*', help='TOML file(s) or pattern to validate')
+    parser.add_argument('--all-batches', metavar='LANG',
+                        help='Validate all batch files for a language (e.g., ar_AR)')
+    parser.add_argument('--brief', action='store_true',
+                        help='Show brief output without context')
+    parser.add_argument('--quiet', action='store_true',
+                        help='Only show files with errors')
+
+    args = parser.parse_args()
+
+    # Collect files to validate
+    files_to_validate = []
+
+    if args.all_batches:
+        # Find all batch files for the specified language
+        pattern = f"{args.all_batches}_batch_*.toml"
+        files_to_validate = glob.glob(pattern)
+        if not files_to_validate:
+            print(f"No batch files found matching pattern: {pattern}")
+            sys.exit(1)
+    elif args.files:
+        for file_pattern in args.files:
+            matched_files = glob.glob(file_pattern)
+            if matched_files:
+                files_to_validate.extend(matched_files)
+            else:
+                # Try as literal filename
+                files_to_validate.append(file_pattern)
+    else:
+        parser.print_help()
+        sys.exit(1)
+
+    # Validate all files
+    results = []
+    for file_path in files_to_validate:
+        result = validate_toml_file(file_path)
+        results.append(result)
+        print_validation_result(result, brief=args.brief, quiet=args.quiet)
+        if not args.brief and not args.quiet:
+            print()  # Empty line between files
+
+    # Summary
+    total = len(results)
+    valid = sum(1 for r in results if r['valid'])
+    invalid = total - valid
+
+    if not args.quiet:
+        print(f"\n{'='*60}")
+        print(f"Summary: {valid}/{total} files valid")
+        if invalid > 0:
+            print(f"  {invalid} file(s) with errors")
+
+    # Exit with error code if any files invalid
+    sys.exit(0 if invalid == 0 else 1)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/translations/translation_analyzer.py b/scripts/translations/translation_analyzer.py
index 9c8315b53..35b2b3555 100644
--- a/scripts/translations/translation_analyzer.py
+++ b/scripts/translations/translation_analyzer.py
@@ -10,35 +10,27 @@ import sys
 from pathlib import Path
 from typing import Dict, List, Set, Tuple
 import argparse
-try:
-    import tomllib  # Python 3.11+
-except ImportError:
-    try:
-        import toml as tomllib_fallback
-        tomllib = None
-    except ImportError:
-        tomllib = None
-        tomllib_fallback = None
+import tomllib
 
 
 class TranslationAnalyzer:
     def __init__(self, locales_dir: str = "frontend/public/locales", ignore_file: str = "scripts/ignore_translation.toml"):
         self.locales_dir = Path(locales_dir)
-        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.json"
-        self.golden_truth = self._load_json(self.golden_truth_file)
+        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.toml"
+        self.golden_truth = self._load_translation_file(self.golden_truth_file)
         self.ignore_file = Path(ignore_file)
         self.ignore_patterns = self._load_ignore_patterns()
 
-    def _load_json(self, file_path: Path) -> Dict:
-        """Load JSON file with error handling."""
+    def _load_translation_file(self, file_path: Path) -> Dict:
+        """Load TOML translation file with error handling."""
         try:
-            with open(file_path, 'r', encoding='utf-8') as f:
-                return json.load(f)
+            with open(file_path, 'rb') as f:
+                return tomllib.load(f)
         except FileNotFoundError:
             print(f"Error: File not found: {file_path}")
             sys.exit(1)
-        except json.JSONDecodeError as e:
-            print(f"Error: Invalid JSON in {file_path}: {e}")
+        except Exception as e:
+            print(f"Error: Invalid file {file_path}: {e}")
             sys.exit(1)
 
     def _load_ignore_patterns(self) -> Dict[str, Set[str]]:
@@ -47,16 +39,8 @@ class TranslationAnalyzer:
             return {}
 
         try:
-            if tomllib:
-                # Use Python 3.11+ built-in
-                with open(self.ignore_file, 'rb') as f:
-                    ignore_data = tomllib.load(f)
-            elif tomllib_fallback:
-                # Use toml library fallback
-                ignore_data = tomllib_fallback.load(self.ignore_file)
-            else:
-                # Simple parser as fallback
-                ignore_data = self._parse_simple_toml()
+            with open(self.ignore_file, 'rb') as f:
+                ignore_data = tomllib.load(f)
 
             # Convert lists to sets for faster lookup
             return {lang: set(patterns) for lang, data in ignore_data.items()
@@ -65,31 +49,6 @@ class TranslationAnalyzer:
             print(f"Warning: Could not load ignore file {self.ignore_file}: {e}")
             return {}
 
-    def _parse_simple_toml(self) -> Dict:
-        """Simple TOML parser for ignore patterns (fallback)."""
-        ignore_data = {}
-        current_section = None
-
-        with open(self.ignore_file, 'r', encoding='utf-8') as f:
-            for line in f:
-                line = line.strip()
-                if not line or line.startswith('#'):
-                    continue
-
-                if line.startswith('[') and line.endswith(']'):
-                    current_section = line[1:-1]
-                    ignore_data[current_section] = {'ignore': []}
-                elif line.startswith('ignore = [') and current_section:
-                    # Handle ignore array
-                    continue
-                elif line.strip().startswith("'") and current_section:
-                    # Extract quoted items
-                    item = line.strip().strip("',")
-                    if item:
-                        ignore_data[current_section]['ignore'].append(item)
-
-        return ignore_data
-
     def _flatten_dict(self, d: Dict, parent_key: str = '', separator: str = '.') -> Dict[str, str]:
         """Flatten nested dictionary into dot-notation keys."""
         items = []
@@ -102,18 +61,18 @@ class TranslationAnalyzer:
         return dict(items)
 
     def get_all_language_files(self) -> List[Path]:
-        """Get all translation.json files except en-GB."""
+        """Get all translation files except en-GB."""
         files = []
         for lang_dir in self.locales_dir.iterdir():
             if lang_dir.is_dir() and lang_dir.name != "en-GB":
-                translation_file = lang_dir / "translation.json"
-                if translation_file.exists():
-                    files.append(translation_file)
+                toml_file = lang_dir / "translation.toml"
+                if toml_file.exists():
+                    files.append(toml_file)
         return sorted(files)
 
     def find_missing_translations(self, target_file: Path) -> Set[str]:
         """Find keys that exist in en-GB but missing in target file."""
-        target_data = self._load_json(target_file)
+        target_data = self._load_translation_file(target_file)
 
         golden_flat = self._flatten_dict(self.golden_truth)
         target_flat = self._flatten_dict(target_data)
@@ -127,7 +86,7 @@ class TranslationAnalyzer:
 
     def find_untranslated_entries(self, target_file: Path) -> Set[str]:
         """Find entries that appear to be untranslated (identical to en-GB)."""
-        target_data = self._load_json(target_file)
+        target_data = self._load_translation_file(target_file)
 
         golden_flat = self._flatten_dict(self.golden_truth)
         target_flat = self._flatten_dict(target_data)
@@ -170,7 +129,7 @@ class TranslationAnalyzer:
 
     def find_extra_translations(self, target_file: Path) -> Set[str]:
         """Find keys that exist in target file but not in en-GB."""
-        target_data = self._load_json(target_file)
+        target_data = self._load_translation_file(target_file)
 
         golden_flat = self._flatten_dict(self.golden_truth)
         target_flat = self._flatten_dict(target_data)
@@ -185,7 +144,7 @@ class TranslationAnalyzer:
         untranslated = self.find_untranslated_entries(target_file)
         extra = self.find_extra_translations(target_file)
 
-        target_data = self._load_json(target_file)
+        target_data = self._load_translation_file(target_file)
         golden_flat = self._flatten_dict(self.golden_truth)
         target_flat = self._flatten_dict(target_data)
 
@@ -249,8 +208,12 @@ def main():
     analyzer = TranslationAnalyzer(args.locales_dir, args.ignore_file)
 
     if args.language:
-        target_file = Path(args.locales_dir) / args.language / "translation.json"
-        if not target_file.exists():
+        lang_dir = Path(args.locales_dir) / args.language
+        toml_file = lang_dir / "translation.toml"
+
+        if toml_file.exists():
+            target_file = toml_file
+        else:
             print(f"Error: Translation file not found for language: {args.language}")
             sys.exit(1)
         results = [analyzer.analyze_file(target_file)]
diff --git a/scripts/translations/translation_merger.py b/scripts/translations/translation_merger.py
index 84884d946..328b11bfd 100644
--- a/scripts/translations/translation_merger.py
+++ b/scripts/translations/translation_merger.py
@@ -3,6 +3,7 @@
 Translation Merger for Stirling PDF Frontend
 Merges missing translations from en-GB into target language files.
 Useful for AI-assisted translation workflows.
+TOML format only.
 """
 
 import json
@@ -14,46 +15,39 @@ import argparse
 import shutil
 from datetime import datetime
 
-try:
-    import tomllib  # Python 3.11+
-except ImportError:
-    try:
-        import toml as tomllib_fallback
-        tomllib = None
-    except ImportError:
-        tomllib = None
-        tomllib_fallback = None
+import tomllib
+import tomli_w
 
 
 class TranslationMerger:
     def __init__(self, locales_dir: str = "frontend/public/locales", ignore_file: str = "scripts/ignore_translation.toml"):
         self.locales_dir = Path(locales_dir)
-        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.json"
-        self.golden_truth = self._load_json(self.golden_truth_file)
+        self.golden_truth_file = self.locales_dir / "en-GB" / "translation.toml"
+        self.golden_truth = self._load_translation_file(self.golden_truth_file)
         self.ignore_file = Path(ignore_file)
         self.ignore_patterns = self._load_ignore_patterns()
 
-    def _load_json(self, file_path: Path) -> Dict:
-        """Load JSON file with error handling."""
+    def _load_translation_file(self, file_path: Path) -> Dict:
+        """Load TOML translation file."""
         try:
-            with open(file_path, 'r', encoding='utf-8') as f:
-                return json.load(f)
+            with open(file_path, 'rb') as f:
+                return tomllib.load(f)
         except FileNotFoundError:
             print(f"Error: File not found: {file_path}")
             sys.exit(1)
-        except json.JSONDecodeError as e:
-            print(f"Error: Invalid JSON in {file_path}: {e}")
+        except Exception as e:
+            print(f"Error: Invalid file {file_path}: {e}")
             sys.exit(1)
 
-    def _save_json(self, data: Dict, file_path: Path, backup: bool = True) -> None:
-        """Save JSON file with backup option."""
+    def _save_translation_file(self, data: Dict, file_path: Path, backup: bool = False) -> None:
+        """Save TOML translation file with backup option."""
         if backup and file_path.exists():
-            backup_path = file_path.with_suffix(f'.backup.{datetime.now().strftime("%Y%m%d_%H%M%S")}.json')
+            backup_path = file_path.with_suffix(f'.backup.{datetime.now().strftime("%Y%m%d_%H%M%S")}.toml')
             shutil.copy2(file_path, backup_path)
             print(f"Backup created: {backup_path}")
 
-        with open(file_path, 'w', encoding='utf-8') as f:
-            json.dump(data, f, indent=2, ensure_ascii=False)
+        with open(file_path, 'wb') as f:
+            tomli_w.dump(data, f)
 
     def _load_ignore_patterns(self) -> Dict[str, Set[str]]:
         """Load ignore patterns from TOML file."""
@@ -61,26 +55,11 @@ class TranslationMerger:
             return {}
 
         try:
-            # Simple parser for ignore patterns
-            ignore_data = {}
-            current_section = None
+            with open(self.ignore_file, 'rb') as f:
+                ignore_data = tomllib.load(f)
 
-            with open(self.ignore_file, 'r', encoding='utf-8') as f:
-                for line in f:
-                    line = line.strip()
-                    if not line or line.startswith('#'):
-                        continue
-
-                    if line.startswith('[') and line.endswith(']'):
-                        current_section = line[1:-1]
-                        ignore_data[current_section] = set()
-                    elif line.strip().startswith("'") and current_section:
-                        # Extract quoted items
-                        item = line.strip().strip("',")
-                        if item:
-                            ignore_data[current_section].add(item)
-
-            return ignore_data
+            # Convert to sets for faster lookup
+            return {lang: set(data.get('ignore', [])) for lang, data in ignore_data.items()}
         except Exception as e:
             print(f"Warning: Could not load ignore file {self.ignore_file}: {e}")
             return {}
@@ -131,20 +110,19 @@ class TranslationMerger:
             golden_keys = set(self._flatten_dict(self.golden_truth).keys())
             return sorted(golden_keys - ignore_set)
 
-        target_data = self._load_json(target_file)
+        target_data = self._load_translation_file(target_file)
         golden_flat = self._flatten_dict(self.golden_truth)
         target_flat = self._flatten_dict(target_data)
 
         missing = set(golden_flat.keys()) - set(target_flat.keys())
         return sorted(missing - ignore_set)
 
-    def add_missing_translations(self, target_file: Path, keys_to_add: List[str] = None,
-                               mark_untranslated: bool = True) -> Dict:
+    def add_missing_translations(self, target_file: Path, keys_to_add: List[str] = None) -> Dict:
         """Add missing translations from en-GB to target file."""
         if not target_file.exists():
             target_data = {}
         else:
-            target_data = self._load_json(target_file)
+            target_data = self._load_translation_file(target_file)
 
         golden_flat = self._flatten_dict(self.golden_truth)
         missing_keys = keys_to_add or self.get_missing_keys(target_file)
@@ -153,10 +131,7 @@ class TranslationMerger:
         for key in missing_keys:
             if key in golden_flat:
                 value = golden_flat[key]
-                if mark_untranslated and isinstance(value, str):
-                    # Mark as untranslated for AI to translate later
-                    value = f"[UNTRANSLATED] {value}"
-
+                # Add the English value directly without [UNTRANSLATED] marker
                 self._set_nested_value(target_data, key, value)
                 added_count += 1
 
@@ -172,7 +147,7 @@ class TranslationMerger:
             print(f"Error: Target file does not exist: {target_file}")
             return {}
 
-        target_data = self._load_json(target_file)
+        target_data = self._load_translation_file(target_file)
         golden_flat = self._flatten_dict(self.golden_truth)
         target_flat = self._flatten_dict(target_data)
 
@@ -219,13 +194,13 @@ class TranslationMerger:
         return False
 
     def apply_translations(self, target_file: Path, translations: Dict[str, str],
-                          backup: bool = True) -> Dict:
+                          backup: bool = False) -> Dict:
         """Apply provided translations to target file."""
         if not target_file.exists():
             print(f"Error: Target file does not exist: {target_file}")
             return {'success': False, 'error': 'File not found'}
 
-        target_data = self._load_json(target_file)
+        target_data = self._load_translation_file(target_file)
         applied_count = 0
         errors = []
 
@@ -241,7 +216,7 @@ class TranslationMerger:
                 errors.append(f"Error setting {key}: {e}")
 
         if applied_count > 0:
-            self._save_json(target_data, target_file, backup)
+            self._save_translation_file(target_data, target_file, backup)
 
         return {
             'success': True,
@@ -288,7 +263,10 @@ class TranslationMerger:
 
 
 def main():
-    parser = argparse.ArgumentParser(description='Merge and manage translation files')
+    parser = argparse.ArgumentParser(
+        description='Merge and manage translation files',
+        epilog='Works with TOML translation files.'
+    )
     parser.add_argument('--locales-dir', default='frontend/public/locales',
                         help='Path to locales directory')
     parser.add_argument('--ignore-file', default='scripts/ignore_translation.toml',
@@ -299,9 +277,7 @@ def main():
 
     # Add missing command
     add_parser = subparsers.add_parser('add-missing', help='Add missing translations from en-GB')
-    add_parser.add_argument('--no-backup', action='store_true', help='Skip backup creation')
-    add_parser.add_argument('--mark-untranslated', action='store_true', default=True,
-                           help='Mark added translations as [UNTRANSLATED]')
+    add_parser.add_argument('--backup', action='store_true', help='Create backup before modifying files')
 
     # Extract untranslated command
     extract_parser = subparsers.add_parser('extract-untranslated', help='Extract untranslated entries')
@@ -314,7 +290,7 @@ def main():
     # Apply translations command
     apply_parser = subparsers.add_parser('apply-translations', help='Apply translations from JSON file')
     apply_parser.add_argument('--translations-file', required=True, help='JSON file with translations')
-    apply_parser.add_argument('--no-backup', action='store_true', help='Skip backup creation')
+    apply_parser.add_argument('--backup', action='store_true', help='Create backup before modifying files')
 
     args = parser.parse_args()
 
@@ -323,16 +299,16 @@ def main():
         return
 
     merger = TranslationMerger(args.locales_dir, args.ignore_file)
-    target_file = Path(args.locales_dir) / args.language / "translation.json"
+
+    # Find translation file
+    lang_dir = Path(args.locales_dir) / args.language
+    target_file = lang_dir / "translation.toml"
 
     if args.command == 'add-missing':
         print(f"Adding missing translations to {args.language}...")
-        result = merger.add_missing_translations(
-            target_file,
-            mark_untranslated=args.mark_untranslated
-        )
+        result = merger.add_missing_translations(target_file)
 
-        merger._save_json(result['data'], target_file, backup=not args.no_backup)
+        merger._save_translation_file(result['data'], target_file, backup=args.backup)
         print(f"Added {result['added_count']} missing translations")
 
     elif args.command == 'extract-untranslated':
@@ -355,7 +331,7 @@ def main():
         else:
             translations = translations_data
 
-        result = merger.apply_translations(target_file, translations, backup=not args.no_backup)
+        result = merger.apply_translations(target_file, translations, backup=args.backup)
 
         if result['success']:
             print(f"Applied {result['applied_count']} translations")
diff --git a/scripts/translations/validate_json_structure.py b/scripts/translations/validate_json_structure.py
index 3f071c5be..102bc154c 100644
--- a/scripts/translations/validate_json_structure.py
+++ b/scripts/translations/validate_json_structure.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 """
-Validate JSON structure and formatting of translation files.
+Validate TOML structure and formatting of translation files.
 
 Checks for:
-- Valid JSON syntax
+- Valid TOML syntax
 - Consistent key structure with en-GB
 - Missing keys
 - Extra keys not in en-GB
@@ -18,6 +18,7 @@ import sys
 from pathlib import Path
 from typing import Dict, List, Set
 import argparse
+import tomllib  # Python 3.11+ (stdlib)
 
 
 def get_all_keys(d: dict, parent_key: str = '', sep: str = '.') -> Set[str]:
@@ -31,14 +32,12 @@ def get_all_keys(d: dict, parent_key: str = '', sep: str = '.') -> Set[str]:
     return keys
 
 
-def validate_json_file(file_path: Path) -> tuple[bool, str]:
-    """Validate that a file contains valid JSON."""
+def validate_translation_file(file_path: Path) -> tuple[bool, str]:
+    """Validate that a file contains valid TOML."""
     try:
-        with open(file_path, 'r', encoding='utf-8') as f:
-            json.load(f)
-        return True, "Valid JSON"
-    except json.JSONDecodeError as e:
-        return False, f"Invalid JSON at line {e.lineno}, column {e.colno}: {e.msg}"
+        with open(file_path, 'rb') as f:
+            tomllib.load(f)
+        return True, "Valid TOML"
     except Exception as e:
         return False, f"Error reading file: {str(e)}"
 
@@ -101,9 +100,15 @@ def print_validation_result(result: Dict, verbose: bool = False):
     print("-" * 100)
 
 
+def load_translation_file(file_path: Path) -> dict:
+    """Load TOML translation file."""
+    with open(file_path, 'rb') as f:
+        return tomllib.load(f)
+
+
 def main():
     parser = argparse.ArgumentParser(
-        description='Validate translation JSON structure'
+        description='Validate translation TOML structure'
     )
     parser.add_argument(
         '--language',
@@ -125,21 +130,21 @@ def main():
 
     # Define paths
     locales_dir = Path('frontend/public/locales')
-    en_gb_path = locales_dir / 'en-GB' / 'translation.json'
+    en_gb_path = locales_dir / 'en-GB' / 'translation.toml'
+    file_ext = '.toml'
 
     if not en_gb_path.exists():
         print(f"❌ Error: en-GB translation file not found at {en_gb_path}")
         sys.exit(1)
 
     # Validate en-GB itself
-    is_valid, message = validate_json_file(en_gb_path)
+    is_valid, message = validate_translation_file(en_gb_path)
     if not is_valid:
         print(f"❌ Error in en-GB file: {message}")
         sys.exit(1)
 
     # Load en-GB structure
-    with open(en_gb_path, 'r', encoding='utf-8') as f:
-        en_gb = json.load(f)
+    en_gb = load_translation_file(en_gb_path)
 
     en_gb_keys = get_all_keys(en_gb)
 
@@ -147,24 +152,26 @@ def main():
     if args.language:
         languages = [args.language]
     else:
-        languages = [
-            d.name for d in locales_dir.iterdir()
-            if d.is_dir() and d.name != 'en-GB' and (d / 'translation.json').exists()
-        ]
+        # Validate all languages except en-GB
+        languages = []
+        for d in locales_dir.iterdir():
+            if d.is_dir() and d.name != 'en-GB':
+                if (d / 'translation.toml').exists():
+                    languages.append(d.name)
 
     results = []
     json_errors = []
 
     # Validate each language
     for lang_code in sorted(languages):
-        lang_path = locales_dir / lang_code / 'translation.json'
+        lang_path = locales_dir / lang_code / 'translation.toml'
 
         if not lang_path.exists():
-            print(f"⚠️  Warning: {lang_code}/translation.json not found, skipping")
+            print(f"⚠️  Warning: {lang_code}/translation.toml not found, skipping")
             continue
 
-        # First check if JSON is valid
-        is_valid, message = validate_json_file(lang_path)
+        # First check if file is valid
+        is_valid, message = validate_translation_file(lang_path)
         if not is_valid:
             json_errors.append({
                 'language': lang_code,
@@ -174,8 +181,7 @@ def main():
             continue
 
         # Load and compare structure
-        with open(lang_path, 'r', encoding='utf-8') as f:
-            lang_data = json.load(f)
+        lang_data = load_translation_file(lang_path)
 
         lang_keys = get_all_keys(lang_data)
         result = validate_structure(en_gb_keys, lang_keys, lang_code)
@@ -189,9 +195,9 @@ def main():
         }
         print(json.dumps(output, indent=2, ensure_ascii=False))
     else:
-        # Print JSON errors first
+        # Print syntax errors first
         if json_errors:
-            print("\n❌ JSON Syntax Errors:")
+            print("\n❌ Syntax Errors:")
             print("=" * 100)
             for error in json_errors:
                 print(f"\nLanguage: {error['language']}")
diff --git a/scripts/translations/validate_placeholders.py b/scripts/translations/validate_placeholders.py
index ff73755ce..5ce18d288 100644
--- a/scripts/translations/validate_placeholders.py
+++ b/scripts/translations/validate_placeholders.py
@@ -15,6 +15,7 @@ import sys
 from pathlib import Path
 from typing import Dict, List, Set, Tuple
 import argparse
+import tomllib  # Python 3.11+ (stdlib)
 
 
 def find_placeholders(text: str) -> Set[str]:
@@ -117,15 +118,16 @@ def main():
 
     # Define paths
     locales_dir = Path('frontend/public/locales')
-    en_gb_path = locales_dir / 'en-GB' / 'translation.json'
+    en_gb_path = locales_dir / 'en-GB' / 'translation.toml'
+    file_ext = '.toml'
 
     if not en_gb_path.exists():
         print(f"❌ Error: en-GB translation file not found at {en_gb_path}")
         sys.exit(1)
 
     # Load en-GB (source of truth)
-    with open(en_gb_path, 'r', encoding='utf-8') as f:
-        en_gb = json.load(f)
+    with open(en_gb_path, 'rb') as f:
+        en_gb = tomllib.load(f)
 
     en_gb_flat = flatten_dict(en_gb)
 
@@ -134,23 +136,25 @@ def main():
         languages = [args.language]
     else:
         # Validate all languages except en-GB
-        languages = [
-            d.name for d in locales_dir.iterdir()
-            if d.is_dir() and d.name != 'en-GB' and (d / 'translation.json').exists()
-        ]
+        languages = []
+        for d in locales_dir.iterdir():
+            if d.is_dir() and d.name != 'en-GB':
+                if (d / 'translation.toml').exists():
+                    languages.append(d.name)
 
     all_issues = []
 
     # Validate each language
     for lang_code in sorted(languages):
-        lang_path = locales_dir / lang_code / 'translation.json'
+        lang_path = locales_dir / lang_code / 'translation.toml'
 
         if not lang_path.exists():
-            print(f"⚠️  Warning: {lang_code}/translation.json not found, skipping")
+            print(f"⚠️  Warning: {lang_code}/translation.toml not found, skipping")
             continue
 
-        with open(lang_path, 'r', encoding='utf-8') as f:
-            lang_data = json.load(f)
+        # Load language file
+        with open(lang_path, 'rb') as f:
+            lang_data = tomllib.load(f)
 
         lang_flat = flatten_dict(lang_data)
         issues = validate_language(en_gb_flat, lang_flat, lang_code)