diff --git a/.claude/skills/update-translations/SKILL.md b/.claude/skills/update-translations/SKILL.md
new file mode 100644
index 00000000000..b056ca363c2
--- /dev/null
+++ b/.claude/skills/update-translations/SKILL.md
@@ -0,0 +1,235 @@
+---
+name: update-translations
+description: >
+  Sync Transifex translations for the DHIS2 Android Capture App on BOTH the
+  develop and main branches in parallel, talking directly to the Transifex REST
+  API (no tx CLI). For each branch it spins up an isolated git worktree, pushes
+  the branch's sources to its own Transifex resources (develop--* / main--*),
+  pulls the translations for every language that has any key translated, applies
+  the KMP escaped-character fix, cleans up empty stubs, and opens a pull request.
+  Invoke for "update translations", "sync Transifex", "pull the latest
+  translations", or "push sources to Transifex".
+---
+
+# Update Translations (Transifex sync)
+
+Push sources and pull translations for **both** `develop` and `main`, each in its
+own worktree, ending in a PR per branch. The two branches map to **separate**
+Transifex resources — a `--branch develop` push only touches `develop--*`, a
+`--branch main` push only touches `main--*` — so both runs are safe in parallel.
+
+Everything goes through one config-driven helper that talks to the Transifex v3
+REST API directly (no `tx` CLI, no `~/.transifexrc`):
+
+```
+.claude/skills/update-translations/scripts/transifex_sync.py \
+    <push-sources|verify-push|lang-list|pull|postpull|push-translations>  --branch <develop|main>
+```
+
+It parses `.tx/config` for the resource list, source files, `file_filter`
+patterns, `lang_map` and `source_lang` — nothing about the modules is hardcoded,
+so it stays correct as resources are added or removed.
+
+## Prerequisites (check first; stop and tell the user if any is missing)
+
+- **Python 3** (standard library only — no pip installs).
+- **Transifex API token** in `local.properties` as `TX_TOKEN=...` (already there
+  alongside `SONAR_TOKEN` etc.). `local.properties` is gitignored, so it exists
+  only in the primary checkout — see the token step below for worktrees. The
+  helper also accepts `$TX_TOKEN` from the environment.
+- **gh CLI** authenticated (`gh auth status`) for opening PRs.
+- A clean primary working tree is NOT required — work happens in throwaway
+  worktrees on fresh branches, never disturbing the user's checkout.
+
+## Orchestration (you, the invoking agent)
+
+1. Resolve the stable paths, the token, and a datestamp up front (scripts can't
+   read the clock; you pass values in):
+   ```bash
+   REPO="$(git rev-parse --show-toplevel)"
+   SCRIPT="$REPO/.claude/skills/update-translations/scripts/transifex_sync.py"
+   DATE="$(date +%Y%m%d)"
+   git -C "$REPO" fetch origin
+   ```
+2. Create one worktree per branch on a fresh sync branch off the **remote** tip
+   (basing on `origin/<branch>` avoids the "branch already checked out" error and
+   guarantees the newest sources):
+   ```bash
+   git -C "$REPO" worktree add -b "develop-transifex-$DATE" "$REPO/../tx-sync-develop-$DATE" origin/develop
+   git -C "$REPO" worktree add -b "main-transifex-$DATE"    "$REPO/../tx-sync-main-$DATE"    origin/main
+   ```
+   > The `develop-transifex-*` name intentionally matches the existing
+   > `fix-kmp-translations.yml` action, which then runs on that PR as a CI safety
+   > net. `main` has no such action, which is exactly why this skill applies the
+   > escaping fix itself for both branches.
+3. Spawn **two `general-purpose` agents in parallel** (both Agent calls in one
+   message), one per branch. Give each: `$REPO` (so it can read the token — the
+   worktrees have no `local.properties`), its worktree path, its branch name, its
+   sync-branch name, and `$SCRIPT`. Pass the per-branch procedure below verbatim.
+4. When both return, report both PR URLs and each `postpull` summary. Then remove
+   the worktrees (branches already live on origin):
+   ```bash
+   git -C "$REPO" worktree remove --force "$REPO/../tx-sync-develop-$DATE"
+   git -C "$REPO" worktree remove --force "$REPO/../tx-sync-main-$DATE"
+   ```
+
+## Per-branch procedure (each worktree agent runs this from its worktree)
+
+Substitute `<BRANCH>` (`develop`/`main`), `<SYNC_BRANCH>`
+(`<BRANCH>-transifex-<DATE>`), `<WT>` (worktree path), `<REPO>` (primary repo),
+`<SCRIPT>` (absolute helper path).
+
+```bash
+# 0. Token: worktrees have no local.properties, so read it from the primary repo.
+export TX_TOKEN="$(grep -E '^TX_TOKEN=' "<REPO>/local.properties" | cut -d= -f2-)"
+[ -n "$TX_TOKEN" ] || { echo "TX_TOKEN missing in <REPO>/local.properties"; exit 1; }
+cd "<WT>"
+
+# 1. Push this branch's sources to its own <BRANCH>--* resources (async upload).
+#    Reports created/updated/deleted/skipped and any server-side string errors;
+#    non-zero exit on failure.
+python3 "<SCRIPT>" push-sources --branch <BRANCH>
+
+# 2. Independent verification: every local source key (plurals/string-arrays
+#    included, translatable="false" excluded) must be present on the server.
+#    Non-zero exit = a key is missing (silent failure) -> STOP, do NOT pull.
+python3 "<SCRIPT>" verify-push --branch <BRANCH>
+
+# 3. Languages with >=1 translated string on this branch (source lang excluded).
+LANGS="$(python3 "<SCRIPT>" lang-list --branch <BRANCH>)"
+echo "pulling languages: $LANGS"
+
+# 4. Pull translations (default mode, parallel async downloads; ~4-6 min for the
+#    full set). Run it in the FOREGROUND with a long timeout (up to 10 min). Do
+#    NOT background it inside a sub-agent — the agent may end its turn before the
+#    pull finishes and leave the download orphaned. New empty-stub files are
+#    skipped automatically.
+python3 "<SCRIPT>" pull --branch <BRANCH> --langs "$LANGS"
+
+# 5. Clean up + validate:
+#    - unescape \? -> ? in KMP compose-resource modules (build breaker),
+#    - delete new EMPTY (0-string) stub files + their folders,
+#    - revert whitespace-only churn on already-empty files,
+#    - RESTORE any live (in-source) translation the pull dropped, from HEAD,
+#    - validate XML + that keys are a subset of source.
+#    Non-zero exit = validation failed -> STOP and report.
+python3 "<SCRIPT>" postpull
+
+# 6. Sanity-check the diff, then commit, push, and open the PR.
+git add -A
+git status --short | head
+git commit -m "chore(translations): sync <BRANCH> translations from Transifex"
+git push -u origin <SYNC_BRANCH>
+
+# Repo rule: a PR may not exceed 400 changed lines (insertions + deletions)
+# unless its title ends with "[skip size]". Translation syncs almost always
+# exceed this, so compute the total and append the tag when needed.
+CHANGES=$(git diff --numstat "origin/<BRANCH>" HEAD | awk '{a+=$1; d+=$2} END {print a+d+0}')
+TITLE="chore(translations): sync <BRANCH> translations from Transifex"
+[ "$CHANGES" -gt 400 ] && TITLE="$TITLE [skip size]"
+echo "changed lines: $CHANGES  ->  title: $TITLE"
+
+gh pr create --base <BRANCH> --head <SYNC_BRANCH> \
+  --title "$TITLE" \
+  --body "Automated Transifex sync for \`<BRANCH>\`.
+
+- Pushed \`<BRANCH>\` sources to the \`<BRANCH>--*\` resources (verified: no keys missing on the server).
+- Pulled translations for every language with at least one translated key.
+- Applied the KMP escaped-question-mark fix (\`\\?\` -> \`?\`).
+- Removed empty stub files; preserved all in-source translations.
+
+<paste the postpull summary + \`git diff --shortstat\` here>"
+```
+
+Report back to the orchestrator: the PR URL, the `postpull` summary, and
+`git diff --shortstat`. If any step exits non-zero, report the failure instead of
+opening a PR.
+
+## Why each step exists (learned pitfalls — don't drop these)
+
+- **Silent push failures**: `push-sources` waits for each async upload job and
+  surfaces its `errors` + created/updated/deleted counts, and `verify-push` then
+  independently confirms every local key reached the server. Count keys with a
+  regex covering `<string>` **and** `<plurals>`/`<string-array>` (the helper
+  does) — plain `grep '<string '` under-counts and produces false orphan reports.
+- **Only pull real languages**: `lang-list` restricts to languages that actually
+  have a translation on that branch. Do **not** add a percentage floor — it would
+  drop languages with a single translated key (e.g. `fi`, `ko_KR`).
+- **KMP escaped chars can't be fixed on the server**: Transifex stores the KMP
+  compose modules (`tracker`, `aggregates`, `commonskmm`, `login`, `sync`) as
+  ANDROID resources and re-escapes `?` to `\?` on every export; the Compose
+  resource parser then fails to compile. So `\?`->`?` is a mandatory **local,
+  post-pull** step every time. `postpull` fixes every KMP file, so it also
+  self-heals any `\?` already committed on the branch.
+- **Empty files are noise**: `pull` won't create a new empty stub, and `postpull`
+  deletes any that slip through and reverts whitespace-only churn on modules that
+  commit empty placeholders (e.g. `sync`).
+- **develop vs main divergence**: translators work against `develop--`, so
+  `main--` can be missing in-source translations the repo already has; a default
+  pull would silently drop them. `postpull` restores any such dropped in-source
+  translation from HEAD and lists them — if that list is non-empty, run the
+  `push-translations` backfill (see below) so the gap stops recurring instead of
+  being re-restored on every sync.
+- **PR size limit**: this repo rejects PRs over **400 changed lines (insertions +
+  deletions)** unless the title ends with **`[skip size]`**. A translation sync is
+  almost always far larger than that, so step 6 computes the total and appends the
+  tag automatically. Any PR the skill opens (or that you open by hand for this
+  work) must follow the same rule.
+
+## Compilation & tests (delegated to CI)
+
+The skill does **static** validation only (`postpull`: well-formed XML, keys ⊆
+source, and the `\?` fix). It does **not** build or run tests, by design:
+
+- **CI is the compile gate.** `continuous-delivery.yml` runs
+  `./gradlew assembleDhis2Debug` on every PR to `main`/`develop`/`release/*`,
+  which compiles the KMP Compose resources — so any escaping/resource problem
+  that slipped past the static checks fails the PR build automatically.
+- **Worktrees can't build as-is:** `local.properties` is gitignored, so the
+  throwaway worktrees have no `sdk.dir`; a full KMP build per branch would also
+  add several minutes for little gain over CI.
+
+If you want a local pre-PR compile check, fetch the sync branch into the primary
+checkout (which has your SDK config) and run `./gradlew assembleDhis2Debug`.
+Translation-only changes don't touch logic, so the unit-test suite isn't run.
+
+## Backfilling the server (`push-translations`) — closes the divergence
+
+When `postpull` reports "the server was missing these in-source translations",
+the server and repo have drifted: the repo carries translations the `<branch>--`
+resources don't have, so every sync re-drops and re-restores the same keys. The
+`push-translations` subcommand fixes this at the source by pushing those repo
+translations **up** to the server:
+
+```bash
+# dry-run first — lists every (resource, language) gap, uploads nothing
+python3 <SCRIPT> push-translations --branch main
+
+# then actually upload
+python3 <SCRIPT> push-translations --branch main --apply
+```
+
+It is **gap-only and non-destructive**: for each repo translation file it
+downloads the server's current translations and uploads *only* the keys that are
+(a) in the source, (b) translated in the repo, and (c) absent on the server —
+so it can never overwrite a translator's existing work. On a per-language
+download error it skips that pair rather than risk clobbering it.
+
+Run it from a checkout that has the branch's translations (e.g. a `main`
+worktree) with `TX_TOKEN` exported. It is safe to re-run: once a gap is filled
+the next dry-run reports zero. Typically only `main` needs it, since translators
+already work against `develop--`.
+
+## Running for a single branch
+
+Skip the orchestration fan-out: create one worktree and run the per-branch
+procedure for that branch only. Everything else is identical.
+
+## Quick local checks (no worktree, no side effects)
+
+From the primary checkout, the read-only subcommands are safe to run directly:
+
+```bash
+python3 .claude/skills/update-translations/scripts/transifex_sync.py lang-list   --branch main
+python3 .claude/skills/update-translations/scripts/transifex_sync.py verify-push --branch develop
+```
diff --git a/.claude/skills/update-translations/scripts/transifex_sync.py b/.claude/skills/update-translations/scripts/transifex_sync.py
new file mode 100755
index 00000000000..20966f7ca18
--- /dev/null
+++ b/.claude/skills/update-translations/scripts/transifex_sync.py
@@ -0,0 +1,816 @@
+#!/usr/bin/env python3
+"""Transifex sync for the DHIS2 Android Capture App — pure REST API, no tx CLI.
+
+Talks directly to the Transifex v3 API (https://rest.api.transifex.com), so the
+only external tools needed are Python 3, git and gh. Config-driven: the resource
+list, source files, `file_filter` patterns, `lang_map` and `source_lang` are all
+read from ./.tx/config in the current working directory (the branch worktree).
+
+Auth: a Transifex API token, looked up in this order:
+  1. $TX_TOKEN environment variable
+  2. TX_TOKEN=... in ./local.properties     (primary, gitignored)
+  3. ~/.transifexrc                          (legacy fallback)
+Because local.properties is gitignored (absent from worktrees), the orchestrator
+should `export TX_TOKEN=$(...)` before spawning worktree agents.
+
+Subcommands (all operate on the current working directory):
+
+  push-sources --branch <develop|main>
+      Upload every source file to its `<branch>--<slug>` resource via the async
+      strings-upload API, waiting for each job. Reports created/updated/deleted/
+      skipped and any server-side string errors. Exits non-zero on any failure.
+
+  verify-push --branch <develop|main>
+      Independent check: confirm every local (translatable) source key — plurals
+      and string-arrays included — is present on the server. Exits non-zero if a
+      key is missing (a silent push failure). Also lists stale orphan keys.
+
+  lang-list --branch <develop|main>
+      Print the comma-separated Transifex language codes with >=1 translated
+      string on that branch's resources, source language excluded.
+
+  pull --branch <develop|main> [--langs a,b,c] [--workers N]
+      Download translations (default mode) for the chosen languages across all
+      resources via the async download API and write them to the paths given by
+      `file_filter` + `lang_map`. Skips creating brand-new empty stub files.
+      With no --langs, uses the lang-list selection.
+
+  postpull
+      Clean up a freshly pulled tree: unescape `\\?`->`?` in KMP compose modules,
+      delete new empty stubs, revert whitespace-only churn on already-empty
+      files, restore any dropped in-source translation from HEAD, and validate
+      (well-formed XML + keys subset of source). Exits non-zero on validation
+      failure.
+
+  push-translations --branch <develop|main> [--apply] [--workers N]
+      Backfill: for every repo translation file, find keys that are in the
+      source and translated in the repo but MISSING on the server, and upload
+      only those gap keys (never overwriting an existing server translation).
+      This closes the develop-vs-main divergence so future pulls stop dropping
+      and re-restoring the same in-source translations. Dry-run by default;
+      pass --apply to actually upload. On a per-language download error it skips
+      that pair rather than risk an overwrite.
+"""
+
+import argparse
+import base64
+import glob
+import json
+import os
+import re
+import subprocess
+import sys
+import time
+import urllib.error
+import urllib.request
+import xml.dom.minidom
+from collections import defaultdict
+from concurrent.futures import ThreadPoolExecutor, as_completed
+
+API = "https://rest.api.transifex.com"
+JSON_CT = "application/vnd.api+json"
+HTTP_TIMEOUT = 60  # seconds; guards every urlopen so a stalled connection can't hang
+
+# ---------------------------------------------------------------------------
+# token + config parsing
+# ---------------------------------------------------------------------------
+
+
+def load_token():
+    tok = os.environ.get("TX_TOKEN")
+    if tok:
+        return tok.strip()
+    lp = "local.properties"
+    if os.path.exists(lp):
+        with open(lp, encoding="utf-8") as fh:
+            for line in fh:
+                s = line.strip()
+                if "=" in s and s.split("=", 1)[0].strip() == "TX_TOKEN":
+                    return s.split("=", 1)[1].strip()
+    rc = os.path.expanduser("~/.transifexrc")
+    if os.path.exists(rc):
+        section, in_www, fallback = None, None, None
+        with open(rc, encoding="utf-8") as fh:
+            for line in fh:
+                s = line.strip()
+                if s.startswith("[") and s.endswith("]"):
+                    section = s[1:-1]
+                elif s.startswith("token"):
+                    val = s.split("=", 1)[1].strip()
+                    fallback = fallback or val
+                    if section == "https://www.transifex.com":
+                        in_www = val
+        if in_www or fallback:
+            return in_www or fallback
+    sys.exit("No token: set TX_TOKEN, or add TX_TOKEN=... to local.properties.")
+
+
+def parse_tx_config(path=".tx/config"):
+    """Return (project_id, source_lang, lang_map, resources[])."""
+    if not os.path.exists(path):
+        sys.exit(f"{path} not found — run from the repo/worktree root.")
+    project_id, source_lang, lang_map, resources = None, "en", {}, []
+    cur = None
+    with open(path, encoding="utf-8") as fh:
+        lines = fh.readlines()
+    for line in lines:
+        s = line.strip()
+        m = re.match(r"^\[o:([^:]+):p:([^:]+):r:(.+)\]$", s)
+        if m:
+            if cur:
+                resources.append(cur)
+            project_id = f"o:{m.group(1)}:p:{m.group(2)}"
+            cur = {"slug": m.group(3)}
+            continue
+        if s.startswith("[") and cur:
+            resources.append(cur)
+            cur = None
+        if "=" in s:
+            k, v = [x.strip() for x in s.split("=", 1)]
+            if k == "lang_map":
+                for pair in v.split(","):
+                    if ":" in pair:
+                        a, b = [x.strip() for x in pair.split(":", 1)]
+                        lang_map[a] = b
+            if cur is not None and k in ("source_file", "file_filter"):
+                cur[k] = v
+            if k == "source_lang":
+                source_lang = v
+                if cur is not None:
+                    cur["source_lang"] = v
+    if cur:
+        resources.append(cur)
+    if not project_id:
+        sys.exit("Could not parse project id from .tx/config.")
+    return project_id, source_lang, lang_map, resources
+
+
+def android_folder(tx_code, lang_map):
+    """Transifex language code -> Android values-<qualifier> suffix."""
+    if tx_code in lang_map:
+        return lang_map[tx_code]
+    if "_" in tx_code:  # xx_YY -> xx-rYY (Android region convention)
+        base, region = tx_code.split("_", 1)
+        return f"{base}-r{region}"
+    return tx_code
+
+
+# ---------------------------------------------------------------------------
+# HTTP
+# ---------------------------------------------------------------------------
+
+
+def _req(url, tok, method="GET", body=None, accept="*/*"):
+    headers = {"Authorization": "Bearer " + tok, "Accept": accept}
+    data = None
+    if body is not None:
+        data = json.dumps(body).encode()
+        headers["Content-Type"] = JSON_CT
+    return urllib.request.Request(url, data=data, headers=headers, method=method)
+
+
+def api_get(url, tok):
+    with urllib.request.urlopen(_req(url, tok, accept=JSON_CT), timeout=HTTP_TIMEOUT) as r:
+        return json.load(r)
+
+
+def api_post(path, body, tok):
+    req = _req(API + path, tok, "POST", body, JSON_CT)
+    with urllib.request.urlopen(req, timeout=HTTP_TIMEOUT) as r:
+        return json.load(r)
+
+
+def _sleep_backoff(attempt):
+    time.sleep(min(1.0 + attempt * 0.5, 5.0))
+
+
+# ---------------------------------------------------------------------------
+# XML key helpers
+# ---------------------------------------------------------------------------
+
+_KEY_RE = re.compile(r'<(?:string|plurals|string-array)\s+[^>]*name="([^"]+)"')
+_STRING_TAG_RE = re.compile(r"<string\s+[^>]*?/?>")
+
+
+def keys_in_text(text):
+    return set(_KEY_RE.findall(text))
+
+
+def count_strings_text(text):
+    return len(_KEY_RE.findall(text))
+
+
+def source_keys(source_file):
+    """(server_keys, all_keys): server_keys excludes translatable="false"."""
+    with open(source_file, encoding="utf-8") as fh:
+        text = fh.read()
+    all_keys = keys_in_text(text)
+    non_translatable = set()
+    for tag in _STRING_TAG_RE.findall(text):
+        if 'translatable="false"' in tag:
+            m = re.search(r'name="([^"]+)"', tag)
+            if m:
+                non_translatable.add(m.group(1))
+    return all_keys - non_translatable, all_keys
+
+
+def git_show_head(path):
+    r = subprocess.run(["git", "show", f"HEAD:{path}"], capture_output=True, text=True)
+    return r.stdout if r.returncode == 0 else None
+
+
+def is_tracked(path):
+    return subprocess.run(
+        ["git", "ls-files", "--error-unmatch", path], capture_output=True
+    ).returncode == 0
+
+
+# ---------------------------------------------------------------------------
+# push-sources
+# ---------------------------------------------------------------------------
+
+
+def _res_id(project_id, branch, slug):
+    return f"{project_id}:r:{branch}--{slug}"
+
+
+def push_one_source(res_id, source_file, tok):
+    with open(source_file, "rb") as fh:
+        content = base64.b64encode(fh.read()).decode()
+    body = {"data": {
+        "type": "resource_strings_async_uploads",
+        "attributes": {"content": content, "content_encoding": "base64"},
+        "relationships": {"resource": {"data": {"type": "resources", "id": res_id}}},
+    }}
+    job = api_post("/resource_strings_async_uploads", body, tok)
+    job_url = f"{API}/resource_strings_async_uploads/{job['data']['id']}"
+    for attempt in range(120):
+        d = api_get(job_url, tok)
+        attrs = d["data"]["attributes"]
+        st = attrs.get("status")
+        if st == "succeeded":
+            return attrs.get("details", {}), attrs.get("errors", [])
+        if st == "failed":
+            return None, attrs.get("errors", [{"detail": "upload failed"}])
+        _sleep_backoff(attempt)
+    return None, [{"detail": "timed out waiting for upload job"}]
+
+
+def cmd_push_sources(branch):
+    tok = load_token()
+    project_id, _, _, resources = parse_tx_config()
+    print(f"Pushing sources to {branch}-- resources\n")
+    print(f"{'resource':28}{'created':>9}{'updated':>9}{'deleted':>9}{'skipped':>9}")
+    problems = 0
+    for res in resources:
+        src = res.get("source_file")
+        if not src or not os.path.exists(src):
+            continue
+        res_id = _res_id(project_id, branch, res["slug"])
+        try:
+            details, errors = push_one_source(res_id, src, tok)
+        except urllib.error.HTTPError as e:
+            detail = e.read().decode(errors="replace")[:200]
+            print(f"{res['slug']:28}  HTTP {e.code}: {detail}")
+            problems += 1
+            continue
+        if details is None:
+            print(f"{res['slug']:28}  FAILED: {errors}")
+            problems += 1
+            continue
+        print(f"{res['slug']:28}"
+              f"{details.get('strings_created', 0):>9}"
+              f"{details.get('strings_updated', 0):>9}"
+              f"{details.get('strings_deleted', 0):>9}"
+              f"{details.get('strings_skipped', 0):>9}")
+        if errors:
+            problems += 1
+            for err in errors[:10]:
+                print(f"      error: {err}")
+    print()
+    if problems:
+        print(f"FAIL: {problems} resource(s) had upload errors.")
+        sys.exit(1)
+    print("OK: all source files uploaded without errors.")
+
+
+# ---------------------------------------------------------------------------
+# verify-push
+# ---------------------------------------------------------------------------
+
+
+def server_source_keys(res_id, tok):
+    url = f"{API}/resource_strings?filter[resource]={res_id}&limit=1000"
+    out = set()
+    while url:
+        d = api_get(url, tok)
+        for it in d["data"]:
+            out.add(it["attributes"]["key"])
+        url = d.get("links", {}).get("next")
+    return out
+
+
+def cmd_verify_push(branch):
+    tok = load_token()
+    project_id, _, _, resources = parse_tx_config()
+    problems = 0
+    print(f"Verifying source push to {branch}-- resources\n")
+    print(f"{'resource':28}{'local':>7}{'server':>8}{'missing':>9}{'orphan':>8}")
+    for res in resources:
+        src = res.get("source_file")
+        if not src or not os.path.exists(src):
+            continue
+        res_id = _res_id(project_id, branch, res["slug"])
+        local_keys, _ = source_keys(src)
+        try:
+            server = server_source_keys(res_id, tok)
+        except urllib.error.HTTPError as e:
+            print(f"{res['slug']:28}  ERROR fetching server keys: {e}")
+            problems += 1
+            continue
+        missing = local_keys - server
+        orphan = server - local_keys
+        flag = "  <-- MISSING!" if missing else ""
+        print(f"{res['slug']:28}{len(local_keys):>7}{len(server):>8}"
+              f"{len(missing):>9}{len(orphan):>8}{flag}")
+        if missing:
+            problems += 1
+            for k in sorted(missing)[:20]:
+                print(f"      missing: {k}")
+    print()
+    if problems:
+        print(f"FAIL: {problems} resource(s) have keys missing on the server.")
+        sys.exit(1)
+    print("OK: all local source keys are present on the server (no silent failure).")
+
+
+# ---------------------------------------------------------------------------
+# lang-list
+# ---------------------------------------------------------------------------
+
+
+def translated_languages(branch, tok, project_id, source_lang):
+    prefix = f":r:{branch}--"
+    url = f"{API}/resource_language_stats?filter[project]={project_id}"
+    langs = defaultdict(int)
+    while url:
+        d = api_get(url, tok)
+        for it in d["data"]:
+            rid = it["id"]
+            if prefix not in rid:
+                continue
+            lang = rid.split(":")[-1]
+            if lang == source_lang:
+                continue
+            langs[lang] += it["attributes"].get("translated_strings", 0)
+        url = d.get("links", {}).get("next")
+    return sorted(l for l, n in langs.items() if n > 0)
+
+
+def cmd_lang_list(branch):
+    tok = load_token()
+    project_id, source_lang, _, _ = parse_tx_config()
+    print(",".join(translated_languages(branch, tok, project_id, source_lang)))
+
+
+# ---------------------------------------------------------------------------
+# pull
+# ---------------------------------------------------------------------------
+
+
+def download_translation(res_id, tx_code, tok):
+    """Return the translation file bytes (default mode)."""
+    body = {"data": {
+        "type": "resource_translations_async_downloads",
+        "attributes": {"content_encoding": "text", "file_type": "default",
+                       "mode": "default", "pseudo": False},
+        "relationships": {
+            "resource": {"data": {"type": "resources", "id": res_id}},
+            "language": {"data": {"type": "languages", "id": f"l:{tx_code}"}},
+        },
+    }}
+    job = api_post("/resource_translations_async_downloads", body, tok)
+    job_url = f"{API}/resource_translations_async_downloads/{job['data']['id']}"
+    for attempt in range(120):
+        with urllib.request.urlopen(_req(job_url, tok, accept="*/*"), timeout=HTTP_TIMEOUT) as r:
+            ctype = r.headers.get("Content-Type", "")
+            data = r.read()
+        if "json" in ctype:  # still processing / status object
+            attrs = json.loads(data)["data"]["attributes"]
+            if attrs.get("status") == "failed":
+                raise RuntimeError(f"download failed: {attrs.get('errors')}")
+            _sleep_backoff(attempt)
+            continue
+        return data  # redirect followed -> file bytes
+    raise TimeoutError("timed out waiting for download job")
+
+
+def cmd_pull(branch, langs_csv, workers):
+    tok = load_token()
+    project_id, source_lang, lang_map, resources = parse_tx_config()
+    if langs_csv:
+        langs = [x for x in langs_csv.split(",") if x]
+    else:
+        langs = translated_languages(branch, tok, project_id, source_lang)
+    resources = [r for r in resources if r.get("file_filter") and r.get("source_file")]
+    tasks = [(r, lang) for r in resources for lang in langs]
+    print(f"pulling {len(langs)} languages x {len(resources)} resources "
+          f"= {len(tasks)} files (workers={workers})")
+
+    written = skipped_empty = failed = 0
+
+    def work(res, tx_code):
+        res_id = _res_id(project_id, branch, res["slug"])
+        try:
+            content = download_translation(res_id, tx_code, tok).decode("utf-8")
+        except (urllib.error.HTTPError, RuntimeError, TimeoutError) as e:
+            return ("fail", res["slug"], tx_code, str(e))
+        folder = android_folder(tx_code, lang_map)
+        path = res["file_filter"].replace("<lang>", folder)
+        n = count_strings_text(content)
+        if n == 0 and not os.path.exists(path):
+            return ("skip", path, tx_code, None)  # don't create empty stub
+        os.makedirs(os.path.dirname(path), exist_ok=True)
+        with open(path, "w", encoding="utf-8") as fh:
+            fh.write(content)
+        return ("write", path, tx_code, None)
+
+    with ThreadPoolExecutor(max_workers=workers) as pool:
+        futs = [pool.submit(work, r, lang) for r, lang in tasks]
+        for fut in as_completed(futs):
+            kind, a, b, err = fut.result()
+            if kind == "write":
+                written += 1
+            elif kind == "skip":
+                skipped_empty += 1
+            else:
+                failed += 1
+                print(f"  FAIL {a} [{b}]: {err}")
+    print(f"done: {written} written, {skipped_empty} empty-skipped, {failed} failed")
+    if failed:
+        sys.exit(1)
+
+
+# ---------------------------------------------------------------------------
+# postpull
+# ---------------------------------------------------------------------------
+
+
+def resource_translation_files(res):
+    ff = res.get("file_filter")
+    if not ff or "<lang>" not in ff:
+        return []
+    return sorted(glob.glob(ff.replace("<lang>", "*")))
+
+
+def _extract_block(text, key):
+    for pat in (
+        rf'[ \t]*<string\s+name="{re.escape(key)}"[^>]*>.*?</string>',
+        rf'[ \t]*<string\s+name="{re.escape(key)}"[^>]*/>',
+        rf'[ \t]*<plurals\s+name="{re.escape(key)}"[^>]*>.*?</plurals>',
+        rf'[ \t]*<string-array\s+name="{re.escape(key)}"[^>]*>.*?</string-array>',
+    ):
+        m = re.search(pat, text, re.DOTALL)
+        if m:
+            return m.group(0)
+    return None
+
+
+def _translation_patterns(resources):
+    pats = []
+    for res in resources:
+        ff = res.get("file_filter")
+        if ff and "<lang>" in ff:
+            # re.escape (Py 3.7+) leaves <lang> untouched, so replace the plain
+            # token — NOT the pre-3.7 "\<lang\>" form, which never matches here.
+            pats.append((re.compile(re.escape(ff).replace("<lang>", r"[^/]+") + "$"),
+                         res["slug"]))
+    return pats
+
+
+def cmd_postpull():
+    project_id, _, _, resources = parse_tx_config()
+    src_all = {}
+    kmp_dirs = set()
+    for res in resources:
+        src = res.get("source_file")
+        if src and os.path.exists(src):
+            _, all_keys = source_keys(src)
+            src_all[res["slug"]] = all_keys
+            if "composeResources" in src:
+                kmp_dirs.add(os.path.dirname(os.path.dirname(src)))
+
+    report = {"unescaped": 0, "unescaped_files": 0, "empty_removed": 0,
+              "ws_reverted": 0, "restored": 0, "restored_files": 0}
+    live_dropped = defaultdict(list)
+
+    # 1-3. per translation file cleanup / restore
+    for res in resources:
+        slug = res["slug"]
+        if slug not in src_all:
+            continue
+        skeys = src_all[slug]
+        for f in resource_translation_files(res):
+            cur = ""
+            if os.path.exists(f):
+                with open(f, encoding="utf-8") as fh:
+                    cur = fh.read()
+            cur_n = count_strings_text(cur)
+            tracked = is_tracked(f)
+
+            if not tracked:
+                if cur_n == 0 and os.path.exists(f):  # new empty stub -> delete
+                    os.remove(f)
+                    try:
+                        os.rmdir(os.path.dirname(f))
+                    except OSError:
+                        pass
+                    report["empty_removed"] += 1
+                continue
+
+            head = git_show_head(f)
+            if head is None:
+                continue
+            head_n = count_strings_text(head)
+
+            if head_n == 0 and cur_n == 0:  # empty<->empty: drop whitespace churn
+                if subprocess.run(["git", "diff", "--quiet", "HEAD", "--", f]).returncode:
+                    subprocess.run(["git", "checkout", "HEAD", "--", f])
+                    report["ws_reverted"] += 1
+                continue
+
+            dropped_live = sorted((keys_in_text(head) & skeys) - keys_in_text(cur))
+            if dropped_live:
+                blocks, block_keys = [], []
+                for k in dropped_live:
+                    b = _extract_block(head, k)
+                    if b:
+                        blocks.append(b.rstrip("\n"))
+                        block_keys.append(k)
+                # Only record as "restored" once the blocks are actually written
+                # back — a file with no </resources> can't be patched.
+                if blocks:
+                    m = re.search(r"\n?[ \t]*</resources>\s*$", cur)
+                    if m:
+                        cur = cur[: m.start()] + "\n" + "\n".join(blocks) + "\n" + cur[m.start():]
+                        with open(f, "w", encoding="utf-8") as fh:
+                            fh.write(cur)
+                        live_dropped[slug].extend(block_keys)
+                        report["restored"] += len(blocks)
+                        report["restored_files"] += 1
+
+    # 4. unescape \? -> ? in KMP compose-resource dirs. Do this LAST so any block
+    #    restored from HEAD above (which may still carry \?) is covered too.
+    for d in sorted(kmp_dirs):
+        for root, _, files in os.walk(d):
+            for fn in files:
+                if not fn.endswith(".xml"):
+                    continue
+                p = os.path.join(root, fn)
+                with open(p, encoding="utf-8") as fh:
+                    txt = fh.read()
+                if "\\?" in txt:
+                    report["unescaped"] += txt.count("\\?")
+                    report["unescaped_files"] += 1
+                    with open(p, "w", encoding="utf-8") as fh:
+                        fh.write(txt.replace("\\?", "?"))
+
+    # 5. validate
+    pats = _translation_patterns(resources)
+    tracked = subprocess.run(["git", "diff", "--name-only"], capture_output=True, text=True).stdout.split()
+    new = subprocess.run(["git", "ls-files", "--others", "--exclude-standard"],
+                         capture_output=True, text=True).stdout.split()
+    problems = 0
+    for f in tracked + new:
+        slug = next((s for p, s in pats if p.search(f)), None)
+        if not slug or not os.path.exists(f):
+            continue
+        try:
+            xml.dom.minidom.parse(f)
+        except Exception as e:  # noqa: BLE001
+            print(f"MALFORMED XML: {f}: {e}")
+            problems += 1
+            continue
+        if slug in src_all:
+            with open(f, encoding="utf-8") as fh:
+                extra = keys_in_text(fh.read()) - src_all[slug]
+            if extra:
+                print(f"KEYS NOT IN SOURCE: {f}: {sorted(extra)[:10]}")
+                problems += 1
+
+    print("postpull summary")
+    print(f"  \\?->? unescaped        : {report['unescaped']} occ / {report['unescaped_files']} files")
+    print(f"  empty stub files removed: {report['empty_removed']}")
+    print(f"  whitespace-only reverts : {report['ws_reverted']}")
+    print(f"  live translations kept  : {report['restored']} in {report['restored_files']} files")
+    if live_dropped:
+        print("  NOTE: the server was missing these in-source translations "
+              "(restored from HEAD; consider a translation backfill push):")
+        for slug, ks in sorted(live_dropped.items()):
+            uniq = sorted(set(ks))
+            print(f"    {slug}: {len(ks)} entries, keys={uniq[:8]}")
+    if problems:
+        print(f"\nVALIDATION FAILED: {problems} problem(s).")
+        sys.exit(1)
+    print("  validation              : OK (well-formed, keys subset of source)")
+
+
+# ---------------------------------------------------------------------------
+# push-translations (backfill: fill server gaps from the repo, never overwrite)
+# ---------------------------------------------------------------------------
+
+
+def _folder_from_path(file_filter, path):
+    """Recover the values-<qualifier> folder token from a translation path."""
+    pat = re.compile(re.escape(file_filter).replace("<lang>", r"([^/]+)") + "$")
+    m = pat.search(path)
+    return m.group(1) if m else None
+
+
+def folder_to_tx(folder, inv_lang_map):
+    """Android values-<folder> suffix -> Transifex language code (inverse of
+    android_folder). Uses the config lang_map first, then the xx-rYY -> xx_YY
+    convention, else the folder verbatim."""
+    if folder in inv_lang_map:
+        return inv_lang_map[folder]
+    m = re.match(r"^([A-Za-z]{2,3})-r([A-Za-z0-9]+)$", folder)
+    if m:
+        return f"{m.group(1)}_{m.group(2)}"
+    return folder
+
+
+def _minimal_translation_xml(repo_text, keys):
+    """Build a standalone Android <resources> file containing only `keys`,
+    lifted verbatim from the repo translation file. Returns None if none of the
+    keys yield a block."""
+    blocks = []
+    for k in keys:
+        b = _extract_block(repo_text, k)
+        if b:
+            blocks.append(b.rstrip("\n"))
+    if not blocks:
+        return None
+    return "<resources>\n" + "\n".join(blocks) + "\n</resources>\n"
+
+
+def upload_translations(res_id, tx_code, content, tok):
+    """Upload a translation file for one (resource, language) via the async API,
+    waiting for the job. Returns (details, errors)."""
+    b64 = base64.b64encode(content.encode("utf-8")).decode()
+    body = {"data": {
+        "type": "resource_translations_async_uploads",
+        "attributes": {"content": b64, "content_encoding": "base64",
+                       "file_type": "default"},
+        "relationships": {
+            "resource": {"data": {"type": "resources", "id": res_id}},
+            "language": {"data": {"type": "languages", "id": f"l:{tx_code}"}},
+        },
+    }}
+    job = api_post("/resource_translations_async_uploads", body, tok)
+    job_url = f"{API}/resource_translations_async_uploads/{job['data']['id']}"
+    for attempt in range(120):
+        d = api_get(job_url, tok)
+        attrs = d["data"]["attributes"]
+        st = attrs.get("status")
+        if st == "succeeded":
+            return attrs.get("details", {}), attrs.get("errors", [])
+        if st == "failed":
+            return None, attrs.get("errors", [{"detail": "upload failed"}])
+        _sleep_backoff(attempt)
+    return None, [{"detail": "timed out waiting for upload job"}]
+
+
+def cmd_push_translations(branch, apply, workers):
+    tok = load_token()
+    project_id, source_lang, lang_map, resources = parse_tx_config()
+    inv_lang_map = {v: k for k, v in lang_map.items()}
+    resources = [r for r in resources
+                 if r.get("file_filter") and r.get("source_file")
+                 and os.path.exists(r["source_file"])]
+    skeys = {r["slug"]: source_keys(r["source_file"])[0] for r in resources}
+    pairs = [(r, p) for r in resources for p in resource_translation_files(r)]
+    print(f"scanning {len(pairs)} repo translation files for gaps on {branch}-- "
+          f"(workers={workers})\n")
+
+    plan, skipped = [], []
+
+    def detect(res, path):
+        folder = _folder_from_path(res["file_filter"], path)
+        if not folder:
+            return None
+        tx_code = folder_to_tx(folder, inv_lang_map)
+        if tx_code == source_lang:
+            return None
+        with open(path, encoding="utf-8") as fh:
+            repo_text = fh.read()
+        repo_source_keys = keys_in_text(repo_text) & skeys[res["slug"]]
+        if not repo_source_keys:
+            return None
+        res_id = _res_id(project_id, branch, res["slug"])
+        try:
+            server_text = download_translation(res_id, tx_code, tok).decode("utf-8")
+        except (urllib.error.HTTPError, RuntimeError, TimeoutError) as e:
+            # Do NOT assume the server is empty — that would risk overwriting
+            # real translations. Skip and report instead.
+            return ("skip", res["slug"], tx_code, path, str(e))
+        missing = sorted(repo_source_keys - keys_in_text(server_text))
+        if not missing:
+            return None
+        return ("gap", res["slug"], tx_code, path, missing, repo_text)
+
+    with ThreadPoolExecutor(max_workers=workers) as pool:
+        futs = [pool.submit(detect, r, p) for r, p in pairs]
+        res_by_slug = {r["slug"]: r for r in resources}
+        for fut in as_completed(futs):
+            got = fut.result()
+            if not got:
+                continue
+            if got[0] == "skip":
+                skipped.append(got[1:])
+            else:
+                _, slug, tx_code, path, missing, repo_text = got
+                plan.append((res_by_slug[slug], tx_code, path, missing, repo_text))
+
+    total = sum(len(m) for _, _, _, m, _ in plan)
+    print(f"{'resource':28}{'lang':10}{'gap-keys':>9}")
+    for res, tx_code, _, missing, _ in sorted(plan, key=lambda x: (x[0]['slug'], x[1])):
+        print(f"{res['slug']:28}{tx_code:10}{len(missing):>9}")
+    print(f"\n{total} translation(s) missing on the server across "
+          f"{len(plan)} (resource, language) pair(s).")
+    if skipped:
+        print(f"{len(skipped)} pair(s) skipped (download error — not touched):")
+        for slug, tx_code, _, err in skipped[:20]:
+            print(f"    {slug} [{tx_code}]: {err}")
+
+    if not apply:
+        print("\nDRY RUN — nothing uploaded. Re-run with --apply to backfill.")
+        return
+    if not plan:
+        print("\nNothing to upload.")
+        return
+
+    print("\nuploading gap translations ...")
+    uploaded = failed = 0
+    for res, tx_code, path, missing, repo_text in plan:
+        content = _minimal_translation_xml(repo_text, missing)
+        if not content:
+            continue
+        res_id = _res_id(project_id, branch, res["slug"])
+        try:
+            details, errors = upload_translations(res_id, tx_code, content, tok)
+        except urllib.error.HTTPError as e:
+            print(f"  FAIL {res['slug']} [{tx_code}]: HTTP {e.code}")
+            failed += 1
+            continue
+        if details is None or errors:
+            print(f"  FAIL {res['slug']} [{tx_code}]: {errors}")
+            failed += 1
+            continue
+        created = details.get("translations_created", 0)
+        print(f"  {res['slug']:28}{tx_code:10} created={created}")
+        uploaded += 1
+    print(f"\ndone: {uploaded} pair(s) backfilled, {failed} failed.")
+    if failed:
+        sys.exit(1)
+
+
+# ---------------------------------------------------------------------------
+# main
+# ---------------------------------------------------------------------------
+
+
+def main():
+    ap = argparse.ArgumentParser(description=__doc__,
+                                 formatter_class=argparse.RawDescriptionHelpFormatter)
+    sub = ap.add_subparsers(dest="cmd", required=True)
+    for name in ("push-sources", "verify-push", "lang-list"):
+        sp = sub.add_parser(name)
+        sp.add_argument("--branch", required=True)
+    pp = sub.add_parser("pull")
+    pp.add_argument("--branch", required=True)
+    pp.add_argument("--langs", default="")
+    pp.add_argument("--workers", type=int, default=8)
+    sub.add_parser("postpull")
+    ptr = sub.add_parser("push-translations")
+    ptr.add_argument("--branch", required=True)
+    ptr.add_argument("--apply", action="store_true",
+                     help="actually upload; without it, dry-run only")
+    ptr.add_argument("--workers", type=int, default=8)
+    args = ap.parse_args()
+
+    if args.cmd == "push-sources":
+        cmd_push_sources(args.branch)
+    elif args.cmd == "verify-push":
+        cmd_verify_push(args.branch)
+    elif args.cmd == "lang-list":
+        cmd_lang_list(args.branch)
+    elif args.cmd == "pull":
+        cmd_pull(args.branch, args.langs, args.workers)
+    elif args.cmd == "postpull":
+        cmd_postpull()
+    elif args.cmd == "push-translations":
+        cmd_push_translations(args.branch, args.apply, args.workers)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/.github/workflows/fix-kmp-translations.yml b/.github/workflows/fix-kmp-translations.yml
index 56d67418046..cb643ed0ecb 100644
--- a/.github/workflows/fix-kmp-translations.yml
+++ b/.github/workflows/fix-kmp-translations.yml
@@ -2,11 +2,11 @@ name: Fix KMP Translations
 
 on:
   pull_request:
-    types: [opened, synchronize]
+    types: [opened, synchronize, reopened]
 
 jobs:
   fix-kmp-translations:
-    if: startsWith(github.head_ref, 'develop-transifex-')
+    if: startsWith(github.head_ref, 'develop-transifex-') || startsWith(github.head_ref, 'main-transifex-')
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -15,6 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
+          token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
           ref: ${{ github.head_ref }}
           fetch-depth: 0
 
@@ -41,15 +42,14 @@ jobs:
             echo "has_changes=true" >> "$GITHUB_OUTPUT"
           fi
 
+      # Uses the GH API to create the signed commit — the repo ruleset requires verified signatures.
       - name: Commit and push fix
         if: steps.check.outputs.has_changes == 'true'
-        run: |
-          if ! git diff --cached --quiet; then
-            git config user.name "github-actions[bot]"
-            git config user.email "github-actions[bot]@users.noreply.github.com"
-            git commit -m "fix(translations): remove KMP-incompatible escaped question marks [skip ci]"
-            git push
-          fi
+        uses: flex-development/gh-commit@177be4b5bca1b102400ca7220932d9ff7980fddb
+        with:
+          message: 'fix(translations): remove KMP-incompatible escaped question marks [skip ci]'
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
 
       - name: Close PR — no meaningful changes remain
         if: steps.check.outputs.has_changes == 'false'
diff --git a/.github/workflows/release-finish.yml b/.github/workflows/release-finish.yml
index 0c08ecf7201..6c5683b55cd 100644
--- a/.github/workflows/release-finish.yml
+++ b/.github/workflows/release-finish.yml
@@ -49,6 +49,10 @@ jobs:
     - name: Run Python script to update release branch version
       run: python scripts/updateVersionCode.py
 
+      # ${RELEASE_BRANCH_NAME#release/} removes the "release/" from the release branch name.
+    - name: Run Python script to update release name
+      run: python scripts/updateVersionName.py ${RELEASE_BRANCH_NAME#release/}
+
       # Uses the GH API to create the signed commit.
     - name: Commit and Push Changes to auxiliary branch
       uses: flex-development/gh-commit@177be4b5bca1b102400ca7220932d9ff7980fddb
diff --git a/RELEASE.md b/RELEASE.md
index 8d34896494e..bca78a97336 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,101 +1,16 @@
-# Release notes - Android App for DHIS2 - 3.4.1
+# Release notes - Android App for DHIS2 - 3.4.2
 
 ### Bug
 
-[ANDROAPP-6516](https://dhis2.atlassian.net/browse/ANDROAPP-6516) Values in events and program stages not being updated when syncing with server from them
+[ANDROAPP-7682](https://dhis2.atlassian.net/browse/ANDROAPP-7682) Sync button doesn't always appear
+in enrollments list
 
-[ANDROAPP-6611](https://dhis2.atlassian.net/browse/ANDROAPP-6611) Synchronization does not automatically start on re-connection
+[ANDROAPP-7706](https://dhis2.atlassian.net/browse/ANDROAPP-7706) Tei list items display wrong
+attributes
 
-[ANDROAPP-7238](https://dhis2.atlassian.net/browse/ANDROAPP-7238) Analytics configured with data type int in web show 1 decimal in app
+[ANDROAPP-7708](https://dhis2.atlassian.net/browse/ANDROAPP-7708) NullPointerException: Attempt to
+invoke virtual method 'java.lang.Class java.lang.Object.getClass\(\)'... \(ProgramFragment\)
 
-[ANDROAPP-7287](https://dhis2.atlassian.net/browse/ANDROAPP-7287) Flicker when no teis in tei list
-
-[ANDROAPP-7352](https://dhis2.atlassian.net/browse/ANDROAPP-7352) Delete TEI/Delete Enrollment is not showing in the menu with the ALL authority
-
-[ANDROAPP-7364](https://dhis2.atlassian.net/browse/ANDROAPP-7364) Server URL not well formed error
-
-[ANDROAPP-7398](https://dhis2.atlassian.net/browse/ANDROAPP-7398) Wrong Snackbar color
-
-[ANDROAPP-7406](https://dhis2.atlassian.net/browse/ANDROAPP-7406) Cards are not always displayed in map view
-
-[ANDROAPP-7412](https://dhis2.atlassian.net/browse/ANDROAPP-7412) Offline Biometric Login is not accessible
-
-[ANDROAPP-7431](https://dhis2.atlassian.net/browse/ANDROAPP-7431) username does not trim trailing white spaces
-
-[ANDROAPP-7439](https://dhis2.atlassian.net/browse/ANDROAPP-7439) Custom label \(at least enrollment\) is not displayed when editing a TE
-
-[ANDROAPP-7446](https://dhis2.atlassian.net/browse/ANDROAPP-7446) Incorrect flow to create TEI: Display front page list and Allow user to create a TEI without searching
-
-[ANDROAPP-7458](https://dhis2.atlassian.net/browse/ANDROAPP-7458) Cannot select lower options in large option sets with checkbox or radio button configuration
-
-[ANDROAPP-7499](https://dhis2.atlassian.net/browse/ANDROAPP-7499) New Network Status Provider does not handle VPNs and local connections
-
-[ANDROAPP-7520](https://dhis2.atlassian.net/browse/ANDROAPP-7520) SSO: Logout does not end IdP session
-
-[ANDROAPP-7523](https://dhis2.atlassian.net/browse/ANDROAPP-7523) Cursor moves to the end when updating value
-
-[ANDROAPP-7527](https://dhis2.atlassian.net/browse/ANDROAPP-7527) NullPointerException: The callable returned a null value
-
-[ANDROAPP-7528](https://dhis2.atlassian.net/browse/ANDROAPP-7528) ApplicationNotResponding: ANR
-
-[ANDROAPP-7531](https://dhis2.atlassian.net/browse/ANDROAPP-7531) Program rule: not triggered unless selection is made in option set
-
-[ANDROAPP-7532](https://dhis2.atlassian.net/browse/ANDROAPP-7532) \[ANR\] In TeiDashboard with displayAnalytics\(\)
-
-[ANDROAPP-7533](https://dhis2.atlassian.net/browse/ANDROAPP-7533) Working list results fluctuating and loading inconsistently
-
-[ANDROAPP-7541](https://dhis2.atlassian.net/browse/ANDROAPP-7541) AppTheme color not changing text colors
-
-[ANDROAPP-7544](https://dhis2.atlassian.net/browse/ANDROAPP-7544) \[Mobile-UI\] When the DateTime input has focus a small section of the supporting Text background color is shown
-
-[ANDROAPP-7546](https://dhis2.atlassian.net/browse/ANDROAPP-7546) Error when assigning more than one option to multi-select field in the Android capture app
-
-[ANDROAPP-7564](https://dhis2.atlassian.net/browse/ANDROAPP-7564) Description of assigned \(disabled\) data elements are not shown in the android capture
-
-[ANDROAPP-7565](https://dhis2.atlassian.net/browse/ANDROAPP-7565) Crash - toggle between orientation in events
-
-[ANDROAPP-7566](https://dhis2.atlassian.net/browse/ANDROAPP-7566) Numeric value type in search screen does not allow decimals
-
-[ANDROAPP-7567](https://dhis2.atlassian.net/browse/ANDROAPP-7567) Unsupported fields are visible in search screen
-
-[ANDROAPP-7568](https://dhis2.atlassian.net/browse/ANDROAPP-7568) Polygons are not correctly stored in the device
-
-[ANDROAPP-7572](https://dhis2.atlassian.net/browse/ANDROAPP-7572) New events use enrollment OU instead of ownership OU after TEI transfer
-
-[ANDROAPP-7574](https://dhis2.atlassian.net/browse/ANDROAPP-7574) Crash whilst sync \(could not replicate\)
-
-[ANDROAPP-7582](https://dhis2.atlassian.net/browse/ANDROAPP-7582) Unable to close bottomsheet in very long org unit list
-
-[ANDROAPP-7588](https://dhis2.atlassian.net/browse/ANDROAPP-7588) Sync message not consistent when offline
-
-[ANDROAPP-7590](https://dhis2.atlassian.net/browse/ANDROAPP-7590) Sync error due to program rules the assign value of calculated value
-
-[ANDROAPP-7601](https://dhis2.atlassian.net/browse/ANDROAPP-7601) Change orientation: Main content area goes blank/white
-
-[ANDROAPP-7603](https://dhis2.atlassian.net/browse/ANDROAPP-7603) Allow screenshots and screen sharing in Training APK
-
-[ANDROAPP-7613](https://dhis2.atlassian.net/browse/ANDROAPP-7613) IllegalArgumentException: Can't represent a width of 0 and height of 276000 in Constraints
-
-[ANDROAPP-7614](https://dhis2.atlassian.net/browse/ANDROAPP-7614) IllegalStateException: No database is currently activated.
-
-[ANDROAPP-7619](https://dhis2.atlassian.net/browse/ANDROAPP-7619) \[ANR\] Home filters
-
-[ANDROAPP-7632](https://dhis2.atlassian.net/browse/ANDROAPP-7632) Conscrypt crashing for API 37
-
-[ANDROAPP-7635](https://dhis2.atlassian.net/browse/ANDROAPP-7635) Cannot access TEI as it is marked incorrectly as online
-
-[ANDROAPP-7637](https://dhis2.atlassian.net/browse/ANDROAPP-7637) Programs tab appears when analytics is not configured
-
-[ANDROAPP-7646](https://dhis2.atlassian.net/browse/ANDROAPP-7646) Local search results is not returned if remote request fails
-
-[ANDROAPP-7647](https://dhis2.atlassian.net/browse/ANDROAPP-7647) Past results are not cleared when a new search is made
-
-[ANDROAPP-7658](https://dhis2.atlassian.net/browse/ANDROAPP-7658) Program Rule Errors do not prevent syncing of data
-
-[ANDROAPP-7661](https://dhis2.atlassian.net/browse/ANDROAPP-7661) Race condition to sync images using granular sync
-
-[ANDROAPP-7668](https://dhis2.atlassian.net/browse/ANDROAPP-7668) Images/files \(FileResource\) sometimes not downloaded during granular sync — subsequent edit uploads an empty image Data Element overwriting the image in server
-
-[ANDROAPP-7674](https://dhis2.atlassian.net/browse/ANDROAPP-7674) Crash opening map in tablet from teidashboard
-
-[ANDROAPP-7694](https://dhis2.atlassian.net/browse/ANDROAPP-7694) App crash on logout and \(occasionally\) delete account
\ No newline at end of file
+[ANDROAPP-7711](https://dhis2.atlassian.net/browse/ANDROAPP-7711) NullPointerException: Attempt to
+invoke virtual method 'android.content.res.Resources android.view.View.getResources\(\)' on a null
+object reference
\ No newline at end of file
diff --git a/aggregates/build.gradle.kts b/aggregates/build.gradle.kts
index 6243cf76e34..1dc8646f8bb 100644
--- a/aggregates/build.gradle.kts
+++ b/aggregates/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary {
+    android {
         namespace = "org.dhis2.mobile.aggregates"
         compileSdk = libs.versions.sdk.get().toInt()
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/aggregates/src/commonMain/composeResources/values-es/strings.xml b/aggregates/src/commonMain/composeResources/values-es/strings.xml
index 3f4f8932e27..ffbbe42bc21 100644
--- a/aggregates/src/commonMain/composeResources/values-es/strings.xml
+++ b/aggregates/src/commonMain/composeResources/values-es/strings.xml
@@ -26,7 +26,7 @@
     <string name="ok">Aceptar</string>
     <string name="dataset_saved_completed">¡Guardado y completado!</string>
     <string name="error_on_complete_dataset">Ha ocurrido un error al completar el conjunto de datos</string>
-    <string name="run_validation_rules">¿Quieree validar la calidad de los datos?</string>
+    <string name="run_validation_rules">¿Quiere validar la calidad de los datos?</string>
     <string name="no">No</string>
     <string name="yes">Sí</string>
     <string name="error">Error</string>
diff --git a/app/src/main/java/org/dhis2/usescases/main/MainActivity.kt b/app/src/main/java/org/dhis2/usescases/main/MainActivity.kt
index 988e45bba5c..6ae07907dc9 100644
--- a/app/src/main/java/org/dhis2/usescases/main/MainActivity.kt
+++ b/app/src/main/java/org/dhis2/usescases/main/MainActivity.kt
@@ -304,10 +304,9 @@ class MainActivity : ActivityGlobalAbstract() {
                     }
                 },
             ).onNoConnectionListener {
-                val contextView = findViewById<View>(R.id.navigationBar)
                 Snackbar
                     .make(
-                        contextView,
+                        binding.root,
                         R.string.sync_offline_check_connection,
                         Snackbar.LENGTH_SHORT,
                     ).show()
diff --git a/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt b/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt
index 6340a06b260..80fd6df804a 100644
--- a/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt
+++ b/app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt
@@ -161,10 +161,9 @@ class ProgramFragment :
                     }
                 },
             ).onNoConnectionListener {
-                val contextView = activity?.findViewById<View>(R.id.navigationBar)
                 Snackbar
                     .make(
-                        contextView!!,
+                        requireView(),
                         R.string.sync_offline_check_connection,
                         Snackbar.LENGTH_SHORT,
                     ).show()
diff --git a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
index c5d520c6d0b..a1afd1d3d9a 100644
--- a/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
+++ b/app/src/main/java/org/dhis2/usescases/searchTrackEntity/ui/mapper/TEICardMapper.kt
@@ -126,7 +126,7 @@ class TEICardMapper(
 
     private fun getAdditionalInfoList(searchTEIModel: SearchTeiModel): List<AdditionalInfoItem> {
         val attributeList =
-            searchTEIModel.tei.attributeValues
+            searchTEIModel.attributeValues.values
                 .map {
                     AdditionalInfoItem(
                         key = it.displayName,
@@ -275,7 +275,7 @@ class TEICardMapper(
     ) {
         val programNames = enrolledPrograms?.map { it.displayName }
 
-        programNames?.let {
+        programNames?.takeIf { it.size > 1 }?.let {
             list.add(
                 AdditionalInfoItem(
                     key = resourceManager.getString(R.string.programs),
@@ -321,7 +321,7 @@ class TEICardMapper(
         onSyncIconClick: () -> Unit,
     ) {
         val buttonText =
-            when (searchTEIModel.tei.syncState) {
+            when (searchTEIModel.tei.aggregatedSyncState) {
                 SyncState.TO_POST,
                 SyncState.TO_UPDATE,
                     -> {
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
new file mode 100644
index 00000000000..471a48737f8
--- /dev/null
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -0,0 +1,6 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="action_accept">قبول</string>
+    <string name="cancel">إلغاء</string>
+    <string name="wipe_data_ok">قبول</string>
+    <string name="wipe_data_no">إلغاء</string>
+    </resources>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index efa22a4b97d..a3b121d3135 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -105,8 +105,6 @@
     <string name="every_12_hours">12 ساعة</string>
     <string name="Manual">يدوياً</string>
     <string name="a_week">1 أسبوع</string>
-    <string name="sync_max_parameters">عوامل المزامنة الحالية:</string>
-    <string name="sync_default_parameters">إعادة التعيين إلى الافتراضي</string>
     <string name="wipe_data_meesage">سيتم حذف قاعدة البيانات. سيُطلب منك تسجيل الدخول مرة أخرى.</string>
     <string name="wipe_data_ok">قبول</string>
     <string name="wipe_data_no">إلغاء</string>
@@ -151,16 +149,7 @@
     <string name="write_new_note">كتابة ملاحظة جديدة</string>
     <string name="clear">تصفية</string>
     <string name="add_note">أضف ملاحظة</string>
-    <string name="revert">العودة</string>
-    <string name="activated">نشط</string>
-    <string name="missing_mandatory_fields_title">بعض الحقول الإلزامية مفقودة</string>
-    <string name="missing_mandatory_fields_text">بعض الحقول الإلزامية مفقودة. إذا كنت تريد الرجوع الآن ، فسيتم حذف جميع المعلومات المحفوظة.</string>
-    <string name="missing_mandatory_fields_text_not_delete">بعض الحقول الإلزامية مفقودة. إذا كنت تريد العودة ، يرجى ملؤها.</string>
-    <string name="missing_mandatory_fields_events">بعض الحقول تحتاج إلى انتباهك.\nهل تريد مراجعة النموذج؟</string>
     <string name="title_delete_go_back">لم يتم حفظ بياناتك</string>
-    <string name="delete_go_back">إذا رجعت الآن سيتم حذف جميع المعلومات التي تم إدخالها.</string>
-    <string name="missing_mandatory_fields_go_back">الحذف والرجوع للخلف</string>
-    <string name="missing_mandatory_fields_finish">بعض الحقول الإلزامية مفقودة. يمكنك إنهاء إدخال البيانات والخروج، لكن لا يمكن تعيين الحدث كمكتمل.</string>
     <string name="tei_coordinates">إحداثيات لـ </string>
 
     <!--EVENT SUMMARY-->
@@ -202,8 +191,6 @@
     <string name="programs_to_enroll">برامج للتسجيل</string>
     <string name="share">مشاركة</string>
     <string name="share_qr">مشاركة رمز الـ QR</string>
-    <string name="max">الأعلى</string>
-    <string name="current">الحالي</string>
     <string name="tei">TEI</string>
     <string name="teis">TEIs</string>
     <string name="wipe_data">إعادة تعيين بيانات التطبيق و التكوين</string>
@@ -260,19 +247,6 @@
     <string name="delete_local_data_message">سيتم فقدان البيانات التي لم يتم مزامنتها. هل تريد حقاً المتابعة؟</string>
     <string name="delete_local_data_error">تعذر حذف البيانات. يرجى اعادة المحاولة.</string>
     <string name="delete_local_data_done">انتهاء عملية حذف البيانات المحلية بنجاح.</string>
-    <string name="org_unit_selection_warning">يجب تحديد وحدة تنظيمية واحدة على الأقل</string>
-    <string name="send_user_name_title">إرسال البيانات</string>
-    <string name="send_user_name_mesage">ساعد DHIS2 في تحسين هذا التطبيق من خلال مشاركة سجلات الأخطاء المرتبطة بمعرف المستخدم الخاص بك.</string>
-    <string name="improve_app_msg_title">هل تريد مساعدتنا في تحسين هذا التطبيق؟</string>
-    <string name="improve_app_msg_clickable_word">سياسة الخصوصية</string>
-    <string name="check_mandatory_field">تحقق من الحقول</string>
-    <string name="error_no_network_during_sync">فقدان الإتصال بالإنترنت أثناء عملية مزامنة التكوين. يرجى معاودة المحاولة في وقت لاحق</string>
-    <string name="action_agree">قبول</string>
-    <string name="action_continue">متابعة</string>
-    <string name="login_server_info_title">رابط الخادم</string>
-    <string name="forgot_your_code">نسيت الرمز الخاص بك؟</string>
-    <string name="event_form_end_options_title">ما الذي تريد فعله لهذا الحدث؟</string>
-    <string name="sectionSelectorEnd">إنهاء</string>
     <string name="resource_not_found">لم يتم العثور على %s</string>
     <string name="relationship_not_found_message">السجل الذي تحاول الوصول إليه غير متوفر. هل تود البحث عنه؟</string>
     <string name="sync_by_sms">تم التزامن عبر sms</string>
@@ -350,9 +324,6 @@
     <string name="filter_event_status_visited">تم زيارته</string>
     <string name="filter_event_status_completed">المكتملة</string>
     <string name="filter_event_status_skipped">التي تم تخطيها</string>
-    <string name="event_tei_limits">الأحداث:%s حد أعلى:%s%s حالي:%s TEI:%s حد أعلى:%s%s حالي:%s</string>
-    <string name="enrollment_data_hide">إخفاء بيانات التسجيل</string>
-    <string name="enrollment_data_show">إظهار بيانات التسجيل</string>
     <string name="sms_enabled">وحدة الرسائل القصيرة مفعلة</string>
     <string name="sms_disabled">وحدة الرسائل القصيرة غير مفعلة</string>
     <string name="sms_downloading_data">تحميل البيانات لوحدة الرسائل القصيرة. يرجى الإنتظار</string>
@@ -418,7 +389,6 @@
     <string name="filters_title_date">التاريخ</string>
     <string name="privacy_policy_title">سياسة الخصوصية</string>
     <string name="open_privacy_policy">إنقر هنا للإطلاع على <a href=""> سياسة الخصوصية الخاصة بنا</a></string>
-    <string name="coordinates_error">قيم الإحداثيات غير صالحة</string>
     <string name="field_is_mandatory">هذا الحقل إلزامي</string>
     <string name="security_debugger_message">لأسباب أمنية ، لا يُسمح باستخدام هذه النسخة من التطبيق مع adb. الرجاء استخدام نسخة هذا التطبيق المخصصة للتدريب.</string>
 
@@ -471,7 +441,6 @@
     <string name="filter_period_last_n_biweeks">آخر %dزوج اسابيع</string>
     <string name="section_feedback">التغذية الراجعة</string>
     <string name="section_indicators">المؤشرات</string>
-    <string name="value">القيمة</string>
     <string name="camera_permission_denied">تم رفض إذن الكاميرا.\n تحتاج إلى تمكينها لاستخدام هذه الميزة.</string>
     <string name="section_charts_indicators">الرسوم البيانية والمؤشرات</string>
     <string name="take_photo">التقط صورة</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b444ccbb248..334b37e78fb 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -114,8 +114,6 @@
     <string name="every_12_hours">12h</string>
     <string name="Manual">Ručně</string>
     <string name="a_week">1 týden</string>
-    <string name="sync_max_parameters">Aktuální parametry synchronizace:</string>
-    <string name="sync_default_parameters">Obnovit do základního nastavení</string>
     <string name="wipe_data_meesage">Databáze bude smazána.\nBudete požádán o opětovné přihlášení.</string>
     <string name="wipe_data_ok">Přijmout</string>
     <string name="wipe_data_no">Zrušit</string>
@@ -165,16 +163,7 @@
     <string name="write_new_note">Napište novou poznámku</string>
     <string name="clear">vymazat</string>
     <string name="add_note">Přidat poznámku</string>
-    <string name="revert">Vrátit zpět</string>
-    <string name="activated">Aktivováno</string>
-    <string name="missing_mandatory_fields_title">Chybí povinná pole</string>
-    <string name="missing_mandatory_fields_text">Některá povinná pole chybí. Pokud se chcete vrátit zpět, budou všechny uložené informace odstraněny.</string>
-    <string name="missing_mandatory_fields_text_not_delete">Některá povinná pole chybí. Pokud se chcete vrátit, vyplňte je prosím.</string>
-    <string name="missing_mandatory_fields_events">Některé oblasti vyžadují vaši pozornost.\nChcete formulář zkontrolovat\?</string>
     <string name="title_delete_go_back">Vaše data nejsou uložena</string>
-    <string name="delete_go_back">Pokud se nyní vrátíte zpět, všechny zadané informace budou smazány.</string>
-    <string name="missing_mandatory_fields_go_back">Smazat a vrátit se zpět</string>
-    <string name="missing_mandatory_fields_finish">Některá povinná pole chybí. Zadávání a ukončení dat můžete dokončit, ale událost nelze dokončit.</string>
     <string name="tei_coordinates">Souřadnice pro</string>
 
     <!--EVENT SUMMARY-->
@@ -216,8 +205,6 @@
     <string name="programs_to_enroll">Programy k zápisu</string>
     <string name="share">Sdílet</string>
     <string name="share_qr">Sdílet QR</string>
-    <string name="max">Max</string>
-    <string name="current">stávající</string>
     <string name="tei">TEI</string>
     <string name="teis">TEIs</string>
     <string name="wipe_data">Resetovat data aplikace a konfiguraci</string>
@@ -274,20 +261,6 @@
     <string name="delete_local_data_message">Nesynchronizovaná data budou ztracena. Opravdu chcete pokračovat?</string>
     <string name="delete_local_data_error">Data nelze smazat. Zkuste to prosím znovu.</string>
     <string name="delete_local_data_done">Odstranění místních dat bylo úspěšně dokončeno.</string>
-    <string name="org_unit_selection_warning">Musí být vybrána alespoň jedna organizační jednotka</string>
-    <string name="send_user_name_title">Odeslat data</string>
-    <string name="send_user_name_mesage">Pomozte DHIS2 vylepšit tuto aplikaci sdílením protokolů chyb spojených s vaším ID uživatele.</string>
-    <string name="improve_app_msg_title">Chcete nám pomoci vylepšit tuto aplikaci?</string>
-    <string name="improve_app_msg_clickable_word">Zásady ochrany osobních údajů</string>
-    <string name="check_mandatory_field">Zkontrolujte pole</string>
-    <string name="error_no_network_during_sync">Při synchronizaci konfigurace jste ztratili připojení k internetu. Prosím zkuste to znovu později</string>
-    <string name="action_agree">Souhlasit</string>
-    <string name="action_continue">Pokračovat</string>
-    <string name="login_server_info_title">URL serveru</string>
-    <string name="login_server_info_message">Zadejte url serveru DHIS 2 pro vaši organizaci, kterou vám poskytl správce systému.\n\nPřípadně můžete naskenovat QR kód obsahující URL adresu vašeho serveru.</string>
-    <string name="forgot_your_code">Zapomněli jste kód?</string>
-    <string name="event_form_end_options_title">Co byste chtěli udělat pro tuto akci?</string>
-    <string name="sectionSelectorEnd">KONEC</string>
     <string name="resource_not_found">%s nenalezeno</string>
     <string name="relationship_not_found_message">Záznam, ke kterému se pokoušíte získat přístup, není k dispozici. Chcete jej vyhledat?</string>
     <string name="sync_by_sms">Synchronizováno pomocí SMS</string>
@@ -365,7 +338,6 @@
     <string name="filter_event_status_visited">Navštíveno</string>
     <string name="filter_event_status_completed">Dokončeno</string>
     <string name="filter_event_status_skipped">Přeskočeno</string>
-    <string name="event_tei_limits">Události:%smax:%s%saktuální:%s TEI:%smax:%s%saktuální:%s</string>
     <string name="limit_setting">Omezené nastavení %s</string>
     <string name="sms_enabled">SMS modul povolen</string>
     <string name="sms_disabled">SMS modul deaktivován</string>
@@ -432,7 +404,6 @@
     <string name="filters_title_date">Datum</string>
     <string name="privacy_policy_title">Zásady ochrany osobních údajů</string>
     <string name="open_privacy_policy">Kliknutím sem zobrazíte naše <a href="">zásady ochrany osobních údajů</a></string>
-    <string name="coordinates_error">Hodnoty souřadnic nejsou platné</string>
     <string name="break_glass_error_v2">Do tohoto programu nemůžete zapsat %s z jiných organizačních jednotek, protože je chráněný.\nKontaktujte svého správce.</string>
     <string name="field_is_mandatory">Toto pole je povinné</string>
     <string name="security_debugger_message">Z bezpečnostních důvodů není možné tuto verzi aplikace používat s adb. Použijte tréninkovou verzi.</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 2298920f257..0d1841075c2 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -93,8 +93,6 @@
     <string name="every_12_hours">12h</string>
     <string name="Manual">Manual</string>
     <string name="a_week">Semanal</string>
-    <string name="sync_max_parameters">Ajustes actuales de sincronización:</string>
-    <string name="sync_default_parameters">Volver a los valores por defecto</string>
     <string name="wipe_data_meesage">Se borrará la base de datos. \nTendrá que volver a iniciar sesión.</string>
     <string name="wipe_data_ok">Aceptar</string>
     <string name="wipe_data_no">Cancelar</string>
@@ -136,15 +134,7 @@
     <string name="write_new_note">Escribir nota nueva</string>
     <string name="clear">Limpiar</string>
     <string name="add_note">Añadir nota</string>
-    <string name="revert">Deshacer</string>
-    <string name="activated">Activado</string>
-    <string name="missing_mandatory_fields_title">Los campos obligatorios no pueden estar vacios</string>
-    <string name="missing_mandatory_fields_text">Algunos campos obligatorios están vacíos. Si desea ir atrás ahora, toda la información guardada se borrará.</string>
-    <string name="missing_mandatory_fields_text_not_delete">Faltan campos obligatorios. Rellénelos para ir atrás. </string>
     <string name="title_delete_go_back">Los datos no se han guardado</string>
-    <string name="delete_go_back">Si vuelve ahora la información registrada se perderá </string>
-    <string name="missing_mandatory_fields_go_back">Borrar y salir.</string>
-    <string name="missing_mandatory_fields_finish">Algunos campos obligatorios están vacíos. Puede terminar la entrada de datos y salir, pero el evento no podrá ser completado.</string>
     <string name="tei_coordinates">Coordenadas para</string>
 
     <!--EVENT SUMMARY-->
@@ -186,8 +176,6 @@
     <string name="programs_to_enroll">Programas disponibles para admisión</string>
     <string name="share">Compartir</string>
     <string name="share_qr">Compartir QR</string>
-    <string name="max">Máx</string>
-    <string name="current">En uso</string>
     <string name="tei">TEI</string>
     <string name="teis">TEIs</string>
     <string name="wipe_data">Reiniciar app</string>
@@ -320,9 +308,6 @@
     <string name="filter_event_status_visited">Visitado</string>
     <string name="filter_event_status_completed">Completado</string>
     <string name="filter_event_status_skipped">Omitido</string>
-    <string name="event_tei_limits">Eventos:%smax:%s%sactual:%sEntidades:%smax:%s%sactual:%s</string>
-    <string name="enrollment_data_hide">Ocultar datos de registro</string>
-    <string name="enrollment_data_show">Mostrar datos de registro</string>
     <string name="sms_enabled">Módulo de SMS activado</string>
     <string name="sms_disabled">Módulo de SMS desactivado</string>
     <string name="sms_downloading_data">Descargando datos para el módulo de SMS. Por favor espere.</string>
@@ -388,7 +373,6 @@
     <string name="filters_title_date">Fecha</string>
     <string name="privacy_policy_title">Política de privacidad</string>
     <string name="open_privacy_policy">Pulse aquí para comprobar nuestra <a href="">política de privacidad</a></string>
-    <string name="coordinates_error">El valor de las coordenadas no es válido</string>
     <string name="break_glass_error_v2">No puede registrar un/una %s desde otras unidades organizativas en este programa por que está protegido.\nContacte con su administrador.</string>
     <string name="field_is_mandatory">El campo es obligatorio</string>
     <string name="security_debugger_message">Por razones de seguridad, esta versión de la app no permite el uso de adb. Por favor use la versión de formación.</string>
@@ -441,7 +425,6 @@
     <string name="filter_period_last_n_biweeks">Últimas %d quincenas</string>
     <string name="section_feedback">Retroalimentación</string>
     <string name="section_indicators">Indicadores</string>
-    <string name="value">Valor</string>
     <string name="camera_permission_denied">El permiso de la cámara está denegado.\nDebe habilitarlo para usar esta función.</string>
     <string name="section_charts_indicators">Gráficos e indicadores</string>
     <string name="take_photo">Tomar foto</string>
@@ -483,8 +466,8 @@
     <string name="action_ok">De acuerdo</string>
     <string name="init_search">Empieza una búsqueda para encontrar %s</string>
     <string name="search_or_create">Puedes buscar o crear un nuevo %s</string>
+    <string name="missing_warning_fields_events">Tienes algunos mensajes de alerta.\n¿Desea marcar el formulario como Completo\?</string>
     <string name="event_can_be_completed">¿Desea marcar este formulario como completo?</string>
-    <string name="changes_will_be_discarted">Si sales los cambios serán descartados.</string>
     <string name="event_error_on_complete">Tiene algunos mensajes de error. \n¿Desea revisarlos?</string>
     <string name="re_opened">Reabrir</string>
     <string name="account_disable_title">Cuenta deshabilitada</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 73b5115e7af..66b21212141 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -110,8 +110,6 @@
     <string name="every_12_hours">12h</string>
     <string name="Manual">Manual</string>
     <string name="a_week">Semanal</string>
-    <string name="sync_max_parameters">Ajustes actuales de sincronización:</string>
-    <string name="sync_default_parameters">Volver a los valores por defecto</string>
     <string name="wipe_data_meesage">Se borrará la base de datos. \nTendrá que volver a iniciar sesión.</string>
     <string name="wipe_data_ok">Aceptar</string>
     <string name="wipe_data_no">Cancelar</string>
@@ -160,16 +158,7 @@
     <string name="write_new_note">Escribir nota nueva</string>
     <string name="clear">Limpiar</string>
     <string name="add_note">Añadir nota</string>
-    <string name="revert">Deshacer</string>
-    <string name="activated">Activado</string>
-    <string name="missing_mandatory_fields_title">Los campos obligatorios no pueden estar vacios</string>
-    <string name="missing_mandatory_fields_text">Algunos campos obligatorios están vacíos. Si desea ir atrás ahora, toda la información guardada se borrará.</string>
-    <string name="missing_mandatory_fields_text_not_delete">Faltan campos obligatorios. Rellénelos para ir atrás. </string>
-    <string name="missing_mandatory_fields_events">Algunos campos necesitan tu atención.\n¿Deseas revisar el formulario\?</string>
     <string name="title_delete_go_back">Los datos no se han guardado</string>
-    <string name="delete_go_back">Si vuelve ahora la información registrada se perderá </string>
-    <string name="missing_mandatory_fields_go_back">Borrar y salir.</string>
-    <string name="missing_mandatory_fields_finish">Algunos campos obligatorios están vacíos. Puede terminar la entrada de datos y salir, pero el evento no podrá ser completado.</string>
     <string name="tei_coordinates">Coordenadas para</string>
 
     <!--EVENT SUMMARY-->
@@ -211,8 +200,6 @@
     <string name="programs_to_enroll">Programas disponibles para admisión</string>
     <string name="share">Compartir</string>
     <string name="share_qr">Compartir QR</string>
-    <string name="max">Máx</string>
-    <string name="current">En uso</string>
     <string name="tei">TEI</string>
     <string name="teis">TEIs</string>
     <string name="wipe_data">Reiniciar app</string>
@@ -269,20 +256,6 @@
     <string name="delete_local_data_message">Los datos no sincronizados se perderán. Continuar?</string>
     <string name="delete_local_data_error">Los datos no se pudieron borrar. Inténtelo de nuevo.</string>
     <string name="delete_local_data_done">Los datos locales se borraron correctamente.</string>
-    <string name="org_unit_selection_warning">Debe seleccionar al menos una unidad organizativa.</string>
-    <string name="send_user_name_title">Enviar datos</string>
-    <string name="send_user_name_mesage">Ayude a DHIS2 a mejorar esta app compartiendo errores asociados a su usuario.</string>
-    <string name="improve_app_msg_title">¿Desea ayudarnos a mejorar esta aplicación?</string>
-    <string name="improve_app_msg_clickable_word">política de privacidad</string>
-    <string name="check_mandatory_field">Comprobar campos</string>
-    <string name="error_no_network_during_sync">Se perdió la conexión a internet durante la sincronización. Inténtelo mas tarde.</string>
-    <string name="action_agree">Confirmar</string>
-    <string name="action_continue">Seguir</string>
-    <string name="login_server_info_title">URL de servidor</string>
-    <string name="login_server_info_message">Introduzca la URL del servidor DHIS 2 de su organización proporcionada por su administrador. También puede escanear un código QR con la URL de su servidor. </string>
-    <string name="forgot_your_code">¿Olvido su código?</string>
-    <string name="event_form_end_options_title">¿Que quiere hacer con este evento?</string>
-    <string name="sectionSelectorEnd">FIN</string>
     <string name="resource_not_found">%s no encontrado</string>
     <string name="relationship_not_found_message">Este registro no esta disponible. ¿Quiere buscarlo?</string>
     <string name="sync_by_sms">Sincronizado por SMS</string>
@@ -360,7 +333,6 @@
     <string name="filter_event_status_visited">Visitado</string>
     <string name="filter_event_status_completed">Completado</string>
     <string name="filter_event_status_skipped">Omitido</string>
-    <string name="event_tei_limits">Eventos:%smax:%s%sactual:%sEntidades:%smax:%s%sactual:%s</string>
     <string name="limit_setting">Configuración limitada %s</string>
     <string name="sms_enabled">Módulo de SMS activado</string>
     <string name="sms_disabled">Módulo de SMS desactivado</string>
@@ -427,7 +399,6 @@
     <string name="filters_title_date">Fecha</string>
     <string name="privacy_policy_title">Política de privacidad</string>
     <string name="open_privacy_policy">Pulse aquí para comprobar nuestra <a href="">política de privacidad</a></string>
-    <string name="coordinates_error">El valor de las coordenadas no es válido</string>
     <string name="break_glass_error_v2">No puede registrar un/una %s desde otras unidades organizativas en este programa por que está protegido.\nContacte con su administrador.</string>
     <string name="field_is_mandatory">El campo es obligatorio</string>
     <string name="security_debugger_message">Por razones de seguridad, esta versión de la app no permite el uso de adb. Por favor use la versión de formación.</string>
@@ -606,14 +577,9 @@
     <string name="event">evento</string>
     <string name="timeline">Línea de tiempo</string>
     <string name="database_export_downloaded">Base de datos descargada</string>
-    <string name="importing_database">Importando base de datos</string>
     <string name="show_more">Mostrar más</string>
     <string name="show_less">Mostrar menos</string>
     <string name="sync">Sincronizar</string>
-    <string name="show_fields">Mostrar campos</string>
-    <string name="hide_fields">Ocultar campos</string>
-    <string name="importing_successful">Importado con éxito</string>
-    <string name="section_misconfigured">Esta sección está mal configurada.\nContacta a tu administrador.</string>
     <string name="successful_sync">Sincronizado con éxito</string>
     <string name="syncing_something">Sincronizando %s...</string>
     <string name="file_resources">archivos</string>
@@ -630,7 +596,6 @@
     <string name="complete_enrollment_label">Completar %s</string>
     <string name="deactivate_enrollment_label">Desactivar %s</string>
     <string name="reopen_enrollment_label">Reabrir %s</string>
-
     <plurals name="error_count_label">
         <item quantity="one">%s error</item>
         <item quantity="many">%s errores</item>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
new file mode 100644
index 00000000000..529f85da9f2
--- /dev/null
+++ b/app/src/main/res/values-fi/strings.xml
@@ -0,0 +1,3 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="something_wrong">Jokin meni pieleen</string>
+    </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 29dfbe19889..e795999ffbc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -63,7 +63,7 @@
     <!--Event initial-->
     <string name="update">Mettre à jour</string>
     <string name="org_unit">Unités d´Organisation</string>
-    <string name="no_org_units">Il n\'y a pas d\'unité d\'organisation ouverte pour la date sélectionnée. Merci de sélectionner une autre date ou une autre unité d\'organisation.</string>
+    <string name="no_org_units">Il n\'y a pas d\'Unité d\'organisation Ouvert pour la date sélectionnée. Merci de sélectionner une autre date ou une autre Unité d\'Organisation.</string>
     <string name="latitude">Latitude</string>
     <string name="longitude">Longitude</string>
 
@@ -97,8 +97,6 @@
     <string name="every_12_hours">12h</string>
     <string name="Manual">Manuel</string>
     <string name="a_week">1 Semaine</string>
-    <string name="sync_max_parameters">Paramètres de synchronisation actuels</string>
-    <string name="sync_default_parameters">Retour aux valeurs par défaut</string>
     <string name="wipe_data_meesage">La base de données sera supprimée.\nVous devez donc entrer de nouveau</string>
     <string name="wipe_data_ok">Accepter</string>
     <string name="wipe_data_no">Annuler</string>
@@ -144,15 +142,7 @@
     <string name="write_new_note">écrire une nouvelle note</string>
     <string name="clear">Effacer</string>
     <string name="add_note">Ajouter une note</string>
-    <string name="revert">Annuler</string>
-    <string name="activated">Activé</string>
-    <string name="missing_mandatory_fields_title">Les champs obligatoires sont manquant</string>
-    <string name="missing_mandatory_fields_text">Certains des champs obligatoires sont manquant. Si vous voulez retourner, tout l´information sera supprimer</string>
-    <string name="missing_mandatory_fields_text_not_delete">Certains champs obligatoires sont vides. Si vous voulez retourner, veuillez les renseigner. </string>
     <string name="title_delete_go_back">Vos données n\'ont pas été sauvegardées</string>
-    <string name="delete_go_back">Si vous retournez maintenant, toute information saisie sera supprimée.</string>
-    <string name="missing_mandatory_fields_go_back">Supprimer et retourner</string>
-    <string name="missing_mandatory_fields_finish">Des champs obligatoires ne sont pas renseignés. Vous pouvez terminer la saisie et quitter, mais l\'évènement ne peut être complété.</string>
     <string name="tei_coordinates">Coordonnées pour</string>
 
     <!--EVENT SUMMARY-->
@@ -194,8 +184,6 @@
     <string name="programs_to_enroll">Programmes disponibles pour l´admission</string>
     <string name="share">Partager</string>
     <string name="share_qr">Partager le QR</string>
-    <string name="max">Max</string>
-    <string name="current">Courant</string>
     <string name="tei">TEI</string>
     <string name="teis">TEIs</string>
     <string name="wipe_data">Redémarrer l´application</string>
@@ -251,20 +239,6 @@
     <string name="delete_local_data_message">Les données non synchronisées seront perdues. Voulez-vous vraiment continuer? </string>
     <string name="delete_local_data_error">Les données n\'ont pu être supprimées. Veuillez ressayer. </string>
     <string name="delete_local_data_done">Suppression des données locales terminée avec succès. </string>
-    <string name="org_unit_selection_warning">Au moins une unité d\'organisation doit être sélectionnée</string>
-    <string name="send_user_name_title">Envoyer les données</string>
-    <string name="send_user_name_mesage">Aidez DHIS2 à améliorer cette appli en partageant les registres d\'erreurs associés avec votre identifiant utilisateur. </string>
-    <string name="improve_app_msg_title">Voudriez-vous nous aider à améliorer cette application?</string>
-    <string name="improve_app_msg_clickable_word">Politique de confidentialité</string>
-    <string name="check_mandatory_field">Vérifier les champs</string>
-    <string name="error_no_network_during_sync">Vous avez perdu la connexion lors de la synchronisation de la configuration. Veuillez ressayer plus tard.</string>
-    <string name="action_agree">Accord</string>
-    <string name="action_continue">Continuer</string>
-    <string name="login_server_info_title">URL du serveur</string>
-    <string name="login_server_info_message">Saisissez l\'URL du serveur DHIS 2 de votre organisation tel que fourni par votre administrateur système.\n\nVous pouvez également scanner le code QR avec le lien URL du serveur</string>
-    <string name="forgot_your_code">Oublié le code?</string>
-    <string name="event_form_end_options_title">Que souhaitez-vous faire pour cet évènement?</string>
-    <string name="sectionSelectorEnd">FIN</string>
     <string name="resource_not_found">%s non trouvé</string>
     <string name="relationship_not_found_message">La donnée à laquelle vous essayez d\'accéder n\'est pas disponible. Voulez-vous la rechercher? </string>
     <string name="sync_by_sms">Synchronisé par SMS</string>
@@ -274,9 +248,9 @@
     <string name="sent_by_sms">Envoyé par sms</string>
     <string name="action_close">Fermer</string>
     <string name="tuto_main_11">Maintenant vous pouvez vérifier l\'information de synchronisation en cliquant ici</string>
-    <string name="relationship_error_recursive">Vous ne pouvez pas établir de relation entre une donnée et elle-même</string>
+    <string name="relationship_error_recursive">Vous ne pouvez pas établir de relation une donnée avec elle-même</string>
     <string name="change_calendar_view">Changer de vue calendrier</string>
-    <string name="relationship_without_enrollment">La donnée à laquelle vous essayer d\'accéder n\'a pas d\'enrôlement. Vous ne pouvez pas accéder au tableau de bord.</string>
+    <string name="relationship_without_enrollment">La donnée à laquelle vous essayer d\'acceéer n\'a pas d\'enrôlement. Vous ne pouvez pas accéder au tableau de bord.</string>
     <string name="formatting_error">Erreur de formattage</string>
     <string name="dashboard_menu_delete_tei_v2">Supprimer 1%s</string>
     <string name="delete_authority_error">Vous n\'avez pas l\'autorité pour supprimer cette donnée</string>
@@ -342,9 +316,6 @@
     <string name="filter_event_status_visited">Visité</string>
     <string name="filter_event_status_completed">Terminé</string>
     <string name="filter_event_status_skipped">Sauté</string>
-    <string name="event_tei_limits">Événements: %s max:%s %s courant:%s TEI:%s max:%s%s courant:%s</string>
-    <string name="enrollment_data_hide">Masquer les données d\'inscription</string>
-    <string name="enrollment_data_show">Afficher les données d\'inscription</string>
     <string name="sms_enabled">Le module SMS est activé</string>
     <string name="sms_disabled">Le module SMS est désactivé</string>
     <string name="sms_downloading_data">Téléchargement des données pour le module SMS. S\'il vous plaît, attendez</string>
@@ -410,7 +381,6 @@
     <string name="filters_title_date">Date</string>
     <string name="privacy_policy_title">Politique de confidentialité</string>
     <string name="open_privacy_policy">Cliquez ici pour consulter notre <a href=""> politique de confidentialité </a></string>
-    <string name="coordinates_error">Les valeurs des coordonnées ne sont pas valides</string>
     <string name="field_is_mandatory">Ce champ est obligatoire</string>
     <string name="security_debugger_message">Pour des raisons de sécurité, cette version de l\'application ne peut pas être utilisée avec adb. Veuillez utiliser la version de formation.</string>
 
@@ -464,7 +434,6 @@
     <string name="filter_period_last_n_biweeks">%dDernier bimensuel</string>
     <string name="section_feedback">Réaction</string>
     <string name="section_indicators">Indicateurs</string>
-    <string name="value">Valeur</string>
     <string name="camera_permission_denied">L\'autorisation de la caméra est refusée. \nVous devez l\'activer pour utiliser cette fonctionnalité.</string>
     <string name="section_charts_indicators">Graphiques et indicateurs</string>
     <string name="take_photo">Prendre une photo</string>
@@ -491,7 +460,6 @@
     <string name="search_or_create">Vous pouvez rechercher ou créer un nouveau 1%s</string>
     <string name="missing_warning_fields_completed_events">Vous avez des messages d\'avertissement.</string>
     <string name="event_can_be_completed">Voulez-vous marquer ce formulaire comme complet?</string>
-    <string name="changes_will_be_discarted">Si vous quittez maintenant, les modifications seront ignorées.</string>
     <string name="event_error_on_complete">Vous avez des messages d\'erreur.\nVoulez-vous les consulter ?</string>
     <string name="re_opened">Réouvert</string>
     <string name="account_disable_title">Compte désactivé</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 72145803d40..975e6e191a7 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -20,6 +20,9 @@
     <string name="enter_text">पाठ दर्ज करें</string>
     <string name="enter_long_text">लंबा अक्षर दर्ज करें</string>
     <string name="enter_number">नंबर दर्ज करें</string>
+    <string name="enter_negative_integer">नेगेटिव इंटीजर दर्ज करें</string>
+    <string name="enter_positive_integer_or_zero">पॉजिटिव इंटीजर या शून्य दर्ज करें</string>
+    <string name="enter_positive_integer">पॉजिटिव इंटीजर दर्ज करें</string>
     <string name="choose_date">दिन चुनें</string>
 
     <!-- Status -->
@@ -36,6 +39,8 @@
     <string name="latitude">अक्षांश</string>
     <string name="longitude">देशांतर</string>
 
+    <!--Event Detail-->
+    <string name="due_date">नियत तिथि</string>
     <string name="cancel">रद्द करें</string>
     <string name="delete">हटाएं</string>
     <!--TEI DASHBOARD-->
@@ -50,6 +55,7 @@
     <!-- SEARCH OPTION SET -->
     <string name="search_optionset">सर्च करें / खोजें</string>
     <string name="add_file">फ़ाइल जोड़ें</string>
+    <string name="period">पीरियड</string>
     <!-- RELATIONSHIPS -->
     <string name="next">आगे</string>
     <string name="button_ok">ठीक है</string>
@@ -64,12 +70,14 @@
     <string name="action_close">बंद करें</string>
     <string name="syncing">सिंक हो रहा है…</string>
 
+    <string name="filters_title_period">पीरियड</string>
     <string name="filter_period_today">आज</string>
     <string name="filter_period_yesterday">कल (बिता हुआ)</string>
     <string name="filter_period_this_week">इस सप्ताह</string>
     <string name="filter_period_last_week">पिछला सप्ताह</string>
     <string name="filter_period_this_month">इस महीने</string>
     <string name="filter_period_last_month">पिछला महीना</string>
+    <string name="filter_period_other">दूसरा</string>
     <string name="filter_event_status_open">खोलें</string>
     <string name="filter_event_status_overdue">अतिदेय</string>
     <string name="filter_event_status_visited">विज़िट की गई</string>
@@ -93,12 +101,18 @@
     <string name="filters_title_date">तारीख</string>
     <string name="field_is_mandatory">यह फ़ील्ड आवश्यक है</string>
     <string name="customactivityoncrash_error_activity_restart_app">पीछे जाएं</string>
+    <string name="show_bar_graph">बार व्यू</string>
+    <string name="show_line_graph">लाइन व्यू</string>
+    <string name="show_table_graph">टेबल व्यू</string>
+    <string name="show_table_value">वैल्यू व्यू</string>
+    <string name="show_pie_value">पाई व्यू</string>
     <string name="filter_period_this_year">इस वर्ष</string>
     <string name="filter_period_last_quarter">पिछली तिमाही</string>
     <string name="filter_period_last_year">पिछला वर्ष</string>
     <string name="section_indicators">इंडिकेटर्स</string>
     <string name="take_photo">फ़ोटो लें</string>
     <string name="break_glass_dialog_title">यह प्रोग्राम सुरक्षित है</string>
+    <string name="show_radar_graph">रेडार व्यू</string>
     <string name="update_field_error">यह फ़ील्ड अपडेट नहीं हो सका। कृपया फिर से प्रयास करें</string>
     <string name="edition_no_write_access">इस डेटा को संपादित करने की अनुमति नहीं है</string>
     <string name="edition_no_catcombo_access">इस डेटा को संपादित करने की अनुमति नहीं है</string>
@@ -106,6 +120,7 @@
     <string name="not_saved">सेव नहीं</string>
     <string name="missing_warning_fields_completed_events">आपके पास कुछ चेतावनी संदेश हैं</string>
     <string name="missing_warning_fields_events">आपके पास कुछ चेतावनी संदेश हैं\nक्या आप इस फ़ॉर्म को कम्प्लीट मार्क करना चाहते हैं\?</string>
+    <string name="event_error_on_complete">आपके पास कुछ एरर संदेश हैं\nक्या आप उन्हें समीक्षा करना चाहते हैं\?</string>
     <string name="sync_dialog_title_syncing">सिंक हो रहा है</string>
     <string name="sync_dialog_action_not_now">अभी नहीं</string>
     <string name="view_only">केवल देखें</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index bfd1c88a934..324bf88560d 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -94,8 +94,6 @@
     <string name="every_12_hours">12 Jam</string>
     <string name="Manual">Manual</string>
     <string name="a_week">1 Minggu</string>
-    <string name="sync_max_parameters">Parameter sinkronisasi saat ini:</string>
-    <string name="sync_default_parameters">Kembalikan ke default</string>
     <string name="wipe_data_meesage">Database akan dihapus. Anda akan diminta masuk lagi</string>
     <string name="wipe_data_ok">Terima</string>
     <string name="wipe_data_no">batal</string>
@@ -138,9 +136,6 @@
     <string name="clear">Kosongkan</string>
     <string name="add_note">Tambah catatan</string>
     <string name="title_delete_go_back">Data Anda tidak disimpan</string>
-    <string name="delete_go_back">Jika Anda kembali sekarang, semua informasi yang dimasukkan akan dihapus.</string>
-    <string name="missing_mandatory_fields_go_back">Hapus dan kembali</string>
-    <string name="missing_mandatory_fields_finish">Beberapa bidang wajib tidak ada. Anda dapat menyelesaikan entri data dan keluar, tetapi even tidak dapat diselesaikan.</string>
     <string name="tei_coordinates">Koordinat untuk</string>
 
     <!--EVENT SUMMARY-->
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index 100ab4b963f..5e5d4e2a92f 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -80,8 +80,6 @@
     <string name="a_day">១ថ្ងៃ (លំនាំដើម)</string>
     <string name="Manual">ហត្ថកម្ម</string>
     <string name="a_week">១សប្តាហ៍</string>
-    <string name="sync_max_parameters">ប៉ារ៉ាម៉ែត្រដែលកំពុងធ្វើការបញ្ជូន</string>
-    <string name="sync_default_parameters">ធ្វើអោយទោលំនាំដើម</string>
     <string name="wipe_data_meesage">ប្រព័ន្ធទិន្នន័យនឹងត្រូវលុបចោល\nអ្នកត្រូវចូលមកប្រើម្ដងទៀតដោយបញ្ចុលឈ្មោះ និង លេខសំងាត់​</string>
     <string name="wipe_data_ok">ទទួលយក</string>
     <string name="wipe_data_no">បោះបង់</string>
@@ -138,8 +136,6 @@
     <string name="programs_to_enroll">កម្មវិធីចុះឈ្មោះ</string>
     <string name="share">ចែករំលែក</string>
     <string name="share_qr">ចែករំលែកលេខកូដ QR</string>
-    <string name="max">អតិបរមា</string>
-    <string name="current">បច្ចុប្បន្ន</string>
     <string name="tei">TEI</string>
     <string name="wipe_data">កំណត់កម្មវិធីឡើងវិញ</string>
     <string name="warning_error_on_complete_title">ពិនិត្យទីនេះ​</string>
@@ -175,6 +171,7 @@
     <string name="tuto_event_initial_1">ចុចដើម្បីពិនិត្យពីស្ថានភាពនៃការបញ្ចប់របស់ព្រឹត្តិការណ៍</string>
     <string name="relationships">ទំនាក់ទំនង</string>
     <string name="dashboard_overview">ទិដ្ឋភាពទូទៅ</string>
+    <string name="state_warning">ព្រមាន</string>
     <string name="action_close">បិទ</string>
     <string name="filters_title_period">កំឡុងពេល</string>
     <string name="filters_title_state">បញ្ចូន</string>
diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml
index 489b9fa322c..0c187bf415e 100644
--- a/app/src/main/res/values-lo/strings.xml
+++ b/app/src/main/res/values-lo/strings.xml
@@ -104,8 +104,6 @@
     <string name="every_12_hours">12h</string>
     <string name="Manual">ຄູ່ມື</string>
     <string name="a_week">1 ອາທິດ</string>
-    <string name="sync_max_parameters">ຂອບເຂດທີ່ຕັ້ງໄວ້ໃຫ້ລະບົບທໍາງານຮ່ວມກັນໃນປະຈຸບັນ</string>
-    <string name="sync_default_parameters">ປັບລະບົບໃຫ້ທໍາງານໃນຄ່າປົກະຕິ</string>
     <string name="wipe_data_meesage">ຖານຂໍ້ມູນຈະຖືກລືບ.\nທ່ານຈະໄດ້ເຂົ້າລະບົບໃໝ່</string>
     <string name="wipe_data_ok">ຍອມຮັບ</string>
     <string name="wipe_data_no">ຍົກເລີກ</string>
@@ -148,15 +146,7 @@
     <string name="write_new_note">ຂຽນບົດບັນທຶກໃໝ່</string>
     <string name="clear">ຈັດມ້ຽນ</string>
     <string name="add_note">ຂຽນບັນທຶກລົງ</string>
-    <string name="revert">ກັບຄືນສູ່ສະພາບເດີມ</string>
-    <string name="activated">ເປີດການນໍາໃຊ້ແລ້ວ</string>
-    <string name="missing_mandatory_fields_title">ຫ້ອງປ້ອນຂໍ້ມູນທີ່ຈໍາເປັນ ບໍ່ເຫັນ</string>
-    <string name="missing_mandatory_fields_text">ຫ້ອງປ້ອນຂໍ້ມູນຈໍານວນໜື່ງບໍ່ເຫັນ. ຖ້າທ່ານຕ້ອງການກັບຄືນດຽວນີ້, ຂໍ້ມູນທັງໝົດທີ່ໄດ້ບັນທຶກແລ້ວຈະຖືກລືບ</string>
-    <string name="missing_mandatory_fields_text_not_delete">ຊ່ອງທີປ້ອນຂ້ໍມູນບາງຊ່ອງບໍເຫັນ. ຖ້າທ່ານຕ້ອງການກັບຄືນ, ກະລຸນາຕື່ມຂໍ້ມູນໃສ່ໃຫ້ຄົບ</string>
     <string name="title_delete_go_back">ຂໍ້ມູນຂອງທ່ານບໍ່ໄດ້ບັນທຶກ</string>
-    <string name="delete_go_back">ຖ້າທ່ານກັບຄືນຕອນນີ້ ຂໍ້ມູນທີ່ປ້ອນທັ້ງໝົດຈະຖຶກລົບ</string>
-    <string name="missing_mandatory_fields_go_back">ລືບຂໍ້ມູນ ແລະ ກັບຄືນ</string>
-    <string name="missing_mandatory_fields_finish">ຊ່ອງປ້ອນຂໍ້ມູນຈໍານວນໜື່ງບໍ່ເຫັນ. ທ່ານສາມາດປ້ອນຂໍ້ມູນ ແລະ ອອກໄດ້, ແຕ່ເຫດການຈະບໍ່ສາມາດເຮັດໃຫ້ສຳເລັດໄດ້</string>
     <string name="tei_coordinates">ປະສານງານຫາ</string>
 
     <!--EVENT SUMMARY-->
@@ -198,8 +188,6 @@
     <string name="programs_to_enroll">ໂປຣແກຣມເພື່ອລົງທະບຽນ</string>
     <string name="share">ແລກປ່ຽນ</string>
     <string name="share_qr">ແລກປ່ຽນ QR</string>
-    <string name="max">ຄ່າໃຫ່ຍສຸດ</string>
-    <string name="current">ປະຈຸບັນ</string>
     <string name="tei">ຈໍານວນກໍລະນີທີ່ປ້ອນເຂົ້າ</string>
     <string name="wipe_data">ຕັ້ງຄ່າໂປຣແກຣມຄືນໃໝ່</string>
     <string name="warning_error_on_complete_title">ກວດເບີ່ງອັນນີ້</string>
@@ -329,9 +317,6 @@
     <string name="filter_event_status_visited">ເຂົ້າຊົມ</string>
     <string name="filter_event_status_completed">ສໍາເລັດແລ້ວ</string>
     <string name="filter_event_status_skipped">ຂ້າມໄປ</string>
-    <string name="event_tei_limits">ເຫດການ%sສູງສຸດ%s%sປະຈຸບັນ%sTEI%sສູງສຸດ%s%sປະຈຸບັນ%s</string>
-    <string name="enrollment_data_hide">ເຊື່ອງຂໍ້ມູນການລົງທະບຽນ</string>
-    <string name="enrollment_data_show">ສະແດງຂໍ້ມູນການລົງທະບຽນ</string>
     <string name="sms_enabled">ເປິດໃຊ້ງານໂມດູນຂໍ້ຄວາມ</string>
     <string name="sms_disabled">ໂມດູນຂໍ້ຄວາມຖືກປິດໃຊ້ງານ</string>
     <string name="sms_downloading_data">ກຳລັງດາວໂຫຼດຂໍ້ມູນສຳລັບໂມດູນຂໍ້ຄວາມ. ກະ​ລຸ​ນາ​ລໍ​ຖ້າ</string>
@@ -395,7 +380,6 @@
     <string name="filters_title_date">ວັນທີ່</string>
     <string name="privacy_policy_title">ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ</string>
     <string name="open_privacy_policy">ກົດບ່ອນນີ້ເພື່ອກວດສອບ<a href="">ນະໂຍບາຍຄວາມເປັນສ່ວນຕົວ</a>ຂອງພວກເຮົາ</string>
-    <string name="coordinates_error">ປະສານງານບໍ່ຖືກຕ້ອງ</string>
     <string name="field_is_mandatory">ຊ່ອງປ້ອນຂໍ້ມູນນີ້ແມ່ນຈໍາເປັນຕ້ອງປ້ອນຂໍ້ມູນໃສ່</string>
     <string name="security_debugger_message">ເຫດຜົນດ້ານຄວາມປອດໄພ, ແອັບເວີຊັ່ນນີ້ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ກັບ adb. ກະລຸນາໃຊ້ເວີຊັ່ນທີ່ໃຊ້ສະເພາະການຝຶກອົບຮົມ.</string>
 
@@ -448,7 +432,6 @@
     <string name="filter_period_last_n_biweeks">%dສອງອາທິດຜ່ານມາ</string>
     <string name="section_feedback">ຜົນຕອບຮັບ</string>
     <string name="section_indicators">ຕົວຊີ້ວັດ</string>
-    <string name="value">Value</string>
     <string name="camera_permission_denied">ການ​ອະ​ນຸ​ຍາດ​ໃຊ້ກ້ອງ​ຖ່າຍ​ຮູບ​ຖືກ​ປະ​ຕິ​ເສດ. ທ່ານ​​ຕ້ອງ​ເປີດ​ໃຊ້​ງານເພື່ອ​ໃຊ້​ຄຸນ​ສົມ​ບັດ​ນີ້​.</string>
     <string name="section_charts_indicators">ແຜນວາດ ແລະ ຕົວຊີ້ວັດ</string>
     <string name="take_photo">ຖ່າຍຮູບ</string>
@@ -490,7 +473,6 @@
     <string name="init_search">ເລີ່ມການຄົ້ນຫາເພື່ອຊອກຫາອັນໃດນຶ່ງ%s</string>
     <string name="search_or_create">ທ່ານສາມາດຄົ້ນຫາຫຼືສ້າງໃຫມ່%s</string>
     <string name="event_can_be_completed">ທ່ານຕ້ອງການໝາຍແບບຟອມນີ້ວ່າສຳເລັດແລ້ວຫຼືບໍ?</string>
-    <string name="changes_will_be_discarted">ຖ້າທ່ານອອກດຽວນີ້, ການປ່ຽນແປງຈະຖືກຍົກເລີກ.</string>
     <string name="event_error_on_complete">ທ່ານມີຂໍ້ຜິດພາດໃນບາງຂໍ້ຄວາມ.\nທ່ານຕ້ອງການກວດເບິ່ງຄືນບໍ?</string>
     <string name="re_opened">ເປີດຄືນໃໝ່</string>
     <string name="account_disable_title">ບັນຊີຖືກປິດ</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index b853f6ebaaa..54d15587664 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -96,8 +96,6 @@
     <string name="every_12_hours">12t</string>
     <string name="Manual">Manuelt</string>
     <string name="a_week">1 uke</string>
-    <string name="sync_max_parameters">Gjeldende synkroniseringsparametre</string>
-    <string name="sync_default_parameters">Tilbakestill til standard</string>
     <string name="wipe_data_meesage">Databasen vil bli slettet. Du vil bli spurt om å logge inn igjen.</string>
     <string name="wipe_data_ok">Aksepter</string>
     <string name="wipe_data_no">Avbryt</string>
@@ -140,9 +138,6 @@
     <string name="clear">tøm</string>
     <string name="add_note">Legg til notat</string>
     <string name="title_delete_go_back">Dine data er ikke lagret</string>
-    <string name="delete_go_back">Hvis du går tilbake nå, vil all informasjon som har blitt lagt inn bli slettet.</string>
-    <string name="missing_mandatory_fields_go_back">Slett og gå tilbake</string>
-    <string name="missing_mandatory_fields_finish">Noen obligatoriske felter mangler. Du kan fullføre dataregistrering og gå ut, men hendelsen kan ikke fullføres.</string>
     <string name="tei_coordinates">Koordinater for</string>
 
     <!--EVENT SUMMARY-->
@@ -184,8 +179,6 @@
     <string name="programs_to_enroll">Programmer å registrere</string>
     <string name="share">Del</string>
     <string name="share_qr">Del QR</string>
-    <string name="max">Max</string>
-    <string name="current">Nåværende</string>
     <string name="tei">TEI</string>
     <string name="teis">TEIs</string>
     <string name="wipe_data">Resett app data &amp; konfigurasjon</string>
@@ -315,9 +308,6 @@
     <string name="filter_event_status_visited">Besøkte</string>
     <string name="filter_event_status_completed">Fullført</string>
     <string name="filter_event_status_skipped">Hoppet over</string>
-    <string name="event_tei_limits">Hendelser: %sMax: %s%sGjeldende:%sTEI: %sMax:%s%sGjeldende%s</string>
-    <string name="enrollment_data_hide">Skjul registreringsdata</string>
-    <string name="enrollment_data_show">Vis registreringsdata</string>
     <string name="sms_enabled">SMS modul er aktivert.</string>
     <string name="sms_disabled">SMS modul er deaktivert.</string>
     <string name="sms_downloading_data">Laster ned data for SMS modul. Vennligst vent</string>
@@ -383,7 +373,6 @@
     <string name="filters_title_date">Dato</string>
     <string name="privacy_policy_title">Personvernregler</string>
     <string name="open_privacy_policy">Klikk her for å sjekke<a href="">personvernreglene</a> våre</string>
-    <string name="coordinates_error">Koordinatverdiene er ikke gyldige</string>
     <string name="field_is_mandatory">Dette feltet er obligatorisk</string>
     <string name="security_debugger_message">Av sikkerhetsgrunner, så er denne versjonen av appen ikke tillatt til å bli brukt med adb. Vennligst bruk treningsversjonen.</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 10c26f41b09..83b305dcb5d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -95,8 +95,6 @@
     <string name="every_12_hours">12 uur</string>
     <string name="Manual">Handmatig</string>
     <string name="a_week">1 week</string>
-    <string name="sync_max_parameters">Huidige synchronisatieparameters:</string>
-    <string name="sync_default_parameters">Resetten naar standaard</string>
     <string name="wipe_data_meesage">Database wordt verwijderd.\nU wordt gevraagd opnieuw in te loggen.</string>
     <string name="wipe_data_ok">Aanvaarden</string>
     <string name="wipe_data_no">Annuleren</string>
@@ -141,15 +139,7 @@
     <string name="write_new_note">Schrijf een nieuwe notitie</string>
     <string name="clear">Verwijder</string>
     <string name="add_note">Notitie toevoegen</string>
-    <string name="revert">Terugdraaien</string>
-    <string name="activated">Geactiveerd</string>
-    <string name="missing_mandatory_fields_title">Verplichte velden ontbreken</string>
-    <string name="missing_mandatory_fields_text">Sommige verplichte velden ontbreken. Als u nu terug wilt gaan, wordt alle opgeslagen informatie verwijderd.</string>
-    <string name="missing_mandatory_fields_text_not_delete">Sommige verplichte velden ontbreken. Als je terug wilt gaan, vul ze dan in.</string>
     <string name="title_delete_go_back">Uw gegevens worden niet bewaard</string>
-    <string name="delete_go_back">Als u nu teruggaat, wordt alle ingevoerde informatie verwijderd.</string>
-    <string name="missing_mandatory_fields_go_back">Verwijderen en teruggaan</string>
-    <string name="missing_mandatory_fields_finish">Sommige verplichte velden ontbreken. U kunt het invoeren en afsluiten van gegevens voltooien, maar de gebeurtenis kan niet worden voltooid.</string>
     <string name="tei_coordinates">Coördinaten voor de</string>
 
     <!--EVENT SUMMARY-->
@@ -191,8 +181,6 @@
     <string name="programs_to_enroll">Programma\'s om in te schrijven</string>
     <string name="share">Deel</string>
     <string name="share_qr">QR delen</string>
-    <string name="max">Max</string>
-    <string name="current">Huidig</string>
     <string name="tei">TEI</string>
     <string name="teis">TEI\'s</string>
     <string name="wipe_data">Reset app-gegevens &amp;-configuratie</string>
@@ -248,20 +236,6 @@
     <string name="delete_local_data_message">Niet-gesynchroniseerde gegevens gaan verloren. Wil je echt doorgaan?</string>
     <string name="delete_local_data_error">Gegevens konden niet worden verwijderd. Probeer het opnieuw.</string>
     <string name="delete_local_data_done">Verwijderen van lokale gegevens is voltooid.</string>
-    <string name="org_unit_selection_warning">Er moet ten minste één organisatie-eenheid worden geselecteerd</string>
-    <string name="send_user_name_title">Verstuur data</string>
-    <string name="send_user_name_mesage">Help DHIS2 deze app te verbeteren door foutenlogboeken te delen die zijn gekoppeld aan uw gebruikers-ID.</string>
-    <string name="improve_app_msg_title">Wil je ons helpen deze app te verbeteren?</string>
-    <string name="improve_app_msg_clickable_word">privacybeleid</string>
-    <string name="check_mandatory_field">Velden controleren</string>
-    <string name="error_no_network_during_sync">Je internetverbinding is verbroken tijdens het uitvoeren van je configuratiesynchronisatie. Probeer het later opnieuw</string>
-    <string name="action_agree">Mee eens zijn</string>
-    <string name="action_continue">Doorgaan</string>
-    <string name="login_server_info_title">Server-URL</string>
-    <string name="login_server_info_message">Voer de DHIS 2-server-URL voor uw organisatie in zoals verstrekt door uw systeembeheerder.\n\nU kunt ook een QR-code scannen met de URL van uw server</string>
-    <string name="forgot_your_code">Ben je je code vergeten?</string>
-    <string name="event_form_end_options_title">Wat zou je willen doen voor dit evenement?</string>
-    <string name="sectionSelectorEnd">EINDE</string>
     <string name="resource_not_found">%s niet gevonden</string>
     <string name="relationship_not_found_message">Het record dat u probeert te openen, is niet beschikbaar. Wil je ernaar zoeken?</string>
     <string name="sync_by_sms">Gesynchroniseerd via sms</string>
@@ -339,9 +313,6 @@
     <string name="filter_event_status_visited">Bezocht</string>
     <string name="filter_event_status_completed">Voltooid</string>
     <string name="filter_event_status_skipped">Overgeslaten</string>
-    <string name="event_tei_limits">Evenementen:%smax:%s%shuidig:%s TEI:%smax:%s%shuidig:%s</string>
-    <string name="enrollment_data_hide">Inschrijvingsgegevens verbergen</string>
-    <string name="enrollment_data_show">Toon inschrijvingsgegevens</string>
     <string name="sms_enabled">SMS-module ingeschakeld</string>
     <string name="sms_disabled">SMS-module uitgeschakeld</string>
     <string name="sms_downloading_data">Gegevens downloaden voor SMS-module. Even geduld aub</string>
@@ -407,7 +378,6 @@
     <string name="filters_title_date">Datum</string>
     <string name="privacy_policy_title">Privacybeleid</string>
     <string name="open_privacy_policy">Klik hier om ons privacybeleid <a href=""> te bekijken </a></string>
-    <string name="coordinates_error">Coördinatenwaarden zijn niet geldig</string>
     <string name="break_glass_error_v2">U kunt een %s van andere organisatie-eenheden niet inschrijven in dit programma omdat deze beveiligd is.\nNeem contact op met uw beheerder.</string>
     <string name="field_is_mandatory">Dit veld is verplicht</string>
     <string name="security_debugger_message">Om veiligheidsredenen mag deze versie van de app niet worden gebruikt met adb. Gebruik de trainingsversie.</string>
@@ -461,7 +431,6 @@
     <string name="filter_period_last_n_biweeks">Laatste %d twee weken</string>
     <string name="section_feedback">Feedback</string>
     <string name="section_indicators">Indicatoren</string>
-    <string name="value">Waarde</string>
     <string name="camera_permission_denied">Cameratoestemming is geweigerd.\Je moet deze inschakelen om deze functie te gebruiken.</string>
     <string name="section_charts_indicators">Grafieken en indicatoren</string>
     <string name="take_photo">Neem foto</string>
@@ -504,7 +473,6 @@
     <string name="init_search">Start een zoekopdracht om een %s</string>
     <string name="search_or_create">U kunt zoeken of een nieuwe creëren %s</string>
     <string name="event_can_be_completed">Wilt u dit formulier als voltooid markeren?</string>
-    <string name="changes_will_be_discarted">Als u nu afsluit, worden de wijzigingen verwijderd.</string>
     <string name="event_error_on_complete">U heeft een aantal foutmeldingen.\nWilt u deze bekijken?</string>
     <string name="re_opened">heropend</string>
     <string name="account_disable_title">Account ongebruikelijk gemaakt</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d2186a9d0a1..d26150217b1 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -110,8 +110,6 @@
     <string name="every_12_hours">12h</string>
     <string name="Manual">Manual</string>
     <string name="a_week">1 Semana</string>
-    <string name="sync_max_parameters">Parâmetros de sincronização atuais:</string>
-    <string name="sync_default_parameters">Restaurar ao padrão</string>
     <string name="wipe_data_meesage">O banco de dados será excluído. \nVocê será solicitado a fazer login novamente.</string>
     <string name="wipe_data_ok">Aceitar</string>
     <string name="wipe_data_no">Cancelar</string>
@@ -158,15 +156,7 @@
     <string name="write_new_note">Escrever nova nota</string>
     <string name="clear">claro</string>
     <string name="add_note">Adicionar uma nota</string>
-    <string name="revert">Reverter</string>
-    <string name="activated">Ativado</string>
-    <string name="missing_mandatory_fields_title">Faltam campos obrigatórios</string>
-    <string name="missing_mandatory_fields_text">Alguns campos obrigatórios estão ausentes. Se você quiser voltar agora, todas as informações salvas serão excluídas.</string>
-    <string name="missing_mandatory_fields_text_not_delete">Alguns campos obrigatórios estão ausentes. Se você quiser voltar, por favor preencha-os. </string>
     <string name="title_delete_go_back">Seus dados não são salvos</string>
-    <string name="delete_go_back">Se você voltar agora, todas as informações inseridas serão excluídas.</string>
-    <string name="missing_mandatory_fields_go_back">Suprimir e voltar</string>
-    <string name="missing_mandatory_fields_finish">Alguns campos obrigatórios estão ausentes. Você pode concluir a entrada e saída de dados, mas o evento não pode ser concluído.</string>
     <string name="tei_coordinates">Coordenadas para o</string>
 
     <!--EVENT SUMMARY-->
@@ -208,8 +198,6 @@
     <string name="programs_to_enroll">Programas para inscrição</string>
     <string name="share">Partilha</string>
     <string name="share_qr">Compartilhe QR</string>
-    <string name="max">Máx</string>
-    <string name="current">Corrente</string>
     <string name="tei">TEI</string>
     <string name="teis">TEIs</string>
     <string name="wipe_data">Redefinir dados do aplicativo e configuração</string>
@@ -266,20 +254,6 @@
     <string name="delete_local_data_message">Dados não sincronizados serão perdidos. Deseja mesmo continuar?</string>
     <string name="delete_local_data_error">Não foi possível excluir os dados. Por favor tente novamente.</string>
     <string name="delete_local_data_done">Exclua os dados locais concluídos com sucesso.</string>
-    <string name="org_unit_selection_warning">Pelo menos uma unidade organizacional deve ser selecionada</string>
-    <string name="send_user_name_title">Enviar dados</string>
-    <string name="send_user_name_mesage">Ajude o DHIS2 a melhorar este aplicativo compartilhando logs de erros associados ao seu ID de usuário.</string>
-    <string name="improve_app_msg_title">Quer nos ajudar a melhorar esta aplicação?</string>
-    <string name="improve_app_msg_clickable_word">política de privacidade.</string>
-    <string name="check_mandatory_field">Verificar campos</string>
-    <string name="error_no_network_during_sync">Você perdeu sua conexão com a Internet ao executar sua sincronização de configuração. Por favor tente novamente mais tarde</string>
-    <string name="action_agree">Aceita</string>
-    <string name="action_continue">Continuar</string>
-    <string name="login_server_info_title">url do servidor</string>
-    <string name="login_server_info_message">Digite o URL do servidor DHIS 2 da sua organização, conforme fornecido pelo administrador do sistema.\n\nAlternativamente, você pode digitalizar um código QR contendo o URL do seu servido</string>
-    <string name="forgot_your_code">Esqueceu seu código?</string>
-    <string name="event_form_end_options_title">O que você gostaria de fazer para este evento?</string>
-    <string name="sectionSelectorEnd">FIM</string>
     <string name="resource_not_found">%s não encontrado</string>
     <string name="relationship_not_found_message">O registro que você está tentando acessar não está disponível. Deseja procurar?</string>
     <string name="sync_by_sms">Sincronizado por SMS</string>
@@ -357,9 +331,6 @@
     <string name="filter_event_status_visited">Visitou</string>
     <string name="filter_event_status_completed">Completo</string>
     <string name="filter_event_status_skipped">Ignorado</string>
-    <string name="event_tei_limits">Eventos: %s max: %s %s atual: %s TEI: %s max: %s %s atual: %s</string>
-    <string name="enrollment_data_hide">Ocultar dados de inscrição</string>
-    <string name="enrollment_data_show">Mostrar dados de inscrição</string>
     <string name="sms_enabled">Módulo SMS ativado</string>
     <string name="sms_disabled">Módulo SMS desativado</string>
     <string name="sms_downloading_data">Baixando dados para o módulo SMS. Por favor espere.</string>
@@ -425,7 +396,6 @@
     <string name="filters_title_date">Data</string>
     <string name="privacy_policy_title">Política de Privacidade</string>
     <string name="open_privacy_policy">Clique aqui para conferir nosso <a href=""> política de privacidade </a></string>
-    <string name="coordinates_error">Os valores das coordenadas não são válidos</string>
     <string name="break_glass_error_v2">Não é possível inscrever um  %s de outras unidades organizacionais neste programa porque está protegido.\nContacte o seu administrador.</string>
     <string name="field_is_mandatory">Este campo é obrigatório</string>
     <string name="security_debugger_message">Por razões de segurança, esta versão do aplicativo não pode ser usada com o adb. Por favor, use a versão de treinamento.</string>
@@ -482,7 +452,6 @@
     <string name="filter_period_last_n_biweeks">Últimas %d quinzenas</string>
     <string name="section_feedback">Retroinformacão</string>
     <string name="section_indicators">Indicadores</string>
-    <string name="value">Valor</string>
     <string name="camera_permission_denied">A permissão da câmara é negada.\nPrecisa de a ativar para utilizar esta funcionalidade.</string>
     <string name="section_charts_indicators">Gráficos e indicadores</string>
     <string name="take_photo"> Tirar fotografia</string>
@@ -527,7 +496,6 @@
     <string name="search_or_create">É possível pesquisar ou criar um novo %s</string>
     <string name="missing_warning_fields_completed_events">Tem algumas mensagens de aviso.</string>
     <string name="event_can_be_completed">Deseja marcar este formulário como completo?</string>
-    <string name="changes_will_be_discarted">Se sair agora, as alterações serão rejeitadas.</string>
     <string name="event_error_on_complete">Tem algumas mensagens de erro. Quer revê-las?</string>
     <string name="re_opened">Reaberto</string>
     <string name="account_disable_title">Conta desactivada</string>
@@ -603,13 +571,9 @@
     <string name="event">evento</string>
     <string name="timeline">Linha do tempo</string>
     <string name="database_export_downloaded">Banco de dados descarregado</string>
-    <string name="importing_database">Importando base de dados</string>
     <string name="show_more">Mostre mais</string>
     <string name="show_less">Mostre menos</string>
     <string name="sync">Sincronizar</string>
-    <string name="show_fields">Mostrar campos</string>
-    <string name="hide_fields">Ocultar campos</string>
-    <string name="importing_successful">Importação bem sucedida</string>
     <string name="successful_sync">Sincronização bem sucedida</string>
     <string name="syncing_something">A sincronizar %s…</string>
     <string name="file_resources">recursos de ficheiros</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 462c583a6b6..cc201eb4d9c 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -109,8 +109,6 @@
     <string name="every_12_hours">12 часов</string>
     <string name="Manual">Вручную</string>
     <string name="a_week">1 неделя</string>
-    <string name="sync_max_parameters">Текущие параметры синхронизации:</string>
-    <string name="sync_default_parameters">Возвратить в исходное положение по умолчанию</string>
     <string name="wipe_data_meesage">База данных будет удалена.Вам будет предложено войти в систему снова.</string>
     <string name="wipe_data_ok">Принять</string>
     <string name="wipe_data_no">Отмена</string>
@@ -152,15 +150,7 @@
     <string name="write_new_note">Написать новую заметку</string>
     <string name="clear">очистить</string>
     <string name="add_note">Добавить заметку</string>
-    <string name="activated">Активированно</string>
-    <string name="missing_mandatory_fields_title">Не заполнены обязательные поля </string>
-    <string name="missing_mandatory_fields_text">Некоторые обязательные поля не заполнены. Если вы захотите вернуться назад, вся сохраненная информация будет удалена.</string>
-    <string name="missing_mandatory_fields_text_not_delete">Некоторые обязательные поля не заполнены. Если вы хотите вернуться, пожалуйста, заполните их.</string>
-    <string name="missing_mandatory_fields_events">Некоторые поля требуют Вашего внимания.\nХотите просмотреть форму\?</string>
     <string name="title_delete_go_back">Ваши данные не сохранены</string>
-    <string name="delete_go_back">Если Вы вернетесь назад сейчас, вся введенная информация будет удалена.</string>
-    <string name="missing_mandatory_fields_go_back">Удалить и вернуться назад</string>
-    <string name="missing_mandatory_fields_finish">Некоторые обязательные поля не заполнены. Вы можете завершить ввод данных и выйти, но событие не может быть завершено.</string>
     <string name="tei_coordinates">Координаты для</string>
 
     <!--EVENT SUMMARY-->
@@ -202,8 +192,6 @@
     <string name="programs_to_enroll">Программы для регистрации</string>
     <string name="share">Поделиться</string>
     <string name="share_qr">Поделиться QR</string>
-    <string name="max">Макс</string>
-    <string name="current">Текущий</string>
     <string name="tei">TEI</string>
     <string name="wipe_data">Сброс данных приложения &amp; конфигурации</string>
     <string name="warning_error_on_complete_title">Проверьте это!</string>
@@ -257,20 +245,6 @@
     <string name="delete_local_data_message">Не синхронизированные данные будут потеряны. Вы действительно хотите продолжить?</string>
     <string name="delete_local_data_error">Данные не удалось удалить. Пожалуйста, повторите попытку.</string>
     <string name="delete_local_data_done">Удаление локальных данных успешно завершено.</string>
-    <string name="org_unit_selection_warning">Необходимо выбрать хотя бы одну Организационную единицу.</string>
-    <string name="send_user_name_title">Отправить данные</string>
-    <string name="send_user_name_mesage">Помогите DHIS2 улучшить это приложение, поделившись журналами ошибок, связанных с Вашим идентификатором пользователя.</string>
-    <string name="improve_app_msg_title">Хотите помочь нам улучшить это приложение?</string>
-    <string name="improve_app_msg_clickable_word">политика конфиденциальности</string>
-    <string name="check_mandatory_field">Проверить поля</string>
-    <string name="error_no_network_during_sync">Во время синхронизации конфигурации было потеряно подключение к Интернету. Пожалуйста, повторите попытку позже</string>
-    <string name="action_agree">Согласен</string>
-    <string name="action_continue">Продолжить</string>
-    <string name="login_server_info_title">Адрес веб-страницы сервера</string>
-    <string name="login_server_info_message">Введите URL-адрес сервера DHIS 2 для Вашей организации, предоставленный Вашим системным администратором. Другой вариант - отсканировать QR-код, содержащий URL-адрес Вашего сервера.</string>
-    <string name="forgot_your_code">Забыли свой код?</string>
-    <string name="event_form_end_options_title">Что бы Вы хотели сделать для этого события?</string>
-    <string name="sectionSelectorEnd">КОНЕЦ</string>
     <string name="resource_not_found">%s не найдено</string>
     <string name="relationship_not_found_message">Запись, к которой Вы пытаетесь получить доступ, недоступна. Не хотите ли Вы поискать ее?</string>
     <string name="sync_by_sms">Синхронизировано по SMS</string>
@@ -402,7 +376,6 @@
     <string name="filters_title_date">Дата</string>
     <string name="privacy_policy_title">Политика конфиденциальности</string>
     <string name="open_privacy_policy">Нажмите здесь, чтобы ознакомиться с нашей политикой конфиденциальности <a href=""></a> . </string>
-    <string name="coordinates_error">Значения координат не действительны</string>
     <string name="break_glass_error_v2">Вы не можете зарегистрировать %s из других организационных подразделений в этой программе, потому что она защищена. Свяжитесь с Вашим администратором.</string>
     <string name="field_is_mandatory">Это поле обязательно для заполнения</string>
     <string name="security_debugger_message">По соображениям безопасности эта версия приложения не может быть использована с adb. Пожалуйста, используйте учебную версию.</string>
@@ -575,14 +548,9 @@
     <string name="event">событие</string>
     <string name="timeline">Временная шкала</string>
     <string name="database_export_downloaded">База данных загружена</string>
-    <string name="importing_database">Импорт базы данных</string>
     <string name="show_more">Показать больше</string>
     <string name="show_less">Показать меньше информации</string>
     <string name="sync">Синхронизация</string>
-    <string name="show_fields">Показать поля</string>
-    <string name="hide_fields">Скрыть поля</string>
-    <string name="importing_successful">Импорт прошел успешно</string>
-    <string name="section_misconfigured">Неверная конфигурация раздела. Обратитесь администратору</string>
     <string name="successful_sync">Успешная синхронизация</string>
     <string name="syncing_something">Синхронизация %s...</string>
     <string name="show_description">Показать описание</string>
@@ -598,7 +566,6 @@
     <string name="complete_enrollment_label">Завершить %s</string>
     <string name="deactivate_enrollment_label">Деактивировать %s</string>
     <string name="reopen_enrollment_label">Окрыть повторно %s</string>
-
     <plurals name="error_count_label">
         <item quantity="one">%s ошибка</item>
         <item quantity="few">%s ошибки</item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 23e02b2e7d9..94f8d4d460a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -80,8 +80,6 @@
     <string name="a_day">1 dag (Standard)</string>
     <string name="Manual">Manuell</string>
     <string name="a_week">1 vecka</string>
-    <string name="sync_max_parameters">Nuvarande synkroniseringsparametrar</string>
-    <string name="sync_default_parameters">Återställ till standardvärden</string>
     <string name="wipe_data_meesage">Databasen kommer att raderas\nDu måste logga in igen.</string>
     <string name="wipe_data_ok">Acceptera</string>
     <string name="wipe_data_no">Avbryt</string>
@@ -138,8 +136,6 @@
     <string name="programs_to_enroll">Program för att registrera</string>
     <string name="share">Dela med sig</string>
     <string name="share_qr">Dela QR</string>
-    <string name="max">max</string>
-    <string name="current">AKTUELL</string>
     <string name="tei">TEI</string>
     <string name="wipe_data">Återställ app</string>
     <string name="warning_error_on_complete_title">Kolla detta!</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f6e17a02e9e..88c43025b71 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -105,8 +105,6 @@
     <string name="every_12_hours">12 год</string>
     <string name="Manual">Вручну</string>
     <string name="a_week">1 тиждень</string>
-    <string name="sync_max_parameters">Поточні параметри синхронізації:</string>
-    <string name="sync_default_parameters">Установити за замовчуванням</string>
     <string name="wipe_data_meesage">Базу даних буде видалено. Вам буде запропоновано увійти знову.</string>
     <string name="wipe_data_ok">Прийняти</string>
     <string name="wipe_data_no">Скасувати</string>
@@ -151,15 +149,7 @@
     <string name="write_new_note">Написати нову примітку</string>
     <string name="clear">очистити</string>
     <string name="add_note">Додати нотатку</string>
-    <string name="revert">Повернути</string>
-    <string name="activated">Активовано</string>
-    <string name="missing_mandatory_fields_title">Не заповнено обов\'язкові поля</string>
-    <string name="missing_mandatory_fields_text">Деякі обов’язкові поля не заповнено. Якщо Ви хочете повернутися зараз, уся збережена інформація буде видалена.</string>
-    <string name="missing_mandatory_fields_text_not_delete">Деякі обов’язкові поля не заповнено. Якщо Ви хочете повернутися, заповніть їх. </string>
     <string name="title_delete_go_back">Ваші дані не збережено</string>
-    <string name="delete_go_back">Якщо Ви зараз повернетеся назад, уся введена інформація буде видалена.</string>
-    <string name="missing_mandatory_fields_go_back">Видалити та повернутися назад</string>
-    <string name="missing_mandatory_fields_finish">Деякі обов’язкові поля не заповнено. Ви можете завершити введення даних і вийти, але випадок не може бути завершений.</string>
     <string name="tei_coordinates">Координати для</string>
 
     <!--EVENT SUMMARY-->
@@ -201,8 +191,6 @@
     <string name="programs_to_enroll">Програми для реєстрації</string>
     <string name="share">Поділитися</string>
     <string name="share_qr">Поділитись QR</string>
-    <string name="max">Макс</string>
-    <string name="current">Поточний</string>
     <string name="tei">Об’єкт, який відстежується</string>
     <string name="teis">Об’єкти, які відстежуються</string>
     <string name="wipe_data">Скинути дані програми &amp; конфігурацію</string>
@@ -258,19 +246,6 @@
     <string name="delete_local_data_message">Несинхронізовані дані буде втрачено. Ви дійсно хочете продовжити?</string>
     <string name="delete_local_data_error">Не вдалося видалити дані. Будь ласка, повторіть спробу.</string>
     <string name="delete_local_data_done">Видалення локальних даних успішно завершено.</string>
-    <string name="org_unit_selection_warning">Необхідно вибрати принаймні один організаційний підрозділ</string>
-    <string name="send_user_name_title">Надіслати дані</string>
-    <string name="send_user_name_mesage">Допоможіть DHIS2 покращити цей додаток, поділившись журналами помилок, пов’язаними з Вашим ідентифікатором користувача.</string>
-    <string name="improve_app_msg_title">Ви хочете допомогти нам покращити цю програму?</string>
-    <string name="check_mandatory_field">Перевірте поля</string>
-    <string name="error_no_network_during_sync">Під час синхронізації конфігурації з’єднання з Інтернетом було втрачено. Будь-ласка спробуйте пізніше</string>
-    <string name="action_agree">Погодитись</string>
-    <string name="action_continue">Продовжити</string>
-    <string name="login_server_info_title">URL-адреса серверу</string>
-    <string name="login_server_info_message">Введіть URL-адресу серверу DHIS 2 для Вашої організації, надану Вашим системним адміністратором. Альтернативно, Ви можете відсканувати QR-код, що містить URL-адресу Вашого сервера</string>
-    <string name="forgot_your_code">Забули код?</string>
-    <string name="event_form_end_options_title">Що б Ви хотіли зробити для цього випадку?</string>
-    <string name="sectionSelectorEnd">КІН</string>
     <string name="resource_not_found">%s не знайдено</string>
     <string name="relationship_not_found_message">Запис, до якого Ви намагаєтеся отримати доступ, недоступний. Ви б хотіли його пошукати?</string>
     <string name="sync_by_sms">Синхронізовано через SMS</string>
@@ -348,9 +323,6 @@
     <string name="filter_event_status_visited">Відвідано</string>
     <string name="filter_event_status_completed">Завершено</string>
     <string name="filter_event_status_skipped">Пропущено</string>
-    <string name="event_tei_limits">Випадки:%sмакс:%s%sпоточн:%s Об\'єкти:%sмакс:%s%sпоточн%s</string>
-    <string name="enrollment_data_hide">Приховати дані реєстрації</string>
-    <string name="enrollment_data_show">Показати дані реєстрації</string>
     <string name="sms_enabled">SMS-модуль включений</string>
     <string name="sms_disabled">SMS-модуль відключений</string>
     <string name="sms_downloading_data">Завантаження даних для модуля SMS. Будь ласка, зачекайте</string>
@@ -416,7 +388,6 @@
     <string name="filters_title_date">Дата</string>
     <string name="privacy_policy_title">Політика конфіденційності</string>
     <string name="open_privacy_policy">Натисніть тут, щоб ознайомитися з нашою <a href=""> політикою конфіденційності </a></string>
-    <string name="coordinates_error">Значення координат недійсні</string>
     <string name="break_glass_error_v2">Ви не можете зареєструвати %s з інших організаційних підрозділів у цій програмі, оскільки вона закрита для Вас. Зверніться до свого адміністратора.</string>
     <string name="field_is_mandatory">Це поле обов\'язкове для заповнення</string>
     <string name="security_debugger_message">З міркувань безпеки цю версію додатку не можна використовувати з adb. Будь ласка, використовуйте навчальну версію.</string>
@@ -471,7 +442,6 @@
     <string name="filter_period_last_n_biweeks">Минулі %d двотижневі періоди</string>
     <string name="section_feedback">Відгук</string>
     <string name="section_indicators">Показники</string>
-    <string name="value">Значення</string>
     <string name="camera_permission_denied">Відмовлено у використанні камери. Вам потрібно ввімкнути цей дозвіл, щоб використовувати цю функцію.</string>
     <string name="section_charts_indicators">Діаграми та індикатори</string>
     <string name="take_photo">Зробити фото</string>
@@ -515,7 +485,6 @@
     <string name="init_search">Почніть пошук, щоб знайти будь-який %s</string>
     <string name="search_or_create">Ви можете знайти або створити новий %s</string>
     <string name="event_can_be_completed">Ви бажаєте позначити цю форму як завершену?</string>
-    <string name="changes_will_be_discarted">Якщо Ви зараз вийдете, зміни буде скасовано.</string>
     <string name="event_error_on_complete">У вас є кілька повідомлень про помилки. Бажаєте їх переглянути?</string>
     <string name="re_opened">Відкрито знову</string>
     <string name="account_disable_title">Обліковий запис вимкнено</string>
diff --git a/app/src/main/res/values-uz-rUZ/strings.xml b/app/src/main/res/values-uz-rUZ/strings.xml
index 7586c57baf5..49f8eb00a40 100644
--- a/app/src/main/res/values-uz-rUZ/strings.xml
+++ b/app/src/main/res/values-uz-rUZ/strings.xml
@@ -92,8 +92,6 @@
     <string name="every_12_hours">12 soat</string>
     <string name="Manual">Qoʼllanma</string>
     <string name="a_week">1 hafta</string>
-    <string name="sync_max_parameters">Joriy sinxronlash parametrlari</string>
-    <string name="sync_default_parameters">Standart holatga qaytish</string>
     <string name="wipe_data_meesage">Maʼlumotlar bazasi oʼchiriladi. Sizdan qayta kirish soʼraladi.</string>
     <string name="wipe_data_ok">Qabul qiling</string>
     <string name="wipe_data_no">Бекор қилиш</string>
@@ -136,9 +134,6 @@
     <string name="clear">aniq</string>
     <string name="add_note">Izoh qoldirish</string>
     <string name="title_delete_go_back">Maʼlumotingiz saqlanmadi</string>
-    <string name="delete_go_back">Аgarda hozir orqaga qaytsangiz, barcha kiritilgan maʼlumotlar oʼchiriladi.</string>
-    <string name="missing_mandatory_fields_go_back">Oʼchirib tashlash va orqaga qaytish</string>
-    <string name="missing_mandatory_fields_finish">Baʼzi majburiy maydonlar qoldirib ketilgan. Siz maʼlumotlarni kiritishni yakunlab chiqishingiz mumkin. Аmmo bu holda hodisa/tadbirni yakunlab boʼlmaydi.</string>
     <string name="tei_coordinates">Uchun koordinatalar</string>
 
     <!--EVENT SUMMARY-->
@@ -180,8 +175,6 @@
     <string name="programs_to_enroll">Roʼyxatga olish dasturlari</string>
     <string name="share">Улашиш</string>
     <string name="share_qr">QR ni ulashish</string>
-    <string name="max">Максимум</string>
-    <string name="current">Joriy</string>
     <string name="tei">TEI</string>
     <string name="teis">TEI lar</string>
     <string name="wipe_data">Ilova maʼlumotlarining asl standart holatini tiklash; konfiguratsiya</string>
@@ -310,9 +303,6 @@
     <string name="filter_event_status_visited">Tashrif buyurdi</string>
     <string name="filter_event_status_completed">bajarildi</string>
     <string name="filter_event_status_skipped">Oʼtkazib yuborildi</string>
-    <string name="event_tei_limits">Hodisa/tadbirlar %s maksimal : %s %s ketma-ketlik: %s TEI: %s maksimal : %s %s ketma-ketlik: %s</string>
-    <string name="enrollment_data_hide">Qayd qilish maʼlumotlarini berkitish</string>
-    <string name="enrollment_data_show">Qayd qilish maʼlumotlarini koʼrsatish</string>
     <string name="sms_enabled">SMS modul yoqib qoʼyilgan</string>
     <string name="sms_disabled">SMS modul oʼchirib qoʼyilgan</string>
     <string name="sms_downloading_data">SMS modul uchun maʼlumotlar yuklanmoqda. Iltimos, kuting</string>
@@ -376,7 +366,6 @@
     <string name="download_tei_error">Tanlangan %s  yuklanmadi.</string>
     <string name="filters_title_date">Sana</string>
     <string name="privacy_policy_title">Maxfiylik siyosati</string>
-    <string name="coordinates_error">Koordinata qiymatlari yaroqsiz</string>
     <string name="field_is_mandatory">Maydon toʼldirilishi majburiy</string>
     <string name="security_debugger_message">Xavfsizlik sababli ushbu versiyadan adb formatidan foydalanishga ruxsat berilmagan.Ilitmos, mashq versiyasidan foydalaning.</string>
 
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index 25d5e029d4e..52f0170f2e0 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -96,8 +96,6 @@
     <string name="every_12_hours">12 соат</string>
     <string name="Manual">Қўлланма</string>
     <string name="a_week">1 ҳафта</string>
-    <string name="sync_max_parameters">Жорий синхронлаш параметрлари</string>
-    <string name="sync_default_parameters">Стандарт ҳолатга қайтиш</string>
     <string name="wipe_data_meesage">Маълумотлар базаси ўчирилади. Сиздан қайта кириш сўралади.</string>
     <string name="wipe_data_ok">Қабул қилинг</string>
     <string name="wipe_data_no">Бекор қилиш</string>
@@ -140,9 +138,6 @@
     <string name="clear">аниқ</string>
     <string name="add_note">Изоҳ қолдириш</string>
     <string name="title_delete_go_back">Маълумотингиз сақланмади</string>
-    <string name="delete_go_back">Агарда ҳозир орқага қайтсангиз, барча киритилган маълумотлар ўчирилади.</string>
-    <string name="missing_mandatory_fields_go_back">Ўчириб ташлаш ва орқага қайтиш</string>
-    <string name="missing_mandatory_fields_finish">Баъзи мажбурий майдонлар қолдириб кетилган. Сиз маълумотларни киритишни якунлаб чиқишингиз мумкин. Аммо бу ҳолда ҳодиса/тадбирни якунлаб бўлмайди.</string>
     <string name="tei_coordinates">Учун координаталар</string>
 
     <!--EVENT SUMMARY-->
@@ -184,8 +179,6 @@
     <string name="programs_to_enroll">Рўйхатга олиш дастурлари</string>
     <string name="share">Улашиш</string>
     <string name="share_qr">QR ни улашиш</string>
-    <string name="max">Максимум</string>
-    <string name="current">Жорий</string>
     <string name="tei">TEI</string>
     <string name="teis">TEI лар</string>
     <string name="wipe_data">Илова маълумотларининг асл стандарт ҳолатини тиклаш; конфигурация</string>
@@ -317,9 +310,6 @@
     <string name="filter_event_status_visited">Ташриф буюрди</string>
     <string name="filter_event_status_completed">бажарилди</string>
     <string name="filter_event_status_skipped">Ўтказиб юборилди</string>
-    <string name="event_tei_limits">Ҳодиса/тадбирлар %s максимал : %s %s кетма-кетлик: %s TEI: %s максимал : %s %s кетма-кетлик: %s</string>
-    <string name="enrollment_data_hide">Қайд қилиш маълумотларини беркитиш</string>
-    <string name="enrollment_data_show">Қайд қилиш маълумотларини кўрсатиш</string>
     <string name="sms_enabled">СМС модуль ёқиб қўйилган</string>
     <string name="sms_disabled">СМС модуль ўчириб қўйилган</string>
     <string name="sms_downloading_data">СМС модуль учун маълумотлар юкланмоқда. Илтимос, кутинг</string>
@@ -385,7 +375,6 @@
     <string name="filters_title_date">Сана</string>
     <string name="privacy_policy_title">Махфийлик сиёсати</string>
     <string name="open_privacy_policy">Махфийлик сиёсатини текшириш учун шу ерни босинг</string>
-    <string name="coordinates_error">Координата қийматлари яроқсиз</string>
     <string name="field_is_mandatory">Майдон тўлдирилиши мажбурий</string>
     <string name="security_debugger_message">Хавфсизлик сабабли ушбу версиядан adb форматидан фойдаланишга рухсат берилмаган.Илитмос, машқ версиясидан фойдаланинг.</string>
 
@@ -429,7 +418,6 @@
     <string name="filter_period_last_financial_year">Охирги молиявий йил</string>
     <string name="section_feedback">Фикр-мулоҳаза</string>
     <string name="section_indicators">Кўрсатгичлар</string>
-    <string name="value">Қиймат</string>
     <string name="camera_permission_denied">Камерада фойдаланишга рухсат берилмаган. Ушбу функциядан фойдаланиш учун уни ёқишингиз керак.</string>
     <string name="section_charts_indicators">Диаграммалар ва индикаторлар</string>
     <string name="take_photo">Суратга олиш</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index dd4b7a8f15d..bd977b6dd3f 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -110,8 +110,6 @@
     <string name="every_12_hours">12 Giờ</string>
     <string name="Manual">Thủ công</string>
     <string name="a_week">1 Tuần</string>
-    <string name="sync_max_parameters">Các tham số đồng bộ hiện tại:</string>
-    <string name="sync_default_parameters">Trở về cài đặt mặc định</string>
     <string name="wipe_data_meesage">Cơ sở dữ liệu sẽ được xóa.\nBạn sẽ được yêu cầu đăng nhập lại.</string>
     <string name="wipe_data_ok">Chấp nhận</string>
     <string name="wipe_data_no">Hủy</string>
@@ -158,16 +156,7 @@
     <string name="write_new_note">Viết ghi chú mới</string>
     <string name="clear">xóa</string>
     <string name="add_note">Thêm ghi chú</string>
-    <string name="revert">Hoàn tác</string>
-    <string name="activated">Đã hoạt động</string>
-    <string name="missing_mandatory_fields_title">Thiếu trường dữ liệu bắt buộc</string>
-    <string name="missing_mandatory_fields_text">Một số trường bắt buộc bị thiếu. Nếu bạn muốn quay lại, tất cả các thông tin đã lưu sẽ bị xóa.</string>
-    <string name="missing_mandatory_fields_text_not_delete">Một số trường bắt buộc nhập bị thiếu. Nếu bạn muốn quay lại, vui lòng nhập giá trị cho chúng</string>
-    <string name="missing_mandatory_fields_events">Một số trường dữ liệu cần bạn chú ý.\nBạn có muốn xem xét biểu nhập không\?</string>
     <string name="title_delete_go_back">Dữ liệu của bạn chưa được lưu</string>
-    <string name="delete_go_back">Nếu bạn quay lại bây giờ, tất cả thông tin đã nhập sẽ bị xóa.</string>
-    <string name="missing_mandatory_fields_go_back">Xóa và quay lại</string>
-    <string name="missing_mandatory_fields_finish">Một số trường bắt buộc bị thiếu. Bạn có thể lưu biểu nhập và tắt, nhưng sự kiện chưa hoàn tất.</string>
     <string name="tei_coordinates">Tọa độ của </string>
 
     <!--EVENT SUMMARY-->
@@ -209,8 +198,6 @@
     <string name="programs_to_enroll">Chương trình để đăng ký</string>
     <string name="share">Chia sẻ</string>
     <string name="share_qr">Chia sẻ mã QR</string>
-    <string name="max">Lớn nhất</string>
-    <string name="current">Hiện tại</string>
     <string name="tei">ĐỐI TƯỢNG THEO DÕI</string>
     <string name="teis">ĐỐI TƯỢNG THEO DÕI</string>
     <string name="wipe_data">Cài đặt lại Dữ liệu &amp; cấu hình</string>
@@ -267,20 +254,6 @@
     <string name="delete_local_data_message">Dữ liệu đã đồng bộ sẽ không bị mất. Bạn có muốn tiếp tục không?</string>
     <string name="delete_local_data_error">Không thể xóa dữ liệu. Vui lòng thử lại.</string>
     <string name="delete_local_data_done">Đã xóa dữ liệu cục bộ thành công</string>
-    <string name="org_unit_selection_warning">Phải chọn ít nhất một đơn vị</string>
-    <string name="send_user_name_title">Đã gửi dữ liệu</string>
-    <string name="send_user_name_mesage">Giúp DHIS2 cải thiện ứng dụng này bằng việc chia sẻ lịch sử lỗi liên kết với tên đăng nhập của bạn.</string>
-    <string name="improve_app_msg_title">Bạn có muốn giúp chúng tôi cải thiện ứng dụng này không?</string>
-    <string name="improve_app_msg_clickable_word">chính sách bảo mật</string>
-    <string name="check_mandatory_field">Kiểm tra các trường dữ liệu</string>
-    <string name="error_no_network_during_sync">Bạn đã mất kết nối mạng trong khi đang thực hiện đồng bộ cấu hình. Vui lòng thử lại sau.</string>
-    <string name="action_agree">Đồng ý</string>
-    <string name="action_continue">Tiếp tục</string>
-    <string name="login_server_info_title">Đường dẫn đến máy chủ</string>
-    <string name="login_server_info_message">Nhập đường dẫn liên kết đến máy chủ DHIS 2 với đơn vị được cung cấp bởi quản lý của bạn.\n\n Hoặc bạn có thể quét mã QR có chứa đường dẫn liên kết đến máy chủ.</string>
-    <string name="forgot_your_code">Bạn đã quên mã của bạn phải không?</string>
-    <string name="event_form_end_options_title">Bạn muốn làm gì với sự kiện này?</string>
-    <string name="sectionSelectorEnd">KẾT THÚC</string>
     <string name="resource_not_found">Không tìm thấy %s</string>
     <string name="relationship_not_found_message">Hồ sơ bạn đang cố truy cập không có. Bạn có muốn tìm kiếm nó không?</string>
     <string name="sync_by_sms">Được đồng bộ bằng SMS</string>
@@ -358,9 +331,6 @@
     <string name="filter_event_status_visited">Đã đến</string>
     <string name="filter_event_status_completed">Đã hoàn tất</string>
     <string name="filter_event_status_skipped">Đã bỏ qua</string>
-    <string name="event_tei_limits">Sự kiện: %stối đa: %s%shiện có: %sĐối tượng theo dõi: %stối đa: %s%shiện có%s</string>
-    <string name="enrollment_data_hide">Ẩn dữ liệu đăng ký</string>
-    <string name="enrollment_data_show">Hiển thị dữ liệu đăng ký</string>
     <string name="sms_enabled">Mô đun SMS đã bật</string>
     <string name="sms_disabled">Mô đun SMS đã tắt</string>
     <string name="sms_downloading_data">Đang tải xuống dữ liệu cho mô đun SMS. Vui lòng đợi</string>
@@ -426,7 +396,6 @@
     <string name="filters_title_date">Ngày</string>
     <string name="privacy_policy_title">Chính Sách Bảo Mật</string>
     <string name="open_privacy_policy">Bấm vào đây để kiểm tra<a href="">chính sách bảo mật</a></string>
-    <string name="coordinates_error">Giá trị tọa độ không đúng</string>
     <string name="break_glass_error_v2">Bạn không thể đăng ký %stừ đơn vị khác vào chương trình này bởi vì nó được bảo vệ.\n Hãy liên hệ quản lý của bạn.</string>
     <string name="field_is_mandatory">Trường dữ liệu này bắt buộc</string>
     <string name="security_debugger_message">Vì lí do bảo mật, phiên bản ứng dụng này không cho phép sử dụng với adb. Vui lòng sử dụng phiên bản đào tạo.</string>
@@ -605,14 +574,9 @@
     <string name="event">sự kiện</string>
     <string name="timeline">Dòng thời gian</string>
     <string name="database_export_downloaded">Cơ sở dữ liệu đã được tải về</string>
-    <string name="importing_database">Đang nhập cơ sở dữ liệu</string>
     <string name="show_more">Hiện thêm</string>
     <string name="show_less">Ẩn bớt</string>
     <string name="sync">Đồng bộ</string>
-    <string name="show_fields">Hiện trường dữ liệu</string>
-    <string name="hide_fields">Ẩn trường dữ liệu</string>
-    <string name="importing_successful">Nhập thành công</string>
-    <string name="section_misconfigured">Phần này được cấu hình sai.\nLiên hệ với người quản lý của bạn.</string>
     <string name="successful_sync">Đồng bộ thành công</string>
     <string name="syncing_something">Đang đồng bộ %s...</string>
     <string name="file_resources">tài nguyên tập tin</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 37f60f48ed7..415a7d4babb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -110,8 +110,6 @@
     <string name="every_12_hours">12小时</string>
     <string name="Manual">手工</string>
     <string name="a_week">一周</string>
-    <string name="sync_max_parameters">当前同步参数</string>
-    <string name="sync_default_parameters">复位缺省值</string>
     <string name="wipe_data_meesage">数据库将被删除，\n 你将被要求再次登录。</string>
     <string name="wipe_data_ok">接受</string>
     <string name="wipe_data_no">取消</string>
@@ -157,15 +155,7 @@
     <string name="write_new_note">书写新笔记</string>
     <string name="clear">清除</string>
     <string name="add_note">添加笔记</string>
-    <string name="revert">反转</string>
-    <string name="activated">激活</string>
-    <string name="missing_mandatory_fields_title">强制字段缺失</string>
-    <string name="missing_mandatory_fields_text">有些强制字段缺失，如果你后退，所有保存的信息将被删除。</string>
-    <string name="missing_mandatory_fields_text_not_delete">有些强制字段缺失，如果你后退，请填充他们</string>
     <string name="title_delete_go_back">你的数据已经被保存</string>
-    <string name="delete_go_back">如果退回，所有输入信息将被删除</string>
-    <string name="missing_mandatory_fields_go_back">删除并后退</string>
-    <string name="missing_mandatory_fields_finish">有些强制字段缺失。你可以完成数据录入并退出，但不能完成该事件。</string>
     <string name="tei_coordinates">坐标</string>
 
     <!--EVENT SUMMARY-->
@@ -207,8 +197,6 @@
     <string name="programs_to_enroll">注册的项目</string>
     <string name="share">共享</string>
     <string name="share_qr">共享二维码</string>
-    <string name="max">最大</string>
-    <string name="current">当前</string>
     <string name="tei">跟踪实体</string>
     <string name="teis">跟踪实体</string>
     <string name="wipe_data">重置应用数据和配置</string>
@@ -265,19 +253,6 @@
     <string name="delete_local_data_message">没有同步的数据不会丢失，你真想要继续</string>
     <string name="delete_local_data_error">数据不能删除，请重试</string>
     <string name="delete_local_data_done">删除本地数据成功完成</string>
-    <string name="org_unit_selection_warning">至少得选择一个机构</string>
-    <string name="send_user_name_title">发送数据</string>
-    <string name="send_user_name_mesage">帮助提升该应用通过分享你的错误日志。</string>
-    <string name="improve_app_msg_title">你想帮助我们改进这个应用程序吗？</string>
-    <string name="improve_app_msg_clickable_word">隐私政策</string>
-    <string name="check_mandatory_field">检查字段</string>
-    <string name="error_no_network_during_sync">你丢掉了互联网连接，当执行配置同步的时候。稍后再试。</string>
-    <string name="action_agree">同意</string>
-    <string name="action_continue">继续</string>
-    <string name="login_server_info_title">服务器URL</string>
-    <string name="forgot_your_code">忘记你的数字口令</string>
-    <string name="event_form_end_options_title">对该事件你想做什么？</string>
-    <string name="sectionSelectorEnd">结束</string>
     <string name="resource_not_found">%s没有发现</string>
     <string name="relationship_not_found_message">你试图访问的记录不可用。你想搜索吗？</string>
     <string name="sync_by_sms">通过短信同步。</string>
@@ -355,9 +330,6 @@
     <string name="filter_event_status_visited">已随访</string>
     <string name="filter_event_status_completed">已完成</string>
     <string name="filter_event_status_skipped">跳过的</string>
-    <string name="event_tei_limits">事件：%s 最大：%s%s 当前：%s ，实体：%s 最大：%s%s 当前：%s</string>
-    <string name="enrollment_data_hide">隐藏注册数据</string>
-    <string name="enrollment_data_show">显示注册数据</string>
     <string name="sms_enabled">短信模块被激活</string>
     <string name="sms_disabled">短信模块被关闭</string>
     <string name="sms_downloading_data">下载短信模块，请等待。</string>
@@ -423,7 +395,6 @@
     <string name="filters_title_date">日期</string>
     <string name="privacy_policy_title">私有策略</string>
     <string name="open_privacy_policy">点击这里检查<a href="">隐私策略</a></string>
-    <string name="coordinates_error">坐标值无效</string>
     <string name="break_glass_error_v2">您无法在此项目中加入来自其他组织单位的 %s，因为它受到保护。\n请与您的管理员联系。</string>
     <string name="field_is_mandatory">此字段是必填字段</string>
     <string name="security_debugger_message">出于安全原因，此版本的应用程序不允许与adb一起使用。请使用培训版本。</string>
@@ -480,7 +451,6 @@
     <string name="filter_period_last_n_biweeks">最近%d双周</string>
     <string name="section_feedback">反馈</string>
     <string name="section_indicators">指标</string>
-    <string name="value">值</string>
     <string name="camera_permission_denied">相机权限被拒绝。\n 您需要启用它才能使用此功能。</string>
     <string name="section_charts_indicators">图表和指标</string>
     <string name="take_photo">拍照</string>
@@ -525,7 +495,6 @@
     <string name="search_or_create">您可以搜索或创建一个新的 %s</string>
     <string name="missing_warning_fields_completed_events">您收到了一些警告信息。</string>
     <string name="event_can_be_completed">您想将此表单标记为已完成吗？</string>
-    <string name="changes_will_be_discarted">如果您现在退出，更改将被丢弃。</string>
     <string name="event_error_on_complete">您有一些错误消息。\n您要查看它们吗？</string>
     <string name="re_opened">重新开放</string>
     <string name="account_disable_title">帐户已禁用</string>
@@ -601,13 +570,9 @@
     <string name="event">事件</string>
     <string name="timeline">时间线</string>
     <string name="database_export_downloaded">数据库已下载</string>
-    <string name="importing_database">导入数据库</string>
     <string name="show_more">更多</string>
     <string name="show_less">显示较少</string>
     <string name="sync">同步</string>
-    <string name="show_fields">显示字段</string>
-    <string name="hide_fields">隐藏字段</string>
-    <string name="importing_successful">导入成功</string>
     <string name="successful_sync">成功同步</string>
     <string name="syncing_something">正在同步 %s…</string>
     <string name="file_resources">文件资源</string>
@@ -624,7 +589,6 @@
     <string name="complete_enrollment_label">完整%s</string>
     <string name="deactivate_enrollment_label">停用%s</string>
     <string name="reopen_enrollment_label">重新打开%s</string>
-
     <plurals name="error_count_label">
         <item quantity="other">%s 错误</item>
     </plurals>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 218c288afc0..7afaf5188a2 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -165,12 +165,6 @@
     <string name="clear">清除</string>
     <string name="add_note">添加笔记</string>
     <string name="title_delete_go_back">你的数据已经被保存</string>
-    <string name="delete_go_back">如果退回，所有输入信息将被删除</string>
-    <string name="missing_mandatory_fields_go_back">删除并后退</string>
-    <string name="error_fields">某些字段有错误：
-%s
-请检查它们。</string>
-    <string name="missing_mandatory_fields_finish">有些强制字段缺失。你可以完成数据录入并退出，但不能完成该事件。</string>
     <string name="tei_coordinates">坐标</string>
 
     <!--EVENT SUMMARY-->
@@ -193,11 +187,6 @@
     <!-- RELATIONSHIPS -->
     <string name="next">下一步</string>
     <string name="search_min_num_attr">你至少需要输入 %d个属性便于搜索</string>
-    <string name="search_attr">你至少需要输入 一个属性便于搜索</string>
-    <string name="search_max_tei_reached">有多余%d个结果，请再细化搜索条件</string>
-    <string name="search_criteria_not_met">您的搜索标准没有返回任何结果。
-修改您的标准或注册一个新的%s</string>
-    <string name="search_init">输入你的搜索条件</string>
 
     <!-- QR -->
     <string name="QR_SCANNER">导入二维码数据</string>
@@ -217,10 +206,6 @@
     <string name="programs_to_enroll">加入的项目</string>
     <string name="share">分享</string>
     <string name="share_qr">共享二维码</string>
-    <string name="teiType_search_online">在线搜索无法按类型搜索。
-请从列表中选择程序。</string>
-    <string name="max">最大</string>
-    <string name="current">当前</string>
     <string name="tei">跟踪实体</string>
     <string name="teis">跟踪实体</string>
     <string name="wipe_data">重置应用数据和配置</string>
@@ -354,9 +339,6 @@
     <string name="filter_event_status_visited">已随访</string>
     <string name="filter_event_status_completed">已完成</string>
     <string name="filter_event_status_skipped">跳过的</string>
-    <string name="event_tei_limits">事件：%s 最大：%s%s 当前：%s ，实体：%s 最大：%s%s 当前：%s</string>
-    <string name="event_tei_limits_v2">设置有限%s
-活动：%s/%s TEI：%s/%s</string>
     <string name="limit_setting">设置限制%s</string>
     <string name="sms_enabled">短信模块被激活</string>
     <string name="sms_disabled">短信模块被关闭</string>
@@ -423,9 +405,6 @@
     <string name="filters_title_date">日期</string>
     <string name="privacy_policy_title">私有策略</string>
     <string name="open_privacy_policy">点击这里检查<a href="">隐私策略</a></string>
-    <string name="coordinates_error">坐标值无效</string>
-    <string name="break_glass_error">由于该程序受保护，您不能让其他组织单位的 TEI 加入该程序。
-请联系您的管理员。</string>
     <string name="break_glass_error_v2">由于%s 受保护，您不能从其他组织单位注册该程序。
 请联系您的管理员。</string>
     <string name="field_is_mandatory">此字段是必填字段</string>
@@ -612,9 +591,6 @@
     <string name="event">事件</string>
     <string name="timeline">时间线</string>
     <string name="database_export_downloaded">数据库已下载</string>
-    <string name="importing_database">导入数据库</string>
-    <string name="empty_search_attributes_message">没有配置可使用的搜索字段。
-请联系您的管理员。</string>
     <string name="show_more">更多</string>
     <string name="show_less">显示较少</string>
     <string name="sync">同步</string>
diff --git a/build.gradle.kts b/build.gradle.kts
index a923bc4363b..37600610e17 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -20,6 +20,7 @@ plugins {
     alias(libs.plugins.cyclonedx)
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.android.kotlin.multiplatform.library) apply false
+    alias(libs.plugins.android.lint) apply false
 
 }
 
diff --git a/commons/src/main/res/values-ar-rEG/strings.xml b/commons/src/main/res/values-ar-rEG/strings.xml
new file mode 100644
index 00000000000..2f89d846162
--- /dev/null
+++ b/commons/src/main/res/values-ar-rEG/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_accept">قبول</string>
+    <string name="cancel">إلغاء</string>
+    </resources>
diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml
index 24fd62e1b7f..e10e55aebb6 100644
--- a/commons/src/main/res/values-ar/strings.xml
+++ b/commons/src/main/res/values-ar/strings.xml
@@ -236,4 +236,5 @@
     <string name="period_six_monthly_title">ستة أشهر</string>
     <string name="period_yearly_title">سنة</string>
     <string name="action_clear_all">تنظيف الكل</string>
-</resources>
+
+    </resources>
diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml
index a8980102e90..6f21808d052 100644
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@@ -206,4 +206,5 @@
     <string name="period_quarter_title">Trimestre</string>
     <string name="period_yearly_title">Année</string>
     <string name="action_clear_all">Tout effacer</string>
-</resources>
+
+    </resources>
diff --git a/commons/src/main/res/values-km/strings.xml b/commons/src/main/res/values-km/strings.xml
index f534228c85d..6ff5d7cfc9a 100644
--- a/commons/src/main/res/values-km/strings.xml
+++ b/commons/src/main/res/values-km/strings.xml
@@ -29,6 +29,7 @@
     <string name="state_synced">បញ្ចូន</string>
     <string name="state_to_update">ដើម្បីធ្វើបច្ចុប្បន្នភាព</string>
     <string name="state_error">កំហុសបច្ចេកទេស</string>
+    <string name="state_warning">ព្រមាន</string>
     <!-- Status -->
     <string name="filter_event_status_open">បើក</string>
     <string name="filter_event_status_completed">បានបញ្ចប់</string>
diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 00000000000..492701c0aa0
--- /dev/null
+++ b/commons/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="remove">제거</string>
+    </resources>
diff --git a/commons/src/main/res/values-lo/strings.xml b/commons/src/main/res/values-lo/strings.xml
index 11cd8ae776d..714898e11bd 100644
--- a/commons/src/main/res/values-lo/strings.xml
+++ b/commons/src/main/res/values-lo/strings.xml
@@ -215,4 +215,5 @@
     <string name="period_monthly_title">ເດືອນ</string>
     <string name="period_yearly_title">ປີ</string>
     <string name="action_clear_all">ລຶບທັງໝົດ</string>
-</resources>
+
+    </resources>
diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml
index 1b7a926bfb5..6634e516ff4 100644
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@@ -142,4 +142,5 @@
     <string name="period_quarter_title">Kvartal</string>
     <string name="period_yearly_title">År</string>
     <string name="action_clear_all">Fjern alt</string>
-</resources>
+
+    </resources>
diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml
index 1d4f58714ce..9fe085a656f 100644
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@@ -259,4 +259,5 @@
     <string name="period_quarter_title">Trimestral</string>
     <string name="period_yearly_title">Ano</string>
     <string name="action_clear_all">Limpar tudo</string>
-</resources>
+
+    </resources>
diff --git a/commons/src/main/res/values-uk/strings.xml b/commons/src/main/res/values-uk/strings.xml
index b82b29502ef..8b48dee3607 100644
--- a/commons/src/main/res/values-uk/strings.xml
+++ b/commons/src/main/res/values-uk/strings.xml
@@ -252,4 +252,5 @@
     <string name="period_weekly_title">Тиждень</string>
     <string name="period_yearly_title">Рік</string>
     <string name="action_clear_all">Очистити все</string>
-</resources>
+
+    </resources>
diff --git a/commons/src/main/res/values-uz-rUZ/strings.xml b/commons/src/main/res/values-uz-rUZ/strings.xml
index 1aa348770d0..9ff58ab64a8 100644
--- a/commons/src/main/res/values-uz-rUZ/strings.xml
+++ b/commons/src/main/res/values-uz-rUZ/strings.xml
@@ -126,4 +126,5 @@
     <string name="period_weekly_title">Hafta</string>
     <string name="period_yearly_title">Yil</string>
     <string name="action_clear_all">Barchasini tozalash</string>
-</resources>
+
+    </resources>
diff --git a/commons/src/main/res/values-uz/strings.xml b/commons/src/main/res/values-uz/strings.xml
index 971dfe7ab20..0d23897e3e4 100644
--- a/commons/src/main/res/values-uz/strings.xml
+++ b/commons/src/main/res/values-uz/strings.xml
@@ -154,4 +154,5 @@
     <string name="period_quarter_title">Чорак</string>
     <string name="period_yearly_title">Йил</string>
     <string name="action_clear_all">Барчасини тозалаш</string>
-</resources>
+
+    </resources>
diff --git a/commons/src/main/res/values-zh/strings.xml b/commons/src/main/res/values-zh/strings.xml
index 4ddc1ffd3e2..b5da390dd4d 100644
--- a/commons/src/main/res/values-zh/strings.xml
+++ b/commons/src/main/res/values-zh/strings.xml
@@ -45,6 +45,7 @@
     <string name="bi_weekly">两周</string>
     <string name="weekly_start_wednesday">开始于周三的周报</string>
     <string name="weekly_start_thursday">开始于周四的周报</string>
+    <string name="weekly_start_friday">每周从周五开始</string>
     <string name="weekly_start_saturday">开始于周六的周报</string>
     <string name="weekly_start_sunday">开始于周日的周报</string>
     <string name="monthly">每月</string>
@@ -55,8 +56,11 @@
     <string name="six_monthly_april">开始于四月的每六个月</string>
     <string name="six_monthly_nov">开始于11月的半年</string>
     <string name="yearly">每年</string>
+    <string name="financial_year_february">从 2 月开始的财务年度</string>
     <string name="financial_year_april">开始于四月的财政年</string>
     <string name="financial_year_july">开始于六月的财政年</string>
+    <string name="financial_year_august">从 8 月开始的财政年度</string>
+    <string name="financial_year_september">9 月开始的财政年度</string>
     <string name="financial_year_october">开始于十月的财政年</string>
     <string name="financial_year_november">开始于11月的财政年</string>
 
diff --git a/commonskmm/build.gradle.kts b/commonskmm/build.gradle.kts
index be788975ab8..015dae0bd8d 100644
--- a/commonskmm/build.gradle.kts
+++ b/commonskmm/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 
-    androidLibrary {
+    android {
         namespace = "org.dhis2.mobile.commons"
         compileSdk = libs.versions.sdk.get().toInt()
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/commonskmm/src/commonMain/composeResources/values-ar/strings.xml b/commonskmm/src/commonMain/composeResources/values-ar/strings.xml
index ac890848627..91d61841855 100644
--- a/commonskmm/src/commonMain/composeResources/values-ar/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-ar/strings.xml
@@ -53,6 +53,7 @@
     <string name="discard_go_back">إذا قمت بالخروج الآن ، فسيتم تجاهل جميع المعلومات الموجودة في النموذج.</string>
     <string name="field_errors_not_saved_discard">تحتوي بعض الحقول على أخطاء ولا يتم حفظها. \nإذا قمت بالخروج الآن سيتم تجاهل التغييرات.</string>
     <string name="share">مشاركة</string>
+    <string name="camera_permission_denied">تم رفض إذن الكاميرا.\n تحتاج إلى تمكينها لاستخدام هذه الميزة.</string>
     <string name="action_close">إغلاق</string>
     <string name="copied_text">تم النسخ</string>
     <string name="take_photo">التقط صورة</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-bn/strings.xml b/commonskmm/src/commonMain/composeResources/values-bn/strings.xml
index 6edef692700..f04800bf638 100644
--- a/commonskmm/src/commonMain/composeResources/values-bn/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-bn/strings.xml
@@ -3,4 +3,4 @@
     <string name="invalid_integer">অবশ্যই সংখ্যা হতে হবে</string>
     <string name="error">ভুল</string>
     <string name="due_date">নির্ধারিত তারিখ</string>
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/commonskmm/src/commonMain/composeResources/values-cs/strings.xml b/commonskmm/src/commonMain/composeResources/values-cs/strings.xml
index 6dad687abd7..b5b2b1a23ae 100644
--- a/commonskmm/src/commonMain/composeResources/values-cs/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-cs/strings.xml
@@ -23,7 +23,7 @@
     <string name="conf_error_value_option_set">Hodnota pole %s nepatří do možnosti nastavené v položce %s</string>
     <string name="field_is_mandatory">Toto pole je povinné</string>
     <string name="missing_warning_fields_completed_events">Máte několik varovných hlášení.</string>
-    <string name="missing_warning_fields_events">Máte několik varovných hlášení.\nChcete tento formulář označit jako dokončený\?</string>
+    <string name="missing_warning_fields_events">Máte několik varovných hlášení.\nChcete tento formulář označit jako dokončený?</string>
     <string name="required">Vyžadováno</string>
     <string name="polygon">Polygon</string>
     <string name="latitude">Zeměpisná šířka</string>
@@ -47,9 +47,9 @@
     <string name="complete">Dokončit</string>
     <string name="discard_changes">Zrušit změny</string>
     <string name="saved">Uloženo!</string>
-    <string name="event_error_on_complete">Máte několik chybových hlášení.\nChcete je zkontrolovat\?</string>
-    <string name="missing_error_fields_events">Některá pole obsahují chyby a neukládají se. \nChcete formulář zkontrolovat\?</string>
-    <string name="review_message">Některé oblasti vyžadují vaši pozornost.\nChcete formulář zkontrolovat\?</string>
+    <string name="event_error_on_complete">Máte několik chybových hlášení.\nChcete je zkontrolovat?</string>
+    <string name="missing_error_fields_events">Některá pole obsahují chyby a neukládají se. \nChcete formulář zkontrolovat?</string>
+    <string name="review_message">Některé oblasti vyžadují vaši pozornost.\nChcete formulář zkontrolovat?</string>
     <string name="not_now">Teď ne</string>
     <string name="keep_editing">Pokračovat v úpravách</string>
     <string name="event_can_be_completed">Chcete tento formulář označit jako vyplněný?</string>
@@ -183,7 +183,6 @@
     <string name="database_import_failed">Import databáze se nezdařil</string>
     <string name="invalid_file">Neplatný soubor</string>
     <string name="not_in_totp_2fa_enrollment_mode">Není v režimu registrace TOTP 2FA</string>
-    <string name="openid_login_cancelled">Ověřování zrušeno</string>
     <!--*******************
        END OF D2 Error Messages
     **********************-->
diff --git a/commonskmm/src/commonMain/composeResources/values-es-rES/strings.xml b/commonskmm/src/commonMain/composeResources/values-es-rES/strings.xml
index 63291f3482c..09011442517 100644
--- a/commonskmm/src/commonMain/composeResources/values-es-rES/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-es-rES/strings.xml
@@ -22,6 +22,7 @@
     <string name="conf_error_value_to_assign_option_set">La regla de programa %s está intentando asignar el valor %s que no pertenece al conjunto de opciones %s</string>
     <string name="conf_error_value_option_set">El valor del campo %s no pertenece al conjunto de opciones en %s</string>
     <string name="field_is_mandatory">El campo es obligatorio</string>
+    <string name="missing_warning_fields_events">Tienes algunos mensajes de alerta.\n¿Desea marcar el formulario como Completo?</string>
     <string name="polygon">Polígono</string>
     <string name="latitude">Latitud</string>
     <string name="longitude">Longitud</string>
@@ -44,11 +45,14 @@
     <string name="complete">Completar</string>
     <string name="discard_changes">Descartar los cambios</string>
     <string name="saved">¡Guardado!</string>
+    <string name="event_error_on_complete">Tiene algunos mensajes de error. \n¿Desea revisarlos?</string>
     <string name="not_now">Ahora no</string>
     <string name="keep_editing">Seguir editando</string>
     <string name="event_can_be_completed">¿Desea marcar este formulario como completo?</string>
     <string name="discard_go_back">Si sale toda la información del formulario será descartada.</string>
+    <string name="field_errors_not_saved_discard">Algunos campos tienen errores y no serán guardados. \nSi sale, los cambios serán descartados.</string>
     <string name="share">Compartir</string>
+    <string name="camera_permission_denied">El permiso de la cámara está denegado.\nDebe habilitarlo para usar esta función.</string>
     <string name="action_close">Cerrar</string>
     <string name="copied_text">Copiado</string>
     <string name="take_photo">Tomar foto</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-es/strings.xml b/commonskmm/src/commonMain/composeResources/values-es/strings.xml
index 1d4def10b1d..3433fefd7a2 100644
--- a/commonskmm/src/commonMain/composeResources/values-es/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-es/strings.xml
@@ -23,7 +23,7 @@
     <string name="conf_error_value_option_set">El valor del campo %s no pertenece al conjunto de opciones en %s</string>
     <string name="field_is_mandatory">El campo es obligatorio</string>
     <string name="missing_warning_fields_completed_events">Tienes algunos mensajes de aviso.</string>
-    <string name="missing_warning_fields_events">Tiene algunos mensajes de advertencia.\n¿Deseas marcar este formulario como completo\?</string>
+    <string name="missing_warning_fields_events">Tiene algunos mensajes de advertencia.\n¿Deseas marcar este formulario como completo?</string>
     <string name="required">Necesario</string>
     <string name="polygon">Polígono</string>
     <string name="latitude">Latitud</string>
@@ -47,9 +47,9 @@
     <string name="complete">Completar</string>
     <string name="discard_changes">Descartar los cambios</string>
     <string name="saved">¡Guardado!</string>
-    <string name="event_error_on_complete">Tienes algunos mensajes de error.\n¿Deseas revisarlos\?</string>
-    <string name="missing_error_fields_events">Algunos campos tienen errores y no se han guardado.\n¿Deseas revisar el formulario\?</string>
-    <string name="review_message">Algunos campos necesitan tu atención.\n¿Deseas revisar el formulario\?</string>
+    <string name="event_error_on_complete">Tienes algunos mensajes de error.\n¿Deseas revisarlos?</string>
+    <string name="missing_error_fields_events">Algunos campos tienen errores y no se han guardado.\n¿Deseas revisar el formulario?</string>
+    <string name="review_message">Algunos campos necesitan tu atención.\n¿Deseas revisar el formulario?</string>
     <string name="not_now">Ahora no</string>
     <string name="keep_editing">Seguir editando</string>
     <string name="event_can_be_completed">¿Desea marcar este formulario como completo?</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-fr/strings.xml b/commonskmm/src/commonMain/composeResources/values-fr/strings.xml
index 42fddb45f7d..e983ee8e183 100644
--- a/commonskmm/src/commonMain/composeResources/values-fr/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-fr/strings.xml
@@ -46,11 +46,14 @@
     <string name="complete">Terminer</string>
     <string name="discard_changes">Annuler les modifications</string>
     <string name="saved">Enregistré!</string>
+    <string name="event_error_on_complete">Vous avez des messages d\'erreur.\nVoulez-vous les consulter ?</string>
     <string name="not_now">Pas maintenant</string>
     <string name="keep_editing">Continuer l’édition</string>
     <string name="event_can_be_completed">Voulez-vous marquer ce formulaire comme complet?</string>
     <string name="discard_go_back">Si vous quittez maintenant, toutes les informations du formulaire seront supprimées.</string>
+    <string name="field_errors_not_saved_discard">Certains champs contiennent des erreurs et ils ne sont pas enregistrés. \ nSi vous quittez maintenant, les modifications seront ignorées.</string>
     <string name="share">Partager</string>
+    <string name="camera_permission_denied">L\'autorisation de la caméra est refusée. \nVous devez l\'activer pour utiliser cette fonctionnalité.</string>
     <string name="action_close">Fermer</string>
     <string name="copied_text">Copié</string>
     <string name="take_photo">Prendre une photo</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-hi-rIN/strings.xml b/commonskmm/src/commonMain/composeResources/values-hi-rIN/strings.xml
index 629e42f9920..8d0f3fad63f 100644
--- a/commonskmm/src/commonMain/composeResources/values-hi-rIN/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-hi-rIN/strings.xml
@@ -9,11 +9,16 @@
     <string name="invalid_possitive_zero">केवल शून्य या पॉजिटिव संख्या ही अनुमति है</string>
     <string name="invalid_interval">केवल 0 से 1 के मान ही अनुमति हैं</string>
     <string name="validation_url">यह मान्य URL नहीं है</string>
+    <string name="invalid_integer">वैल्यू इंटीजर होनी चाहिए</string>
+    <string name="wrong_pattern">यह सही फॉर्मेट नहीं है</string>
+    <string name="pattern_error">कॉन्फ़िगर्ड पैटर्न %s गलत है</string>
     <string name="update_field_error">यह फ़ील्ड अपडेट नहीं हो सका। कृपया फिर से प्रयास करें</string>
-    <string name="error">एरर्स</string>
+    <string name="error">त्रुटि</string>
     <string name="unique_warning">मान अद्वितीय होना चाहिए। समान मान मिला है। इसे सहेजा नहीं गया। कृपया जाँच करें</string>
     <string name="select_time">समय चुनें</string>
     <string name="choose_date">दिन चुनें</string>
+    <string name="conf_error_value_to_assign_option_set">प्रोग्राम रूल %s वैल्यू %s असाइन कर रहा है, जो ऑप्शन सेट %s में नहीं है</string>
+    <string name="conf_error_value_option_set">फील्ड का मान %s के ऑप्शन सेट %s में नहीं है</string>
     <string name="field_is_mandatory">यह फ़ील्ड आवश्यक है</string>
     <string name="missing_warning_fields_completed_events">आपके पास कुछ चेतावनी संदेश हैं</string>
     <string name="missing_warning_fields_events">आपके पास कुछ चेतावनी संदेश हैं\nक्या आप इस फ़ॉर्म को कम्प्लीट मार्क करना चाहते हैं?</string>
@@ -24,17 +29,22 @@
     <string name="enter_url">URL दर्ज करें</string>
     <string name="enter_email">ईमेल दर्ज करें</string>
     <string name="enter_phone_number">फ़ोन नंबर दर्ज करें</string>
+    <string name="enter_positive_integer_or_zero">पॉजिटिव इंटीजर या शून्य दर्ज करें</string>
+    <string name="enter_negative_integer">नेगेटिव इंटीजर दर्ज करें</string>
+    <string name="enter_positive_integer">पॉजिटिव इंटीजर दर्ज करें</string>
     <string name="enter_number">नंबर दर्ज करें</string>
     <string name="enter_percentage">प्रतिशत दर्ज करें</string>
     <string name="enter_unit_interval">0 से 1 नंबर दर्ज करें</string>
     <string name="enter_letter">अक्षर दर्ज करें</string>
     <string name="enter_long_text">लंबा अक्षर दर्ज करें</string>
     <string name="enter_text">पाठ दर्ज करें</string>
+    <string name="due_date">नियत तिथि</string>
     <string name="not_saved">सेव नहीं</string>
     <string name="review">रिव्यू</string>
     <string name="complete">पूरा हुआ</string>
     <string name="discard_changes">बदलावों को छोड़ना है</string>
     <string name="saved">सेव</string>
+    <string name="event_error_on_complete">आपके पास कुछ एरर संदेश हैं\nक्या आप उन्हें समीक्षा करना चाहते हैं?</string>
     <string name="not_now">अभी नहीं</string>
     <string name="keep_editing">संपादन करते रहें</string>
     <string name="share">साझा करें</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-lo/strings.xml b/commonskmm/src/commonMain/composeResources/values-lo/strings.xml
index 50e290bb0f5..5db68114243 100644
--- a/commonskmm/src/commonMain/composeResources/values-lo/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-lo/strings.xml
@@ -45,11 +45,13 @@
     <string name="complete">ສຳເລັດແລ້ວ</string>
     <string name="discard_changes">ລຶບການປ່ຽນແປງ</string>
     <string name="saved">ບັນທຶກແລ້ວ!</string>
+    <string name="event_error_on_complete">ທ່ານມີຂໍ້ຜິດພາດໃນບາງຂໍ້ຄວາມ.\nທ່ານຕ້ອງການກວດເບິ່ງຄືນບໍ?</string>
     <string name="not_now">ບໍ່​ແມ່ນ​ຕອນ​ນີ້</string>
     <string name="keep_editing">ສຶບຕໍ່ແກ້ໄຂ</string>
     <string name="event_can_be_completed">ທ່ານຕ້ອງການໝາຍແບບຟອມນີ້ວ່າສຳເລັດແລ້ວຫຼືບໍ?</string>
     <string name="discard_go_back">ຖ້າທ່ານອອກດຽວນີ້ ຂໍ້ມູນທັງໝົດໃນແບບຟອມຈະຖືກຍົກເລີກ.</string>
     <string name="share">ເຜີຍແຜ່</string>
+    <string name="camera_permission_denied">ການ​ອະ​ນຸ​ຍາດ​ໃຊ້ກ້ອງ​ຖ່າຍ​ຮູບ​ຖືກ​ປະ​ຕິ​ເສດ. ທ່ານ​​ຕ້ອງ​ເປີດ​ໃຊ້​ງານເພື່ອ​ໃຊ້​ຄຸນ​ສົມ​ບັດ​ນີ້​.</string>
     <string name="action_close">ປິດ</string>
     <string name="copied_text">ສຳເນົາແລ້ວ</string>
     <string name="take_photo">ຖ່າຍຮູບ</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-nl/strings.xml b/commonskmm/src/commonMain/composeResources/values-nl/strings.xml
index ef3fc47b3f1..2481a0186e5 100644
--- a/commonskmm/src/commonMain/composeResources/values-nl/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-nl/strings.xml
@@ -45,11 +45,14 @@
     <string name="complete">Compleet</string>
     <string name="discard_changes">Veranderingen ongedaan maken</string>
     <string name="saved">Opgeslagen!</string>
+    <string name="event_error_on_complete">U heeft een aantal foutmeldingen.\nWilt u deze bekijken?</string>
     <string name="not_now">Niet nu</string>
     <string name="keep_editing">Blijf bewerken</string>
     <string name="event_can_be_completed">Wilt u dit formulier als voltooid markeren?</string>
     <string name="discard_go_back">Als u nu afsluit, wordt alle informatie in het formulier weggegooid.</string>
+    <string name="field_errors_not_saved_discard">Sommige velden bevatten fouten en worden niet opgeslagen. \Als u nu afsluit, worden de wijzigingen verwijderd.</string>
     <string name="share">Deel</string>
+    <string name="camera_permission_denied">Cameratoestemming is geweigerd.\Je moet deze inschakelen om deze functie te gebruiken.</string>
     <string name="action_close">Sluit</string>
     <string name="copied_text">Gekopieerd</string>
     <string name="take_photo">Neem foto</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-pt/strings.xml b/commonskmm/src/commonMain/composeResources/values-pt/strings.xml
index c2498ba2970..f1d0cf40bfe 100644
--- a/commonskmm/src/commonMain/composeResources/values-pt/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-pt/strings.xml
@@ -46,11 +46,14 @@
     <string name="complete">Concluir</string>
     <string name="discard_changes">Descartar alterações</string>
     <string name="saved">Gravado!</string>
+    <string name="event_error_on_complete">Tem algumas mensagens de erro. Quer revê-las?</string>
     <string name="not_now">Agora não</string>
     <string name="keep_editing">Continue a editar</string>
     <string name="event_can_be_completed">Deseja marcar este formulário como completo?</string>
     <string name="discard_go_back">Se sair agora, todas as informações do formulário serão descartadas.</string>
+    <string name="field_errors_not_saved_discard">Alguns campos têm erros e não são guardados. \Se sair agora, as suas alterações serão descartadas.</string>
     <string name="share">Partilhar</string>
+    <string name="camera_permission_denied">A permissão da câmara é negada.\nPrecisa de a ativar para utilizar esta funcionalidade.</string>
     <string name="action_close">Fechar</string>
     <string name="copied_text">Copiado</string>
     <string name="take_photo"> Tirar fotografia</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-ru/strings.xml b/commonskmm/src/commonMain/composeResources/values-ru/strings.xml
index 5f8be6e2bb1..db01df14eb6 100644
--- a/commonskmm/src/commonMain/composeResources/values-ru/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-ru/strings.xml
@@ -21,7 +21,7 @@
     <string name="conf_error_value_to_assign_option_set">Правило программы %s пытается присвоить значение %s, которое не принадлежит набору опций. %s</string>
     <string name="field_is_mandatory">Это поле обязательно для заполнения</string>
     <string name="missing_warning_fields_completed_events">У вас есть несколько предупреждающих сообщений.</string>
-    <string name="missing_warning_fields_events">У Вас есть несколько предупреждающих сообщений.\nХотите ли Вы отметить эту форму как завершенную\?</string>
+    <string name="missing_warning_fields_events">У Вас есть несколько предупреждающих сообщений.\nХотите ли Вы отметить эту форму как завершенную?</string>
     <string name="required">Обязательный</string>
     <string name="polygon">Полигон</string>
     <string name="latitude">Широта</string>
@@ -45,9 +45,9 @@
     <string name="complete">Завершить</string>
     <string name="discard_changes">Не сохранять изменения</string>
     <string name="saved">Сохранено!</string>
-    <string name="event_error_on_complete">У Вас есть несколько сообщений об ошибках.\nХотите просмотреть их\?</string>
-    <string name="missing_error_fields_events">В некоторых полях есть ошибки, и они не сохраняются. \nВы хотите просмотреть форму\?</string>
-    <string name="review_message">Некоторые поля требуют Вашего внимания.\nХотите просмотреть форму\?</string>
+    <string name="event_error_on_complete">У Вас есть несколько сообщений об ошибках.\nХотите просмотреть их?</string>
+    <string name="missing_error_fields_events">В некоторых полях есть ошибки, и они не сохраняются. \nВы хотите просмотреть форму?</string>
+    <string name="review_message">Некоторые поля требуют Вашего внимания.\nХотите просмотреть форму?</string>
     <string name="not_now">Не сейчас</string>
     <string name="keep_editing">Продолжить редактирование</string>
     <string name="event_can_be_completed">Хотите ли Вы отметить эту форму как завершенную?</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-si/strings.xml b/commonskmm/src/commonMain/composeResources/values-si/strings.xml
index 21aa1406a9e..7a76bba81b0 100644
--- a/commonskmm/src/commonMain/composeResources/values-si/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-si/strings.xml
@@ -7,4 +7,4 @@
     <string name="input_age_or">හෝ</string>
     <string name="input_action_accept">පිළිගන්න</string>
     <string name="action_done">නිම කළා</string>
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/commonskmm/src/commonMain/composeResources/values-uk/strings.xml b/commonskmm/src/commonMain/composeResources/values-uk/strings.xml
index 63e2e009d39..b5edea37337 100644
--- a/commonskmm/src/commonMain/composeResources/values-uk/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-uk/strings.xml
@@ -45,11 +45,14 @@
     <string name="complete">Завершити</string>
     <string name="discard_changes">Відхилити внесені зміни</string>
     <string name="saved">Збережено!</string>
+    <string name="event_error_on_complete">У вас є кілька повідомлень про помилки. Бажаєте їх переглянути?</string>
     <string name="not_now">Не зараз</string>
     <string name="keep_editing">Продовжити редагування</string>
     <string name="event_can_be_completed">Ви бажаєте позначити цю форму як завершену?</string>
     <string name="discard_go_back">Якщо Ви зараз вийдете, уся інформація у формі буде відхилена.</string>
+    <string name="field_errors_not_saved_discard">Деякі поля містять помилки і не були збережені. Якщо Ви вийдете зараз, внесені зміни буде скасовано.</string>
     <string name="share">Поділитися</string>
+    <string name="camera_permission_denied">Відмовлено у використанні камери. Вам потрібно ввімкнути цей дозвіл, щоб використовувати цю функцію.</string>
     <string name="action_close">Закрити</string>
     <string name="copied_text">Скопійовано</string>
     <string name="take_photo">Зробити фото</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-ur/strings.xml b/commonskmm/src/commonMain/composeResources/values-ur/strings.xml
index 8505ea64dce..4327fe9a0dd 100644
--- a/commonskmm/src/commonMain/composeResources/values-ur/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-ur/strings.xml
@@ -6,7 +6,6 @@
     <string name="polygon">کثیر زبان</string>
     <string name="latitude">طول</string>
     <string name="longitude">لمبائی</string>
-    <string name="polygon_captured">کثیر الاضلاع (حدود) محفوظ کر لی گئیں</string>
     <string name="due_date">اخری تاریخ</string>
     <string name="complete">مکمل</string>
     <string name="share">بانٹیں</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-uz/strings.xml b/commonskmm/src/commonMain/composeResources/values-uz/strings.xml
index af1e7cadc1c..025362ec8ad 100644
--- a/commonskmm/src/commonMain/composeResources/values-uz/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-uz/strings.xml
@@ -42,6 +42,7 @@
     <string name="not_now">Hozir emas</string>
     <string name="keep_editing">Таҳрирни давом этинг</string>
     <string name="share">Улашиш</string>
+    <string name="camera_permission_denied">Камерада фойдаланишга рухсат берилмаган. Ушбу функциядан фойдаланиш учун уни ёқишингиз керак.</string>
     <string name="action_close">Ёпмоқ</string>
     <string name="copied_text">Нусха олинди</string>
     <string name="take_photo">Суратга олиш</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-vi/strings.xml b/commonskmm/src/commonMain/composeResources/values-vi/strings.xml
index 14e75b53b2a..78e1b282f1c 100644
--- a/commonskmm/src/commonMain/composeResources/values-vi/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-vi/strings.xml
@@ -23,7 +23,7 @@
     <string name="conf_error_value_option_set">Giá trị của trường %s không thuộc tùy chọn trong %s</string>
     <string name="field_is_mandatory">Trường dữ liệu này bắt buộc</string>
     <string name="missing_warning_fields_completed_events">Bạn có một số tin nhắn cảnh báo.</string>
-    <string name="missing_warning_fields_events">Bạn có một số tin nhắn cảnh báo..\nBạn có muốn đánh dấu biểu nhập này là hoàn tất không\?</string>
+    <string name="missing_warning_fields_events">Bạn có một số tin nhắn cảnh báo..\nBạn có muốn đánh dấu biểu nhập này là hoàn tất không?</string>
     <string name="required">Bắt buộc</string>
     <string name="polygon">Đa giác</string>
     <string name="latitude">Vĩ độ</string>
@@ -47,9 +47,9 @@
     <string name="complete">Hoàn tất</string>
     <string name="discard_changes">Hủy bỏ các thay đổi</string>
     <string name="saved">Đã lưu!</string>
-    <string name="event_error_on_complete">Bạn có một số tin nhắn lỗi.\nBạn có muốn xem không\?</string>
-    <string name="missing_error_fields_events">Một số trường dữ liệu có lỗi và chưa được lưu. \nBạn có muốn xem lại biểu nhập không\?</string>
-    <string name="review_message">Một số trường dữ liệu cần bạn chú ý.\nBạn có muốn xem xét biểu nhập không\?</string>
+    <string name="event_error_on_complete">Bạn có một số tin nhắn lỗi.\nBạn có muốn xem không?</string>
+    <string name="missing_error_fields_events">Một số trường dữ liệu có lỗi và chưa được lưu. \nBạn có muốn xem lại biểu nhập không?</string>
+    <string name="review_message">Một số trường dữ liệu cần bạn chú ý.\nBạn có muốn xem xét biểu nhập không?</string>
     <string name="not_now">Không phải bây giờ</string>
     <string name="keep_editing">Tiếp tục chỉnh sửa</string>
     <string name="event_can_be_completed">Bạn có muốn đánh dấu biểu nhập này là hoàn tất không?</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-zh-rCN/strings.xml b/commonskmm/src/commonMain/composeResources/values-zh-rCN/strings.xml
index a83b6a4bc30..91edbb652bc 100644
--- a/commonskmm/src/commonMain/composeResources/values-zh-rCN/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-zh-rCN/strings.xml
@@ -46,11 +46,13 @@
     <string name="complete">完成</string>
     <string name="discard_changes">忽略修改</string>
     <string name="saved">已经保存！</string>
+    <string name="event_error_on_complete">您有一些错误消息。\n您要查看它们吗？</string>
     <string name="not_now">现在不要</string>
     <string name="keep_editing">继续编辑</string>
     <string name="event_can_be_completed">您想将此表单标记为已完成吗？</string>
     <string name="discard_go_back">如果您现在退出，表单中的所有信息都将被丢弃。</string>
     <string name="share">分享</string>
+    <string name="camera_permission_denied">相机权限被拒绝。\n 您需要启用它才能使用此功能。</string>
     <string name="action_close">关闭</string>
     <string name="copied_text">副本</string>
     <string name="take_photo">拍照</string>
diff --git a/commonskmm/src/commonMain/composeResources/values-zh/strings.xml b/commonskmm/src/commonMain/composeResources/values-zh/strings.xml
index 86d410771c6..a76483042f0 100644
--- a/commonskmm/src/commonMain/composeResources/values-zh/strings.xml
+++ b/commonskmm/src/commonMain/composeResources/values-zh/strings.xml
@@ -143,6 +143,7 @@
     <string name="error_create_existing_error">创作中止。对象已经存在。</string>
     <string name="error_delete_non_existing_object">删除已中止。对象不存在。</string>
     <string name="error_instance_keystore">无法实例化密钥库。</string>
+    <string name="error_reserve_value_on_server">我们无法为这些记录保留数值。请联系您的管理员。</string>
     <string name="error_export_login">请登录以导出数据库。</string>
     <string name="error_export_encrypted">不支持导出加密数据库。</string>
     <string name="error_import_exist">您正在导入一个已经存在的数据库。</string>
@@ -169,6 +170,7 @@
     <string name="error_socket_timeout">服务器花费了太多时间来响应。我们取消了请求。</string>
     <string name="error_relationship_updated">关系无法更新。</string>
     <string name="error_too_many_periods">期间太多了。</string>
+    <string name="error_url_not_found">我们找不到 URL。请验证。</string>
     <string name="error_account_disabled">您的用户帐户已被禁用。如果这是错误，请联系您的管理员。</string>
     <string name="error_account_locked">您的用户帐户被锁定。如果这是错误，请联系您的管理员。</string>
     <string name="error_set_value">无法设置该值。</string>
@@ -177,13 +179,13 @@
     <string name="error_sms_not_supported">不支持短信。</string>
     <string name="error_min_attributes">没有足够的属性来执行搜索。请使用更多属性优化您的搜索。</string>
     <string name="error_org_unit_scope">在线搜索仅适用于您的用户搜索组织单位。</string>
+    <string name="invalid_configuration">配置无效</string>
     <string name="error_invalid_characters">查询中有无效字符。请让管理员验证服务器配置（relaxedQueryChars，...）。</string>
     <string name="error_server_unavailable">服务器当前不可用。稍后再试。</string>
     <string name="error_no_internet_connection">您已离线。连接到互联网并重试。</string>
     <string name="database_import_failed">数据库导入失败</string>
     <string name="invalid_file">无效文件</string>
     <string name="not_in_totp_2fa_enrollment_mode">未进入 TOTP 2FA 注册模式</string>
-    <string name="openid_login_cancelled">认证取消</string>
     <!--*******************
        END OF D2 Error Messages
     **********************-->
diff --git a/dhis_android_analytics/src/main/res/values-en-rUS/strings.xml b/dhis_android_analytics/src/main/res/values-en-rUS/strings.xml
index a508bacacfb..40df7fe8191 100644
--- a/dhis_android_analytics/src/main/res/values-en-rUS/strings.xml
+++ b/dhis_android_analytics/src/main/res/values-en-rUS/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_accept">Accept</string>
-    </resources>
+    </resources>
\ No newline at end of file
diff --git a/dhis_android_analytics/src/main/res/values-hi-rIN/strings.xml b/dhis_android_analytics/src/main/res/values-hi-rIN/strings.xml
index 38f6eba739a..9fe420b5b87 100644
--- a/dhis_android_analytics/src/main/res/values-hi-rIN/strings.xml
+++ b/dhis_android_analytics/src/main/res/values-hi-rIN/strings.xml
@@ -1,13 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="show_bar_graph">बार व्यू</string>
+    <string name="show_line_graph">लाइन व्यू</string>
+    <string name="show_table_graph">टेबल व्यू</string>
+    <string name="show_table_value">वैल्यू व्यू</string>
+    <string name="show_radar_graph">रेडार व्यू</string>
+    <string name="show_pie_value">पाई व्यू</string>
     <string name="action_accept">स्वीकार करें</string>
+    <string name="period">पीरियड</string>
     <string name="daily">रोज़ाना</string>
     <string name="today">आज</string>
+    <string name="other">दूसरा</string>
     <string name="yesterday">कल (बिता हुआ)</string>
+    <string name="last3Days">पिछले 3 दिन</string>
+    <string name="last7Days">पिछले 7 दिन</string>
+    <string name="last14Days">पिछले 14 दिन</string>
+    <string name="last30Days">पिछले 30 दिन</string>
+    <string name="thisweek">इस सप्ताह</string>
+    <string name="lastweek">पिछला सप्ताह</string>
+    <string name="last4weeks">पिछला 4 सप्ताह</string>
+    <string name="last12weeks">पिछला 12 सप्ताह</string>
+    <string name="thismonth">इस महीने</string>
+    <string name="lastmonth">पिछला महीना</string>
+    <string name="last3months">पिछला 3 महीने</string>
+    <string name="last6months">पिछला 6 महीने</string>
+    <string name="last12months">पिछला 12 महीने</string>
+    <string name="monthsthisyear">महीने इस वर्ष</string>
+    <string name="thisquarter">इस क्वार्टर</string>
+    <string name="lastquarter">पिछली क्वार्टर</string>
+    <string name="last4quarters">पिछली 4 क्वार्टर</string>
+    <string name="quartersthisyear">क्वार्टर इस वर्ष</string>
     <string name="thisyear">इस वर्ष</string>
+    <string name="lastyear">पिछला वर्ष</string>
+    <string name="last5years">पिछले 5 वर्ष</string>
     <string name="weekly">साप्ताहिक</string>
     <string name="monthly">मासिक</string>
     <string name="yearly">वार्षिक</string>
     <string name="all">सभी</string>
-    <string name="reset">रीसेट करें</string>
-    </resources>
\ No newline at end of file
+    <string name="selection">चयन</string>
+    <string name="reset">रीसेट</string>
+    <string name="include_this_period_title">क्या आप करंट पीरियड शामिल करना चाहते हैं\?</string>
+    <string name="include_this_period_body">यह चार्ट में वर्तमान अवधि दिखाएगा</string>
+    <string name="no_data_for_selected_filters">आपके द्वारा लगाए गए फ़िल्टर कोई डेटा नहीं दिखा रहे हैं</string>
+    <string name="no_data_to_display">दिखाने के लिए कोई डेटा उपलब्ध नहीं है</string>
+    <string name="visualization_failure">विज़ुअलाइज़ेशन में कुछ समस्या है</string>
+    <string name="visualization_groups_failure">विज़ुअलाइज़ेशन ग्रुप्स में कुछ समस्या है</string>
+    <string name="pie_chart_no_data">सभी डेटा शून्य हैं</string>
+    <string name="error_invalid_arguments">यह विज़ुअलाइज़ेशन सही से कॉन्फ़िगर नहीं है, कृपया अपने एडमिन से संपर्क करें</string>
+    <string name="error_invalid_data_element">आपके पास डेटा एलिमेंट %s का एक्सेस नहीं है</string>
+    <string name="error_invalid_data_element_operand">आपके पास डेटा एलिमेंट ऑपेरेंड %s का एक्सेस नहीं है</string>
+    <string name="error_invalid_indicator">आपके पास इंडिकेटर %s का एक्सेस नहीं है</string>
+    <string name="error_invalid_program_indicator">आपके पास प्रोग्राम इंडिकेटर %s का एक्सेस नहीं है</string>
+    <string name="error_invalid_visualization">विज़ुअलाइज़ेशन %s उपलब्ध नहीं है</string>
+    <string name="error_parsing_visualization">यह विज़ुअलाइज़ेशन सही से कॉन्फ़िगर नहीं है, कृपया अपने एडमिन से संपर्क करें</string>
+    <string name="error_database">डेटाबेस एक्सेस नहीं हो रहा है। कृपया अपने एडमिन से संपर्क करें</string>
+    <string name="error_invalid_program">आपके पास प्रोग्राम %s का एक्सेस नहीं है</string>
+    <string name="error_invalid_attribute">आपके पास एट्रिब्यूट %s का एक्सेस नहीं है</string>
+    <string name="error_unsupported_aggregation_type">अनसपोर्टेड एग्रीगेशन टाइप %s</string>
+    <string name="line_listing_max_results">टेबल एंट्रीज़ %1$s तक लिमिटेड है। रिज़ल्ट्स को रिफ़ाइन करने के लिए फ़िल्टर करें</string>
+</resources>
\ No newline at end of file
diff --git a/form/src/main/res/values-ar/strings.xml b/form/src/main/res/values-ar/strings.xml
index dea6bedbd9c..bca48101eaa 100644
--- a/form/src/main/res/values-ar/strings.xml
+++ b/form/src/main/res/values-ar/strings.xml
@@ -39,11 +39,9 @@
     <string name="keep_editing">استمر في التعديل</string>
     <string name="event_can_be_completed">هل تريد وضع علامة على هذا النموذج كمكتمل؟</string>
     <string name="discard_go_back">إذا قمت بالخروج الآن ، فسيتم تجاهل جميع المعلومات الموجودة في النموذج.</string>
-    <string name="field_errors_not_saved">بعض الحقول بها أخطاء ولم يتم حفظها.</string>
-    <string name="fields_mandatory_missing">بعض الحقول الإلزامية غير مدخله ولا يمكن حفظ النموذج.</string>
-    <string name="fields_mandatory_missing_discard">بعض الحقول الإلزامية مفقودة ولا يمكن حفظ النموذج. \nإذا قمت بالخروج الآن سيتم تجاهل التغييرات.</string>
-    <string name="field_errors_not_saved_discard">بعض الحقول بها أخطاء ولم يتم حفظها. \n إذا قمت بالخروج الآن ، فسيتم تجاهل التغييرات.</string>
+    <string name="field_errors_not_saved_discard">تحتوي بعض الحقول على أخطاء ولا يتم حفظها. \nإذا قمت بالخروج الآن سيتم تجاهل التغييرات.</string>
     <string name="share">مشاركة</string>
+    <string name="camera_permission_denied">تم رفض إذن الكاميرا.\n تحتاج إلى تمكينها لاستخدام هذه الميزة.</string>
     <string name="action_close">إغلاق</string>
     <string name="copied_text">تم النسخ</string>
     <string name="take_photo">التقط صورة</string>
diff --git a/form/src/main/res/values-cs/strings.xml b/form/src/main/res/values-cs/strings.xml
index 959afd7d3a0..c05af111f4c 100644
--- a/form/src/main/res/values-cs/strings.xml
+++ b/form/src/main/res/values-cs/strings.xml
@@ -41,10 +41,7 @@
     <string name="keep_editing">Pokračovat v úpravách</string>
     <string name="event_can_be_completed">Chcete tento formulář označit jako vyplněný?</string>
     <string name="discard_go_back">Pokud nyní odejdete, všechny informace ve formuláři budou zahozeny.</string>
-    <string name="field_errors_not_saved">Některá pole obsahují chyby a neuloží se.</string>
-    <string name="fields_mandatory_missing">Některá povinná pole chybí a formulář nelze uložit.</string>
-    <string name="fields_mandatory_missing_discard">Chybí některá povinná pole a formulář nelze uložit. \nPokud nyní formulář ukončíte, změny budou zrušeny.</string>
-    <string name="field_errors_not_saved_discard">Některá pole obsahují chyby a neuloží se. \nPokud nyní skončíte, změny budou zahozeny.</string>
+    <string name="field_errors_not_saved_discard">Některá pole obsahují chyby a neukládají se. \nPokud je nyní ukončíte, změny budou zrušeny.</string>
     <string name="share">Sdílet</string>
     <string name="camera_permission_denied">Povolení k použití kamery je zamítnuto.\nChcete-li tuto funkci používat, musíte ji povolit.</string>
     <string name="action_close">Zavřít</string>
diff --git a/form/src/main/res/values-es-rES/strings.xml b/form/src/main/res/values-es-rES/strings.xml
index 88b07f7aa21..5c7de171231 100644
--- a/form/src/main/res/values-es-rES/strings.xml
+++ b/form/src/main/res/values-es-rES/strings.xml
@@ -9,11 +9,6 @@
     <string name="conf_error_value_to_assign_option_set">La regla de programa %s está intentando asignar el valor %s que no pertenece al conjunto de opciones %s</string>
     <string name="conf_error_value_option_set">El valor del campo %s no pertenece al conjunto de opciones en %s</string>
     <string name="field_is_mandatory">El campo es obligatorio</string>
-    <string name="date">Fecha</string>
-    <string name="hint_year">Años</string>
-    <string name="hint_month">Meses</string>
-    <string name="hint_day">Días</string>
-    <string name="wrong_date_format">%s no es una fecha válida</string>
     <string name="missing_warning_fields_events">Tienes algunos mensajes de alerta.\n¿Desea marcar el formulario como Completo?</string>
     <string name="polygon">Polígono</string>
     <string name="latitude">Latitud</string>
@@ -37,14 +32,14 @@
     <string name="complete">Completar</string>
     <string name="discard_changes">Descartar los cambios</string>
     <string name="saved">¡Guardado!</string>
+    <string name="event_error_on_complete">Tiene algunos mensajes de error. \n¿Desea revisarlos\?</string>
     <string name="not_now">Ahora no</string>
     <string name="keep_editing">Seguir editando</string>
     <string name="event_can_be_completed">¿Desea marcar este formulario como completo?</string>
     <string name="discard_go_back">Si sale toda la información del formulario será descartada.</string>
-    <string name="field_errors_not_saved">Algunos campos tienen errores y no serán guardados.</string>
-    <string name="fields_mandatory_missing">Algunos campos obligatorios faltan llenarse, el formulario no puede ser guardado</string>
     <string name="field_errors_not_saved_discard">Algunos campos tienen errores y no serán guardados. \nSi sale, los cambios serán descartados.</string>
     <string name="share">Compartir</string>
+    <string name="camera_permission_denied">El permiso de la cámara está denegado.\nDebe habilitarlo para usar esta función.</string>
     <string name="action_close">Cerrar</string>
     <string name="copied_text">Copiado</string>
     <string name="take_photo">Tomar foto</string>
diff --git a/form/src/main/res/values-es/strings.xml b/form/src/main/res/values-es/strings.xml
index e10b858837f..eb8b6b6a346 100644
--- a/form/src/main/res/values-es/strings.xml
+++ b/form/src/main/res/values-es/strings.xml
@@ -41,10 +41,7 @@
     <string name="keep_editing">Seguir editando</string>
     <string name="event_can_be_completed">¿Desea marcar este formulario como completo?</string>
     <string name="discard_go_back">Si sale toda la información del formulario será descartada.</string>
-    <string name="field_errors_not_saved">Algunos campos tienen errores y no serán guardados.</string>
-    <string name="fields_mandatory_missing">Algunos campos obligatorios faltan llenarse, el formulario no puede ser guardado</string>
-    <string name="fields_mandatory_missing_discard">Faltan algunos campos obligatorios y el formulario no puede guardarse.\nSi sales ahora, los cambios se descartarán.</string>
-    <string name="field_errors_not_saved_discard">Algunos campos tienen errores y no serán guardados. \nSi sale, los cambios serán descartados.</string>
+    <string name="field_errors_not_saved_discard">Algunos campos presentan errores y no se han guardado.\nSi sales ahora, los cambios se descartarán.</string>
     <string name="share">Compartir</string>
     <string name="camera_permission_denied">El permiso de cámara está denegado.\nDebes activarlo para usar esta función.</string>
     <string name="action_close">Cerrar</string>
diff --git a/form/src/main/res/values-fr/strings.xml b/form/src/main/res/values-fr/strings.xml
index d3c8bd3f860..e4f34622344 100644
--- a/form/src/main/res/values-fr/strings.xml
+++ b/form/src/main/res/values-fr/strings.xml
@@ -33,14 +33,14 @@
     <string name="complete">Terminer</string>
     <string name="discard_changes">Annuler les modifications</string>
     <string name="saved">Enregistré!</string>
+    <string name="event_error_on_complete">Vous avez des messages d\'erreur.\nVoulez-vous les consulter \?</string>
     <string name="not_now">Pas maintenant</string>
     <string name="keep_editing">Continuer l’édition</string>
     <string name="event_can_be_completed">Voulez-vous marquer ce formulaire comme complet?</string>
     <string name="discard_go_back">Si vous quittez maintenant, toutes les informations du formulaire seront supprimées.</string>
-    <string name="field_errors_not_saved">Certains champs contiennent des erreurs et ils ne sont pas enregistrés.</string>
-    <string name="fields_mandatory_missing">Certains champs obligatoires manquent et le formulaire ne peut pas être enregistré.</string>
     <string name="field_errors_not_saved_discard">Certains champs contiennent des erreurs et ils ne sont pas enregistrés. \ nSi vous quittez maintenant, les modifications seront ignorées.</string>
     <string name="share">Partager</string>
+    <string name="camera_permission_denied">L\'autorisation de la caméra est refusée. \nVous devez l\'activer pour utiliser cette fonctionnalité.</string>
     <string name="action_close">Fermer</string>
     <string name="copied_text">Copié</string>
     <string name="take_photo">Prendre une photo</string>
diff --git a/form/src/main/res/values-hi-rIN/strings.xml b/form/src/main/res/values-hi-rIN/strings.xml
index 4393d506f2d..ad32282e3a4 100644
--- a/form/src/main/res/values-hi-rIN/strings.xml
+++ b/form/src/main/res/values-hi-rIN/strings.xml
@@ -5,6 +5,8 @@
     <string name="unique_warning">मान अद्वितीय होना चाहिए। समान मान मिला है। इसे सहेजा नहीं गया। कृपया जाँच करें</string>
     <string name="select_time">समय चुनें</string>
     <string name="choose_date">दिन चुनें</string>
+    <string name="conf_error_value_to_assign_option_set">प्रोग्राम रूल %s वैल्यू %s असाइन कर रहा है, जो ऑप्शन सेट %s में नहीं है</string>
+    <string name="conf_error_value_option_set">फील्ड का मान %s के ऑप्शन सेट %s में नहीं है</string>
     <string name="field_is_mandatory">यह फ़ील्ड आवश्यक है</string>
     <string name="missing_warning_fields_completed_events">आपके पास कुछ चेतावनी संदेश हैं</string>
     <string name="missing_warning_fields_events">आपके पास कुछ चेतावनी संदेश हैं\nक्या आप इस फ़ॉर्म को कम्प्लीट मार्क करना चाहते हैं\?</string>
@@ -15,17 +17,22 @@
     <string name="enter_url">URL दर्ज करें</string>
     <string name="enter_email">ईमेल दर्ज करें</string>
     <string name="enter_phone_number">फ़ोन नंबर दर्ज करें</string>
+    <string name="enter_positive_integer_or_zero">पॉजिटिव इंटीजर या शून्य दर्ज करें</string>
+    <string name="enter_negative_integer">नेगेटिव इंटीजर दर्ज करें</string>
+    <string name="enter_positive_integer">पॉजिटिव इंटीजर दर्ज करें</string>
     <string name="enter_number">नंबर दर्ज करें</string>
     <string name="enter_percentage">प्रतिशत दर्ज करें</string>
     <string name="enter_unit_interval">0 से 1 नंबर दर्ज करें</string>
     <string name="enter_letter">अक्षर दर्ज करें</string>
     <string name="enter_long_text">लंबा अक्षर दर्ज करें</string>
     <string name="enter_text">पाठ दर्ज करें</string>
+    <string name="due_date">नियत तिथि</string>
     <string name="not_saved">सेव नहीं</string>
     <string name="review">रिव्यू</string>
     <string name="complete">पूरा हुआ</string>
     <string name="discard_changes">बदलावों को छोड़ना है</string>
     <string name="saved">सेव</string>
+    <string name="event_error_on_complete">आपके पास कुछ एरर संदेश हैं\nक्या आप उन्हें समीक्षा करना चाहते हैं\?</string>
     <string name="not_now">अभी नहीं</string>
     <string name="keep_editing">संपादन करते रहें</string>
     <string name="share">साझा करें</string>
diff --git a/form/src/main/res/values-lo/strings.xml b/form/src/main/res/values-lo/strings.xml
index c641b7d3496..5f8faa8dd70 100644
--- a/form/src/main/res/values-lo/strings.xml
+++ b/form/src/main/res/values-lo/strings.xml
@@ -32,11 +32,13 @@
     <string name="complete">ສຳເລັດແລ້ວ</string>
     <string name="discard_changes">ລຶບການປ່ຽນແປງ</string>
     <string name="saved">ບັນທຶກແລ້ວ!</string>
+    <string name="event_error_on_complete">ທ່ານມີຂໍ້ຜິດພາດໃນບາງຂໍ້ຄວາມ.\nທ່ານຕ້ອງການກວດເບິ່ງຄືນບໍ\?</string>
     <string name="not_now">ບໍ່​ແມ່ນ​ຕອນ​ນີ້</string>
     <string name="keep_editing">ສຶບຕໍ່ແກ້ໄຂ</string>
     <string name="event_can_be_completed">ທ່ານຕ້ອງການໝາຍແບບຟອມນີ້ວ່າສຳເລັດແລ້ວຫຼືບໍ?</string>
     <string name="discard_go_back">ຖ້າທ່ານອອກດຽວນີ້ ຂໍ້ມູນທັງໝົດໃນແບບຟອມຈະຖືກຍົກເລີກ.</string>
     <string name="share">ເຜີຍແຜ່</string>
+    <string name="camera_permission_denied">ການ​ອະ​ນຸ​ຍາດ​ໃຊ້ກ້ອງ​ຖ່າຍ​ຮູບ​ຖືກ​ປະ​ຕິ​ເສດ. ທ່ານ​​ຕ້ອງ​ເປີດ​ໃຊ້​ງານເພື່ອ​ໃຊ້​ຄຸນ​ສົມ​ບັດ​ນີ້​.</string>
     <string name="action_close">ປິດ</string>
     <string name="copied_text">ສຳເນົາແລ້ວ</string>
     <string name="take_photo">ຖ່າຍຮູບ</string>
diff --git a/form/src/main/res/values-nl/strings.xml b/form/src/main/res/values-nl/strings.xml
index 36972853645..b9b76d4c82a 100644
--- a/form/src/main/res/values-nl/strings.xml
+++ b/form/src/main/res/values-nl/strings.xml
@@ -32,14 +32,14 @@
     <string name="complete">Compleet</string>
     <string name="discard_changes">Veranderingen ongedaan maken</string>
     <string name="saved">Opgeslagen!</string>
+    <string name="event_error_on_complete">U heeft een aantal foutmeldingen.\nWilt u deze bekijken\?</string>
     <string name="not_now">Niet nu</string>
     <string name="keep_editing">Blijf bewerken</string>
     <string name="event_can_be_completed">Wilt u dit formulier als voltooid markeren?</string>
     <string name="discard_go_back">Als u nu afsluit, wordt alle informatie in het formulier weggegooid.</string>
-    <string name="field_errors_not_saved">Sommige velden bevatten fouten en worden niet opgeslagen.</string>
-    <string name="fields_mandatory_missing">Sommige verplichte velden ontbreken en het formulier kan niet worden opgeslagen.</string>
     <string name="field_errors_not_saved_discard">Sommige velden bevatten fouten en worden niet opgeslagen. \Als u nu afsluit, worden de wijzigingen verwijderd.</string>
     <string name="share">Deel</string>
+    <string name="camera_permission_denied">Cameratoestemming is geweigerd.\Je moet deze inschakelen om deze functie te gebruiken.</string>
     <string name="action_close">Sluit</string>
     <string name="copied_text">Gekopieerd</string>
     <string name="take_photo">Neem foto</string>
diff --git a/form/src/main/res/values-pt/strings.xml b/form/src/main/res/values-pt/strings.xml
index a50a97fea74..d68b71ba975 100644
--- a/form/src/main/res/values-pt/strings.xml
+++ b/form/src/main/res/values-pt/strings.xml
@@ -33,14 +33,14 @@
     <string name="complete">Completo</string>
     <string name="discard_changes">Descartar mudanças</string>
     <string name="saved">Gravado!</string>
+    <string name="event_error_on_complete">Tem algumas mensagens de erro. Quer revê-las\?</string>
     <string name="not_now">Não agora</string>
     <string name="keep_editing">Continue editando</string>
     <string name="event_can_be_completed">Deseja marcar este formulário como completo?</string>
     <string name="discard_go_back">Se sair agora, todas as informações do formulário serão descartadas.</string>
-    <string name="field_errors_not_saved">Alguns campos apresentam erros e não são guardados.</string>
-    <string name="fields_mandatory_missing">Alguns campos obrigatórios estão em falta e o formulário não pode ser guardado.</string>
     <string name="field_errors_not_saved_discard">Alguns campos têm erros e não são guardados. \Se sair agora, as suas alterações serão descartadas.</string>
     <string name="share">Partilha</string>
+    <string name="camera_permission_denied">A permissão da câmara é negada.\nPrecisa de a ativar para utilizar esta funcionalidade.</string>
     <string name="action_close">Fechar</string>
     <string name="copied_text">Copiado</string>
     <string name="take_photo"> Tirar fotografia</string>
diff --git a/form/src/main/res/values-ru/strings.xml b/form/src/main/res/values-ru/strings.xml
index d43ba453726..82b744159cb 100644
--- a/form/src/main/res/values-ru/strings.xml
+++ b/form/src/main/res/values-ru/strings.xml
@@ -40,10 +40,7 @@
     <string name="keep_editing">Продолжить редактировать</string>
     <string name="event_can_be_completed">Хотите ли Вы отметить эту форму как завершенную?</string>
     <string name="discard_go_back">Если Вы выйдете сейчас, вся информация в форме будет удалена.</string>
-    <string name="field_errors_not_saved">Некоторые поля содержат ошибки, и они не сохранены.</string>
-    <string name="fields_mandatory_missing">Некоторые обязательные поля не заполнены, и форму невозможно сохранить.</string>
-    <string name="fields_mandatory_missing_discard">Некоторые обязательные поля отсутствуют, и форма не может быть сохранена. \nЕсли вы выйдете сейчас, изменения будут отменены.</string>
-    <string name="field_errors_not_saved_discard">Некоторые поля содержат ошибки, и они не сохраняются.  Если Вы выйдете сейчас, изменения будут отменены.</string>
+    <string name="field_errors_not_saved_discard">Некоторые поля содержат ошибки, и они не сохраняются. \nЕсли Вы выйдете сейчас, изменения будут отменены.</string>
     <string name="share">Поделиться</string>
     <string name="camera_permission_denied">Разрешение камеры запрещено.\nЧтобы использовать эту функцию, ее необходимо разрешить.</string>
     <string name="action_close">Закрыть</string>
diff --git a/form/src/main/res/values-uk/strings.xml b/form/src/main/res/values-uk/strings.xml
index b905503413a..81facabd841 100644
--- a/form/src/main/res/values-uk/strings.xml
+++ b/form/src/main/res/values-uk/strings.xml
@@ -32,14 +32,14 @@
     <string name="complete">Завершити</string>
     <string name="discard_changes">Відхилити внесені зміни</string>
     <string name="saved">Збережено!</string>
+    <string name="event_error_on_complete">У вас є кілька повідомлень про помилки. Бажаєте їх переглянути\?</string>
     <string name="not_now">Не зараз</string>
     <string name="keep_editing">Продовжити редагування</string>
     <string name="event_can_be_completed">Ви бажаєте позначити цю форму як завершену?</string>
     <string name="discard_go_back">Якщо Ви зараз вийдете, уся інформація у формі буде відхилена.</string>
-    <string name="field_errors_not_saved">Деякі поля містять помилки і не були збережені.</string>
-    <string name="fields_mandatory_missing">Деякі обов’язкові поля не заповнено, і форму неможливо зберегти.</string>
     <string name="field_errors_not_saved_discard">Деякі поля містять помилки і не були збережені. Якщо Ви вийдете зараз, внесені зміни буде скасовано.</string>
     <string name="share">Поділитися</string>
+    <string name="camera_permission_denied">Відмовлено у використанні камери. Вам потрібно ввімкнути цей дозвіл, щоб використовувати цю функцію.</string>
     <string name="action_close">Закрити</string>
     <string name="copied_text">Скопійовано</string>
     <string name="take_photo">Зробити фото</string>
diff --git a/form/src/main/res/values-ur/strings.xml b/form/src/main/res/values-ur/strings.xml
index 25ed7a141d5..c7967918ff0 100644
--- a/form/src/main/res/values-ur/strings.xml
+++ b/form/src/main/res/values-ur/strings.xml
@@ -5,7 +5,6 @@
     <string name="polygon">کثیر زبان</string>
     <string name="latitude">طول</string>
     <string name="longitude">لمبائی</string>
-    <string name="polygon_captured">کثیر الاضلاع (حدود) محفوظ کر لی گئیں</string>
     <string name="due_date">اخری تاریخ</string>
     <string name="complete">مکمل</string>
     <string name="share">بانٹیں</string>
diff --git a/form/src/main/res/values-uz/strings.xml b/form/src/main/res/values-uz/strings.xml
index ba47049049a..e5c26f36c1a 100644
--- a/form/src/main/res/values-uz/strings.xml
+++ b/form/src/main/res/values-uz/strings.xml
@@ -31,6 +31,7 @@
     <string name="not_now">Hozir emas</string>
     <string name="keep_editing">Таҳрирни давом этинг</string>
     <string name="share">Улашиш</string>
+    <string name="camera_permission_denied">Камерада фойдаланишга рухсат берилмаган. Ушбу функциядан фойдаланиш учун уни ёқишингиз керак.</string>
     <string name="action_close">Ёпиш</string>
     <string name="copied_text">Нусха олинди</string>
     <string name="take_photo">Суратга олиш</string>
diff --git a/form/src/main/res/values-vi/strings.xml b/form/src/main/res/values-vi/strings.xml
index bb8a52b73b6..ac6ac4ac120 100644
--- a/form/src/main/res/values-vi/strings.xml
+++ b/form/src/main/res/values-vi/strings.xml
@@ -41,10 +41,7 @@
     <string name="keep_editing">Tiếp tục chỉnh sửa</string>
     <string name="event_can_be_completed">Bạn có muốn đánh dấu biểu nhập này là hoàn tất không?</string>
     <string name="discard_go_back">Nếu bạn tắt bây giờ, tất cả thông tin trong biểu nhập sẽ bị hủy bỏ.</string>
-    <string name="field_errors_not_saved">Một số trường dữ liệu bị lỗi và chưa được lưu</string>
-    <string name="fields_mandatory_missing">Thiếu một số trường dữ liệu bắt buộc và Không thể lưu biểu nhập.</string>
-    <string name="fields_mandatory_missing_discard">hiếu một số trường dữ liệu bắt buộc và không thể lưu biểu nhập.  \nNếu bạn tắt bây giờ, tất cả thay đổi sẽ bị hủy bỏ..</string>
-    <string name="field_errors_not_saved_discard">Một số trường dữ liệu có lỗi và chưa được lưu.\n Nếu bạn tắt bây giờ, tất cả thay đổi sẽ bị hủy bỏ.</string>
+    <string name="field_errors_not_saved_discard">Một số trường dữ liệu có lỗi và chưa được lưu.. \nNếu bạn tắt bây giờ, tất cả thay đổi sẽ bị hủy bỏ.</string>
     <string name="share">Chia sẻ</string>
     <string name="camera_permission_denied">Quyền mở máy ảnh bị từ chối..\nBạn cần bật tính năng máy ảnh để sử dụng chức năng này.</string>
     <string name="action_close">Đóng</string>
diff --git a/form/src/main/res/values-zh-rCN/strings.xml b/form/src/main/res/values-zh-rCN/strings.xml
index 990a2f02c74..10f9bbdd741 100644
--- a/form/src/main/res/values-zh-rCN/strings.xml
+++ b/form/src/main/res/values-zh-rCN/strings.xml
@@ -33,13 +33,13 @@
     <string name="complete">完成</string>
     <string name="discard_changes">忽略修改</string>
     <string name="saved">已经保存！</string>
+    <string name="event_error_on_complete">您有一些错误消息。\n您要查看它们吗？</string>
     <string name="not_now">现在不要</string>
     <string name="keep_editing">继续编辑</string>
     <string name="event_can_be_completed">您想将此表单标记为已完成吗？</string>
     <string name="discard_go_back">如果您现在退出，表单中的所有信息都将被丢弃。</string>
-    <string name="field_errors_not_saved">一些字段有错误并且它们没有被保存。</string>
-    <string name="fields_mandatory_missing">缺少一些必填字段，无法保存表单。</string>
     <string name="share">分享</string>
+    <string name="camera_permission_denied">相机权限被拒绝。\n 您需要启用它才能使用此功能。</string>
     <string name="action_close">关闭</string>
     <string name="copied_text">副本</string>
     <string name="take_photo">拍照</string>
diff --git a/form/src/main/res/values-zh/strings.xml b/form/src/main/res/values-zh/strings.xml
index 681caec1189..aabb7f3c3d5 100644
--- a/form/src/main/res/values-zh/strings.xml
+++ b/form/src/main/res/values-zh/strings.xml
@@ -42,9 +42,6 @@
     <string name="event_can_be_completed">您想将此表单标记为已完成吗？</string>
     <string name="discard_go_back">如果您现在退出，表单中的所有信息都将被丢弃。</string>
     <string name="field_errors_not_saved_discard">某些字段有错误，无法保存。 \n如果您现在退出，更改将被丢弃。</string>
-    <string name="field_errors_not_saved">一些字段有错误并且它们没有被保存。</string>
-    <string name="fields_mandatory_missing">缺少一些必填字段，无法保存表单。</string>
-    <string name="fields_mandatory_missing_discard">某些必填字段缺失，无法保存表格。 \n如果您现在退出，更改将被丢弃。</string>
     <string name="share">分享</string>
     <string name="camera_permission_denied">相机权限被拒绝。\n您需要启用它才能使用此功能。</string>
     <string name="action_close">关闭</string>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f01cf784327..c8a9ddf9d54 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -4,16 +4,16 @@ lifecycleRuntimeCompose = "2.9.6"
 navigationCompose = "2.9.2"
 sdk = "36"
 minSdk = "23"
-vCode = "156"
-vName = "3.4.1"
+vCode = "157"
+vName = "3.4.2"
 gradle = "9.0.1"
 kotlin = '2.3.20'
 dagger = '2.57.2'
 jacoco = '0.8.14'
 designSystem = "0.7.1"
-dhis2sdk = "1.14.1"
-ruleEngine = "3.7.2"
-expressionParser = "1.4.1"
+dhis2sdk = "1.14.2"
+ruleEngine = "3.8.1"
+expressionParser = "1.4.3"
 appcompat = "1.7.1"
 annotation = "1.9.1"
 cardview = "1.0.0"
@@ -239,6 +239,7 @@ ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
 sentry = { id = "io.sentry.android.gradle", version.ref = "sentryPlugin" }
 cyclonedx = { id = "org.cyclonedx.bom", version.ref = "cyclonedx" }
+android-lint = { id = "com.android.lint", version.ref = "gradle" }
 
 [bundles]
 analytics-implementation = ["androidx-cardview", "androidx-constraintlayout"]
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index c1a0d8aa7d3..13069f7e749 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4062,6 +4062,16 @@
             <sha256 value="3c77089a35108ef47cebc72e4baab3f3b686b217322399624087483b3efeffe0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.hisp.dhis.lib.expression" name="expression-parser-jvm" version="1.4.2">
+         <artifact name="expression-parser-jvm-1.4.2.jar">
+            <sha256 value="d65e6d6357f3e96aa1a0180355dbf41444ed4cf25cb630a5665a5a129564e109" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
+      <component group="org.hisp.dhis.lib.expression" name="expression-parser-jvm" version="1.4.3">
+         <artifact name="expression-parser-jvm-1.4.3.jar">
+            <sha256 value="d42d9e9aad5fa8119f81440359620fa8bd42c4e30590e1ac9756438e09380836" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.hisp.dhis.mobile" name="designsystem-android" version="0.7.1">
          <artifact name="designsystem-release.aar">
             <sha256 value="50a24964b60fe31049280e410fc4c9cff016a1bd0e2fe48e39fec89aa6f479c2" origin="Generated by Gradle"/>
@@ -4087,6 +4097,11 @@
             <sha256 value="8e67a8f870acefdf3dcb2a268a12bcd3ce1c0bdebe4fe249f9e4bdcd5a29501e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.hisp.dhis.rules" name="rule-engine-jvm" version="3.8.1">
+         <artifact name="rule-engine-jvm-3.8.1.jar">
+            <sha256 value="8e75c4bfa63e79cc27aa08a7561644bd35eefdd30a09b3e4961d69a9d596c1c6" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jacoco" name="org.jacoco.agent" version="0.8.10">
          <artifact name="org.jacoco.agent-0.8.10.jar">
             <sha256 value="32d62211c0a323f50822a750a647c122b2b1b559f63533ea2e324c0324381370" origin="Generated by Gradle"/>
diff --git a/login/build.gradle.kts b/login/build.gradle.kts
index 380aa71c941..a71bbc9d835 100644
--- a/login/build.gradle.kts
+++ b/login/build.gradle.kts
@@ -12,7 +12,7 @@ kotlin {
         freeCompilerArgs.add("-Xcontext-parameters")
     }
 
-    androidLibrary {
+    android {
         namespace = "org.dhis2.mobile.login"
         compileSdk = libs.versions.sdk.get().toInt()
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/login/src/commonMain/composeResources/values-cs/strings.xml b/login/src/commonMain/composeResources/values-cs/strings.xml
index 4035c4a7221..7fa57a1ce92 100644
--- a/login/src/commonMain/composeResources/values-cs/strings.xml
+++ b/login/src/commonMain/composeResources/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="add_account">Přidat nový účet</string>
     <string name="two_fa_screen_title">Dvoufaktorové ověřování</string>
@@ -66,4 +66,5 @@
     <string name="importing_successful">Import byl úspěšný</string>
     <string name="openid_process_cancelled">Přihlášení bylo zrušeno</string>
     <string name="openid_invalid_auth_result">Neplatný výsledek autorizace</string>
-</resources>
\ No newline at end of file
+    <string name="openid_login_cancelled">Ověřování zrušeno</string>
+    </resources>
\ No newline at end of file
diff --git a/login/src/commonMain/composeResources/values-en-rUS/strings.xml b/login/src/commonMain/composeResources/values-en-rUS/strings.xml
index 3b3f80dc158..1df60655540 100644
--- a/login/src/commonMain/composeResources/values-en-rUS/strings.xml
+++ b/login/src/commonMain/composeResources/values-en-rUS/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_no_now">Not now</string>
     </resources>
\ No newline at end of file
diff --git a/login/src/commonMain/composeResources/values-es/strings.xml b/login/src/commonMain/composeResources/values-es/strings.xml
index 6d7a8e7a334..8e3674d0c81 100644
--- a/login/src/commonMain/composeResources/values-es/strings.xml
+++ b/login/src/commonMain/composeResources/values-es/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="add_account">Añadir una cuenta nueva</string>
     <string name="two_fa_screen_title">Autenticación de dos factores</string>
diff --git a/login/src/commonMain/composeResources/values-fr/strings.xml b/login/src/commonMain/composeResources/values-fr/strings.xml
index fa6f5ed9804..9f6abd8a111 100644
--- a/login/src/commonMain/composeResources/values-fr/strings.xml
+++ b/login/src/commonMain/composeResources/values-fr/strings.xml
@@ -4,7 +4,6 @@
     <string name="two_fa_authentication_code">Code d\'authentification</string>
     <string name="action_next">Suivant</string>
     <string name="two_fa_is_on">L\'authentification à deux facteurs est activée.</string>
-    <string name="two_fa_code">Code d\'authentification</string>
     <string name="biometrics_login_text">Voudriez-vous utiliser l\'empreinte digitale ou autre méthode biométrique pour se connecter</string>
     <string name="username_hint">Nom d\'utilisateur</string>
     <string name="password_hint">Mot de passe</string>
@@ -16,4 +15,4 @@
     <string name="action_no_now">Pas maintenant</string>
     <string name="action_yes">Oui</string>
     <string name="enter_pin_button">Déverrouiller</string>
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/login/src/commonMain/composeResources/values-nl/strings.xml b/login/src/commonMain/composeResources/values-nl/strings.xml
index 82c082e57a9..54cb66987bf 100644
--- a/login/src/commonMain/composeResources/values-nl/strings.xml
+++ b/login/src/commonMain/composeResources/values-nl/strings.xml
@@ -12,4 +12,4 @@
     <string name="privacy_policy">privacybeleid</string>
     <string name="action_no_now">Niet nu</string>
     <string name="action_yes">Ja</string>
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/login/src/commonMain/composeResources/values-uk/strings.xml b/login/src/commonMain/composeResources/values-uk/strings.xml
index e7f4a5f4f73..e406a535a51 100644
--- a/login/src/commonMain/composeResources/values-uk/strings.xml
+++ b/login/src/commonMain/composeResources/values-uk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="action_next">Далі</string>
     <string name="username_hint">Ім\'я користувача</string>
diff --git a/login/src/commonMain/composeResources/values-vi/strings.xml b/login/src/commonMain/composeResources/values-vi/strings.xml
index e121c25b9f4..4eeb44e307b 100644
--- a/login/src/commonMain/composeResources/values-vi/strings.xml
+++ b/login/src/commonMain/composeResources/values-vi/strings.xml
@@ -17,4 +17,4 @@
     <string name="action_yes">Có</string>
     <string name="enter_pin_button">Mở khoá</string>
     <string name="importing_successful">Nhập thành công</string>
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/login/src/commonMain/composeResources/values-zh/strings.xml b/login/src/commonMain/composeResources/values-zh/strings.xml
index 691cf81d86c..b478fe844ea 100644
--- a/login/src/commonMain/composeResources/values-zh/strings.xml
+++ b/login/src/commonMain/composeResources/values-zh/strings.xml
@@ -66,4 +66,9 @@
     <string name="importing_successful">导入成功</string>
     <string name="openid_process_cancelled">登录被取消</string>
     <string name="openid_invalid_auth_result">授权结果无效</string>
-    </resources>
\ No newline at end of file
+    <string name="openid_error_expected_intent">预期 IntentWithRequestCode</string>
+    <string name="openid_error_controller_not_bounded">OpenIdController 未绑定到生命周期作用域</string>
+    <string name="openid_login_cancelled">认证已取消</string>
+    <string name="error_device_not_registered">设备未注册</string>
+    <string name="missing_username_from_oauth_login_response">OAuth 登录响应中缺少用户名</string>
+</resources>
\ No newline at end of file
diff --git a/stock-usecase/src/main/res/values-cs/strings.xml b/stock-usecase/src/main/res/values-cs/strings.xml
index ee25d57614a..eff29f8c0a1 100644
--- a/stock-usecase/src/main/res/values-cs/strings.xml
+++ b/stock-usecase/src/main/res/values-cs/strings.xml
@@ -37,38 +37,9 @@
         Než budete moci pokračovat, musí být vyplněno pole zařízení
     </string>
     <string name="mandatory_distributed_to_selection">\\n        Před pokračováním je třeba vyplnit pole \"Distribuováno do\".</string>
-    <string name="mandatory_transaction_date_selection">\n        Než budete moci pokračovat, musí být vyplněno pole „Distribuováno do“.\n    </string>
-    <string name="previous_page_lose_data_warning">\\n        Opravdu se chcete vrátit na předchozí obrazovku\?\\n        Pokud se rozhodnete pokračovat, ztratíte právě zadané údaje.\\n    </string>
     <string name="transaction_completed">
         Transakce byla úspěšně dokončena!
     </string>
-    <string name="transaction_cancelled">
-        Transakce byla úspěšně zrušena!
-    </string>
-    <string name="force_sync_confirmation_message">\\n        Opravdu chcete vynutit synchronizaci\?\\n    </string>
-    <string name="logout_confirmation_message">Opravdu se chcete odhlásit\?</string>
-
-    <string name="remove_correction_item_confirmation_message">\\n        Opravdu chcete trvale odstranit záznam pro opravu \"%1$s\"\?\\\n        Tuto akci nelze vzít zpět.\\n    </string>
-    <string name="remove_distribution_item_confirmation_message">\\n        Opravdu chcete trvale odstranit položku pro distribuci \"%1$s\"\?\\\n        Tuto akci nelze vzít zpět.\\n    </string>
-    <string name="remove_discard_item_confirmation_message">\\n        Opravdu chcete trvale odstranit položku pro vyřazení \"%1$s\"\?\\\n        Tuto akci nelze vrátit zpět.\\n    </string>
-
-    <plurals name="items_found">
-        <item quantity="one">%d položka</item>
-        <item quantity="few">%d položky</item>
-        <item quantity="many">%d položek</item>
-        <item quantity="other">%d položek</item>
-    </plurals>
-    <string name="no_items_found">Nenalezeny žádné položky</string>
-    <string name="loading_items_message">Načítání skladových položek &#8230;</string>
-    <string name="prompt_email">E-mail</string>
-    <string name="prompt_password">Heslo</string>
-    <string name="action_sign_in">Přihlaste se nebo se zaregistrujte</string>
-    <string name="action_sign_in_short">Přihlásit se</string>
-    <string name="welcome">Vítejte !</string>
-    <string name="invalid_username">Neplatné uživatelské jméno</string>
-    <string name="invalid_password">Heslo musí mít >5 znaků</string>
-    <string name="login_failed">Přihlášení selhalo</string>
-    <string name="resync">Znovu synchronizovat</string>
 
     <!-- Errors -->
     <string name="facilities_load_error">Nelze načíst seznam dostupných zařízení</string>
@@ -80,16 +51,6 @@
 
     <string name="confirm_transaction_label">Potvrdit</string>
 
-    <string name="restart_later">Restartovat později</string>
-    <string name="confirm_app_restart_message">\\n        Aby se však změny projevily, je třeba aplikaci restartovat,\\n        všechny neuložené změny budou ztraceny.\\n\\nChcete pokračovat v restartu\?\\n    </string>
-    <string name="language_change_dialog_title">Potvrdit restart</string>
-    <string name="scan_canceled">Skenování zrušeno!</string>
-    <string name="logout_error_message">
-        Při odhlašování došlo k chybě. Prosím zkuste to znovu později.
-    </string>
-    <string name="logout_success_message">Úspěšně odhlášeno</string>
-
-    <string name="invalid_quantity">Neplatný</string>
     <string name="stock_on_hand_exceeded_message">
         Dostupné skladové zásoby nelze překročit
     </string>
@@ -113,7 +74,9 @@
     <string name="speech_timeout_error">Nebyl zjištěn žádný hlasový vstup</string>
     <string name="unknown_speech_error">Nastala neznámá chyba.</string>
     <string name="non_numeric_speech_input_error">Nenumerický vstup není povolen: \"%s\"</string>
-    <string name="negative_number_speech_input_error">\n        Zadání záporného čísla není povoleno: \"%s\"\n    </string>
+    <string name="negative_number_speech_input_error">
+        Zadání záporného čísla není povoleno: \"%s\"
+    </string>
 
     <string name="unable_to_sync_data_no_network_available">
         Nelze synchronizovat data, protože není k dispozici připojení k síti
diff --git a/stock-usecase/src/main/res/values-es/strings.xml b/stock-usecase/src/main/res/values-es/strings.xml
index c60a5bcb340..672663de5ce 100644
--- a/stock-usecase/src/main/res/values-es/strings.xml
+++ b/stock-usecase/src/main/res/values-es/strings.xml
@@ -74,7 +74,9 @@ android.permission.RECORD_AUDIO
     <string name="speech_timeout_error">No se detectó entrada de voz</string>
     <string name="unknown_speech_error">Se ha producido un error desconocido.</string>
     <string name="non_numeric_speech_input_error">No se permiten entradas no numéricas: \"%s\"</string>
-    <string name="negative_number_speech_input_error">\n        No se permite la entrada de números negativos: \"%s\"\n    </string>
+    <string name="negative_number_speech_input_error">
+        No se permite la entrada de números negativos: \"%s\"
+    </string>
 
     <string name="unable_to_sync_data_no_network_available">
         No se puede sincronizar los datos porque no hay conexión de red disponible
diff --git a/stock-usecase/src/main/res/values-fr/strings.xml b/stock-usecase/src/main/res/values-fr/strings.xml
index 97812705d1f..dfe7b8fd117 100644
--- a/stock-usecase/src/main/res/values-fr/strings.xml
+++ b/stock-usecase/src/main/res/values-fr/strings.xml
@@ -7,10 +7,6 @@
 
     <!-- Sign in -->
     <string name="username">Nom d\'utilisateur</string>
-    <string name="password">Mot de passe</string>
-    <string name="forgot_password">Mot de passe oublié?</string>
-
-    <string name="sync_completed">Synchronisation terminée</string>
 
     <!-- FloatingActionButtons -->
     <string name="review">Vérifier</string>
diff --git a/stock-usecase/src/main/res/values-lo/strings.xml b/stock-usecase/src/main/res/values-lo/strings.xml
index d3085495a52..afc4301ebf3 100644
--- a/stock-usecase/src/main/res/values-lo/strings.xml
+++ b/stock-usecase/src/main/res/values-lo/strings.xml
@@ -30,7 +30,8 @@
 
     <string name="speech_network_error">ຂໍ້ຜິດພາດທາງເຄື່ອຂ່າຍ</string>
     <string name="speech_network_timeout_error">ການເຮັດວຽກຂອງອິນເຕີເນັດໝົດເວລາແລ້ວ</string>
-    <string name="negative_number_speech_input_error">\nບໍ່ອະນຸຍາດໃຫ້ປ້ອນຕົວເລກລົບ:\"%s\" </string>
+    <string name="negative_number_speech_input_error">
+ບໍ່ອະນຸຍາດໃຫ້ປ້ອນຕົວເລກລົບ:\"%s\" </string>
 
     <string name="unable_to_sync_data_no_network_available">
 ບໍ່ສາມາດ ອັບເດດຂໍ້ມູນໃຫ້ຄືກັນຂໍ້ມູນໄດ້ເນື່ອງຈາກບໍ່ມີການເຊື່ອມຕໍ່ອິນເຕີເນັດ</string>
diff --git a/stock-usecase/src/main/res/values-nl/strings.xml b/stock-usecase/src/main/res/values-nl/strings.xml
index a55981525e2..f1a28c269c0 100644
--- a/stock-usecase/src/main/res/values-nl/strings.xml
+++ b/stock-usecase/src/main/res/values-nl/strings.xml
@@ -44,14 +44,6 @@
 
     <string name="confirm_transaction_label">Bevestigen</string>
 
-    <string name="restart_later">Later opnieuw opstarten</string>
-    <string name="confirm_app_restart_message">        De toepassing moet opnieuw worden gestart om de wijzigingen door te voeren, maar        alle niet-opgeslagen wijzigingen gaan verloren.\\n\\nWilt u doorgaan met de herstart\?    </string>
-    <string name="language_change_dialog_title">Bevestig opnieuw opstarten</string>
-    <string name="scan_canceled">Scan geannuleerd!</string>
-    <string name="logout_error_message">        Er is een fout opgetreden tijdens het uitloggen. Probeer het later opnieuw.    </string>
-    <string name="logout_success_message">Succesvol uitgelogd</string>
-
-    <string name="invalid_quantity">Ongeldig</string>
     <string name="stock_on_hand_exceeded_message">        De beschikbare voorraad kan niet worden overschreden    </string>
 
     <string name="permission_granted">Toestemming verleend</string>
@@ -72,9 +64,6 @@
     <string name="negative_number_speech_input_error">        Negatieve getalinvoer is niet toegestaan: \"%s\"    </string>
 
     <string name="unable_to_sync_data_no_network_available">        Kan gegevens niet synchroniseren omdat er geen netwerkverbinding beschikbaar is    </string>
-    <string name="openid_authentication_not_successful">        Kan niet verifiëren met uw ICRC-account    </string>
-
-    <string name="contact_service_desk_message">        Neem bij problemen \\ncontact op met de ICRC-servicedesk    </string>
 
     <!--SDK error codes-->
     <string name="login_error_unsuccessful_response">Er is iets fout gegaan. Controleer of de server-URL, gebruikersnaam en wachtwoord juist zijn en probeer het opnieuw.</string>
diff --git a/stock-usecase/src/main/res/values-pt/strings.xml b/stock-usecase/src/main/res/values-pt/strings.xml
index 32e11c7c7c8..a79f469b4c4 100644
--- a/stock-usecase/src/main/res/values-pt/strings.xml
+++ b/stock-usecase/src/main/res/values-pt/strings.xml
@@ -71,7 +71,9 @@
     <string name="speech_timeout_error"> Não foi detectada qualquer entrada de voz</string>
     <string name="unknown_speech_error"> Ocorreu um erro desconhecido.</string>
     <string name="non_numeric_speech_input_error"> Não é permitida a introdução de dados não numéricos: \"%s\"</string>
-    <string name="negative_number_speech_input_error">\n       A introdução de números negativos não é permitida:\"%s\"\n    </string>
+    <string name="negative_number_speech_input_error">
+       A introdução de números negativos não é permitida:\"%s\"
+    </string>
 
     <string name="unable_to_sync_data_no_network_available">
        Não é possível sincronizar dados porque não existe uma ligação de rede disponível
diff --git a/stock-usecase/src/main/res/values-uz-rUZ/strings.xml b/stock-usecase/src/main/res/values-uz-rUZ/strings.xml
index 7d8f6704aa4..944eb8e0974 100644
--- a/stock-usecase/src/main/res/values-uz-rUZ/strings.xml
+++ b/stock-usecase/src/main/res/values-uz-rUZ/strings.xml
@@ -61,12 +61,10 @@
     <string name="speech_timeout_error">Ovozli matn aniqlanmadi</string>
     <string name="unknown_speech_error">Номаълум хатолик юз берди</string>
     <string name="non_numeric_speech_input_error">Raqamsiz kiritishga ruxsat berilmagan: \"%s\"</string>
-    <string name="negative_number_speech_input_error">Raqamni salbiy kiritish mumkin emas: \"%s\"\n    </string>
+    <string name="negative_number_speech_input_error">Raqamni salbiy kiritish mumkin emas: \"%s\"
+    </string>
 
     <string name="unable_to_sync_data_no_network_available">Maʼlumotlarni sinxronlash imkonsiz, chunki tarmoq ulanishi mavjud emas</string>
-    <string name="openid_authentication_not_successful">ICRC akkauntingiz bilan autentifikatsiya qilish imkonsiz</string>
-
-    <string name="contact_service_desk_message">Muammolar bo\'lsa, \\nIltimos, ICRC  xizmat ko\'rsatish markaziga murojaat qiling</string>
 
     <!--SDK error codes-->
     <string name="login_error_unsuccessful_response">Nimadir notoʼgʼri bajarildi. Server URL manzili, foydalanuvchi nomi va parol toʼgʼri ekanligini tekshiring va qaytadan urining.</string>
diff --git a/stock-usecase/src/main/res/values-vi/strings.xml b/stock-usecase/src/main/res/values-vi/strings.xml
index 1d4e2869417..c5bbe67cfa6 100644
--- a/stock-usecase/src/main/res/values-vi/strings.xml
+++ b/stock-usecase/src/main/res/values-vi/strings.xml
@@ -73,7 +73,9 @@
     <string name="speech_timeout_error">Không nhận được đầu vào bằng giọng nói</string>
     <string name="unknown_speech_error">Một lỗi không xác định đã xuất hiện.</string>
     <string name="non_numeric_speech_input_error">Không chấp nhận đầu vào không phải là số: \"%s\"</string>
-    <string name="negative_number_speech_input_error">\n        Không chấp nhận đầu vào là số âm: \"%s\"\n    </string>
+    <string name="negative_number_speech_input_error">
+        Không chấp nhận đầu vào là số âm: \"%s\"
+    </string>
 
     <string name="unable_to_sync_data_no_network_available">
         Không thể đồng bộ hóa dữ liệu bởi vì không có kết nối internet
diff --git a/stock-usecase/src/main/res/values-zh/strings.xml b/stock-usecase/src/main/res/values-zh/strings.xml
index df018ade13f..beadf1c12c4 100644
--- a/stock-usecase/src/main/res/values-zh/strings.xml
+++ b/stock-usecase/src/main/res/values-zh/strings.xml
@@ -37,35 +37,9 @@
         必须先填写设施字段，然后才能继续
     </string>
     <string name="mandatory_distributed_to_selection">\\n        必须填写 \"分发至 \"字段后才能继续操作</string>
-    <string name="mandatory_transaction_date_selection">\n        必须填写“分发给”字段才能继续\n    </string>
-    <string name="previous_page_lose_data_warning">\\n        您确定要返回上一屏幕吗？\\n        如果您决定继续，您将丢失刚刚输入的数据。\\n    </string>
     <string name="transaction_completed">
         交易成功完成！
     </string>
-    <string name="transaction_cancelled">
-        交易取消成功！
-    </string>
-    <string name="force_sync_confirmation_message">\\n        您确定要强制同步吗？\\n    </string>
-    <string name="logout_confirmation_message">您确定要退出吗？</string>
-
-    <string name="remove_correction_item_confirmation_message">\\n        您确定要永久删除更正“%1$s”\的条目吗？\\n        此操作无法撤消。\\n    </string>
-    <string name="remove_distribution_item_confirmation_message">\\n        您确定要永久删除“%1$s”\ 的分发条目吗？\\n        此操作无法撤消。\\n    </string>
-    <string name="remove_discard_item_confirmation_message">\\n        您确定要永久删除“%1$s”\的丢弃条目吗？\\n        此操作无法撤消。\\n    </string>
-
-    <plurals name="items_found">
-        <item quantity="other">%d 项目</item>
-    </plurals>
-    <string name="no_items_found">未找到任何项目</string>
-    <string name="loading_items_message">加载库存项目 &#8230;</string>
-    <string name="prompt_email">邮件</string>
-    <string name="prompt_password">口令</string>
-    <string name="action_sign_in">登录或注册</string>
-    <string name="action_sign_in_short">登录</string>
-    <string name="welcome">欢迎 ！</string>
-    <string name="invalid_username">不是有效的用户名</string>
-    <string name="invalid_password">密码必须大于 5 个字符</string>
-    <string name="login_failed">登录失败</string>
-    <string name="resync">重新同步</string>
 
     <!-- Errors -->
     <string name="facilities_load_error">无法加载可用设施列表</string>
@@ -77,16 +51,6 @@
 
     <string name="confirm_transaction_label">确认</string>
 
-    <string name="restart_later">稍后重启</string>
-    <string name="confirm_app_restart_message">\\n        需要重新启动应用程序才能使更改生效，但是，\\n        任何未保存的更改都将丢失。\\n\\n您要继续重启\吗？\\n    </string>
-    <string name="language_change_dialog_title">确认重启</string>
-    <string name="scan_canceled">扫描已取消！</string>
-    <string name="logout_error_message">
-        注销期间发生错误。请稍后再试。
-    </string>
-    <string name="logout_success_message">成功登出</string>
-
-    <string name="invalid_quantity">无效</string>
     <string name="stock_on_hand_exceeded_message">
         手头的可用库存不能超过
     </string>
@@ -110,7 +74,9 @@
     <string name="speech_timeout_error">未检测到语音输入</string>
     <string name="unknown_speech_error">出现未知错误。</string>
     <string name="non_numeric_speech_input_error">不允许非数字输入：“%s”</string>
-    <string name="negative_number_speech_input_error">\n        不允许输入负数：“%s”\n    </string>
+    <string name="negative_number_speech_input_error">
+        不允许输入负数：“%s”
+    </string>
 
     <string name="unable_to_sync_data_no_network_available">
         无法同步数据，因为没有可用的网络连接
diff --git a/sync/build.gradle.kts b/sync/build.gradle.kts
index 6ec44b2d670..fdcc9f41b33 100644
--- a/sync/build.gradle.kts
+++ b/sync/build.gradle.kts
@@ -15,7 +15,7 @@ kotlin {
         freeCompilerArgs.add("-Xexpect-actual-classes")
     }
 
-    androidLibrary {
+    android {
         namespace = "org.dhis2.mobile.sync"
         compileSdk = libs.versions.sdk.get().toInt()
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/sync/src/commonMain/composeResources/values-zh/strings.xml b/sync/src/commonMain/composeResources/values-zh/strings.xml
index f38f31555db..2f6c8ee058b 100644
--- a/sync/src/commonMain/composeResources/values-zh/strings.xml
+++ b/sync/src/commonMain/composeResources/values-zh/strings.xml
@@ -4,5 +4,6 @@
     <string name="app_name">DHIS2</string>
     <string name="syncing_settings">检查网络设置</string>
     <string name="syncing_configuration">同步配置</string>
-    </resources>
+    <string name="syncing_data">同步您的数据</string>
+</resources>
 
diff --git a/tracker/build.gradle.kts b/tracker/build.gradle.kts
index ae21c54eb6d..91ad22bd9af 100644
--- a/tracker/build.gradle.kts
+++ b/tracker/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 kotlin {
-    androidLibrary {
+    android {
         namespace = "org.dhis2.mobile.tracker"
         compileSdk = libs.versions.sdk.get().toInt()
         minSdk = libs.versions.minSdk.get().toInt()
diff --git a/tracker/src/commonMain/composeResources/values-zh/strings.xml b/tracker/src/commonMain/composeResources/values-zh/strings.xml
index 07ff4461bcc..a3013adb3f4 100644
--- a/tracker/src/commonMain/composeResources/values-zh/strings.xml
+++ b/tracker/src/commonMain/composeResources/values-zh/strings.xml
@@ -25,4 +25,5 @@
     <string name="end_with_search_operator">必须与数值的末尾一致</string>
     <string name="yes">是</string>
     <string name="no">否</string>
-    </resources>
\ No newline at end of file
+    <string name="min_characters_warning">请输入至少%1$d 个字符</string>
+</resources>
\ No newline at end of file
diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US
index 2a9f6e9b9f0..4e39d6abfb5 100644
--- a/whatsnew/whatsnew-en-US
+++ b/whatsnew/whatsnew-en-US
@@ -1,9 +1,9 @@
 This is a patch version that fixes:
-- ANDROAPP-6516 Values in events and program stages not being updated when syncing with server from them
-- ANDROAPP-7287 Flicker when no TEIs in tei list
-- ANDROAPP-7364 Server URL not well formed error
-- ANDROAPP-7398 Wrong SnackBar color
-- ANDROAPP-7431 Username does not trim trailing white spaces
+
+- ANDROAPP-7682 Sync button doesn't always appear in enrollments list
+- ANDROAPP-7706 Tei list items display wrong attributes
+- ANDROAPP-7708 NullPointerException: Attempt to invoke virtual method 'java.lang.Class java.lang.Object.getClass\(\)'... \(ProgramFragment\)
+- ANDROAPP-7711 NullPointerException: Attempt to invoke virtual method 'android.content.res.Resources android.view.View.getResources\(\)' on a null object reference
 
 ....
 You can find all the details on Jira and Github.
\ No newline at end of file