Merge branch 'internal-15_06_2025' into usearch_again

2025-06-04 22:14:26 +05:30
parent 726425bbb6 cc1660d9af
commit 82a8e504af
554 changed files with 27124 additions and 14754 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -17,8 +17,8 @@ body:
              Please describe the bug. If possible, also include the steps to
              reproduce the behaviour, and the expected behaviour (sometimes
              bugs are just expectation mismatches, in which case this would be
-              a good fit for [feature
-              requests](https://github.com/ente-io/ente/discussions/categories/feature-requests)).
+              a good fit for
+              [enhancements](https://github.com/ente-io/ente/discussions/categories/enhancements)).
      validations:
          required: true
    - type: input
@@ -33,12 +33,12 @@ body:
              The version where the feature was last known to be working. It is
              fine if you don't remember the exact version (mention roughly
              then), but if there just isn't a last known working version, then
-              it is likely that what is being reported is not an issue but a
-              feature request. The difference between the two categories is not
-              just semantic - feature requests use GitHub discussions and so can
-              be [upvoted by the
-              community](https://github.com/ente-io/ente/discussions/categories/feature-requests)
-              (issues can't be).
+              it is likely that what is being reported is not an issue
+              (regression) but an enhancement. The difference between the two
+              categories is not just semantic - **enhancements use GitHub
+              discussions and so can be [upvoted by the
+              community](https://github.com/ente-io/ente/discussions/categories/enhancements)**
+              (while issues cannot be).
          placeholder: e.g. v1.2.3
    - type: dropdown
      attributes:
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-    - name: Feature requests and questions
+    - name: Enhacements, feature requests, feedback and questions
      url: https://github.com/ente-io/ente/discussions
      about: Please use Discussions for everything apart from the above.
--- a/.github/workflows/auth-release.yml
+++ b/.github/workflows/auth-release.yml
@@ -83,7 +83,7 @@ jobs:
              # disable this step if release tag contains nightly or beta
              if: startsWith(github.ref, 'refs/tags/auth-v') && !contains(github.ref, 'nightly') && !contains(github.ref, 'beta')
              run: |
-                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
+                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore --dart-define=cronetHttpNoPlay=true
              env:
                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
@@ -141,6 +141,7 @@ jobs:

    build-windows:
        runs-on: windows-latest
+        environment: "auth-win-build"

        defaults:
            run:
@@ -174,14 +175,22 @@ jobs:
            - name: Retain Windows EXE and DLLs
              run: cp -r build/windows/x64/runner/Release ente-${{ github.ref_name }}-windows

-            - name: Code sign Windows installer and EXE
-              uses: dlemstra/code-sign-action@v1
+            - name: Sign files with Trusted Signing
+              uses: azure/trusted-signing-action@v0
              with:
-                  certificate: "${{ secrets.WINDOWS_CERTIFICATE }}"
-                  password: "${{ secrets.WINDOWS_CERTIFICATE_PASSWORD }}"
-                  files: |
-                      auth/artifacts/ente-${{ github.ref_name }}-installer.exe
-                      auth/ente-${{ github.ref_name }}-windows/auth.exe
+                azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+                azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+                azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+                endpoint: ${{ secrets.AZURE_ENDPOINT }}
+                trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
+                certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
+                files: |
+                      ${{ github.workspace }}/auth/artifacts/ente-${{ github.ref_name }}-installer.exe
+                      ${{ github.workspace }}/auth/ente-${{ github.ref_name }}-windows/auth.exe
+                file-digest: SHA256
+                timestamp-rfc3161: http://timestamp.acs.microsoft.com
+                timestamp-digest: SHA256  
+

            - name: Zip Windows EXE and DLLs
              run: tar.exe -a -c -f artifacts/ente-${{ github.ref_name }}-windows.zip ente-${{ github.ref_name }}-windows
--- a/.github/workflows/auth-win-sign.yml
+++ b/.github/workflows/auth-win-sign.yml
@@ -0,0 +1,70 @@
+name: "Windows build & Sign (auth)"
+
+
+on:
+    workflow_dispatch: # Allow manually running the action
+
+env:
+    FLUTTER_VERSION: "3.24.3"
+
+permissions:
+    contents: write
+
+jobs:
+    build-windows:
+        runs-on: windows-latest
+        environment: "auth-win-build"
+
+        defaults:
+            run:
+                working-directory: auth
+
+        steps:
+            - name: Checkout code and submodules
+              uses: actions/checkout@v4
+              with:
+                  submodules: recursive
+
+            - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
+              uses: subosito/flutter-action@v2
+              with:
+                  channel: "stable"
+                  flutter-version: ${{ env.FLUTTER_VERSION  }}
+                  cache: true
+
+            - name: Create artifacts directory
+              run: mkdir artifacts
+
+            - name: Build Windows installer
+              run: |
+                  flutter config --enable-windows-desktop
+                  # dart pub global activate flutter_distributor
+                  dart pub global activate --source git https://github.com/ente-io/flutter_distributor_fork --git-ref develop --git-path packages/flutter_distributor
+                  make innoinstall
+                  flutter_distributor package --platform=windows --targets=exe --skip-clean
+                  mv dist/**/*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe
+
+            - name: Retain Windows EXE and DLLs
+              run: cp -r build/windows/x64/runner/Release ente-${{ github.ref_name }}-windows
+
+            - name: Sign files with Trusted Signing
+              uses: azure/trusted-signing-action@v0
+              with:
+                azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+                azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
+                azure-client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
+                endpoint: ${{ secrets.AZURE_ENDPOINT }}
+                trusted-signing-account-name: ${{ secrets.AZURE_CODE_SIGNING_NAME }}
+                certificate-profile-name: ${{ secrets.AZURE_CERT_PROFILE_NAME }}
+                files: |
+                      ${{ github.workspace }}/auth/artifacts/ente-${{ github.ref_name }}-installer.exe
+                      ${{ github.workspace }}/auth/ente-${{ github.ref_name }}-windows/auth.exe
+                file-digest: SHA256
+                timestamp-rfc3161: http://timestamp.acs.microsoft.com
+                timestamp-digest: SHA256  
+
+            - name: Zip Windows EXE and DLLs
+              run: tar.exe -a -c -f artifacts/ente-${{ github.ref_name }}-windows.zip ente-${{ github.ref_name }}-windows
+
+            - name: Generate checksums
+              run: sha256sum artifacts/ente-* > artifacts/sha256sum-windows
--- a/.github/workflows/mobile-internal-release.yml
+++ b/.github/workflows/mobile-internal-release.yml
@@ -63,6 +63,6 @@ jobs:
              with:
                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
                  nodetail: true
-                  title: "🏆 Internal release available for Photos"
+                  title: "🏆 Internal release Photos (Branch: ${{ github.ref_name }})"
                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
                  color: 0x00ff00
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,7 @@ Just hang around, enjoy the vibe. Answer someone's query on our
 [Discord](https://discord.gg/z2YVKkycX3), or pile on in the sporadic #off-topic
 rants there. Chuckle (or wince!) at our [Twitter](https://twitter.com/enteio)
 memes. Suggest a new feature in our [Github
-Discussions](https://github.com/ente-io/ente/discussions/new?category=feature-requests),
+Discussions](https://github.com/ente-io/ente/discussions/new?category=enhancements),
 or upvote the existing ones that you feel we should focus on first. Provide your
 opinion on existing threads.

@@ -68,8 +68,8 @@ best to start small. Consider some well-scoped changes, say like adding more
 Each of the individual product/platform specific directories in this repository
 have instructions on setting up a dev environment.

-For anything beyond trivial bug fixes, please use [features requests and
-discussions](https://github.com/ente-io/ente/discussions) instead of performing
+For anything beyond trivial bug fixes, please use
+[discussions](https://github.com/ente-io/ente/discussions) instead of performing
 code changes directly.

 > [!TIP]
--- a/auth/assets/custom-icons/_data/custom-icons.json
+++ b/auth/assets/custom-icons/_data/custom-icons.json
@@ -43,6 +43,12 @@
      "title": "Anycoin Direct",
      "slug": "anycoindirect"
    },
+    {
+      "title": "AR24",
+      "altNames": [
+        "Docaposte AR24"
+      ]
+    },
    {
      "title": "Aruba",
      "slug": "aruba",
@@ -192,7 +198,11 @@
      "slug": "blue_sky"
    },
    {
-      "title": "bonify"
+      "title": "bonify",
+      "slug": "bonify",
+      "altNames": [
+        "bonify.de"
+      ]
    },
    {
      "title": "Booking",
@@ -296,6 +306,15 @@
    {
      "title": "CSAM"
    },
+    {
+      "title": "CSSBuy",
+      "slug": "cssbuy",
+      "altNames": [
+        "CSS Buy",
+        "CSS-Buy",
+        "cssbuy.com"
+      ]
+    },
    {
      "title": "CSFloat"
    },
@@ -303,6 +322,10 @@
      "title": "CSGORoll",
      "slug": "csgoroll"
    },
+    {
+      "title": "Cryptee",
+      "slug": "cryptee"
+    },
    {
      "title": "Cwallet",
      "altNames": [
@@ -435,6 +458,9 @@
      "title": "Finanzfluss",
      "slug": "finanzfluss"
    },
+    {
+      "title": "Finary"
+    },
    {
      "title": "Firefox",
      "slug": "mozilla"
@@ -456,6 +482,9 @@
      "title": "Gate.io",
      "slug": "gateio.svg"
    },
+    {
+      "title": "GERID"
+    },
    {
      "title": "GitHub"
    },
@@ -737,6 +766,7 @@
    {
      "title": "Mistral",
      "altNames": [
+        "Le Chat",
        "Mistral AI",
        "MistralAI"
      ]
@@ -886,6 +916,10 @@
      "slug": "onshape",
      "hex": "7abb5e"
    },
+    {
+      "title": "Oracle Cloud",
+      "slug": "oracle_cloud"
+    },
    {
      "title": "Parqet",
      "slug": "parqet"
@@ -1272,6 +1306,14 @@
      "title": "US Mobile",
      "slug": "us_mobile"
    },
+    {
+      "title": "uollet",
+      "slug": "uollet",
+      "altNames": [
+        "UOLLET",
+        "uollet.com.br"
+      ]
+    },
    {
      "title": "Vikunja"
    },
--- a/auth/assets/custom-icons/icons/ar24.svg
+++ b/auth/assets/custom-icons/icons/ar24.svg
@@ -0,0 +1,6 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="#0000FF" xmlns="http://www.w3.org/2000/svg">
+<path d="M139.63 306.55H125.64C123.41 306.55 121.53 306.5 119.99 306.39C118.45 306.28 117.13 305.99 116.01 305.51C114.9 305.04 113.92 304.32 113.08 303.36C112.22 302.41 111.38 301.09 110.53 299.39L103.85 286.35H35.47L25.29 306.55H0L58.37 194.11H81.26L139.63 306.55ZM93.2 265.36L69.66 218.6L46.12 265.36H93.2Z"/>
+<path d="M265.23 306.55H245.67C241.96 306.55 238.93 306.07 236.6 305.12C234.27 304.16 232.31 302.68 230.72 300.67L206.17 270.76H177.48V306.55H153.95V195.23C156.92 195.12 160.16 195.04 163.66 194.99C167.17 194.93 170.77 194.86 174.5 194.75C178.21 194.64 181.92 194.57 185.64 194.51C189.36 194.46 192.86 194.43 196.15 194.43C209.74 194.43 220.97 195.41 229.84 197.37C238.71 199.34 246 202.91 251.74 208.1C258.11 214.04 261.3 222.1 261.3 232.28C261.3 237.37 260.61 241.85 259.23 245.72C257.84 249.59 255.88 252.96 253.33 255.81C250.78 258.68 247.7 261.09 244.09 263.05C240.49 265.02 236.45 266.63 231.99 267.9L265.23 306.55ZM196.25 250.25C199.75 250.25 203.27 250.22 206.82 250.17C210.38 250.12 213.74 249.88 216.93 249.45C220.1 249.03 223.02 248.36 225.67 247.46C228.32 246.55 230.5 245.24 232.19 243.54C233.67 241.94 234.82 240.29 235.61 238.59C236.4 236.89 236.81 234.7 236.81 232.03C236.81 230.23 236.45 228.47 235.77 226.77C235.08 225.06 234.15 223.62 232.99 222.45C231.4 220.85 229.44 219.6 227.11 218.7C224.77 217.79 222.1 217.12 219.07 216.7C216.05 216.27 212.63 216.03 208.81 215.98C205 215.93 200.81 215.9 196.25 215.9H187.18C183.58 215.9 180.34 215.95 177.48 216.06V250.1C180.34 250.2 183.58 250.25 187.18 250.25H196.25Z"/>
+<path d="M324.59 213.35C318.34 213.35 312.61 215.03 307.41 218.37C302.22 221.7 297.93 225.65 294.54 230.22L276.09 217.97C282.13 210.65 289.36 204.66 297.79 200C306.22 195.33 315.47 193 325.55 193C332.33 193 338.53 193.87 344.15 195.62C349.77 197.37 354.59 199.84 358.63 203.02C362.65 206.2 365.78 210.07 368.01 214.63C370.23 219.19 371.35 224.27 371.35 229.89C371.35 235.2 370.36 239.86 368.4 243.89C366.44 247.92 363.85 251.6 360.61 254.94C357.38 258.28 353.69 261.38 349.56 264.25C345.42 267.11 341.18 269.97 336.84 272.84L317.27 285.72H370.87V306.55H279.42V286.04L318.39 260.27C322.2 257.73 325.86 255.32 329.36 253.03C332.86 250.76 335.93 248.42 338.58 246.04C341.24 243.65 343.35 241.13 344.95 238.48C346.54 235.83 347.33 232.91 347.33 229.74C347.33 227.41 346.72 225.23 345.5 223.22C344.28 221.2 342.64 219.45 340.57 217.97C338.51 216.49 336.09 215.35 333.34 214.55C330.58 213.75 327.66 213.35 324.59 213.35Z"/>
+<path d="M457.22 306.55V283.49H388.84V259.95L455.47 195.23H480.12V263.77H500V283.49H480.12V306.55L457.22 306.55ZM413.17 263.77H457.22V220.35L413.17 263.77Z"/>
+</svg>
--- a/auth/assets/custom-icons/icons/bonify.svg
+++ b/auth/assets/custom-icons/icons/bonify.svg
@@ -1,29 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="logosandtypes_com" data-name="logosandtypes com" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 150 150">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #101010;
-      }
-
-      .cls-2 {
-        fill: none;
-      }
-
-      .cls-3 {
-        fill: url(#linear-gradient);
-      }
-    </style>
-    <linearGradient id="linear-gradient" x1="186.97" y1="96.04" x2="45.7" y2="96.04" gradientTransform="translate(0 150.11) scale(1 -1)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#165cc3"/>
-      <stop offset="1" stop-color="#3ddabb"/>
-    </linearGradient>
-  </defs>
-  <g id="Layer_3" data-name="Layer 3">
-    <g id="Layer_2" data-name="Layer 2">
-      <path id="Layer_3-2" data-name="Layer 3-2" class="cls-2" d="M0,0H150V150H0V0Z"/>
-    </g>
-  </g>
-  <path class="cls-1" d="M111.63,75.01c.06,.86,.08,1.72,.08,2.59,0,20.52-16.62,37.16-37.14,37.16-20.52,0-37.16-16.62-37.16-37.14,0-20.52,16.62-37.16,37.14-37.16,0,0,.02,0,.02,0,1.61,0,3.22,.1,4.82,.32l12.7-17.11C62.3,14,30.31,30.3,20.63,60.09c-9.68,29.79,6.62,61.78,36.41,71.47,29.79,9.68,61.78-6.62,71.47-36.41,4.29-13.2,3.59-27.52-1.97-40.24l-14.9,20.11Z"/>
-  <polygon class="cls-3" points="120.26 4.82 74.49 66.53 62.93 53.99 45.67 69.89 76.4 103.32 149.5 4.82 120.26 4.82"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+    <defs>
+        <linearGradient id="a" x1="186.97" x2="45.7" y1="96.04" y2="96.04"
+            gradientTransform="matrix(1 0 0 -1 0 150.11)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#165cc3" />
+            <stop offset="1" stop-color="#3ddabb" />
+        </linearGradient>
+    </defs>
+    <path
+        d="M111.63 75.01c.06.86.08 1.72.08 2.59 0 20.52-16.62 37.16-37.14 37.16S37.41 98.14 37.41 77.62s16.62-37.16 37.14-37.16h.02c1.61 0 3.22.1 4.82.32l12.7-17.11C62.3 14 30.31 30.3 20.63 60.09s6.62 61.78 36.41 71.47c29.79 9.68 61.78-6.62 71.47-36.41 4.29-13.2 3.59-27.52-1.97-40.24l-14.9 20.11Z"
+        style="fill:#EFEFEF; mix-blend-mode: difference" />
+    <path d="M120.26 4.82 74.49 66.53 62.93 53.99l-17.26 15.9 30.73 33.43 73.1-98.5z"
+        style="fill:url(#a)" />
 </svg>
--- a/auth/assets/custom-icons/icons/cryptee.svg
+++ b/auth/assets/custom-icons/icons/cryptee.svg
@@ -0,0 +1 @@
+<svg width="1400" height="1400" xmlns="http://www.w3.org/2000/svg"><path d="M699.914 0C1004.659 0 1263.915 194.786 1360 466.662l-399.246-.003C896.674 395.059 803.556 350 699.914 350c-193.276 0-349.957 156.7-349.957 350s156.681 350 349.957 350c103.641 0 196.76-45.059 260.84-116.658L1360 933.34C1263.915 1205.214 1004.659 1400 699.914 1400 313.362 1400 0 1086.6 0 700S313.362 0 699.914 0zm347.087 747.002L1398 747a696.274 696.274 0 0 1-12.453 93H1021a345.75 345.75 0 0 0 26.001-92.998zM1385.547 560A696.301 696.301 0 0 1 1398 653l-351-.002A345.762 345.762 0 0 0 1021 560h364.547z" fill-rule="evenodd"/></svg>
--- a/auth/assets/custom-icons/icons/cssbuy.svg
+++ b/auth/assets/custom-icons/icons/cssbuy.svg
@@ -0,0 +1,9 @@
+<svg width="145" height="39" viewBox="0 0 145 39" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<rect width="145" height="39" fill="url(#pattern0_2030_2)"/>
+<defs>
+<pattern id="pattern0_2030_2" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_2030_2" transform="scale(0.00689655 0.025641)"/>
+</pattern>
+<image id="image0_2030_2" width="145" height="39" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJEAAAAnCAMAAAA4lVp5AAAAIGNIUk0AAHomAACAhAAA+gAAAIDoAAB1MAAA6mAAADqYAAAXcJy6UTwAAAERUExURQAAAGy8Kmy8Kmy9Kmy8Km28KWy9Km2/Lmy8Kmu8Kmu8Kmy8KWy7KGy9Kmu9KWu8Km27K3C/KGy8Kmy8KW29K2y8Kmy8K3C/MGy9Kmy7LGy8KWu8LGy7Kmy9KnDCKWy8KWy7Km28Kmy7Kmy8Kmu5Km29Km26KGq6Kmu8Kmy9Kmu7Kmy8Kmy8Kmy8Kmy8Kmy8Km69KWy9K2u8KoC/IG28Km27Kmy7Kmy5K2y8Km2+LGi3KGq6Kmu8KWy9Kmq8K2y6Kmy7Kmy8Kn7ERazZh9ruyv///+Py177ioYjJUpHNX+335LXdlHXAN9HqvKPVecjmr5rRbfb78qPVerbeldvuyuTz2O335cjmsK3ZiNHqvb/iok0+o7UAAABBdFJOUwD359fHm1UcxmbMv0B/cN+PIKOgj9CQEMBA8EyA1BlQkrDb4DdgPzCkyE/v7c+2r12QnwjDMeJC9VIgYFiXSGh4PBaO/QAAAAFiS0dERY6zqFcAAAAHdElNRQfpBR8TLQ+T8HIEAAAAAW9yTlQBz6J3mgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyNS0wNS0zMVQxOTo0NToxNSswMDowMFaVqvwAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjUtMDUtMzFUMTk6NDU6MTUrMDA6MDAnyBJAAAAAKHRFWHRkYXRlOnRpbWVzdGFtcAAyMDI1LTA1LTMxVDE5OjQ1OjE1KzAwOjAwcN0znwAAAFplWElmTU0AKgAAAAgABQESAAMAAAABAAEAAAEaAAUAAAABAAAASgEbAAUAAAABAAAAUgEoAAMAAAABAAIAAAITAAMAAAABAAEAAAAAAAAAAABIAAAAAQAAAEgAAAABH1L3NAAABF9JREFUWMPNV3lf2kAQpbWXUlFKOUJpFSnQ1tqD3tYeGxIgEJRww/f/IN3ZczYE/QlqnT8kzmY3L++9md3EyEpx5+7GvfsPHsauI1ZDJOLR5m1DRMjW1WNaExEh8ce3DREh2xHLJuTgTnw3eeOIyJPFZVMXQb5eROTpwrJpYzyzFiK77jhuw2m2UM5rOm3H6dgq4de7NNM9XcZCluZyFo1EJg/jlxEujOfMleFIAL4jU02R6QUi0Za4n5mrWjSVEOCArsLKiPouioA/zm/o1Fn4LnEPef7CWLVAU5a43gO+VkU0cI0IfEgyhoLhkKX6oCG7Gg3HjCUxdd9YtUgzhoIrIuLvPun5xO4zXSY02YKLKQg6ohdDejEDPMDNFIZ6fO6BsWqJkDRGdBlrYw8BisAT5oHnuzbnbcjHIUN/4YffNaFXAzH7JVo0iUGU6T9l7q5KRVq8WqlUeKaip0EyixHB+q4qsZYQaaafOpsNemJAOHw4mUr/43LbUyAoRTuE5Dkgmt0T2RxXsojrEMZLGJHvojeG54/mAG8OZYe19TVHOF6FjF0VgOIKRwI9XtRfWdckkxrKwXQR97IRzCxdG2WYuKfh+14jRJQBUoF4s3uo6SpKsqg+AibIW0SvkTF8NBNWDoXPe8+ZZoVXZLtuon+7rIBLluZAPr0s6UqrokxyzfDkoSjucMjuo3jipl/gCTkUp4+kUFmiO2VK0pUhsnHl5JUphkeiIAVmNyT+zGiYC4jK5vyytrukKy3pqgqp2BxengdqorsMEfEHHFOg3OTxfunOIxHBi2f5Awt5haOgssrYNOj4ERBI/Zbno+8MRD0SHf507Jo281ivcO0oRJSBEi7puJQljZKW0g8cBT+iM+wbPkLv3AG+Wp1uY6DNQ7eMetMJkL+mUYiItjD3h2QjJXIJTRdvXRaa8kCtODeqvwfVxMpqrhLQGOGvuGlk9q8YpkVv9tK74BjZeoqaxCzDUlKa8YzQAXu1FbDNo6f3UoFoqIlpLEGUQBbWNVRG2ZKmC8YPC1ozGu/VkiNd452A7yi+RglHgJlg0lNv0ItAlML/gGVJyNiYLnki1zLHPqglW+IU5ogDEVDB/Ntudjptsc3ZvDd16uxoN46qNbzxM3hFiaiqRNMkJtlkpRnER7WmcV7j/vHHKMNKbYrvaUUgAh9ITbI1Ip9eIOoIYNYBbGdIMxqfPqtF1WmVKiP0kA0aAPkh3IHRLLCxa2xT266BZAIepA+rUiZNIrN+MWbEl6+67ww4gNFAb1p9npqp7mlPGHHjgbmxyeUKxIwU5mLniCf1oZL1xvCXwbfvaAHf87zwCaDlhZo5vckO3aMQ5YxsSelRzUuIOYyoiG2u4scOWT/kYnmVSedS2B9J9lmZ3othRMu+C45rV4fovLCskD6RmvH4uXUTiBYiWjMRm2tiWgXQRd9yJ782bhbROZqpOP598ufv9kqxAqLMeZr9j7DI5b52rz3gS05udbc5/gHZ/BLSJh/eDgAAAABJRU5ErkJggg=="/>
+</defs>
+</svg>
--- a/auth/assets/custom-icons/icons/finary.svg
+++ b/auth/assets/custom-icons/icons/finary.svg
@@ -0,0 +1,3 @@
+<svg width="500" height="500" viewBox="0 0 500 500" fill="#F1C086" xmlns="http://www.w3.org/2000/svg">
+<path d="M166.67 62C74.62 62 0 136.62 0 228.67H333.33C425.38 228.67 500 154.05 500 62H166.67ZM166.67 270.33C74.62 270.33 0 344.95 0 437H154.76C246.81 437 321.43 362.38 321.43 270.33H166.67Z"/>
+</svg>
--- a/auth/assets/custom-icons/icons/gerid.svg
+++ b/auth/assets/custom-icons/icons/gerid.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: https://ezgif.com/png-to-svg -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="195" height="195">
+<path d="M0,0 L44,0 L70,2 L94,6 L98,8 L98,39 L95,75 L91,98 L85,114 L76,131 L65,145 L58,153 L55,154 L55,144 L51,131 L42,121 L38,118 L38,98 L34,98 L33,29 L28,27 L26,26 L26,89 L22,89 L22,25 L20,25 L20,89 L13,89 L12,29 L11,30 L11,98 L6,98 L6,118 L-3,125 L-9,135 L-11,143 L-11,154 L-15,152 L-25,141 L-35,126 L-43,110 L-48,95 L-52,69 L-54,44 L-55,8 L-50,6 L-26,2 Z " fill="#046097" transform="translate(75,8)"/>
+<path d="M0,0 L44,0 L70,2 L94,6 L98,8 L98,39 L95,75 L91,98 L85,114 L76,131 L65,145 L58,153 L55,154 L55,144 L51,131 L42,121 L38,118 L38,98 L34,98 L33,29 L28,27 L26,26 L26,89 L22,89 L22,25 L20,24 L22,24 L22,1 L0,1 Z " fill="#0495C0" transform="translate(75,8)"/>
+<path d="M0,0 L8,0 L13,3 L15,7 L15,15 L6,21 L0,20 L-7,16 L-8,10 L-5,3 Z " fill="#0A669B" transform="translate(93,165)"/>
+<path d="M0,0 L6,1 L10,5 L11,7 L11,15 L2,21 L-2,20 L0,20 Z " fill="#0D99C1" transform="translate(97,165)"/>
+</svg>
--- a/auth/assets/custom-icons/icons/mistral.svg
+++ b/auth/assets/custom-icons/icons/mistral.svg
@@ -1,15 +1,7 @@
-<svg width="500" height="500" viewBox="0 0 500 500" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g style="mix-blend-mode:difference">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M363.636 23H409.091V477.545H363.636V23ZM0 23H45.4545V477.545H0V23ZM227.273 295.727H181.818V386.636H227.273V295.727ZM272.727 113.909H318.182V204.818H272.727V113.909Z" fill="white"/>
-</g>
-<path d="M136.364 386.636H45.4545V477.545H136.364V386.636Z" fill="#EA3326"/>
-<path d="M500 386.636H409.091V477.545H500V386.636Z" fill="#EA3326"/>
-<path d="M136.364 295.727H45.4545V386.636H136.364V295.727Z" fill="#EB5829"/>
-<path d="M318.182 295.727H227.273V386.636H318.182V295.727Z" fill="#EB5829"/>
-<path d="M500 295.727H409.091V386.636H500V295.727Z" fill="#EB5829"/>
-<path d="M136.364 23H45.4545V113.909H136.364V23Z" fill="#F7D046"/>
-<path d="M500 23H409.091V113.909H500V23Z" fill="#F7D046"/>
-<path d="M227.273 113.909H45.4545V204.818H227.273V113.909Z" fill="#F2A73B"/>
-<path d="M500 113.909H318.182V204.818H500V113.909Z" fill="#F2A73B"/>
-<path d="M500 204.818H45.4545V295.727H500V204.818Z" fill="#EE792F"/>
-</svg>
+<svg width="500" height="500" viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg">
+  <path d="M71.41 73H142.83V143.75H71.41V73ZM357.12 73H428.54V143.75H357.12V73Z" fill="#FFD800"/>
+  <path d="M71.41 143.75H214.25V214.5H71.41V143.75ZM285.7 143.75H428.54V214.5H285.7V143.75Z" fill="#FFAF00"/>
+  <path d="M71.41 214.5H428.54V285.25H71.41V214.5Z" fill="#FF8205"/>
+  <path d="M71.41 285.27H142.83V356.02H71.41V285.27ZM214.27 285.27H285.69V356.02H214.27V285.27ZM357.12 285.27H428.54V356.02H357.12V285.27Z" fill="#FA500F"/>
+  <path d="M0 356.06H214.3V426.82H0V356.06ZM285.7 356.06H500V426.82H285.7V356.06Z" fill="#E10500"/>
+</svg>
--- a/auth/assets/custom-icons/icons/oracle_cloud.svg
+++ b/auth/assets/custom-icons/icons/oracle_cloud.svg
@@ -0,0 +1 @@
+<svg height="2100" viewBox="0 0 32 21" width="3200" xmlns="http://www.w3.org/2000/svg"><path d="m9.9 20.1c-5.5 0-9.9-4.4-9.9-9.9s4.4-9.9 9.9-9.9h11.6c5.5 0 9.9 4.4 9.9 9.9s-4.4 9.9-9.9 9.9zm11.3-3.5c3.6 0 6.4-2.9 6.4-6.4 0-3.6-2.9-6.4-6.4-6.4h-11c-3.6 0-6.4 2.9-6.4 6.4s2.9 6.4 6.4 6.4z" fill="#c74634"/></svg>
--- a/auth/assets/custom-icons/icons/uollet.svg
+++ b/auth/assets/custom-icons/icons/uollet.svg
@@ -0,0 +1,15 @@
+<svg width="500" height="404" viewBox="0 0 500 404" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M232.61 401.571C220.894 398.642 214.011 395.42 204.052 388.39C199.219 384.876 154.991 341.672 105.783 292.172C37.244 223.34 15.1299 200.347 11.1757 193.61C-3.03008 169.006 -3.61588 146.16 8.97892 121.263C14.6905 109.987 26.6995 96.806 75.0284 48.4771C115.303 8.20299 118.378 6.00622 139.321 1.46623C151.33 -1.02344 160.41 -0.437633 174.176 3.9559C188.235 8.20299 197.901 15.5256 224.262 41.7403C237.443 54.7745 249.013 65.4654 250.038 65.4654C250.916 65.4654 251.649 66.7835 251.649 68.3945C251.649 70.0054 251.063 71.3235 250.331 71.3235C249.745 71.3235 243.887 76.5957 237.443 83.0396C224.409 95.9273 216.647 109.108 215.329 120.385C214.596 127.561 217.525 144.549 219.576 144.549C220.308 144.549 220.894 145.867 220.894 147.478C220.894 151.725 240.811 171.203 248.72 174.865C252.381 176.475 258.532 178.672 262.34 179.697C268.93 181.455 269.955 181.308 279.914 177.501C285.772 175.157 291.044 172.521 291.63 171.35C292.216 170.325 293.241 169.446 293.973 169.446C294.559 169.446 304.664 159.926 316.527 148.21C336.59 128.586 338.494 126.975 343.62 126.975C348.746 126.975 350.943 128.879 386.091 164.027C406.301 184.237 422.997 201.812 422.997 202.837C422.997 203.715 423.582 204.594 424.315 204.594C424.9 204.594 427.39 208.695 429.733 213.821C433.102 221.29 433.98 225.39 434.42 237.253C435.006 249.555 434.713 251.459 432.662 251.459C431.344 251.459 430.319 252.337 430.319 253.362C430.319 254.388 400.15 285.289 363.391 321.902C303.492 381.507 295.145 389.123 286.065 393.809C267.465 403.328 250.184 405.818 232.61 401.571ZM2.24217 152.311C1.94926 149.968 1.65636 151.579 1.65636 155.533C1.65636 159.634 1.94926 161.391 2.24217 159.634C2.53507 157.73 2.53507 154.508 2.24217 152.311Z" fill="#461EC5"/>
+<path d="M430.319 233.152C430.319 231.981 429.733 230.955 429.001 230.955C428.269 230.955 427.976 229.637 428.415 228.026C429.733 222.901 433.248 224.512 433.248 230.223C433.248 233.006 432.662 235.349 431.784 235.349C431.052 235.349 430.319 234.324 430.319 233.152Z" fill="#36198A"/>
+<path d="M421.386 210.745C417.138 205.766 416.846 203.13 420.8 203.13C424.022 203.13 424.461 203.715 424.461 208.255C424.461 214.113 424.315 214.26 421.386 210.745Z" fill="#36198A"/>
+<path d="M252.527 182.48C247.695 180.869 241.104 177.647 237.736 175.304C228.949 169.299 212.4 150.407 215.768 150.407C216.354 150.407 215.622 149.382 214.45 148.064C213.132 146.892 212.4 145.135 212.839 144.403C213.425 143.671 212.986 143.085 212.107 143.085C211.082 143.085 210.789 141.913 211.375 140.156C211.814 138.545 211.814 137.227 211.082 137.227C210.496 137.227 209.91 131.662 209.91 124.778C209.91 117.895 210.496 112.33 211.228 112.33C211.814 112.33 212.107 111.305 211.521 110.133C211.082 108.962 211.375 107.936 212.253 107.936C213.132 107.936 213.571 106.911 212.986 105.74C212.546 104.568 212.839 103.543 213.718 103.543C214.597 103.543 214.889 102.957 214.45 102.225C214.011 101.493 214.597 100.467 215.915 100.028C217.233 99.5887 217.965 98.1242 217.526 97.099C217.086 95.9274 217.672 94.6094 218.844 94.17C220.015 93.7306 220.748 92.8519 220.601 92.2661C220.162 90.8016 244.18 66.9301 246.084 66.9301C246.816 66.9301 246.962 66.1978 246.377 65.3191C245.791 64.2939 246.377 64.001 248.134 64.5868C250.331 65.3191 256.921 59.4611 278.01 38.665C307.007 9.96053 311.694 6.7386 330.732 1.75926C347.721 -2.78073 370.714 1.90571 385.505 12.7431C392.242 17.7224 440.571 65.3191 440.571 67.0765C440.571 67.6623 441.45 68.541 442.475 68.8339C443.353 69.2733 438.374 69.5662 431.052 69.5662C420.946 69.4197 416.406 70.0055 411.72 72.2023C404.69 75.4242 348.16 129.904 351.821 129.904C353.432 129.904 354.165 131.222 354.165 134.298C354.165 138.252 354.604 138.691 358.558 138.691C362.659 138.691 362.952 139.131 362.952 144.11V149.529L353.579 140.302C344.938 131.808 343.767 131.076 341.423 132.98C339.959 134.151 330 143.817 319.163 154.508C308.325 165.052 298.953 173.839 298.367 173.839C297.781 173.839 296.609 174.718 296.023 175.743C295.438 176.915 290.458 179.551 284.893 181.601C273.177 186.288 264.683 186.581 252.527 182.48ZM288.847 141.913C297.342 134.737 299.538 127.414 295.731 119.067C292.069 110.865 287.529 107.204 278.596 105.007C271.859 103.543 270.395 103.689 265.562 106.033C261.315 108.229 259.557 110.573 256.775 117.309C253.406 125.511 253.406 125.95 255.749 132.394C258.386 139.423 263.951 144.549 271.42 147.039C276.253 148.65 283.429 146.6 288.847 141.913Z" fill="#36198A"/>
+<path d="M383.455 170.178L378.476 165.052H383.894C389.167 165.052 389.313 165.199 389.313 170.178C389.313 172.961 389.167 175.304 388.874 175.304C388.581 175.304 386.238 172.961 383.455 170.178Z" fill="#36198A"/>
+<path d="M430.026 239.157C429.44 228.612 428.561 225.097 424.021 216.017C419.335 206.498 414.649 201.372 382.136 168.714C361.926 148.65 345.084 130.929 344.498 129.465C343.327 125.95 398.392 71.9093 407.326 67.6622C412.012 65.6119 416.552 64.8796 426.218 64.8796H438.959L459.023 84.5041C480.698 105.886 488.899 116.87 492.854 129.758C494.318 134.298 495.929 138.398 496.661 138.838C497.394 139.423 497.54 141.181 497.101 142.792C496.515 144.403 496.808 146.16 497.686 146.746C499.59 147.918 499.59 161.684 497.54 163.002C496.661 163.441 496.222 165.199 496.661 166.663C497.101 168.128 496.075 171.789 494.611 174.865C493.146 177.794 491.828 181.601 491.828 183.066C491.828 186.434 485.97 197.272 484.213 197.272C483.627 197.272 483.041 198.15 483.041 199.175C483.041 201.372 434.419 251.459 432.223 251.459C431.344 251.459 430.465 246.333 430.026 239.157Z" fill="#2B146D"/>
+<path d="M266.586 151.432C260.435 149.089 251.355 141.913 252.38 140.009C252.966 139.277 252.527 138.691 251.648 138.691C250.77 138.691 250.477 138.105 250.916 137.227C251.355 136.494 251.209 135.762 250.33 135.762C249.451 135.762 249.159 134.737 249.598 133.565C250.184 132.394 249.891 131.368 249.159 131.368C248.426 131.368 247.84 128.732 247.987 125.51C247.987 122.289 248.426 119.652 248.866 119.652C250.33 119.652 253.259 112.183 252.38 110.719C251.795 109.987 252.234 109.401 252.966 109.401C253.845 109.401 254.431 108.669 254.138 107.643C253.991 106.765 256.481 104.421 259.703 102.664C267.026 98.417 275.959 96.806 278.742 99.1492C279.913 100.028 281.524 100.467 282.257 100.028C282.989 99.4421 284.014 99.735 284.6 100.614C285.186 101.492 286.064 101.785 286.797 101.346C288.847 100.028 297.341 108.229 300.124 114.527C303.638 122.289 303.638 124.046 299.684 124.046C297.195 124.046 295.73 122.581 293.973 118.334C291.044 111.451 282.257 104.568 276.691 104.714C271.566 104.861 260.582 110.133 259.41 113.062C258.971 114.234 257.36 115.259 255.895 115.259C253.552 115.259 253.113 116.43 253.113 121.849C253.113 125.657 254.138 130.49 255.31 132.687C257.946 137.812 265.415 144.256 270.101 145.428C272.591 146.014 273.616 147.332 273.616 149.821C273.616 153.776 273.323 153.776 266.586 151.432Z" fill="#2B146D"/>
+<path d="M275.081 149.821C275.081 147.039 276.106 146.014 279.621 145.281C285.186 144.11 293.973 135.03 295.145 129.611C295.731 126.536 296.756 125.51 299.392 125.51C303.346 125.51 303.493 126.682 301.442 134.444C299.538 141.034 293.827 147.039 286.065 150.554C277.864 154.361 275.081 154.068 275.081 149.821Z" fill="#2B146D"/>
+<path d="M265.561 150.114C257.507 146.014 254.578 143.231 251.502 136.494C247.841 128.44 247.987 122.289 252.381 113.794C260.143 98.2705 281.818 94.9022 293.241 107.204C299.978 114.38 301.003 115.845 300.27 117.895C299.978 118.774 300.417 119.652 301.296 119.652C302.174 119.652 302.907 121.996 302.907 124.778C302.907 127.561 302.174 129.904 301.296 129.904C300.417 129.904 299.978 131.222 300.417 132.833C300.856 134.444 300.563 135.762 299.685 135.762C298.952 135.762 298.659 136.348 299.099 137.08C299.538 137.812 298.952 138.838 297.634 139.277C296.316 139.863 295.584 140.595 296.17 141.181C296.609 141.62 295.584 142.792 293.68 143.817C291.923 144.696 290.605 146.16 290.751 147.039C290.898 147.918 288.408 148.943 285.332 149.528C282.11 149.968 279.474 151.139 279.474 151.872C279.474 154.215 271.859 153.19 265.561 150.114Z" fill="#1F0E4E"/>
+<rect x="1.21729" y="150.407" width="4.39354" height="10.2516" fill="#461EC5"/>
+<path d="M462.539 88.1654C506.161 130.726 511.237 166.488 480.113 203.13L462.539 88.1654Z" fill="#2B146D"/>
+<circle cx="275.081" cy="125.51" r="27.8257" fill="#1F0E4E"/>
+<path d="M222.359 89.6299C196.86 117.609 199.757 132.937 221.627 159.926L222.359 89.6299Z" fill="#36198A"/>
+</svg>
--- a/auth/lib/core/constants.dart
+++ b/auth/lib/core/constants.dart
@@ -11,7 +11,7 @@ const String roadmapURL = "https://roadmap.ente.io";
 const String kAccountsUrl = "https://accounts.ente.io";

 const String githubFeatureRequestUrl =
-    "https://github.com/ente-io/ente/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+requests%22+label%3A%22-+auth%22+sort%3Atop";
+    "https://github.com/ente-io/ente/discussions/categories/enhancements?discussions_q=is%3Aopen%+label%3A%22-+auth%22+sort%3Atop";
 const int microSecondsInDay = 86400000000;
 const int android11SDKINT = 30;
 const int galleryLoadStartTime = -8000000000000000; // Wednesday, March 6, 1748
--- a/auth/lib/gateway/authenticator.dart
+++ b/auth/lib/gateway/authenticator.dart
@@ -73,7 +73,10 @@ class AuthenticatorGateway {
    );
  }

-  Future<List<AuthEntity>> getDiff(int sinceTime, {int limit = 500}) async {
+  Future<(List<AuthEntity>, int?)> getDiff(
+    int sinceTime, {
+    int limit = 500,
+  }) async {
    try {
      final response = await _enteDio.get(
        "/authenticator/entity/diff",
@@ -84,11 +87,12 @@ class AuthenticatorGateway {
      );
      final List<AuthEntity> authEntities = <AuthEntity>[];
      final diff = response.data["diff"] as List;
+      final int? unixTimeInMicroSeconds = response.data["timestamp"] as int?;
      for (var entry in diff) {
        final AuthEntity entity = AuthEntity.fromMap(entry);
        authEntities.add(entity);
      }
-      return authEntities;
+      return (authEntities, unixTimeInMicroSeconds);
    } catch (e) {
      if (e is DioException && e.response?.statusCode == 401) {
        throw UnauthorizedError();
--- a/auth/lib/l10n/arb/app_ar.arb
+++ b/auth/lib/l10n/arb/app_ar.arb
@@ -47,7 +47,7 @@
  "saveAction": "حفظ",
  "nextTotpTitle": "التالي",
  "deleteCodeTitle": "حذف الرمز؟",
-  "deleteCodeMessage": "هل أنت متأكد من أنك تريد حذف هذه الشيفرة؟ هذا الإجراء لا رجعة فيه.",
+  "deleteCodeMessage": "هل أنت متيقِّن من أنك تريد حذف هذه الشيفرة؟ هذا الإجراء لا رجعة فيه.",
  "trashCode": "حذف الكود؟",
  "trashCodeMessage": "هل أنت متيقِّن أنك تريد حذف الكود الخاص بـ {account}؟",
  "trash": "سلة المهملات",
@@ -173,6 +173,7 @@
  "invalidQRCode": "شيفرة استجابة سريعة غير صالحة",
  "noRecoveryKeyTitle": "لا يوجد مفتاح استرجاع؟",
  "enterEmailHint": "أدخل عنوان البريد الإلكتروني الخاص بك",
+  "enterNewEmailHint": "أدخل عنوان بريدك الإلكتروني الجديد",
  "invalidEmailTitle": "عنوان البريد الإلكتروني غير صالح",
  "invalidEmailMessage": "الرجاء إدخال بريد إلكتروني صالح.",
  "deleteAccount": "إزالة الحساب",
@@ -513,5 +514,10 @@
  "free5GB": "5GB  مجانًا على <bold-green>ente</bold-green> صور",
  "loginWithAuthAccount": "سجّل الدخول باستخدام حساب المُصادقة",
  "freeStorageOffer": "خَصْم 10٪ على صور <bold-green>ente</bold-green>",
-  "freeStorageOfferDescription": "استخدم الكود \"AUTH\" وأحصل على 10٪ خَصْم في السنة الأولى"
+  "freeStorageOfferDescription": "استخدم الكود \"AUTH\" وأحصل على 10٪ خَصْم في السنة الأولى",
+  "advanced": "متقدم",
+  "algorithm": "الخوارزمية",
+  "type": "النوع",
+  "period": "المدّة",
+  "digits": "الأرقام"
 }
--- a/auth/lib/l10n/arb/app_de.arb
+++ b/auth/lib/l10n/arb/app_de.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "Ungültiger QR-Code",
  "noRecoveryKeyTitle": "Kein Wiederherstellungsschlüssel?",
  "enterEmailHint": "Geben Sie Ihre E-Mail-Adresse ein",
+  "enterNewEmailHint": "Gib deine neue E-Mail-Adresse ein",
  "invalidEmailTitle": "Ungültige E-Mail-Adresse",
  "invalidEmailMessage": "Bitte geben Sie eine gültige E-Mail-Adresse ein.",
  "deleteAccount": "Konto löschen",
@@ -513,5 +514,10 @@
  "free5GB": "5GB kostenlos auf <bold-green>ente</bold-green> Photos",
  "loginWithAuthAccount": "Mit Ihrem Auth Account anmelden",
  "freeStorageOffer": "10% Rabatt für <bold-green>ente</bold-green> Photos",
-  "freeStorageOfferDescription": "Verwende den Code \"AUTH\", um 10% im ersten Jahr zu sparen"
+  "freeStorageOfferDescription": "Verwende den Code \"AUTH\", um 10% im ersten Jahr zu sparen",
+  "advanced": "Erweitert",
+  "algorithm": "Algorithmus",
+  "type": "Typ",
+  "period": "Periode",
+  "digits": "Ziffern"
 }
--- a/auth/lib/l10n/arb/app_en.arb
+++ b/auth/lib/l10n/arb/app_en.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "Invalid QR code",
  "noRecoveryKeyTitle": "No recovery key?",
  "enterEmailHint": "Enter your email address",
+  "enterNewEmailHint": "Enter your new email address",
  "invalidEmailTitle": "Invalid email address",
  "invalidEmailMessage": "Please enter a valid email address.",
  "deleteAccount": "Delete account",
--- a/auth/lib/l10n/arb/app_fr.arb
+++ b/auth/lib/l10n/arb/app_fr.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "QR code non valide",
  "noRecoveryKeyTitle": "Pas de clé de récupération ?",
  "enterEmailHint": "Entrez votre adresse e-mail",
+  "enterNewEmailHint": "Saisissez votre nouvelle adresse email",
  "invalidEmailTitle": "Adresse e-mail invalide",
  "invalidEmailMessage": "Veuillez saisir une adresse e-mail valide.",
  "deleteAccount": "Supprimer le compte",
@@ -513,5 +514,10 @@
  "free5GB": "5 Go gratuits sur <bold-green>Ente</bold-green> Photos",
  "loginWithAuthAccount": "Connectez-vous avec votre compte Auth",
  "freeStorageOffer": "10% de réduction sur <bold-green>Ente</bold-green> Photos",
-  "freeStorageOfferDescription": "Utilisez le code coupon \"AUTH\" pour obtenir 10% de réduction la première année"
+  "freeStorageOfferDescription": "Utilisez le code coupon \"AUTH\" pour obtenir 10% de réduction la première année",
+  "advanced": "Avancé",
+  "algorithm": "Algorithme",
+  "type": "Type",
+  "period": "Période",
+  "digits": "Chiffres"
 }
--- a/auth/lib/l10n/arb/app_hu.arb
+++ b/auth/lib/l10n/arb/app_hu.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "Érvénytelen QR-kód",
  "noRecoveryKeyTitle": "Nincs helyreállítási kulcs?",
  "enterEmailHint": "Adja meg az e-mail címét",
+  "enterNewEmailHint": "Add meg az új e-mail címed",
  "invalidEmailTitle": "Érvénytelen e-mail cím",
  "invalidEmailMessage": "Kérjük, adjon meg egy érvényes e-mail címet.",
  "deleteAccount": "Fiók törlése",
@@ -513,5 +514,6 @@
  "free5GB": "5GB ingyen <bold-green>ente <bold-green> Photos",
  "loginWithAuthAccount": "Jelentkezzen be Auth fiókjával",
  "freeStorageOffer": "10% kedvezmény on <bold-green>ente<bold-green> photos",
-  "freeStorageOfferDescription": "Használja az \"AUTH\" kódot, hogy 10% kedvezményt kapjon az első évben"
+  "freeStorageOfferDescription": "Használja az \"AUTH\" kódot, hogy 10% kedvezményt kapjon az első évben",
+  "type": "Típus"
 }
--- a/auth/lib/l10n/arb/app_id.arb
+++ b/auth/lib/l10n/arb/app_id.arb
@@ -88,6 +88,8 @@
  "useRecoveryKey": "Gunakan kunci pemulihan",
  "incorrectPasswordTitle": "Kata sandi salah",
  "welcomeBack": "Selamat datang kembali!",
+  "emailAlreadyRegistered": "Email sudah terdaftar.",
+  "emailNotRegistered": "Email belum terdaftar.",
  "madeWithLoveAtPrefix": "dibuat dengan ❤️ di ",
  "supportDevs": "Berlangganan <bold-green>ente</bold-green> untuk mendukung kami",
  "supportDiscount": "Gunakan kode kupon \"AUTH\" untuk mendapatkan potongan 10% untuk tahun pertama",
@@ -171,6 +173,7 @@
  "invalidQRCode": "Kode QR tidak valid",
  "noRecoveryKeyTitle": "Tidak punya kunci pemulihan?",
  "enterEmailHint": "Masukkan alamat email Anda",
+  "enterNewEmailHint": "Masukkan alamat email baru anda",
  "invalidEmailTitle": "Alamat email tidak valid",
  "invalidEmailMessage": "Harap masukkan alamat email yang valid.",
  "deleteAccount": "Hapus akun",
@@ -501,5 +504,12 @@
  "deselectAll": "Batalkan semua pilihan",
  "selectAll": "Pilih semua",
  "deleteDuplicates": "Hapus duplikat",
-  "plainHTML": "HTML Sederhana"
+  "plainHTML": "HTML Sederhana",
+  "tellUsWhatYouThink": "Berikan pendapatmu",
+  "dropReviewAndroid": "Berikan ulasan di Play Store",
+  "advanced": "Lanjutan",
+  "algorithm": "Algoritma",
+  "type": "Tipe",
+  "period": "Periode",
+  "digits": "Digit"
 }
--- a/auth/lib/l10n/arb/app_it.arb
+++ b/auth/lib/l10n/arb/app_it.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "Codice QR non valido",
  "noRecoveryKeyTitle": "Nessuna chiave di recupero?",
  "enterEmailHint": "Inserisci il tuo indirizzo email",
+  "enterNewEmailHint": "Inserisci il tuo nuovo indirizzo email",
  "invalidEmailTitle": "Indirizzo email non valido",
  "invalidEmailMessage": "Inserisci un indirizzo email valido.",
  "deleteAccount": "Elimina account",
@@ -513,5 +514,10 @@
  "free5GB": "5GB gratis su <bold-green>ente</bold-green> Foto",
  "loginWithAuthAccount": "Accedi con il tuo account Auth",
  "freeStorageOffer": "10% di sconto su <bold-green>ente</bold-green> Foto",
-  "freeStorageOfferDescription": "Utilizzare il codice \"AUTH\" per ottenere il 10% di sconto al primo anno"
+  "freeStorageOfferDescription": "Utilizzare il codice \"AUTH\" per ottenere il 10% di sconto al primo anno",
+  "advanced": "Avanzate",
+  "algorithm": "Algoritmo",
+  "type": "Tipo",
+  "period": "Periodo",
+  "digits": "Cifre"
 }
--- a/auth/lib/l10n/arb/app_lt.arb
+++ b/auth/lib/l10n/arb/app_lt.arb
@@ -508,9 +508,15 @@
  "tellUsWhatYouThink": "Pasakykite mums, ką manote",
  "dropReviewiOS": "Rašyti apžvalgą parduotuvėje „App Store“",
  "dropReviewAndroid": "Rašyti apžvalgą parduotuvėje „Play“ parduotuvė“",
+  "supportEnte": "Paremti „<bold-green>ente</bold-green>“",
  "giveUsAStarOnGithub": "Suteikite mums žvaigždutę platformoje „Github“",
  "free5GB": "5 GB nemokami programai „<bold-green>ente</bold-green>“ nuotraukos",
  "loginWithAuthAccount": "Prisijungti su jūsų „Auth“ paskyra",
  "freeStorageOffer": "10 % nuolaida programai „<bold-green>ente</bold-green>“ nuotraukos",
-  "freeStorageOfferDescription": "Naudokite kodą „AUTH“, kad gautumėte 10 % nuolaida pirmiesiems metams. "
+  "freeStorageOfferDescription": "Naudokite kodą „AUTH“, kad gautumėte 10 % nuolaida pirmiesiems metams. ",
+  "advanced": "Išplėstiniai",
+  "algorithm": "Algoritmas",
+  "type": "Tipas",
+  "period": "Laikotarpis",
+  "digits": "Skaitmenys"
 }
--- a/auth/lib/l10n/arb/app_nl.arb
+++ b/auth/lib/l10n/arb/app_nl.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "Ongeldige QR-code",
  "noRecoveryKeyTitle": "Geen herstelsleutel?",
  "enterEmailHint": "Voer je e-mailadres in",
+  "enterNewEmailHint": "Voer uw nieuwe e-mailadres in",
  "invalidEmailTitle": "Ongeldig e-mailadres",
  "invalidEmailMessage": "Voer een geldig e-mailadres in.",
  "deleteAccount": "Account verwijderen",
@@ -513,5 +514,10 @@
  "free5GB": "5GB gratis op <bold-green>ente</bold-green> Photos",
  "loginWithAuthAccount": "Log in met je Auth account",
  "freeStorageOffer": "10% korting op <bold-green>ente</bold-green> photos",
-  "freeStorageOfferDescription": "Gebruik de code \"AUTH\" voor 10% korting op je eerste jaar"
+  "freeStorageOfferDescription": "Gebruik de code \"AUTH\" voor 10% korting op je eerste jaar",
+  "advanced": "Geavanceerd",
+  "algorithm": "Algoritme",
+  "type": "Type",
+  "period": "Periode",
+  "digits": "Cijfers"
 }
--- a/auth/lib/l10n/arb/app_pl.arb
+++ b/auth/lib/l10n/arb/app_pl.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "Nieprawidłowy kod QR",
  "noRecoveryKeyTitle": "Brak klucza odzyskiwania?",
  "enterEmailHint": "Wprowadź adres e-mail",
+  "enterNewEmailHint": "Wprowadź nowy adres e-mail",
  "invalidEmailTitle": "Nieprawidłowy adres e-mail",
  "invalidEmailMessage": "Prosimy podać prawidłowy adres e-mail.",
  "deleteAccount": "Usuń konto",
@@ -513,5 +514,10 @@
  "free5GB": "5 GB za darmo na zdjęcia <bold-green>ente</bold-green>",
  "loginWithAuthAccount": "Zaloguj się przy użyciu konta Auth",
  "freeStorageOffer": "10% zniżki na zdjęcia <bold-green>ente</bold-green>",
-  "freeStorageOfferDescription": "Użyj kodu „AUTH”, aby uzyskać 10% zniżki na pierwszy rok"
+  "freeStorageOfferDescription": "Użyj kodu „AUTH”, aby uzyskać 10% zniżki na pierwszy rok",
+  "advanced": "Zaawansowane",
+  "algorithm": "Algorytm",
+  "type": "Rodzaj",
+  "period": "Okres",
+  "digits": "Cyfry"
 }
--- a/auth/lib/l10n/arb/app_pt.arb
+++ b/auth/lib/l10n/arb/app_pt.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "QR Code inválido",
  "noRecoveryKeyTitle": "Sem chave de recuperação?",
  "enterEmailHint": "Insira o endereço de e-mail",
+  "enterNewEmailHint": "Insira seu novo e-mail",
  "invalidEmailTitle": "Endereço de e-mail inválido",
  "invalidEmailMessage": "Insira um endereço de e-mail válido.",
  "deleteAccount": "Excluir conta",
@@ -513,5 +514,10 @@
  "free5GB": "5GB grátis no <bold-green>ente</bold-green> Photos",
  "loginWithAuthAccount": "Registrar-se com sua conta Auth",
  "freeStorageOffer": "10% de desconto no <bold-green>ente</bold-green> photos",
-  "freeStorageOfferDescription": "Use o cupom \"AUTH\" para obter 10% de desconto no primeiro ano"
+  "freeStorageOfferDescription": "Use o cupom \"AUTH\" para obter 10% de desconto no primeiro ano",
+  "advanced": "Avançado",
+  "algorithm": "Algoritmo",
+  "type": "Tipo",
+  "period": "Período",
+  "digits": "Dígitos"
 }
--- a/auth/lib/l10n/arb/app_sr.arb
+++ b/auth/lib/l10n/arb/app_sr.arb
@@ -0,0 +1,523 @@
+{
+  "account": "Налог",
+  "unlock": "Откључај",
+  "recoveryKey": "Резервни Кључ",
+  "counterAppBarTitle": "Бројач",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Сигурносно правити копију 2ФА кôдова",
+  "onBoardingGetStarted": "Почети",
+  "setupFirstAccount": "Подесити свој први налог",
+  "importScanQrCode": "Скенирај QR кôд",
+  "qrCode": "QR кôд",
+  "importEnterSetupKey": "Унети кључ за подешавање",
+  "importAccountPageTitle": "Унети детаље налога",
+  "secretCanNotBeEmpty": "Тајна не може бити празна",
+  "bothIssuerAndAccountCanNotBeEmpty": "И издавалац и рачун не могу бити празни",
+  "incorrectDetails": "Погрешни детаљи",
+  "pleaseVerifyDetails": "Проверите детаље и покушајте поново",
+  "codeIssuerHint": "Издавач",
+  "codeSecretKeyHint": "Тајни кључ",
+  "secret": "Тајна",
+  "all": "Све",
+  "notes": "Белешке",
+  "notesLengthLimit": "Белешке могу имати највише {count} знакова",
+  "@notesLengthLimit": {
+    "description": "Text to indicate the maximum number of characters allowed for notes",
+    "placeholders": {
+      "count": {
+        "description": "The maximum number of characters allowed for notes",
+        "type": "int",
+        "example": "100"
+      }
+    }
+  },
+  "codeAccountHint": "Налог (you@domain.com)",
+  "codeTagHint": "Ознака",
+  "accountKeyType": "Тип кључа",
+  "sessionExpired": "Сесија је истекла",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Молимо да се поново пријавите",
+  "loggingOut": "Одјављивање...",
+  "timeBasedKeyType": "Временски (TOTP)",
+  "counterBasedKeyType": "На основу бројања (HOTP)",
+  "saveAction": "Сачувај",
+  "nextTotpTitle": "следеће",
+  "deleteCodeTitle": "Обрисати кôд?",
+  "deleteCodeMessage": "Сигурно желите да избришете овај кôд? Ова акција је неповратна.",
+  "trashCode": "Кôд у смеће?",
+  "trashCodeMessage": "Сигурно желите да поставите кôд у смеће за {account}?",
+  "trash": "Смеће",
+  "viewLogsAction": "Прегледај извештаје",
+  "sendLogsDescription": "Ово ће делите ваше записе како би нам помогли да вам исправимо проблем. Док преузмемо мере предострожности да осигурамо да осетљиве информације нису пријављене, охрабрујемо вас да прегледате ове записе пре него што их делите.",
+  "preparingLogsTitle": "Спремање извештаја...",
+  "emailLogsTitle": "Имејловати извештаје",
+  "emailLogsMessage": "Пошаљите извештаје на {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Копирати имејл",
+  "exportLogsAction": "Извези изештаје",
+  "reportABug": "Пријави грешку",
+  "crashAndErrorReporting": "Пријављивање дања и грешке",
+  "reportBug": "Пријaви грешку",
+  "emailUsMessage": "Пошаљите нам имејл на {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Контактирати подршку",
+  "rateUsOnStore": "Оцените нас на {storeName}",
+  "blog": "Блог",
+  "merchandise": "Роба",
+  "verifyPassword": "Верификујте лозинку",
+  "pleaseWait": "Молимо сачекајте...",
+  "generatingEncryptionKeysTitle": "Генерисање кључева за шифровање...",
+  "recreatePassword": "Поново креирати лозинку",
+  "recreatePasswordMessage": "Тренутни уређај није довољно моћан да потврди вашу лозинку, тако да је морамо да регенеришемо једном на начин који ради са свим уређајима. \n\nПријавите се помоћу кључа за опоравак и обновите своју лозинку (можете поново користити исту ако желите).",
+  "useRecoveryKey": "Користите кључ за опоравак",
+  "incorrectPasswordTitle": "Неисправна лозинка",
+  "welcomeBack": "Добродошли назад!",
+  "emailAlreadyRegistered": "Имејл је већ регистрован.",
+  "emailNotRegistered": "Имејл није регистрован.",
+  "madeWithLoveAtPrefix": "урађено са ❤️ на ",
+  "supportDevs": "Претплатити се на <bold-green>ente</bold-green> да би нас подржали",
+  "supportDiscount": "Употребите купон \"AUTH\" да би добили попуст од 10% прве године",
+  "changeEmail": "Промени имејл",
+  "changePassword": "Промени лозинку",
+  "data": "Подаци",
+  "importCodes": "Увоз кôдова",
+  "importTypePlainText": "Обичан текст",
+  "importTypeEnteEncrypted": "Ente шифрован извоз",
+  "passwordForDecryptingExport": "Лозинка за дешифровање извоза",
+  "passwordEmptyError": "Лозинка не може да буде празна",
+  "importFromApp": "Увоз кôдова од {appName}",
+  "importGoogleAuthGuide": "Извезите своје рачуне од Google Authenticator на QR кôд помоћу опције \"Трансфер налоге\". Затим помоћу другог уређаја скенирајте QR кôд.\n\nСавет: можете користити веб камеру вашег лаптопа да бисте снимили слику QR кôда.",
+  "importSelectJsonFile": "Одабрати JSON датотеку",
+  "importSelectAppExport": "Одабрати извозну датотеку {appName}-а",
+  "importEnteEncGuide": "Одабрати шифровану извозну JSON датотеку од Ente",
+  "importRaivoGuide": "Употребите \"Export OTPs to Zip archive\" опцију из подешавања Raivo-а.\n\nИздвојите zip датотеку и увезите JSON датотеку.",
+  "importBitwardenGuide": "Употребите \"Извоз Сефа\" из Bitwarden и увезите нешифровану JSON датотеку.",
+  "importAegisGuide": "Употребити \"Export the vault\" из Aegis-а.\n\nАко је сеф шифрован, мораћете унети лозинку сефа да би га дешифровали.",
+  "import2FasGuide": "Употребити \"Settings->Backup -Export\" из 2FAS-а.\n\nАко је ваша копија шифрирана, мораћете да унесете лозинку за дешифрирање копије",
+  "importLastpassGuide": "Употребити \"Transfer accounts\" из Lastpass Authenticator и стисните \"Export accounts to file\". Унесите преузет JSON.",
+  "exportCodes": "Извоз кôдова",
+  "importLabel": "Увоз",
+  "importInstruction": "Изаберите датотеку која садржи списак ваших кôдова у следећем формату",
+  "importCodeDelimiterInfo": "Кôдови се могу одвојити зарезом или новом линијом",
+  "selectFile": "Изаберите датотеку",
+  "emailVerificationToggle": "Имејл провера",
+  "emailVerificationEnableWarning": "Да бисте избегли да се закључате са свог рачуна, обавезно чувајте копију 2ФА имејла ван Ente Auth пре него што омогућите имејл верификацију.",
+  "authToChangeEmailVerificationSetting": "Потврдите аутентичност да промените верификацији имејл",
+  "authenticateGeneric": "Молимо потврдите аутентичност",
+  "authToViewYourRecoveryKey": "Аутентификујте се да бисте погледали кључ за опоравак",
+  "authToChangeYourEmail": "Аутентификујте се да бисте променили имејл",
+  "authToChangeYourPassword": "Аутентификујте се да бисте променили лозинку",
+  "authToViewSecrets": "Аутентификујте се да бисте прегледали Ваше тајне",
+  "authToInitiateSignIn": "Аутентификујте се да бисте почели пријављивање за копију.",
+  "ok": "У реду",
+  "cancel": "Откажи",
+  "yes": "Да",
+  "no": "Не",
+  "email": "Имејл",
+  "support": "Подршка",
+  "general": "Опште",
+  "settings": "Подешавања",
+  "copied": "Копирано",
+  "pleaseTryAgain": "Пробајте поново",
+  "existingUser": "Постојећи корисник",
+  "newUser": "Нов у Ente",
+  "delete": "Обриши",
+  "enterYourPasswordHint": "Унесите лозинку",
+  "forgotPassword": "Заборавио сам лозинку",
+  "oops": "Упс",
+  "suggestFeatures": "Предложи карактеристике",
+  "faq": "Питања",
+  "somethingWentWrongMessage": "Нешто је пошло наопако, покушајте поново",
+  "leaveFamily": "Напусти family претплату",
+  "leaveFamilyMessage": "Јесте ли сигурни да желите да напустите family чланство?",
+  "inFamilyPlanMessage": "Имате family чланство!",
+  "hintForMobile": "Дуго притисните кôд за уређивање или уклањање.",
+  "hintForDesktop": "Десни клик на кôд за уређивање или уклањање.",
+  "scan": "Скенирај",
+  "scanACode": "Скенирај кôд",
+  "verify": "Верификуј",
+  "verifyEmail": "Потврди имејл",
+  "enterCodeHint": "Унесите 6-цифрени кôд из\nапликације за аутентификацију",
+  "lostDeviceTitle": "Узгубили сте уређај?",
+  "twoFactorAuthTitle": "Дво-факторска аутентификација",
+  "passkeyAuthTitle": "Верификација сигурносном кључем",
+  "verifyPasskey": "Проверите сигурносни кључ",
+  "loginWithTOTP": "Пријава са TOTP",
+  "recoverAccount": "Опоравак налога",
+  "enterRecoveryKeyHint": "Унети кључ за опоравак",
+  "recover": "Опорави",
+  "contactSupportViaEmailMessage": "Послати имејл на {email} са регистрованог имејла",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "invalidQRCode": "Неважећи QR кôд",
+  "noRecoveryKeyTitle": "Немате кључ за опоравак?",
+  "enterEmailHint": "Унесите Ваш имејл",
+  "enterNewEmailHint": "Унесите Ваш нови имејл",
+  "invalidEmailTitle": "Погрешна имејл адреса",
+  "invalidEmailMessage": "Унесите важећи имејл.",
+  "deleteAccount": "Избриши налог",
+  "deleteAccountQuery": "Жао нам је што одлазите. Да ли се суочавате са неком грешком?",
+  "yesSendFeedbackAction": "Да, послати повратне информације",
+  "noDeleteAccountAction": "Не, избрисати налог",
+  "initiateAccountDeleteTitle": "Молимо вас да се аутентификујете за брисање рачуна",
+  "sendEmail": "Шаљи имејл",
+  "createNewAccount": "Креирај нови налог",
+  "weakStrength": "Слабо",
+  "strongStrength": "Јако",
+  "moderateStrength": "Умерено",
+  "confirmPassword": "Потврдите лозинку",
+  "close": "Затвори",
+  "oopsSomethingWentWrong": "Нешто није у реду.",
+  "selectLanguage": "Изабери језик",
+  "language": "Језик",
+  "social": "Друштвене мреже",
+  "security": "Безбедност",
+  "lockscreen": "Закључавање екрана",
+  "authToChangeLockscreenSetting": "Аутентификујте се да бисте променили закључавање екрана",
+  "deviceLockEnablePreSteps": "Да бисте омогућили закључавање уређаја, молимо вас да подесите шифру уређаја или закључавање екрана у системским подешавањима.",
+  "viewActiveSessions": "Видети активне сесије",
+  "authToViewYourActiveSessions": "Аутентификујте се да бисте преглеадали активне сесије",
+  "searchHint": "Претрага...",
+  "search": "Претрага",
+  "sorryUnableToGenCode": "Извините, не могу да генеришем кôд за {issuerName}",
+  "noResult": "Нема резултата",
+  "addCode": "Додај кôд",
+  "scanAQrCode": "Скенирај QR кôд",
+  "enterDetailsManually": "Ручно унети детеље",
+  "edit": "Уреди",
+  "share": "Подели",
+  "shareCodes": "Дели кôдове",
+  "shareCodesDuration": "Изаберите трајање за које желите да поделите кôдове.",
+  "restore": "Врати",
+  "copiedToClipboard": "Копирано у оставу",
+  "copiedNextToClipboard": "Копирали следећи кôд у остави",
+  "error": "Грешка",
+  "recoveryKeyCopiedToClipboard": "Кључ за опоравак копирано у остави",
+  "recoveryKeyOnForgotPassword": "Ако заборавите лозинку, једини начин на који можете повратити податке је са овим кључем.",
+  "recoveryKeySaveDescription": "Не чувамо овај кључ, молимо да сачувате кључ од 24 речи на сигурном месту.",
+  "doThisLater": "Уради то касније",
+  "saveKey": "Сачувај кључ",
+  "save": "Сачувај",
+  "send": "Пошаљи",
+  "saveOrSendDescription": "Да ли желите да ово сачувате у складиште (фасцикли за преузимање подразумевано) или да га пошаљете другим апликацијама?",
+  "saveOnlyDescription": "Да ли желите да ово сачувате у складиште (фасцикли за преузимање подразумевано)?",
+  "back": "Назад",
+  "createAccount": "Направи налог",
+  "passwordStrength": "Снага лозинке: {passwordStrengthValue}",
+  "@passwordStrength": {
+    "description": "Text to indicate the password strength",
+    "placeholders": {
+      "passwordStrengthValue": {
+        "description": "The strength of the password as a string",
+        "type": "String",
+        "example": "Weak or Moderate or Strong"
+      }
+    },
+    "message": "Password Strength: {passwordStrengthText}"
+  },
+  "password": "Лозинка",
+  "signUpTerms": "Прихватам <u-terms>услове сервиса</u-terms> и <u-policy>политику приватности</u-policy>",
+  "privacyPolicyTitle": "Политика приватности",
+  "termsOfServicesTitle": "Услови",
+  "encryption": "Шифровање",
+  "setPasswordTitle": "Постави лозинку",
+  "changePasswordTitle": "Промени лозинку",
+  "resetPasswordTitle": "Ресетуј лозинку",
+  "encryptionKeys": "Кључеве шифровања",
+  "passwordWarning": "Не чувамо ову лозинку, па ако је заборавите, <underline>не можемо дешифрирати ваше податке</underline>",
+  "enterPasswordToEncrypt": "Унесите лозинку за употребу за шифровање ваших података",
+  "enterNewPasswordToEncrypt": "Унесите нову лозинку за употребу за шифровање ваших података",
+  "passwordChangedSuccessfully": "Лозинка је успешно промењена",
+  "generatingEncryptionKeys": "Генерисање кључева за шифровање...",
+  "continueLabel": "Настави",
+  "insecureDevice": "Уређај није сигуран",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Извините, не можемо да генеришемо сигурне кључеве на овом уређају.\n\nМолимо пријавите се са другог уређаја.",
+  "howItWorks": "Како то функционише",
+  "ackPasswordLostWarning": "Разумем да ако изгубим лозинку, могу изгубити своје податке пошто су <underline>шифрирани од краја до краја</underline>.",
+  "loginTerms": "Кликом на пријаву, прихватам <u-terms>услове сервиса</u-terms> и <u-policy>политику приватности</u-policy>",
+  "logInLabel": "Пријави се",
+  "logout": "Одјави ме",
+  "areYouSureYouWantToLogout": "Да ли сте сигурни да се одјавите?",
+  "yesLogout": "Да, одјави ме",
+  "exit": "Излаз",
+  "theme": "Тема",
+  "lightTheme": "Светла",
+  "darkTheme": "Tamna",
+  "systemTheme": "Систем",
+  "verifyingRecoveryKey": "Провера кључа за опоравак...",
+  "recoveryKeyVerified": "Кључ за опоравак је проверен",
+  "recoveryKeySuccessBody": "Сјајно! Ваш кључ за опоравак важи. Хвала за проверу.\n\nИмајте на уму да задржите кључ за опоравак на сигрном.",
+  "invalidRecoveryKey": "Кључ за опоравак који сте унели није валидан. Молимо вас да будете сигурни да садржи 24 речи и проверите правопис сваког.\n\nАко сте унели старији кôд за опоравак, проверите да ли је дугачак 64 знака и проверите сваки од њих.",
+  "recreatePasswordTitle": "Поново креирати лозинку",
+  "recreatePasswordBody": "Тренутни уређај није довољно моћан да потврди вашу лозинку, али можемо регенерирати на начин који ради са свим уређајима.\n\nПријавите се помоћу кључа за опоравак и обновите своју лозинку (можете поново користити исту ако желите).",
+  "invalidKey": "Неисправан кључ",
+  "tryAgain": "Покушај поново",
+  "viewRecoveryKey": "Видети кључ за опоравак",
+  "confirmRecoveryKey": "Потврдити кључ за опоравак",
+  "recoveryKeyVerifyReason": "Ваш кључ за опоравак је једини начин да се врате фотографије ако заборавите лозинку. Можете пронаћи свој кључ за опоравак у Подешавања> Рачун.\n\nОвдје унесите кључ за опоравак да бисте проверили да ли сте га исправно сачували.",
+  "confirmYourRecoveryKey": "Потврдити кључ за опоравак",
+  "confirm": "Потврди",
+  "emailYourLogs": "Имејлирајте извештаје",
+  "pleaseSendTheLogsTo": "Пошаљите извештаје на \n{toEmail}",
+  "copyEmailAddress": "Копирати имејл адресу",
+  "exportLogs": "Извези изештаје",
+  "enterYourRecoveryKey": "Унети кључ за опоравак",
+  "tempErrorContactSupportIfPersists": "Изгледа да је нешто погрешно. Покушајте поново након неког времена. Ако грешка настави, обратите се нашем тиму за подршку.",
+  "networkHostLookUpErr": "Није могуће повезивање са Ente-ом, молимо вас да проверите мрежне поставке и контактирајте подршку ако грешка и даље постоји.",
+  "networkConnectionRefusedErr": "Није могуће повезивање са Ente-ом, покушајте поново мало касније. Ако грешка настави, обратите се подршци.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Изгледа да је нешто погрешно. Покушајте поново након неког времена. Ако грешка настави, обратите се нашем тиму за подршку.",
+  "about": "О програму",
+  "weAreOpenSource": "Користимо отворени извор!",
+  "privacy": "Приватност",
+  "terms": "Услови",
+  "checkForUpdates": "Провери ажурирања",
+  "checkStatus": "Провери статус",
+  "downloadUpdate": "Преузми",
+  "criticalUpdateAvailable": "Критично ажурирање је доступно",
+  "updateAvailable": "Доступно ажурирање",
+  "update": "Ажурирај",
+  "checking": "Провера...",
+  "youAreOnTheLatestVersion": "Користите најновију верзију",
+  "warning": "Упозорење",
+  "exportWarningDesc": "Извозна датотека садржи осетљиве информације. Молимо вас да је чувате на сигурно.",
+  "iUnderStand": "Разумем",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Аутентификујте се да бисте извезли кôдове",
+  "importSuccessTitle": "Jeeee!",
+  "importSuccessDesc": "Увели сте {count} кôдова!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Жао ми је",
+  "importFailureDesc": "Нисам могао да анализирам изабрану датотеку.\nПишите на support@ente.io ако вам је потребна помоћ!",
+  "pendingSyncs": "Упозорење",
+  "pendingSyncsWarningBody": "Неки од ваших кôдова нису сачувани.\n\nМолимо вас осигурајте да имате резервну копију за ове кôдове пре него што се одјавите.",
+  "checkInboxAndSpamFolder": "Молимо вас да проверите примљену пошту (и нежељену пошту) да бисте довршили верификацију",
+  "tapToEnterCode": "Пипните да бисте унели кôд",
+  "resendEmail": "Поново послати имејл",
+  "weHaveSendEmailTo": "Послали смо имејл на <green>{email}</green>",
+  "@weHaveSendEmailTo": {
+    "description": "Text to indicate that we have sent a mail to the user",
+    "placeholders": {
+      "email": {
+        "description": "The email address of the user",
+        "type": "String",
+        "example": "example@ente.io"
+      }
+    }
+  },
+  "manualSort": "Прилагођено",
+  "editOrder": "Уреди поредак",
+  "mostFrequentlyUsed": "Често коришћено",
+  "mostRecentlyUsed": "Недавно коришћено",
+  "activeSessions": "Активне сесије",
+  "somethingWentWrongPleaseTryAgain": "Нешто је пошло наопако. Покушајте поново",
+  "thisWillLogYouOutOfThisDevice": "Ово ће вас одјавити из овог уређаја!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Ово ће вас одјавити из овог уређаја:",
+  "terminateSession": "Прекинути сесију?",
+  "terminate": "Прекини",
+  "thisDevice": "Овај уређај",
+  "toResetVerifyEmail": "Да бисте ресетовали лозинку, прво потврдите свој имејл.",
+  "thisEmailIsAlreadyInUse": "Овај имејл је већ у употреби",
+  "verificationFailedPleaseTryAgain": "Неуспешна верификација, покушајте поново",
+  "yourVerificationCodeHasExpired": "Ваш верификациони кôд је истекао",
+  "incorrectCode": "Погрешан кôд",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Унет кôд није добар",
+  "emailChangedTo": "Имејл промењен на {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Аутентификација није успела, покушајте поново",
+  "authenticationSuccessful": "Успешна аутентификација!",
+  "twofactorAuthenticationSuccessfullyReset": "Двофакторска аутентификација успешно рисетирана",
+  "incorrectRecoveryKey": "Нетачан кључ за опоравак",
+  "theRecoveryKeyYouEnteredIsIncorrect": "Унети кључ за опоравак је натачан",
+  "enterPassword": "Унеси лозинку",
+  "selectExportFormat": "Изабрати формат извоза",
+  "exportDialogDesc": "Шифровани извоз ће бити заштићен лозинком по вашем избору.",
+  "encrypted": "Шифровано",
+  "plainText": "Обичан текст",
+  "passwordToEncryptExport": "Лозинка за шифровање извоза",
+  "export": "Извези",
+  "useOffline": "Користите без резервних копија",
+  "signInToBackup": "Пријавите се да бисте сачували кôдове",
+  "singIn": "Пријавите се",
+  "sigInBackupReminder": "Извезите кôдове да бисте имали резервну копију од које можете да их вратите.",
+  "offlineModeWarning": "Одлучили сте да наставите без резервних копија. Молимо примите ручне резервне копије да бисте били сигурни да су ваше кодове на сигурном.",
+  "showLargeIcons": "Прикажи велике иконе",
+  "compactMode": "Компактни режим",
+  "shouldHideCode": "Сакриј кодове",
+  "doubleTapToViewHiddenCode": "Можете да двапут додирнете унос да бисте видели кôд",
+  "focusOnSearchBar": "Фокус на претрагу на покретање",
+  "confirmUpdatingkey": "Јесте ли сигурни да желите да ажурирате тајну кључ?",
+  "minimizeAppOnCopy": "Умањи апликацију после копије",
+  "editCodeAuthMessage": "Аутентификуј се за уред кôда",
+  "deleteCodeAuthMessage": "Аутентификуј се за брсање кôда",
+  "showQRAuthMessage": "Аутентификуј се за приказ QR кôда",
+  "confirmAccountDeleteTitle": "Потврда брисања рачуна",
+  "confirmAccountDeleteMessage": "Овај налог је повезан са другим Ente апликацијама, ако користите било коју.\n\nВаши преношени подаци, на свим Ente апликацијама биће заказани за брисање, и ваш рачун ће се трајно избрисати.",
+  "androidBiometricHint": "Потврдите идентитет",
+  "@androidBiometricHint": {
+    "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricNotRecognized": "Нисмо препознали. Покушати поново.",
+  "@androidBiometricNotRecognized": {
+    "description": "Message to let the user know that authentication was failed. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricSuccess": "Успех",
+  "@androidBiometricSuccess": {
+    "description": "Message to let the user know that authentication was successful. It is used on Android side. Maximum 60 characters."
+  },
+  "androidCancelButton": "Откажи",
+  "@androidCancelButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on Android side. Maximum 30 characters."
+  },
+  "androidSignInTitle": "Потребна аутентификација",
+  "@androidSignInTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user that they need to scan biometric to continue. It is used on Android side. Maximum 60 characters."
+  },
+  "androidBiometricRequiredTitle": "Потребна је биометрија",
+  "@androidBiometricRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up biometric authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsRequiredTitle": "Потребни су акредитиви уређаја",
+  "@androidDeviceCredentialsRequiredTitle": {
+    "description": "Message showed as a title in a dialog which indicates the user has not set up credentials authentication on their device. It is used on Android side. Maximum 60 characters."
+  },
+  "androidDeviceCredentialsSetupDescription": "Потребни су акредитиви уређаја",
+  "@androidDeviceCredentialsSetupDescription": {
+    "description": "Message advising the user to go to the settings and configure device credentials on their device. It shows in a dialog on Android side."
+  },
+  "goToSettings": "Иди на поставке",
+  "@goToSettings": {
+    "description": "Message showed on a button that the user can click to go to settings pages from the current dialog. It is used on both Android and iOS side. Maximum 30 characters."
+  },
+  "androidGoToSettingsDescription": "Биометријска аутентификација није постављена на вашем уређају. Идите на \"Подешавања> Сигурност\" да бисте додали биометријску аутентификацију.",
+  "@androidGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure biometric on their device. It shows in a dialog on Android side."
+  },
+  "iOSLockOut": "Биометријска аутентификација је онемогућена. Закључајте и откључите екран да бисте је омогућили.",
+  "@iOSLockOut": {
+    "description": "Message advising the user to re-enable biometrics on their device. It shows in a dialog on iOS side."
+  },
+  "iOSGoToSettingsDescription": "Биометријска аутентификација није постављена на вашем уређају. Молимо или омогућите Touch ID или Face ID.",
+  "@iOSGoToSettingsDescription": {
+    "description": "Message advising the user to go to the settings and configure Biometrics for their device. It shows in a dialog on iOS side."
+  },
+  "iOSOkButton": "У реду",
+  "@iOSOkButton": {
+    "description": "Message showed on a button that the user can click to leave the current dialog. It is used on iOS side. Maximum 30 characters."
+  },
+  "noInternetConnection": "Нема интернет везе",
+  "pleaseCheckYourInternetConnectionAndTryAgain": "Провери своју везу са интернетом и покушај поново.",
+  "signOutFromOtherDevices": "Одјави се из других уређаја",
+  "signOutOtherBody": "Ако мислиш да неко може знати твоју лозинку, можеш приморати одјављивање све остале уређаје које користе твој налог.",
+  "signOutOtherDevices": "Одјави друге уређаје",
+  "doNotSignOut": "Не одјави",
+  "hearUsWhereTitle": "Како сте чули о Ente? (опционо)",
+  "hearUsExplanation": "Не пратимо инсталацију апликације. Помогло би да нам кажеш како си нас нашао!",
+  "recoveryKeySaved": "Кључ за опоравак сачуван у фасцикли за преузимање!",
+  "waitingForBrowserRequest": "Чека се захтев за претраживач...",
+  "waitingForVerification": "Чека се верификација...",
+  "passkey": "Кључ за приступ",
+  "passKeyPendingVerification": "Верификација је још у току",
+  "loginSessionExpired": "Сесија је истекла",
+  "loginSessionExpiredDetails": "Ваша сесија је истекла. Молимо пријавите се поново.",
+  "developerSettingsWarning": "Сигурно желиш да промениш подешавања за програмере?",
+  "developerSettings": "Подешавања за програмере",
+  "serverEndpoint": "Крајња тачка сервера",
+  "invalidEndpoint": "Погрешна крајња тачка",
+  "invalidEndpointMessage": "Извини, крајња тачка коју си унео је неважећа. Унеси важећу крајњу тачку и покушај поново.",
+  "endpointUpdatedMessage": "Крајна тачка успешно ажурирана",
+  "customEndpoint": "Везано за {endpoint}",
+  "pinText": "Закачи",
+  "unpinText": "Откачи",
+  "pinnedCodeMessage": "{code} је прикачен",
+  "unpinnedCodeMessage": "{code} је одкачен",
+  "pinned": "Прикачено",
+  "tags": "Ознаке",
+  "createNewTag": "Креирај нову ознаку",
+  "tag": "Ознака",
+  "create": "Направи",
+  "editTag": "Уреди ознаку",
+  "deleteTagTitle": "Обрисати ознаку?",
+  "deleteTagMessage": "Сигурно желите да избришете ову ознаку? Ова акција је неповратна.",
+  "somethingWentWrongParsingCode": "Нисмо били у стању да рашчланимо {x} кôдова.",
+  "updateNotAvailable": "Ажурирање није доступно",
+  "viewRawCodes": "Погледајте сирове кôдове",
+  "rawCodes": "Сирове кôдове",
+  "rawCodeData": "Податак сировог кôда",
+  "appLock": "Закључавање апликације",
+  "noSystemLockFound": "Није пронађено ниједно закључавање система",
+  "toEnableAppLockPleaseSetupDevicePasscodeOrScreen": "Да бисте омогућили закључавање апликације, молимо вас да подесите шифру уређаја или закључавање екрана у системским подешавањима.",
+  "autoLock": "Ауто-закључавање",
+  "immediately": "Одмах",
+  "reEnterPassword": "Поново унеси лозинку",
+  "reEnterPin": "Поново унеси ПИН",
+  "next": "Следеће",
+  "tooManyIncorrectAttempts": "Превише погрешних покушаја",
+  "tapToUnlock": "Додирните да бисте откључали",
+  "setNewPassword": "Постави нову лозинку",
+  "deviceLock": "Закључавање уређаја",
+  "hideContent": "Сакриј садржај",
+  "hideContentDescriptionAndroid": "Сакрива садржај апликације у пребацивање апликација и онемогућује снимке екрана",
+  "hideContentDescriptioniOS": "Сакрива садржај апликације у пребацивање апликација",
+  "autoLockFeatureDescription": "Време након којег се апликација блокира након што је постављенеа у позадину",
+  "appLockDescription": "Изаберите између заданог закључавање екрана вашег уређаја и прилагођени екран за закључавање са ПИН-ом или лозинком.",
+  "pinLock": "ПИН клокирање",
+  "enterPin": "Унеси ПИН",
+  "setNewPin": "Постави нови ПИН",
+  "importFailureDescNew": "Није могао да анализира изабрану датотеку.",
+  "appLockNotEnabled": "Блокирање апликације није упаљено",
+  "appLockNotEnabledDescription": "Молимо упалие блокирање апликације на Безбедност > Блокирај апликацију",
+  "authToViewPasskey": "Аутентификујте се да бисте прегледали кључ",
+  "appLockOfflineModeWarning": "Одлучили сте да наставите без резервних копија. Ако заборавите лозинку, нећете моћи да приступите својим подацима.",
+  "duplicateCodes": "Дупликатни кодови",
+  "noDuplicates": "✨ Нема дупликата",
+  "youveNoDuplicateCodesThatCanBeCleared": "Немате дупликатне кодове који се могу очистити",
+  "deduplicateCodes": "Дедуплицирај кодове",
+  "deselectAll": "Поништи избор свега",
+  "selectAll": "Изабери све",
+  "deleteDuplicates": "Обриши дупликате",
+  "plainHTML": "HTML",
+  "tellUsWhatYouThink": "Реци нам шта мислиш",
+  "dropReviewiOS": "Напиши мишљење на App Store",
+  "dropReviewAndroid": "Напиши мишљење на Play Store",
+  "supportEnte": "Подржи <bold-green>ente</bold-green>",
+  "giveUsAStarOnGithub": "Дај нам звездицу на Github",
+  "free5GB": "5GB бесплатно на <bold-green>ente</bold-green> Photos",
+  "loginWithAuthAccount": "Пријави се са твојим Auth налогом",
+  "freeStorageOffer": "Попуст од 10% на <bold-green>ente</bold-green> photos",
+  "freeStorageOfferDescription": "Употребите кôд \"AUTH\" да би добили попуст од 10% прве године",
+  "advanced": "Напредно",
+  "algorithm": "Алгоритам",
+  "type": "Тип",
+  "period": "Период",
+  "digits": "Цифре"
+}
--- a/auth/lib/l10n/arb/app_tr.arb
+++ b/auth/lib/l10n/arb/app_tr.arb
@@ -9,7 +9,7 @@
  "onBoardingBody": "2FA kodlarınızı güvenli bir şekilde yedekleyin",
  "onBoardingGetStarted": "Başlayın",
  "setupFirstAccount": "İlk hesabınızı ekleyin",
-  "importScanQrCode": "Karekod tara",
+  "importScanQrCode": "QR kod tara",
  "qrCode": "QR Kodu",
  "importEnterSetupKey": "Kurulum anahtarını giriniz",
  "importAccountPageTitle": "Hesap bilgilerinizi girin",
@@ -142,7 +142,7 @@
  "forgotPassword": "Şifremi unuttum",
  "oops": "Hay aksi",
  "suggestFeatures": "Özellik önerin",
-  "faq": "S.S.S.",
+  "faq": "SSS",
  "somethingWentWrongMessage": "Bir şeyler ters gitti, lütfen tekrar deneyin",
  "leaveFamily": "Aile planından ayrıl",
  "leaveFamilyMessage": "Aile planından ayrılmak istediğinize emin misiniz?",
@@ -173,6 +173,7 @@
  "invalidQRCode": "Geçersiz QR kodu",
  "noRecoveryKeyTitle": "Kurtarma anahtarınız yok mu?",
  "enterEmailHint": "E-posta adresinizi girin",
+  "enterNewEmailHint": "Yeni e-posta adresinizi girin",
  "invalidEmailTitle": "Geçersiz e-posta adresi",
  "invalidEmailMessage": "Lütfen geçerli bir e-posta adresi girin.",
  "deleteAccount": "Hesabı sil",
@@ -513,5 +514,10 @@
  "free5GB": "<bold-green>ente</bold-green> Fotoğraflarında 5GB ücretsiz",
  "loginWithAuthAccount": "Kimlik Doğrulama hesabınızla giriş yapın",
  "freeStorageOffer": "<bold-green>ente</bold-green> fotoğraflarında %10 indirim",
-  "freeStorageOfferDescription": "İlk yılda %10 indirim almak için \"AUTH\" kodunu kullanın"
+  "freeStorageOfferDescription": "İlk yılda %10 indirim almak için \"AUTH\" kodunu kullanın",
+  "advanced": "Gelişmiş",
+  "algorithm": "Algoritma",
+  "type": "Tür",
+  "period": "Zaman Aralığı",
+  "digits": "Uzunluk"
 }
--- a/auth/lib/l10n/arb/app_zh_CN.arb
+++ b/auth/lib/l10n/arb/app_zh_CN.arb
@@ -173,6 +173,7 @@
  "invalidQRCode": "二维码无效",
  "noRecoveryKeyTitle": "没有恢复密钥吗？",
  "enterEmailHint": "请输入您的电子邮件地址",
+  "enterNewEmailHint": "请输入您的新电子邮件地址",
  "invalidEmailTitle": "无效的电子邮件地址",
  "invalidEmailMessage": "请输入一个有效的电子邮件地址。",
  "deleteAccount": "删除账户",
@@ -513,5 +514,10 @@
  "free5GB": "<bold-green>ente</bold-green> Photos 上 5GB 可用空间",
  "loginWithAuthAccount": "使用您的认证账户登录",
  "freeStorageOffer": "购买 <bold-green>ente</bold-green> Photos 可享受 10% 优惠",
-  "freeStorageOfferDescription": "使用优惠码“AUTH”可享受首年 10% 折扣"
+  "freeStorageOfferDescription": "使用优惠码“AUTH”可享受首年 10% 折扣",
+  "advanced": "高级",
+  "algorithm": "算法",
+  "type": "类型",
+  "period": "周期",
+  "digits": "数字"
 }
--- a/auth/lib/l10n/arb/app_zh_TW.arb
+++ b/auth/lib/l10n/arb/app_zh_TW.arb
@@ -513,5 +513,10 @@
  "free5GB": "<bold-green>ente</bold-green> Photos 上 5GB 可用空間",
  "loginWithAuthAccount": "使用您的認證帳戶登錄",
  "freeStorageOffer": "購買 <bold-green>ente</bold-green> Photos 可享受 10% 優惠",
-  "freeStorageOfferDescription": "使用優惠碼“AUTH”可享受首年 10% 折扣"
+  "freeStorageOfferDescription": "使用優惠碼“AUTH”可享受首年 10% 折扣",
+  "advanced": "進階",
+  "algorithm": "演算法",
+  "type": "類型",
+  "period": "期間",
+  "digits": "數位"
 }
--- a/auth/lib/locale.dart
+++ b/auth/lib/locale.dart
@@ -38,28 +38,28 @@ const List<Locale> appSupportedLocales = <Locale>[
 ];

 Locale? autoDetectedLocale;
-Locale localResolutionCallBack(locales, supportedLocales) {
-  Locale? languageCodeMatch;
-  final Map<String, Locale> languageCodeToLocale = {
-    for (Locale supportedLocale in appSupportedLocales)
-      supportedLocale.languageCode: supportedLocale,
-  };
-
-  for (Locale locale in locales) {
+// This function takes device locales and supported locales as input
+// and returns the best matching locale.
+// The device locales are sorted by priority, so the first one is the most preferred.
+Locale localResolutionCallBack(onDeviceLocales, supportedLocales) {
+  final Set<String> languageSupport = {};
+  for (Locale supportedLocale in appSupportedLocales) {
+    languageSupport.add(supportedLocale.languageCode);
+  }
+  for (Locale locale in onDeviceLocales) {
+    // check if exact local is supported, if yes, return it
    if (appSupportedLocales.contains(locale)) {
      autoDetectedLocale = locale;
      return locale;
    }
-
-    if (languageCodeMatch == null &&
-        languageCodeToLocale.containsKey(locale.languageCode)) {
-      languageCodeMatch = languageCodeToLocale[locale.languageCode];
-      autoDetectedLocale = languageCodeMatch;
+    // check if language code is supported, if yes, return it
+    if (languageSupport.contains(locale.languageCode)) {
+      autoDetectedLocale = locale;
+      return locale;
    }
  }
-
  // Return the first language code match or default to 'en'
-  return languageCodeMatch ?? const Locale('en');
+  return autoDetectedLocale ?? const Locale('en');
 }

 Future<Locale?> getLocale({
--- a/auth/lib/services/authenticator_service.dart
+++ b/auth/lib/services/authenticator_service.dart
@@ -13,6 +13,7 @@ import 'package:ente_auth/models/authenticator/auth_entity.dart';
 import 'package:ente_auth/models/authenticator/auth_key.dart';
 import 'package:ente_auth/models/authenticator/entity_result.dart';
 import 'package:ente_auth/models/authenticator/local_auth_entity.dart';
+import 'package:ente_auth/services/preference_service.dart';
 import 'package:ente_auth/store/authenticator_db.dart';
 import 'package:ente_auth/store/offline_authenticator_db.dart';
 import 'package:ente_crypto_dart/ente_crypto_dart.dart';
@@ -194,8 +195,13 @@ class AuthenticatorService {
    final int lastSyncTime = _prefs.getInt(_lastEntitySyncTime) ?? 0;
    _logger.info("Current sync is $lastSyncTime");
    const int fetchLimit = 500;
-    final List<AuthEntity> result =
+    late final List<AuthEntity> result;
+    late final int? epochTimeInMicroseconds;
+    (result, epochTimeInMicroseconds) =
        await _gateway.getDiff(lastSyncTime, limit: fetchLimit);
+    PreferenceService.instance
+        .computeAndStoreTimeOffset(epochTimeInMicroseconds);
+
    _logger.info("${result.length} entries fetched from remote");
    if (result.isEmpty) {
      return;
--- a/auth/lib/services/preference_service.dart
+++ b/auth/lib/services/preference_service.dart
@@ -18,6 +18,7 @@ class PreferenceService {
  late final SharedPreferences _prefs;

  static const kHasShownCoachMarkKey = "has_shown_coach_mark_v2";
+  static const kLocalTimeOffsetKey = "local_time_offset";
  static const kShouldShowLargeIconsKey = "should_show_large_icons";
  static const kShouldHideCodesKey = "should_hide_codes";
  static const kShouldAutoFocusOnSearchBar = "should_auto_focus_on_search_bar";
@@ -114,4 +115,24 @@ class PreferenceService {
      return installedTimeinMillis;
    }
  }
+
+  // localEpochOffsetInMilliSecond returns the local epoch offset in milliseconds.
+  // This is used to adjust the time for TOTP calculations when device local time is not in sync with actual time.
+  int timeOffsetInMilliSeconds() {
+    return _prefs.getInt(kLocalTimeOffsetKey) ?? 0;
+  }
+
+  void computeAndStoreTimeOffset(
+    int? epochTimeInMicroseconds,
+  ) {
+    if (epochTimeInMicroseconds == null) {
+      _prefs.remove(kLocalTimeOffsetKey);
+      return;
+    }
+    int serverEpochTimeInMilliSecond = epochTimeInMicroseconds ~/ 1000;
+    int localEpochTimeInMilliSecond = DateTime.now().millisecondsSinceEpoch;
+    int localEpochOffset =
+        serverEpochTimeInMilliSecond - localEpochTimeInMilliSecond;
+    _prefs.setInt(kLocalTimeOffsetKey, localEpochOffset);
+  }
 }
--- a/auth/lib/ui/account/change_email_dialog.dart
+++ b/auth/lib/ui/account/change_email_dialog.dart
@@ -18,7 +18,7 @@ class _ChangeEmailDialogState extends State<ChangeEmailDialog> {
  Widget build(BuildContext context) {
    final l10n = context.l10n;
    return AlertDialog(
-      title: Text(l10n.enterEmailHint),
+      title: Text(l10n.enterNewEmailHint),
      content: SingleChildScrollView(
        child: Column(
          mainAxisAlignment: MainAxisAlignment.start,
--- a/auth/lib/ui/code_timer_progress.dart
+++ b/auth/lib/ui/code_timer_progress.dart
@@ -7,10 +7,12 @@ import 'package:flutter/material.dart';
 class CodeTimerProgress extends StatefulWidget {
  final int period;
  final bool isCompactMode;
+  final int timeOffsetInMilliseconds;
  const CodeTimerProgress({
    super.key,
    required this.period,
    this.isCompactMode = false,
+    this.timeOffsetInMilliseconds = 0,
  });

  @override
@@ -20,7 +22,7 @@ class CodeTimerProgress extends StatefulWidget {
 class _CodeTimerProgressState extends State<CodeTimerProgress> {
  late final Timer _timer;
  late final ValueNotifier<double> _progress;
-  late final int _periodInMicros;
+  late final int _periodInMilii;

  // Reduce update frequency
  final int _updateIntervalMs =
@@ -29,29 +31,30 @@ class _CodeTimerProgressState extends State<CodeTimerProgress> {
  @override
  void initState() {
    super.initState();
-    _periodInMicros = widget.period * 1000000;
+    _periodInMilii = widget.period * 1000;
    _progress = ValueNotifier<double>(0.0);
-    _updateTimeRemaining(DateTime.now().microsecondsSinceEpoch);
+    _updateTimeRemaining(DateTime.now().millisecondsSinceEpoch);

    _timer = Timer.periodic(Duration(milliseconds: _updateIntervalMs), (timer) {
-      final now = DateTime.now().microsecondsSinceEpoch;
+      final now = DateTime.now().millisecondsSinceEpoch;
      _updateTimeRemaining(now);
    });
  }

-  void _updateTimeRemaining(int currentMicros) {
+  void _updateTimeRemaining(int currentMilliSeconds) {
    // More efficient time calculation using modulo
-    final elapsed = (currentMicros) % _periodInMicros;
-    final timeRemaining = _periodInMicros - elapsed;
-    _progress.value = timeRemaining / _periodInMicros;
+    final elapsed = (currentMilliSeconds + widget.timeOffsetInMilliseconds) %
+        _periodInMilii;
+    final timeRemaining = _periodInMilii - elapsed;
+    _progress.value = timeRemaining / _periodInMilii;
  }

  @override
  void didUpdateWidget(covariant CodeTimerProgress oldWidget) {
    super.didUpdateWidget(oldWidget);
    if (oldWidget.period != widget.period) {
-      _periodInMicros = widget.period * 1000000;
-      _updateTimeRemaining(DateTime.now().microsecondsSinceEpoch);
+      _periodInMilii = widget.period * 1000;
+      _updateTimeRemaining(DateTime.now().millisecondsSinceEpoch);
    }
  }

--- a/auth/lib/ui/code_widget.dart
+++ b/auth/lib/ui/code_widget.dart
@@ -152,6 +152,8 @@ class _CodeWidgetState extends State<CodeWidget> {
                  key: ValueKey('period_${widget.code.period}'),
                  period: widget.code.period,
                  isCompactMode: widget.isCompactMode,
+                  timeOffsetInMilliseconds:
+                      PreferenceService.instance.timeOffsetInMilliSeconds(),
                ),
              widget.isCompactMode
                  ? const SizedBox(height: 4)
--- a/auth/lib/utils/totp_util.dart
+++ b/auth/lib/utils/totp_util.dart
@@ -1,8 +1,14 @@
 import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/services/preference_service.dart';
 import 'package:flutter/foundation.dart';
 import 'package:otp/otp.dart' as otp;
 import 'package:steam_totp/steam_totp.dart';

+int millisecondsSinceEpoch() {
+  return DateTime.now().millisecondsSinceEpoch +
+      PreferenceService.instance.timeOffsetInMilliSeconds();
+}
+
 String getOTP(Code code) {
  if (code.type == Type.steam || code.issuer.toLowerCase() == 'steam') {
    return _getSteamCode(code);
@@ -12,7 +18,7 @@ String getOTP(Code code) {
  }
  return otp.OTP.generateTOTPCodeString(
    getSanitizedSecret(code.secret),
-    DateTime.now().millisecondsSinceEpoch,
+    millisecondsSinceEpoch(),
    length: code.digits,
    interval: code.period,
    algorithm: _getAlgorithm(code),
@@ -34,7 +40,7 @@ String _getSteamCode(Code code, [bool isNext = false]) {
  final SteamTOTP steamtotp = SteamTOTP(secret: code.secret);

  return steamtotp.generate(
-    DateTime.now().millisecondsSinceEpoch ~/ 1000 + (isNext ? code.period : 0),
+    millisecondsSinceEpoch() ~/ 1000 + (isNext ? code.period : 0),
  );
 }

@@ -44,7 +50,7 @@ String getNextTotp(Code code) {
  }
  return otp.OTP.generateTOTPCodeString(
    getSanitizedSecret(code.secret),
-    DateTime.now().millisecondsSinceEpoch + code.period * 1000,
+    millisecondsSinceEpoch() + code.period * 1000,
    length: code.digits,
    interval: code.period,
    algorithm: _getAlgorithm(code),
@@ -56,9 +62,7 @@ String getNextTotp(Code code) {
 // It returns the start time and a list of future codes.
 (int, List<String>) generateFutureTotpCodes(Code code, int count) {
  final int startTime =
-      ((DateTime.now().millisecondsSinceEpoch ~/ 1000) ~/ code.period) *
-          code.period *
-          1000;
+      ((millisecondsSinceEpoch() ~/ 1000) ~/ code.period) * code.period * 1000;
  final String secret = getSanitizedSecret(code.secret);
  final List<String> codes = [];
  if (code.type == Type.steam || code.issuer.toLowerCase() == 'steam') {
--- a/auth/linux/packaging/enteauth.appdata.xml
+++ b/auth/linux/packaging/enteauth.appdata.xml
@@ -18,6 +18,8 @@
        </screenshot>
    </screenshots>
    <releases>
+        <release version="4.4.0" date="2025-05-31" />
+        <release version="4.3.8" date="2025-05-20" />
        <release version="4.2.4" date="2025-01-11" />
        <release version="4.0.3" date="2024-10-08" />
    </releases>
@@ -33,4 +35,4 @@
        <color type="primary" scheme_preference="light">#ffffff</color>
        <color type="primary" scheme_preference="dark">#000000</color>
    </branding>
-</component>
+</component>
--- a/auth/pubspec.lock
+++ b/auth/pubspec.lock
@@ -5,15 +5,15 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
      url: "https://pub.dev"
    source: hosted
-    version: "76.0.0"
+    version: "72.0.0"
  _macros:
    dependency: transitive
    description: dart
    source: sdk
-    version: "0.3.3"
+    version: "0.3.2"
  adaptive_theme:
    dependency: "direct main"
    description:
@@ -26,10 +26,10 @@ packages:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
      url: "https://pub.dev"
    source: hosted
-    version: "6.11.0"
+    version: "6.7.0"
  ansicolor:
    dependency: transitive
    description:
@@ -90,10 +90,10 @@ packages:
    dependency: transitive
    description:
      name: async
-      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
      url: "https://pub.dev"
    source: hosted
-    version: "2.12.0"
+    version: "2.11.0"
  auto_size_text:
    dependency: "direct main"
    description:
@@ -130,10 +130,10 @@ packages:
    dependency: transitive
    description:
      name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
  build:
    dependency: transitive
    description:
@@ -202,10 +202,10 @@ packages:
    dependency: transitive
    description:
      name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
  checked_yaml:
    dependency: transitive
    description:
@@ -234,10 +234,10 @@ packages:
    dependency: transitive
    description:
      name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
  code_builder:
    dependency: transitive
    description:
@@ -250,10 +250,10 @@ packages:
    dependency: "direct main"
    description:
      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.19.1"
+    version: "1.18.0"
  confetti:
    dependency: "direct main"
    description:
@@ -435,10 +435,10 @@ packages:
    dependency: transitive
    description:
      name: fake_async
-      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.2"
+    version: "1.3.1"
  ffi:
    dependency: "direct main"
    description:
@@ -944,18 +944,18 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.8"
+    version: "10.0.5"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.9"
+    version: "3.0.5"
  leak_tracker_testing:
    dependency: transitive
    description:
@@ -1024,18 +1024,18 @@ packages:
    dependency: transitive
    description:
      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.3-main.0"
+    version: "0.1.2-main.4"
  matcher:
    dependency: transitive
    description:
      name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
      url: "https://pub.dev"
    source: hosted
-    version: "0.12.17"
+    version: "0.12.16+1"
  material_color_utilities:
    dependency: transitive
    description:
@@ -1056,10 +1056,10 @@ packages:
    dependency: transitive
    description:
      name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
      url: "https://pub.dev"
    source: hosted
-    version: "1.16.0"
+    version: "1.15.0"
  mime:
    dependency: transitive
    description:
@@ -1168,10 +1168,10 @@ packages:
    dependency: "direct main"
    description:
      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.1"
+    version: "1.9.0"
  path_drawing:
    dependency: transitive
    description:
@@ -1472,7 +1472,7 @@ packages:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.0"
+    version: "0.0.99"
  sodium:
    dependency: transitive
    description:
@@ -1509,10 +1509,10 @@ packages:
    dependency: transitive
    description:
      name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
      url: "https://pub.dev"
    source: hosted
-    version: "1.10.1"
+    version: "1.10.0"
  sprintf:
    dependency: transitive
    description:
@@ -1566,10 +1566,10 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.12.1"
+    version: "1.11.1"
  steam_totp:
    dependency: "direct main"
    description:
@@ -1590,10 +1590,10 @@ packages:
    dependency: transitive
    description:
      name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.2"
  stream_transform:
    dependency: transitive
    description:
@@ -1606,10 +1606,10 @@ packages:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
      url: "https://pub.dev"
    source: hosted
-    version: "1.4.1"
+    version: "1.2.0"
  styled_text:
    dependency: "direct main"
    description:
@@ -1630,18 +1630,18 @@ packages:
    dependency: transitive
    description:
      name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.2"
+    version: "1.2.1"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.4"
+    version: "0.7.2"
  timezone:
    dependency: transitive
    description:
@@ -1806,10 +1806,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
      url: "https://pub.dev"
    source: hosted
-    version: "14.3.1"
+    version: "14.2.5"
  watcher:
    dependency: transitive
    description:
@@ -1899,5 +1899,5 @@ packages:
    source: hosted
    version: "3.1.2"
 sdks:
-  dart: ">=3.7.0-0 <4.0.0"
+  dart: ">=3.5.0 <4.0.0"
  flutter: ">=3.24.0"
--- a/auth/pubspec.yaml
+++ b/auth/pubspec.yaml
@@ -1,7 +1,7 @@

 name: ente_auth
 description: ente two-factor authenticator
-version: 4.3.6+437
+version: 4.4.0+440
 publish_to: none

 environment:
--- a/auth/scripts/release_tag.sh
+++ b/auth/scripts/release_tag.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+# Function to display usage
+usage() {
+    echo "Usage: $0 tag"
+    exit 1
+}
+
+# Ensure a tag was provided
+[[ $# -eq 0 ]] && usage
+
+# Exit immediately if a command exits with a non-zero status
+set -e
+
+# Go to the project root directory
+cd "$(dirname "$0")/.."
+
+# Get the tag from the command line argument
+TAG=$1
+
+# Define the appdata file path - use absolute path to avoid directory navigation issues
+PROJECT_ROOT=$(pwd)
+APPDATA_FILE="${PROJECT_ROOT}/linux/packaging/enteauth.appdata.xml"
+
+# Get the version from the pubspec.yaml file and cut everything after the +
+VERSION=$(grep "^version:" pubspec.yaml | awk '{ print $2 }' | cut -d '+' -f 1)
+
+PREFIX="auth-v"
+
+# Ensure the tag has the correct prefix
+if [[ $TAG != $PREFIX* ]]; then
+    echo "Invalid tag. tags must start with '$PREFIX'."
+    exit 1
+fi
+
+# Ensure the tag version is in the pubspec.yaml file
+if [[ $TAG != *$VERSION ]]; then
+    echo "Invalid tag."
+    echo "The version $VERSION in pubspec doesn't match the version in tag $TAG"
+    exit 1
+fi
+
+# Extract version number from the tag (remove prefix)
+TAG_VERSION=${TAG#$PREFIX}
+
+# Check if this version is already in the releases section of the appdata.xml file
+if ! grep -q "<release version=\"$TAG_VERSION\"" "$APPDATA_FILE"; then
+    echo "Adding release entry for version $TAG_VERSION to appdata.xml"
+    
+    # Get today's date in YYYY-MM-DD format
+    TODAY=$(date +%Y-%m-%d)
+    
+    # Use a more reliable approach with awk instead of sed for cross-platform compatibility
+    echo "Creating temporary file with updated content..."
+    awk '/<releases>/{print $0; print "        <release version=\"'"$TAG_VERSION"'\" date=\"'"$TODAY"'\" />"; next}1' "$APPDATA_FILE" > "${APPDATA_FILE}.tmp"
+    mv "${APPDATA_FILE}.tmp" "$APPDATA_FILE"
+    
+    echo "Added release entry for version $TAG_VERSION with date $TODAY"
+    
+    # Stage and commit the updated appdata.xml file
+    git add "$APPDATA_FILE"
+    git commit -m "Add release $TAG_VERSION to appdata.xml"
+    echo "Committed appdata.xml changes for version $TAG_VERSION"
+fi
+
+# If all checks pass, create the tag
+git tag $TAG
+echo "Tag $TAG created."
+
+exit 0
--- a/cli/internal/api/login.go
+++ b/cli/internal/api/login.go
@@ -83,13 +83,14 @@ func (c *Client) VerifySRPSession(
 	return &res, nil
 }

-func (c *Client) SendEmailOTP(
+func (c *Client) SendLoginOTP(
 	ctx context.Context,
 	email string,
 ) error {
 	var res AuthorizationResponse
 	payload := map[string]interface{}{
-		"email": email,
+		"email":   email,
+		"purpose": "login",
 	}
 	r, err := c.restClient.R().
 		SetContext(ctx).
--- a/cli/pkg/sign_in.go
+++ b/cli/pkg/sign_in.go
@@ -167,7 +167,7 @@ func (c *ClICtrl) verifyPassKey(ctx context.Context, authResp *api.Authorization
 }

 func (c *ClICtrl) validateEmail(ctx context.Context, email string) (*api.AuthorizationResponse, error) {
-	err := c.Client.SendEmailOTP(ctx, email)
+	err := c.Client.SendLoginOTP(ctx, email)
 	if err != nil {
 		return nil, err
 	}
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -1,9 +1,17 @@
 # CHANGELOG

-## v1.7.13 (Unreleased)
+## v1.7.14 (Unreleased)
+
+- .
+
+## v1.7.13
+
+- Generate streams for videos (beta)
+
+    > Streamable videos can be enabled in Preferences. For more details, see the
+    > [video streaming FAQ](https://help.ente.io/photos/faq/video-streaming).

 - Support Turkish translations.
- .

 ## v1.7.12

--- a/desktop/package.json
+++ b/desktop/package.json
@@ -1,6 +1,6 @@
 {
    "name": "ente",
-    "version": "1.7.13-beta",
+    "version": "1.7.14-beta",
    "private": true,
    "description": "Desktop client for Ente Photos",
    "repository": "github:ente-io/photos-desktop",
@@ -38,25 +38,26 @@
        "lru-cache": "^11.1.0",
        "next-electron-server": "^1.0.0",
        "node-stream-zip": "^1.15.0",
-        "onnxruntime-node": "^1.20.1"
+        "onnxruntime-node": "^1.20.1",
+        "zod": "^3.25.23"
    },
    "devDependencies": {
-        "@eslint/js": "^9.25.1",
-        "@tsconfig/node22": "^22.0.1",
+        "@eslint/js": "^9.27.0",
+        "@tsconfig/node22": "^22.0.2",
        "@types/auto-launch": "^5.0.5",
        "@types/ffmpeg-static": "^3.0.3",
        "ajv": "^8.17.1",
        "concurrently": "^9.1.2",
        "cross-env": "^7.0.3",
-        "electron": "^36.1.0",
+        "electron": "^36.3.2",
        "electron-builder": "^26.0.14",
        "eslint": "^9",
        "prettier": "3.5.3",
        "prettier-plugin-organize-imports": "^4.1.0",
-        "prettier-plugin-packagejson": "^2.5.10",
-        "shx": "^0.3.4",
+        "prettier-plugin-packagejson": "^2.5.14",
+        "shx": "^0.4.0",
        "typescript": "^5.8.3",
-        "typescript-eslint": "^8.31.1"
+        "typescript-eslint": "^8.32.1"
    },
    "packageManager": "yarn@1.22.22",
    "productName": "ente"
--- a/desktop/src/main.ts
+++ b/desktop/src/main.ts
@@ -78,6 +78,14 @@ export const allowWindowClose = (): void => {
 * We call this at the end of this file.
 */
 const main = () => {
+    // Workaround for Electron 36 not launching on some Linux distros. Remove
+    // once fixed or otherwise mitigated upstream.
+    //
+    // https://github.com/electron/electron/issues/46538#issuecomment-2808806722
+    if (process.platform == "linux") {
+        app.commandLine.appendSwitch("gtk-version", "3");
+    }
+
    const gotTheLock = app.requestSingleInstanceLock();
    if (!gotTheLock) {
        app.quit();
--- a/desktop/src/main/ipc.ts
+++ b/desktop/src/main/ipc.ts
@@ -32,7 +32,7 @@ import {
    openLogDirectory,
    selectDirectory,
 } from "./services/dir";
-import { ffmpegExec } from "./services/ffmpeg";
+import { ffmpegDetermineVideoDuration, ffmpegExec } from "./services/ffmpeg";
 import {
    fsExists,
    fsFindFiles,
@@ -182,10 +182,10 @@ export const attachIPCHandlers = () => {
        "generateImageThumbnail",
        (
            _,
-            dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+            pathOrZipItem: string | ZipItem,
            maxDimension: number,
            maxSize: number,
-        ) => generateImageThumbnail(dataOrPathOrZipItem, maxDimension, maxSize),
+        ) => generateImageThumbnail(pathOrZipItem, maxDimension, maxSize),
    );

    ipcMain.handle(
@@ -193,9 +193,15 @@ export const attachIPCHandlers = () => {
        (
            _,
            command: FFmpegCommand,
-            dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+            pathOrZipItem: string | ZipItem,
            outputFileExtension: string,
-        ) => ffmpegExec(command, dataOrPathOrZipItem, outputFileExtension),
+        ) => ffmpegExec(command, pathOrZipItem, outputFileExtension),
+    );
+
+    ipcMain.handle(
+        "ffmpegDetermineVideoDuration",
+        (_, pathOrZipItem: string | ZipItem) =>
+            ffmpegDetermineVideoDuration(pathOrZipItem),
    );

    // - Upload
--- a/desktop/src/main/services/ffmpeg-worker.ts
+++ b/desktop/src/main/services/ffmpeg-worker.ts
@@ -4,6 +4,7 @@

 // See [Note: Using Electron APIs in UtilityProcess] about what we can and
 // cannot import.
+import shellescape from "any-shell-escape";
 import { expose } from "comlink";
 import pathToFfmpeg from "ffmpeg-static";
 import { randomBytes } from "node:crypto";
@@ -11,11 +12,16 @@ import fs_ from "node:fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { Readable } from "node:stream";
+import { z } from "zod";
 import type { FFmpegCommand } from "../../types/ipc";
 import log from "../log-worker";
 import { messagePortMainEndpoint } from "../utils/comlink";
-import { wait } from "../utils/common";
+import { nullToUndefined, wait } from "../utils/common";
 import { execAsyncWorker } from "../utils/exec-worker";
+import {
+    authenticatedRequestHeaders,
+    publicRequestHeaders,
+} from "../utils/http";

 /* Ditto in the web app's code (used by the Wasm FFmpeg invocation). */
 const ffmpegPathPlaceholder = "FFMPEG";
@@ -43,13 +49,21 @@ export interface FFmpegUtilityProcess {
    ffmpegGenerateHLSPlaylistAndSegments: (
        inputFilePath: string,
        outputPathPrefix: string,
-        outputUploadURL: string,
+        fileID: number,
+        fetchURL: string,
+        authToken: string,
    ) => Promise<FFmpegGenerateHLSPlaylistAndSegmentsResult | undefined>;
+
+    ffmpegDetermineVideoDuration: (inputFilePath: string) => Promise<number>;
 }

 log.debugString("Started ffmpeg utility process");

+process.on("uncaughtException", (e, origin) => log.error(origin, e));
+
 process.parentPort.once("message", (e) => {
+    // Initialize ourselves with the data we got from our parent.
+    parseInitData(e.data);
    // Expose an instance of `FFmpegUtilityProcess` on the port we got from our
    // parent.
    expose(
@@ -57,12 +71,30 @@ process.parentPort.once("message", (e) => {
            ffmpegExec,
            ffmpegConvertToMP4,
            ffmpegGenerateHLSPlaylistAndSegments,
+            ffmpegDetermineVideoDuration,
        } satisfies FFmpegUtilityProcess,
        messagePortMainEndpoint(e.ports[0]!),
    );
+    // Let the main process know we're ready.
    mainProcess("ack", undefined);
 });

+/**
+ * We cannot access Electron's {@link app} object within a utility process, so
+ * we pass the value of `app.getVersion()` during initialization, and it can be
+ * subsequently retrieved from here.
+ */
+let _desktopAppVersion: string | undefined;
+
+/** Equivalent to `app.getVersion()` */
+const desktopAppVersion = () => _desktopAppVersion!;
+
+const FFmpegWorkerInitData = z.object({ appVersion: z.string() });
+
+const parseInitData = (data: unknown) => {
+    _desktopAppVersion = FFmpegWorkerInitData.parse(data).appVersion;
+};
+
 /**
 * Send a message to the main process using a barebones RPC protocol.
 */
@@ -180,6 +212,7 @@ export interface FFmpegGenerateHLSPlaylistAndSegmentsResult {
    playlistPath: string;
    dimensions: { width: number; height: number };
    videoSize: number;
+    videoObjectID: string;
 }

 /**
@@ -190,12 +223,12 @@ export interface FFmpegGenerateHLSPlaylistAndSegmentsResult {
 *
 *     H.264, <= 10 MB              - Skip
 *     H.264, <= 4000 kb/s bitrate  - Don't re-encode video stream
- *     BT.709, <= 2000 kb/s bitrate - Don't apply the scale+fps filter
- *     !BT.709                      - Apply tonemap (zscale+tonemap+zscale)
+ *     !HDR, <= 2000 kb/s bitrate   - Don't apply the scale+fps filter
+ *     HDR                          - Apply tonemap (zscale+tonemap+zscale)
 *
 * Example invocation:
 *
- *     ffmpeg -i in.mov -vf 'scale=-2:720,fps=30,zscale=transfer=linear,tonemap=tonemap=hable:desat=0,zscale=primaries=709:transfer=709:matrix=709,format=yuv420p' -c:v libx264 -c:a aac -f hls -hls_key_info_file out.m3u8.info -hls_list_size 0 -hls_flags single_file out.m3u8
+ *     ffmpeg -i in.mov -vf "scale=-2:'min(720,ih)',fps=30,zscale=transfer=linear,tonemap=tonemap=hable:desat=0,zscale=primaries=709:transfer=709:matrix=709,format=yuv420p" -c:v libx264 -c:a aac -f hls -hls_key_info_file out.m3u8.info -hls_list_size 0 -hls_flags single_file out.m3u8
 *
 * See: [Note: Preview variant of videos]
 *
@@ -206,9 +239,17 @@ export interface FFmpegGenerateHLSPlaylistAndSegmentsResult {
 * the user's local file system. This function will write the generated HLS
 * playlist and video segments under this prefix.
 *
- * @returns The paths to two files on the user's local file system - one
- * containing the generated HLS playlist, and the other containing the
- * transcoded and encrypted video segments that the HLS playlist refers to.
+ * @param fileID The ID of the {@link EnteFile} whose HLS playlist we are
+ * generating.
+ *
+ * @param fetchURL The fully resolved API URL for obtaining pre-signed S3 URLs
+ * for uploading the generated video segment file.
+ *
+ * @param authToken A token that can be used to make API request to
+ * {@link fetchURL}.
+ *
+ * @returns The path to the file on the user's file system containing the
+ * generated HLS playlist, and other metadata about the generated video stream.
 *
 * If the video is such that it doesn't require stream generation, then this
 * function returns `undefined`.
@@ -216,17 +257,21 @@ export interface FFmpegGenerateHLSPlaylistAndSegmentsResult {
 const ffmpegGenerateHLSPlaylistAndSegments = async (
    inputFilePath: string,
    outputPathPrefix: string,
-    outputUploadURL: string,
+    fileID: number,
+    fetchURL: string,
+    authToken: string,
 ): Promise<FFmpegGenerateHLSPlaylistAndSegmentsResult | undefined> => {
-    const { isH264, isBT709, bitrate } =
+    const { isH264, isHDR, bitrate } =
        await detectVideoCharacteristics(inputFilePath);

-    log.debugString(JSON.stringify({ isH264, isBT709, bitrate }));
+    log.debugString(JSON.stringify({ isH264, isHDR, bitrate }));

    // If the video is smaller than 10 MB, and already H.264 (the codec we are
    // going to use for the conversion), then a streaming variant is not much
    // use. Skip such cases.
    //
+    // See also: [Note: Marking files which do not need video processing]
+    //
    // ---
    //
    // [Note: HEVC/H.265 issues]
@@ -274,8 +319,10 @@ const ffmpegGenerateHLSPlaylistAndSegments = async (
    // - BT.709 ("High-Definition" or HD)
    // - BT.2020 ("Ultra-High-Definition" or UHD, aka HDR^).
    //
-    // ^ HDR ("High-Dynamic-Range") is an addendum to BT.2020, but for our
-    //   purpose here we can treat it as as alias.
+    // ^ HDR ("High-Dynamic-Range") is an addendum to BT.2020, but for the
+    //   discussion here we can treat it as as alias. In particular, not all
+    //   BT.2020 videos are HDR, the check we use instead looks for particular
+    //   color transfers (see the `isHDRVideo` function below).
    //
    // BT.709 is the most common amongst these for older files out stored on
    // computers, and they conform mostly to the standard (one notable exception
@@ -292,15 +339,14 @@ const ffmpegGenerateHLSPlaylistAndSegments = async (
    // that uses the tonemap filter.
    //
    // However applying this tonemap to videos that are already HD leads to a
-    // brightness drop. So we conditionally apply this filter chain only if the
-    // colorspace is not already BT.709.
+    // brightness drop. So we conditionally apply this filter chain only if we
+    // can heuristically detect that the video is HDR.
    //
-    // See also: [Note: Alternative FFmpeg command for HDR videos], although
-    // that uses a allow-list based check (while here we use deny-list).
+    // See also: [Note: Alternative FFmpeg command for HDR videos].
    //
    // Reference:
    // - https://trac.ffmpeg.org/wiki/colorspace
-    const tonemap = !isBT709;
+    const tonemap = isHDR;

    // We want the generated playlist to refer to the chunks as "output.ts".
    //
@@ -318,6 +364,20 @@ const ffmpegGenerateHLSPlaylistAndSegments = async (
    const playlistPath = path.join(outputPathPrefix, "output.m3u8");
    const videoPath = path.join(outputPathPrefix, "output.ts");

+    // A file into which we'll redirect ffmpeg's stderr.
+    //
+    // [Note: ERR_CHILD_PROCESS_STDIO_MAXBUFFER]
+    //
+    // For very large videos, the stderr output of ffmpeg may cause the stdio
+    // max buffer size limits to be exceeded, raising the following error:
+    //
+    //     RangeError [ERR_CHILD_PROCESS_STDIO_MAXBUFFER]: stderr maxBuffer length exceeded
+    //
+    // So instead of capturing the stderr normally, we redirect it to a
+    // temporary file, and then read it from there to extract the video
+    // dimensions.
+    const stderrPath = path.join(outputPathPrefix, "stderr.txt");
+
    // Generate a cryptographically secure random key (16 bytes).
    const keyBytes = randomBytes(16);
    const keyB64 = keyBytes.toString("base64");
@@ -336,11 +396,23 @@ const ffmpegGenerateHLSPlaylistAndSegments = async (
    // - the first line specifies the key URI that is written into the playlist.
    // - the second line specifies the path to the local file system file from
    //   where ffmpeg should read the key.
+    //
+    // [Note: ffmpeg newlines]
+    //
+    // Tested on Windows that ffmpeg recognizes these lines correctly. In
+    // general, ffmpeg tends to expect input and write output the Unix way (\n),
+    // even when we're running on Windows.
+    //
+    // - The ffmetadata and the HLS playlist file generated by ffmpeg uses \n
+    //   separators, even on Windows.
+    // - The HLS key info file, expected as an input by ffmpeg, works fine when
+    //   \n separated even on Windows.
+    //
    const keyInfo = [keyURI, keyPath].join("\n");

    // Overview:
    //
-    // - Video H.264 HD 720p 30fps.
+    // - Video H.264 HD 720p (max) 30fps.
    // - Audio AAC 128kbps.
    // - Encrypted HLS playlist with a single file containing all the chunks.
    //
@@ -378,16 +450,15 @@ const ffmpegGenerateHLSPlaylistAndSegments = async (
                                // keeping aspect ratio and the calculated
                                // dimension divisible by 2 (some of the other
                                // operations require an even pixel count).
-                                "scale=-2:720",
+                                "scale=-2:'min(720,ih)'",
                                // Convert the video to a constant 30 fps,
                                // duplicating or dropping frames as necessary.
                                "fps=30",
                            ]
                          : [],
-                      // Convert the colorspace if the video is not in the HD
-                      // color space (bt709). Before conversion, tone map colors
-                      // so that they work the same across the change in the
-                      // dyamic range.
+                      // Convert the colorspace if the video is HDR. Before
+                      // conversion, tone map colors so that they work the same
+                      // across the change in the dyamic range.
                      //
                      // 1. The tonemap filter only works linear light, so we
                      //    first use zscale with transfer=linear to linearize
@@ -453,8 +524,9 @@ const ffmpegGenerateHLSPlaylistAndSegments = async (
        playlistPath,
    ].flat();

-    let dimensions: ReturnType<typeof detectVideoDimensions>;
+    let dimensions: { width: number; height: number };
    let videoSize: number;
+    let videoObjectID: string;

    try {
        // Write the key and the keyInfo to their desired paths.
@@ -463,26 +535,45 @@ const ffmpegGenerateHLSPlaylistAndSegments = async (
            fs.writeFile(keyInfoPath, keyInfo, { encoding: "utf8" }),
        ]);

+        // Tack on the redirection after constructing the command.
+        const commandWithRedirection = `${shellescape(command)} 2>${stderrPath}`;
+
        // Run the ffmpeg command to generate the HLS playlist and segments.
        //
        // Note: Depending on the size of the input file, this may take long!
-        const { stderr: conversionStderr } = await execAsyncWorker(command);
+        await execAsyncWorker(commandWithRedirection);
+
+        // While ffmpeg uses \n as the line separator in the generated playlist
+        // file on Windows too, add an extra safety check that should fail the
+        // HLS generation if this doesn't hold. See: [Note: ffmpeg newlines].
+        if (process.platform == "win32") {
+            const playlistText = await fs.readFile(playlistPath, "utf-8");
+            if (playlistText.includes("\r\n"))
+                throw new Error("Unexpected Windows newlines in playlist");
+        }

        // Determine the dimensions of the generated video from the stderr
        // output produced by ffmpeg during the conversion.
-        dimensions = detectVideoDimensions(conversionStderr);
+        dimensions = await detectVideoDimensions(stderrPath);

        // Find the size of the generated video segments by reading the size of
        // the generated .ts file.
        videoSize = await fs.stat(videoPath).then((st) => st.size);

-        await uploadVideoSegments(videoPath, videoSize, outputUploadURL);
+        videoObjectID = await uploadVideoSegments(
+            videoPath,
+            videoSize,
+            fileID,
+            fetchURL,
+            authToken,
+        );
    } catch (e) {
        log.error("HLS generation failed", e);
        await Promise.all([deletePathIgnoringErrors(playlistPath)]);
        throw e;
    } finally {
        await Promise.all([
+            deletePathIgnoringErrors(stderrPath),
            deletePathIgnoringErrors(keyInfoPath),
            deletePathIgnoringErrors(keyPath),
            deletePathIgnoringErrors(videoPath),
@@ -491,7 +582,7 @@ const ffmpegGenerateHLSPlaylistAndSegments = async (
        ]);
    }

-    return { playlistPath, dimensions, videoSize };
+    return { playlistPath, dimensions, videoSize, videoObjectID };
 };

 /**
@@ -520,10 +611,10 @@ const deletePathIgnoringErrors = async (tempFilePath: string) => {
 *
 *     Stream #0:1[0x2](und): Video: h264 (Constrained Baseline) (avc1 / 0x31637661), yuv420p(progressive), 480x270 [SAR 1:1 DAR 16:9], 539 kb/s, 29.97 fps, 29.97 tbr, 30k tbn (default)
 */
-const videoStreamLineRegex = /Stream #.+: Video:(.+)\n/;
+const videoStreamLineRegex = /Stream #.+: Video:(.+)\r?\n/;

 /** {@link videoStreamLineRegex}, but global. */
-const videoStreamLinesRegex = /Stream #.+: Video:(.+)\n/g;
+const videoStreamLinesRegex = /Stream #.+: Video:(.+)\r?\n/g;

 /**
 * A regex that matches "<digits> kb/s" preceded by a space. See
@@ -543,15 +634,16 @@ const videoDimensionsRegex = / ([1-9]\d*)x([1-9]\d*)/;

 interface VideoCharacteristics {
    isH264: boolean;
-    isBT709: boolean;
+    isHDR: boolean;
    bitrate: number | undefined;
 }
+
 /**
 * Heuristically determine information about the video at the given
 * {@link inputFilePath}:
 *
 * - If is encoded using H.264 codec.
- * - If it uses the BT.709 colorspace.
+ * - If it is HDR.
 * - Its bitrate.
 *
 * The defaults are tailored for the cases in which these conditions are used,
@@ -586,13 +678,18 @@ const detectVideoCharacteristics = async (inputFilePath: string) => {
    // codec conversion to happen, even if it is unnecessary.
    const res: VideoCharacteristics = {
        isH264: false,
-        isBT709: false,
+        isHDR: false,
        bitrate: undefined,
    };
    if (!videoStreamLine) return res;

    res.isH264 = videoStreamLine.startsWith("h264 ");
-    res.isBT709 = videoStreamLine.includes("bt709");
+
+    // Same check as `isHDRVideo`.
+    res.isHDR =
+        videoStreamLine.includes("smpte2084") ||
+        videoStreamLine.includes("arib-std-b67");
+
    // The regex matches "\d kb/s", but there can be other units for the
    // bitrate. However, (a) "kb/s" is the most common for videos out in the
    // wild, and (b) even if we guess wrong it we'll just do "-v:c x264" instead
@@ -600,7 +697,7 @@ const detectVideoCharacteristics = async (inputFilePath: string) => {
    const brs = videoBitrateRegex.exec(videoStreamLine)?.at(0);
    if (brs) {
        const br = parseInt(brs, 10);
-        if (br) res.bitrate = br;
+        if (br) res.bitrate = br * 1000;
    }

    return res;
@@ -617,7 +714,12 @@ const detectVideoCharacteristics = async (inputFilePath: string) => {
 *
 * See: [Note: Parsing CLI output might break on ffmpeg updates].
 */
-const detectVideoDimensions = (conversionStderr: string) => {
+const detectVideoDimensions = async (stderrPath: string) => {
+    // Instead of reading the stderr directly off the child_process.exec, we
+    // wrote it to a file to avoid hitting the max stdio buffer limits. Read it
+    // from there.
+    const conversionStderr = await fs.readFile(stderrPath, "utf-8");
+
    // There is a nicer way to do it - by running `pseudoFFProbeVideo` on the
    // generated playlist. However, that playlist includes a data URL that
    // specifies the encryption info, and ffmpeg refuses to read that unless we
@@ -657,22 +759,21 @@ const detectVideoDimensions = (conversionStderr: string) => {
 * Heuristically detect if the file at given path is a HDR video.
 *
 * This is similar to {@link detectVideoCharacteristics}, and see that
- * function's documentation for all the caveats. However, this function uses an
- * allow-list instead, and considers any file with color transfer "smpte2084" or
- * "arib-std-b67" to be HDR. While this is in some sense a more exact check, it
- * comes with different caveats:
+ * function's documentation for all the caveats. Specifically, this function
+ * uses an allow-list, and considers any file with color transfer "smpte2084" or
+ * "arib-std-b67" to be HDR. Caveats:
 *
- * - These particular constants are not guaranteed to be correct; these are just
- *   what I saw on the internet as being used / recommended for detecting HDR.
+ * 1. These particular constants are not guaranteed to be correct; these are
+ *    from various internet posts as being used / recommended for detecting HDR.
 *
- * - Since we don't have ffprobe, we're not checking the color space value
- *   itself but a substring of the stream line in the ffmpeg stderr output.
+ * 2. Since we don't have ffprobe, we're not checking the color space value
+ *    itself but a substring of the stream line in the ffmpeg stderr output.
 *
- * In particular, we use this more exact check for places where we have less
- * leeway. e.g. when generating thumbnails, if we apply the tonemapping to any
- * non-BT.709 file (as the HLS stream generation does), we start getting the
- * "code 3074: no path between colorspaces" error during the JPEG conversion
- * (this is not a problem in the H.264 conversion).
+ * This check should generally not have false positives (unless something else
+ * in the log line triggers #2), but it can have false negative. This is the
+ * lesser of the two evils since if we apply the tonemapping to any non-BT.709
+ * file, we start getting the "code 3074: no path between colorspaces" error
+ * during the JPEG or H.264 conversion.
 *
 * - See: [Note: Alternative FFmpeg command for HDR videos]
 * - See: [Note: Tonemapping HDR to HD]
@@ -728,10 +829,11 @@ const pseudoFFProbeVideo = async (inputFilePath: string) => {
 };

 /**
- * Upload the file at the given {@link videoFilePath} to the provided presigned
- * {@link objectUploadURL} using a HTTP PUT request.
+ * Upload the file at the given {@link videoFilePath} to the provided pre-signed
+ * URL(s) using a HTTP PUT request.
 *
- * In case on non-HTTP-4xx errors, retry up to 3 times with exponential backoff.
+ * All HTTP requests are retried up to 4 times (1 original + 3 retries) with
+ * exponential backoff.
 *
 * See: [Note: Upload HLS video segment from node side].
 *
@@ -740,20 +842,155 @@ const pseudoFFProbeVideo = async (inputFilePath: string) => {
 *
 * @param videoSize The size in bytes of the file at {@link videoFilePath}.
 *
- * @param objectUploadURL A pre-signed URL to upload the file.
+ * @param fileID The ID of the {@link EnteFile} whose video segment this is.
 *
- * ---
+ * @param fetchURL The API URL for fetching pre-signed upload URLs.
 *
- * This is an inlined but bespoke reimplementation of `retryEnsuringHTTPOkOr4xx`
- * from `web/packages/base/http.ts`
+ * @param authToken The user's auth token for use with {@link fetchURL}.
+ *
+ * @return The object ID of the uploaded file on remote storage.
+ */
+const uploadVideoSegments = async (
+    videoFilePath: string,
+    videoSize: number,
+    fileID: number,
+    fetchURL: string,
+    authToken: string,
+) => {
+    // Self hosters might be using Cloudflare's free plan which (currently) has
+    // a maximum request size of 100 MB. Keeping a bit of margin for headers,
+    const partSize = 96 * 1024 * 1024; /* 96 MB */
+    const partCount = Math.ceil(videoSize / partSize);
+
+    const { objectID, url, partURLs, completeURL } =
+        await getFilePreviewDataUploadURL(
+            partCount,
+            fileID,
+            fetchURL,
+            authToken,
+        );
+
+    if (url) {
+        await uploadVideoSegmentsSingle(videoFilePath, videoSize, url);
+    } else if (partURLs && completeURL) {
+        await uploadVideoSegmentsMultipart(
+            videoFilePath,
+            videoSize,
+            partSize,
+            partURLs,
+            completeURL,
+        );
+    } else {
+        throw new Error("Malformed upload URLs");
+    }
+
+    return objectID;
+};
+
+const FilePreviewDataUploadURLResponse = z.object({
+    /**
+     * The objectID with which this uploaded data can be referred to post upload
+     * (e.g. when invoking {@link putVideoData}).
+     */
+    objectID: z.string(),
+    /**
+     * A pre-signed URL that can be used to upload the file.
+     *
+     * This will be present only if we requested a singular object upload URL.
+     */
+    url: z.string().nullish().transform(nullToUndefined),
+    /**
+     * A list of pre-signed URLs that can be used to upload parts of a multipart
+     * upload of the uploaded data.
+     *
+     * This will be present only if we requested a multipart upload URLs for the
+     * object by setting `isMultiPart` true in the request.
+     */
+    partURLs: z.string().array().nullish().transform(nullToUndefined),
+    /**
+     * A pre-signed URL that can be used to finalize the multipart upload.
+     *
+     * This will be present only if we requested a multipart upload URLs for the
+     * object by setting `isMultiPart` true in the request.
+     */
+    completeURL: z.string().nullish().transform(nullToUndefined),
+});
+
+/**
+ * Obtain a pre-signed URL(s) that can be used to upload the "file preview data"
+ * of type "vid_preview".
+ *
+ * This will be the file containing the encrypted video segments which the
+ * "vid_preview" HLS playlist for the file would refer to.
+ *
+ * @param partCount If greater than 1, then we request for a multipart upload.
+ */
+export const getFilePreviewDataUploadURL = async (
+    partCount: number,
+    fileID: number,
+    fetchURL: string,
+    authToken: string,
+) => {
+    const params = new URLSearchParams({
+        fileID: fileID.toString(),
+        type: "vid_preview",
+    });
+    if (partCount > 1) {
+        params.set("isMultiPart", "true");
+        params.set("count", partCount.toString());
+    }
+
+    const res = await retryEnsuringHTTPOk(() =>
+        fetch(`${fetchURL}?${params.toString()}`, {
+            headers: authenticatedRequestHeaders(
+                desktopAppVersion(),
+                authToken,
+            ),
+        }),
+    );
+
+    return FilePreviewDataUploadURLResponse.parse(await res.json());
+};
+
+const uploadVideoSegmentsSingle = (
+    videoFilePath: string,
+    videoSize: number,
+    objectUploadURL: string,
+) =>
+    retryEnsuringHTTPOk(() =>
+        // net.fetch is 40-50x slower than the native fetch for this particular
+        // PUT request. This is easily reproducible - replace `fetch` with
+        // `net.fetch`, then even on localhost the PUT requests start taking a
+        // minute or so, while they take second(s) with node's native fetch.
+        fetch(objectUploadURL, {
+            method: "PUT",
+            // net.fetch deduces and inserts a content-length for us, when we
+            // use the node native fetch then we need to provide it explicitly.
+            headers: {
+                ...publicRequestHeaders(desktopAppVersion()),
+                "Content-Length": `${videoSize}`,
+            },
+            // See: [Note: duplex param required for stream body]
+            // @ts-expect-error ^see note above
+            duplex: "half",
+            body: Readable.toWeb(fs_.createReadStream(videoFilePath)),
+        }),
+    );
+
+/**
+ * Retry a async operation on failure up to 4 times (1 original + 3 retries)
+ * with exponential backoff.
+ *
+ * This is an inlined but bespoke reimplementation of `retryEnsuringHTTPOk` from
+ * `web/packages/base/http.ts`
 *
 * - We don't have the rest of the scaffolding used by that function, which is
 *   why it is intially inlined bespoked.
 *
 * - It handles the specific use case of uploading videos since generating the
 *   HLS stream is a fairly expensive operation, so a retry to discount
- *   transient network issues is called for. There are only 2 retries for a
- *   total of 3 attempts, and the retry gaps are more spaced out.
+ *   transient network issues is called for. The number of retries and their
+ *   gaps are same as the "background" `retryProfile` of the web implementation.
 *
 * - Later it was discovered that net.fetch is much slower than node's native
 *   fetch, so this implementation has further diverged.
@@ -761,61 +998,136 @@ const pseudoFFProbeVideo = async (inputFilePath: string) => {
 * - This also moved to a utility process, where we also have a more restricted
 *   ability to import electron API.
 */
-const uploadVideoSegments = async (
-    videoFilePath: string,
-    videoSize: number,
-    objectUploadURL: string,
-) => {
-    const waitTimeBeforeNextTry = [5000, 20000];
+const retryEnsuringHTTPOk = async (request: () => Promise<Response>) => {
+    const waitTimeBeforeNextTry = [10000, 30000, 120000];

    while (true) {
-        let abort = false;
        try {
-            const nodeStream = fs_.createReadStream(videoFilePath);
-            const webStream = Readable.toWeb(nodeStream);
-
-            // net.fetch is 40-50x slower than the native fetch for this
-            // particular PUT request. This is easily reproducible - replace
-            // `fetch` with `net.fetch`, then even on localhost the PUT requests
-            // start taking a minute or so, while they take second(s) with
-            // node's native fetch.
-            const res = await fetch(objectUploadURL, {
-                method: "PUT",
-                // net.fetch apparently deduces and inserts a content-length,
-                // because when we use the node native fetch then we need to
-                // provide it explicitly.
-                headers: { "Content-Length": `${videoSize}` },
-                // The duplex option is required since we're passing a stream.
-                //
-                // @ts-expect-error TypeScript's libdom.d.ts does not include
-                // the "duplex" parameter, e.g. see
-                // https://github.com/node-fetch/node-fetch/issues/1769.
-                duplex: "half",
-                body: webStream,
-            });
-
-            if (res.ok) {
-                // Success.
-                return;
-            }
-            if (res.status >= 400 && res.status < 500) {
-                // HTTP 4xx.
-                abort = true;
-            }
+            const res = await request();
+            if (res.ok) /* Success. */ return res;
            throw new Error(
-                `Failed to upload generated HLS video: HTTP ${res.status} ${res.statusText}`,
+                `Request failed: HTTP ${res.status} ${res.statusText}`,
            );
        } catch (e) {
-            if (abort) {
-                throw e;
-            }
            const t = waitTimeBeforeNextTry.shift();
            if (!t) {
                throw e;
            } else {
                log.warn("Will retry potentially transient request failure", e);
+                await wait(t);
            }
-            await wait(t);
        }
    }
 };
+
+const uploadVideoSegmentsMultipart = async (
+    videoFilePath: string,
+    videoSize: number,
+    partSize: number,
+    partUploadURLs: string[],
+    completionURL: string,
+) => {
+    // The part we're currently uploading.
+    let partNumber = 0;
+    // A rolling offset into the file.
+    let start = 0;
+    // See `createMultipartUploadRequestBody` in the web code for a more
+    // expansive and documented version of this XML body construction.
+    const completionXML = ["<CompleteMultipartUpload>"];
+    for (const partUploadURL of partUploadURLs) {
+        partNumber += 1;
+        const size = Math.min(start + partSize, videoSize) - start;
+        const end = start + size - 1;
+        const res = await retryEnsuringHTTPOk(() =>
+            fetch(partUploadURL, {
+                method: "PUT",
+                headers: {
+                    ...publicRequestHeaders(desktopAppVersion()),
+                    "Content-Length": `${size}`,
+                },
+                // See: [Note: duplex param required for stream body]
+                // @ts-expect-error ^see note above
+                duplex: "half",
+                body: Readable.toWeb(
+                    // start and end are inclusive 0-indexed range of bytes to
+                    // read from the file.
+                    fs_.createReadStream(videoFilePath, { start, end }),
+                ),
+            }),
+        );
+        const eTag = res.headers.get("etag");
+        if (!eTag) throw new Error("Response did not have an ETag");
+        start += size;
+        completionXML.push(
+            `<Part><PartNumber>${partNumber}</PartNumber><ETag>${eTag}</ETag></Part>`,
+        );
+    }
+    completionXML.push("</CompleteMultipartUpload>");
+    const completionBody = completionXML.join("");
+    return await retryEnsuringHTTPOk(() =>
+        fetch(completionURL, {
+            method: "POST",
+            headers: {
+                ...publicRequestHeaders(desktopAppVersion()),
+                "Content-Type": "text/xml",
+            },
+            body: completionBody,
+        }),
+    );
+};
+
+/**
+ * A regex that matches the first line of the form
+ *
+ *   Duration: 00:00:03.13, start: 0.000000, bitrate: 16088 kb/s
+ *
+ * The part after Duration: and until the first non-digit or colon is the first
+ * capture group, while after the dot is an optional second capture group.
+ */
+const videoDurationLineRegex = /\s\sDuration: ([0-9:]+)(.[0-9]+)?/;
+
+/**
+ * Determine the duration of the video at the given {@link inputFilePath}.
+ *
+ * While the detection works for all known cases, it is still heuristic because
+ * it uses ffmpeg output instead of ffprobe (which we don't have access to).
+ * See: [Note: Parsing CLI output might break on ffmpeg updates].
+ */
+export const ffmpegDetermineVideoDuration = async (inputFilePath: string) => {
+    const videoInfo = await pseudoFFProbeVideo(inputFilePath);
+    const matches = videoDurationLineRegex.exec(videoInfo);
+
+    const fail = () => {
+        throw new Error(`Cannot parse video duration '${matches?.at(0)}'`);
+    };
+
+    // The HH:mm:ss.
+    const ints = (matches?.at(1) ?? "")
+        .split(":")
+        .map((s) => parseInt(s, 10) || 0);
+    let [h, m, s] = [0, 0, 0];
+    switch (ints.length) {
+        case 1:
+            s = ints[0]!;
+            break;
+        case 2:
+            m = ints[0]!;
+            s = ints[1]!;
+            break;
+        case 3:
+            h = ints[0]!;
+            m = ints[1]!;
+            s = ints[2]!;
+            break;
+        default:
+            fail();
+    }
+
+    // Optional subseconds.
+    const ss = parseFloat(`0${matches?.at(2) ?? ""}`);
+
+    // Follow the same round up behaviour that the web side uses.
+    const duration = Math.ceil(h * 3600 + m * 60 + s + ss);
+    if (!duration) fail();
+    return duration;
+};
--- a/desktop/src/main/services/ffmpeg.ts
+++ b/desktop/src/main/services/ffmpeg.ts
@@ -8,7 +8,7 @@ import fs from "node:fs/promises";
 import type { FFmpegCommand, ZipItem } from "../../types/ipc";
 import {
    deleteTempFileIgnoringErrors,
-    makeFileForDataOrStreamOrPathOrZipItem,
+    makeFileForStreamOrPathOrZipItem,
    makeTempFilePath,
 } from "../utils/temp";
 import type { FFmpegUtilityProcess } from "./ffmpeg-worker";
@@ -29,27 +29,49 @@ export const ffmpegUtilityProcess = () =>
 */
 export const ffmpegExec = async (
    command: FFmpegCommand,
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+    pathOrZipItem: string | ZipItem,
    outputFileExtension: string,
-): Promise<Uint8Array> => {
+): Promise<Uint8Array> =>
+    withInputFile(pathOrZipItem, async (worker, inputFilePath) => {
+        const outputFilePath = await makeTempFilePath(outputFileExtension);
+        try {
+            await worker.ffmpegExec(command, inputFilePath, outputFilePath);
+            return await fs.readFile(outputFilePath);
+        } finally {
+            await deleteTempFileIgnoringErrors(outputFilePath);
+        }
+    });
+
+export const withInputFile = async <T>(
+    pathOrZipItem: string | ZipItem,
+    f: (worker: FFmpegUtilityProcess, inputFilePath: string) => Promise<T>,
+): Promise<T> => {
    const worker = await ffmpegUtilityProcess();

    const {
        path: inputFilePath,
        isFileTemporary: isInputFileTemporary,
        writeToTemporaryFile: writeToTemporaryInputFile,
-    } = await makeFileForDataOrStreamOrPathOrZipItem(dataOrPathOrZipItem);
+    } = await makeFileForStreamOrPathOrZipItem(pathOrZipItem);

-    const outputFilePath = await makeTempFilePath(outputFileExtension);
    try {
        await writeToTemporaryInputFile();

-        await worker.ffmpegExec(command, inputFilePath, outputFilePath);
-
-        return await fs.readFile(outputFilePath);
+        return await f(worker, inputFilePath);
    } finally {
        if (isInputFileTemporary)
            await deleteTempFileIgnoringErrors(inputFilePath);
-        await deleteTempFileIgnoringErrors(outputFilePath);
    }
 };
+
+/**
+ * Implement the IPC "ffmpegDetermineVideoDuration" contract, writing the input
+ * to temporary files as needed, and then forward to the
+ * {@link ffmpegDetermineVideoDuration} running in the utility process.
+ */
+export const ffmpegDetermineVideoDuration = async (
+    pathOrZipItem: string | ZipItem,
+): Promise<number> =>
+    withInputFile(pathOrZipItem, async (worker, inputFilePath) =>
+        worker.ffmpegDetermineVideoDuration(inputFilePath),
+    );
--- a/desktop/src/main/services/image.ts
+++ b/desktop/src/main/services/image.ts
@@ -6,7 +6,7 @@ import { type ZipItem } from "../../types/ipc";
 import { execAsync, isDev } from "../utils/electron";
 import {
    deleteTempFileIgnoringErrors,
-    makeFileForDataOrStreamOrPathOrZipItem,
+    makeFileForStreamOrPathOrZipItem,
    makeTempFilePath,
 } from "../utils/temp";

@@ -61,7 +61,7 @@ const vipsPath = () =>
    );

 export const generateImageThumbnail = async (
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+    pathOrZipItem: string | ZipItem,
    maxDimension: number,
    maxSize: number,
 ): Promise<Uint8Array> => {
@@ -69,7 +69,7 @@ export const generateImageThumbnail = async (
        path: inputFilePath,
        isFileTemporary: isInputFileTemporary,
        writeToTemporaryFile: writeToTemporaryInputFile,
-    } = await makeFileForDataOrStreamOrPathOrZipItem(dataOrPathOrZipItem);
+    } = await makeFileForStreamOrPathOrZipItem(pathOrZipItem);

    const outputFilePath = await makeTempFilePath("jpeg");

--- a/desktop/src/main/services/logout.ts
+++ b/desktop/src/main/services/logout.ts
@@ -3,6 +3,7 @@ import log from "../log";
 import { clearPendingVideoResults } from "../stream";
 import { clearStores } from "./store";
 import { watchReset } from "./watch";
+import { terminateUtilityProcesses } from "./workers";
 import { clearOpenZipCache } from "./zip";

 /**
@@ -36,4 +37,9 @@ export const logout = (watcher: FSWatcher) => {
    } catch (e) {
        ignoreError("zip cache", e);
    }
+    try {
+        terminateUtilityProcesses();
+    } catch (e) {
+        ignoreError("utility processes", e);
+    }
 };
--- a/desktop/src/main/services/ml-worker.ts
+++ b/desktop/src/main/services/ml-worker.ts
@@ -15,6 +15,7 @@ import { existsSync } from "fs";
 import fs from "node:fs/promises";
 import path from "node:path";
 import * as ort from "onnxruntime-node";
+import { z } from "zod";
 import log from "../log-worker";
 import { messagePortMainEndpoint } from "../utils/comlink";
 import { wait } from "../utils/common";
@@ -23,6 +24,8 @@ import { fsStatMtime } from "./fs";

 log.debugString("Started ML utility process");

+process.on("uncaughtException", (e, origin) => log.error(origin, e));
+
 process.parentPort.once("message", (e) => {
    // Initialize ourselves with the data we got from our parent.
    parseInitData(e.data);
@@ -50,17 +53,10 @@ let _userDataPath: string | undefined;
 /** Equivalent to app.getPath("userData") */
 const userDataPath = () => _userDataPath!;

+const MLWorkerInitData = z.object({ userDataPath: z.string() });
+
 const parseInitData = (data: unknown) => {
-    if (
-        data &&
-        typeof data == "object" &&
-        "userDataPath" in data &&
-        typeof data.userDataPath == "string"
-    ) {
-        _userDataPath = data.userDataPath;
-    } else {
-        log.error("Unparseable initialization data");
-    }
+    _userDataPath = MLWorkerInitData.parse(data).userDataPath;
 };

 /**
--- a/desktop/src/main/services/workers.ts
+++ b/desktop/src/main/services/workers.ts
@@ -15,9 +15,22 @@ import type { UtilityProcessType } from "../../types/ipc";
 import log, { processUtilityProcessLogMessage } from "../log";
 import { messagePortMainEndpoint } from "../utils/comlink";

+/**
+ * Terminate any existing utility processes if they're running.
+ *
+ * This function is called during the logout sequence.
+ */
+export const terminateUtilityProcesses = () => {
+    terminateMLProcessIfRunning();
+    terminateFFmpegProcessIfRunning();
+};
+
 /** The active ML utility process, if any. */
 let _utilityProcessML: UtilityProcess | undefined;

+/** The active FFmpeg utility process, if any. */
+let _utilityProcessFFmpeg: UtilityProcess | undefined;
+
 /**
 * A promise to a comlink {@link Endpoint} that can be used to communicate with
 * the active ffmpeg utility process (if any).
@@ -92,18 +105,22 @@ export const triggerCreateUtilityProcess = (
    window: BrowserWindow,
 ) => triggerCreateMLUtilityProcess(window);

-export const triggerCreateMLUtilityProcess = (window: BrowserWindow) => {
+const terminateMLProcessIfRunning = () => {
    if (_utilityProcessML) {
-        log.debug(() => "Terminating previous ML utility process");
+        log.debug(() => "Terminating running ML utility process");
        _utilityProcessML.kill();
        _utilityProcessML = undefined;
    }
+};
+
+export const triggerCreateMLUtilityProcess = (window: BrowserWindow) => {
+    terminateMLProcessIfRunning();

    const { port1, port2 } = new MessageChannelMain();

    const child = utilityProcess.fork(path.join(__dirname, "ml-worker.js"));
    const userDataPath = app.getPath("userData");
-    child.postMessage({ userDataPath }, [port1]);
+    child.postMessage(/* MLWorkerInitData */ { userDataPath }, [port1]);

    window.webContents.postMessage("utilityProcessPort/ml", undefined, [port2]);

@@ -173,7 +190,20 @@ const handleMessagesFromMLUtilityProcess = (child: UtilityProcess) => {
 export const ffmpegUtilityProcessEndpoint = () =>
    (_utilityProcessFFmpegEndpoint ??= createFFmpegUtilityProcessEndpoint());

+const terminateFFmpegProcessIfRunning = () => {
+    if (_utilityProcessFFmpeg) {
+        log.debug(() => "Terminating running FFmpeg utility process");
+        _utilityProcessFFmpeg.kill();
+        _utilityProcessFFmpeg = undefined;
+        _utilityProcessFFmpegEndpoint = undefined;
+    }
+};
+
 const createFFmpegUtilityProcessEndpoint = () => {
+    if (_utilityProcessFFmpeg) {
+        throw new Error("FFmpeg utility process is already running");
+    }
+
    // Promise.withResolvers is currently in the node available to us.
    let resolve: ((endpoint: Endpoint) => void) | undefined;
    const promise = new Promise<Endpoint>((r) => (resolve = r));
@@ -182,8 +212,10 @@ const createFFmpegUtilityProcessEndpoint = () => {

    const child = utilityProcess.fork(path.join(__dirname, "ffmpeg-worker.js"));
    // Send a handle to the port (one end of the message channel) to the utility
-    // process. The utility process will reply with an "ack" when it get it.
-    child.postMessage({}, [port1]);
+    // process (alongwith any other init data). The utility process will reply
+    // with an "ack" when it get it.
+    const appVersion = app.getVersion();
+    child.postMessage(/* FFmpegWorkerInitData */ { appVersion }, [port1]);

    child.on("message", (m: unknown) => {
        if (m && typeof m == "object" && "method" in m) {
@@ -201,6 +233,8 @@ const createFFmpegUtilityProcessEndpoint = () => {
        log.info("Ignoring unknown message from ffmpeg utility process", m);
    });

+    _utilityProcessFFmpeg = child;
+
    // Resolve with the other end of the message channel (once we get an "ack"
    // from the utility process).
    return promise;
--- a/desktop/src/main/stream.ts
+++ b/desktop/src/main/stream.ts
@@ -14,7 +14,7 @@ import { writeStream } from "./utils/stream";
 import {
    deleteTempFile,
    deleteTempFileIgnoringErrors,
-    makeFileForDataOrStreamOrPathOrZipItem,
+    makeFileForStreamOrPathOrZipItem,
    makeTempFilePath,
 } from "./utils/temp";

@@ -277,9 +277,9 @@ const handleVideoDone = async (token: string) => {
 *
 * The difference here is that we the conversion generates two streams^ - one
 * for the HLS playlist itself, and one for the file containing the encrypted
- * and transcoded video chunks. The video stream we write to the objectUploadURL
- * (provided via {@link params}), and then we return a JSON object containing
- * the token for the playlist, and other metadata for use by the renderer.
+ * and transcoded video chunks. The video stream we write to the pre-signed
+ * object upload URL(s), and then we return a JSON object containing the token
+ * for the playlist, and other metadata for use by the renderer.
 *
 * ^ if the video doesn't require a stream to be generated (e.g. it is very
 *   small and already uses a compatible codec) then a HTT 204 is returned and
@@ -289,10 +289,12 @@ const handleGenerateHLSWrite = async (
    request: Request,
    params: URLSearchParams,
 ) => {
-    const objectUploadURL = params.get("objectUploadURL");
-    if (!objectUploadURL) throw new Error("Missing objectUploadURL");
+    const fileID = parseInt(params.get("fileID") ?? "", 10);
+    const fetchURL = params.get("fetchURL");
+    const authToken = params.get("authToken");
+    if (!fileID || !fetchURL || !authToken) throw new Error("Missing params");

-    let inputItem: Parameters<typeof makeFileForDataOrStreamOrPathOrZipItem>[0];
+    let inputItem: Parameters<typeof makeFileForStreamOrPathOrZipItem>[0];
    const path = params.get("path");
    if (path) {
        inputItem = path;
@@ -314,7 +316,7 @@ const handleGenerateHLSWrite = async (
        path: inputFilePath,
        isFileTemporary: isInputFileTemporary,
        writeToTemporaryFile: writeToTemporaryInputFile,
-    } = await makeFileForDataOrStreamOrPathOrZipItem(inputItem);
+    } = await makeFileForStreamOrPathOrZipItem(inputItem);

    const outputFilePathPrefix = await makeTempFilePath();
    let result: FFmpegGenerateHLSPlaylistAndSegmentsResult | undefined;
@@ -324,7 +326,9 @@ const handleGenerateHLSWrite = async (
        result = await worker.ffmpegGenerateHLSPlaylistAndSegments(
            inputFilePath,
            outputFilePathPrefix,
-            objectUploadURL,
+            fileID,
+            fetchURL,
+            authToken,
        );

        if (!result) {
@@ -332,13 +336,18 @@ const handleGenerateHLSWrite = async (
            return new Response(null, { status: 204 });
        }

-        const { playlistPath, videoSize, dimensions } = result;
+        const { playlistPath, dimensions, videoSize, videoObjectID } = result;

        const playlistToken = randomUUID();
        pendingVideoResults.set(playlistToken, playlistPath);

        return new Response(
-            JSON.stringify({ playlistToken, videoSize, dimensions }),
+            JSON.stringify({
+                playlistToken,
+                dimensions,
+                videoSize,
+                videoObjectID,
+            }),
            { status: 200 },
        );
    } finally {
--- a/desktop/src/main/utils/common.ts
+++ b/desktop/src/main/utils/common.ts
@@ -15,3 +15,11 @@
 */
 export const wait = (ms: number) =>
    new Promise((resolve) => setTimeout(resolve, ms));
+
+/**
+ * Convert `null` to `undefined`, passthrough everything else unchanged.
+ *
+ * Duplicated from `web/packages/utils/transform.ts`.
+ */
+export const nullToUndefined = <T>(v: T | null | undefined): T | undefined =>
+    v === null ? undefined : v;
--- a/desktop/src/main/utils/http.ts
+++ b/desktop/src/main/utils/http.ts
@@ -0,0 +1,31 @@
+export const clientPackageName = "io.ente.photos.desktop";
+
+/**
+ * Reimplementation of {@link publicRequestHeaders} from the web source.
+ *
+ * @param desktopAppVersion The desktop app's version. This will get passed on
+ * as the "X-Client-Version" header.
+ *
+ * We cannot directly use `app.getVersion()` to obtain this value since the
+ * {@link app} module is not accessible to Electron utility processes which also
+ * calls this function.
+ */
+export const publicRequestHeaders = (desktopAppVersion: string) => ({
+    "X-Client-Package": clientPackageName,
+    "X-Client-Version": desktopAppVersion,
+});
+
+/**
+ * Reimplementation of {@link authenticatedRequestHeaders} from the web source.
+ *
+ * This builds on top of {@link publicRequestHeaders} and takes the same
+ * parameters, and additionally also requires the {@link authToken} that will be
+ * passed as the "X-Auth-Token" header.
+ */
+export const authenticatedRequestHeaders = (
+    desktopAppVersion: string,
+    authToken: string,
+) => ({
+    ...publicRequestHeaders(desktopAppVersion),
+    "X-Auth-Token": authToken,
+});
--- a/desktop/src/main/utils/temp.ts
+++ b/desktop/src/main/utils/temp.ts
@@ -80,8 +80,8 @@ export const deleteTempFileIgnoringErrors = async (tempFilePath: string) => {
    }
 };

-/** The result of {@link makeFileForDataOrStreamOrPathOrZipItem}. */
-interface FileForDataOrPathOrZipItem {
+/** The result of {@link makeFileForStreamOrPathOrZipItem}. */
+interface FileForStreamOrPathOrZipItem {
    /**
     * The path to the file (possibly temporary).
     */
@@ -107,13 +107,13 @@ interface FileForDataOrPathOrZipItem {
 * that needs to be deleted after processing, and a function to write the given
 * {@link item} into that temporary file if needed.
 *
- * @param item The contents of the file (bytes), or a {@link ReadableStream}
- * with the contents of the file, or the path to an existing file, or a (path to
- * a zip file, name of an entry within that zip file) tuple.
+ * @param item A {@link ReadableStream} with the contents of the file, or the
+ * path to an existing file, or a (path to a zip file, name of an entry within
+ * that zip file) tuple.
 */
-export const makeFileForDataOrStreamOrPathOrZipItem = async (
-    item: Uint8Array | ReadableStream | string | ZipItem,
-): Promise<FileForDataOrPathOrZipItem> => {
+export const makeFileForStreamOrPathOrZipItem = async (
+    item: ReadableStream | string | ZipItem,
+): Promise<FileForStreamOrPathOrZipItem> => {
    let path: string;
    let isFileTemporary: boolean;
    let writeToTemporaryFile = async () => {
@@ -126,9 +126,7 @@ export const makeFileForDataOrStreamOrPathOrZipItem = async (
    } else {
        path = await makeTempFilePath();
        isFileTemporary = true;
-        if (item instanceof Uint8Array) {
-            writeToTemporaryFile = () => fs.writeFile(path, item);
-        } else if (item instanceof ReadableStream) {
+        if (item instanceof ReadableStream) {
            writeToTemporaryFile = () => writeStream(path, item);
        } else {
            writeToTemporaryFile = async () => {
--- a/desktop/src/preload.ts
+++ b/desktop/src/preload.ts
@@ -193,29 +193,32 @@ const convertToJPEG = (imageData: Uint8Array) =>
    ipcRenderer.invoke("convertToJPEG", imageData);

 const generateImageThumbnail = (
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+    pathOrZipItem: string | ZipItem,
    maxDimension: number,
    maxSize: number,
 ) =>
    ipcRenderer.invoke(
        "generateImageThumbnail",
-        dataOrPathOrZipItem,
+        pathOrZipItem,
        maxDimension,
        maxSize,
    );

 const ffmpegExec = (
    command: FFmpegCommand,
-    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+    pathOrZipItem: string | ZipItem,
    outputFileExtension: string,
 ) =>
    ipcRenderer.invoke(
        "ffmpegExec",
        command,
-        dataOrPathOrZipItem,
+        pathOrZipItem,
        outputFileExtension,
    );

+const ffmpegDetermineVideoDuration = (pathOrZipItem: string | ZipItem) =>
+    ipcRenderer.invoke("ffmpegDetermineVideoDuration", pathOrZipItem);
+
 // - Utility processes

 const triggerCreateUtilityProcess = (type: UtilityProcessType) => {
@@ -392,6 +395,7 @@ contextBridge.exposeInMainWorld("electron", {
    convertToJPEG,
    generateImageThumbnail,
    ffmpegExec,
+    ffmpegDetermineVideoDuration,

    // - ML

--- a/desktop/yarn.lock
+++ b/desktop/yarn.lock
@@ -136,13 +136,20 @@
    minimatch "^9.0.3"
    plist "^3.1.0"

-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+"@eslint-community/eslint-utils@^4.2.0":
  version "4.4.0"
  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
  dependencies:
    eslint-visitor-keys "^3.3.0"

+"@eslint-community/eslint-utils@^4.7.0":
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz#607084630c6c033992a082de6e6fbc1a8b52175a"
+  integrity sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==
+  dependencies:
+    eslint-visitor-keys "^3.4.3"
+
 "@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.11.0":
  version "4.11.0"
  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
@@ -177,10 +184,10 @@
  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06"
  integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==

-"@eslint/js@^9.25.1":
-  version "9.25.1"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.25.1.tgz#25f5c930c2b68b5ebe7ac857f754cbd61ef6d117"
-  integrity sha512-dEIwmjntEx8u3Uvv+kr3PDeeArL8Hw07H9kyYxCjnM9pBjfEhk6uLXSchxxzgiwtRhhzVzqmUSDFBOi1TuZ7qg==
+"@eslint/js@^9.27.0":
+  version "9.27.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.27.0.tgz#181a23460877c484f6dd03890f4e3fa2fdeb8ff0"
+  integrity sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==

 "@eslint/object-schema@^2.1.4":
  version "2.1.4"
@@ -268,10 +275,10 @@
  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==

-"@pkgr/core@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31"
-  integrity sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==
+"@pkgr/core@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.2.4.tgz#d897170a2b0ba51f78a099edccd968f7b103387c"
+  integrity sha512-ROFF39F6ZrnzSUEmQQZUar0Jt4xVoP9WnDRdWwF4NNcXs3xBTLgBUDoOwW141y1jP+S8nahIbdxbFC7IShw9Iw==

 "@sindresorhus/is@^4.0.0":
  version "4.6.0"
@@ -290,10 +297,10 @@
  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==

-"@tsconfig/node22@^22.0.1":
-  version "22.0.1"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node22/-/node22-22.0.1.tgz#27e3ee9b359e31e5b94690bf2bad5a923c1d57d0"
-  integrity sha512-VkgOa3n6jvs1p+r3DiwBqeEwGAwEvnVCg/hIjiANl5IEcqP3G0u5m8cBJspe1t9qjZRlZ7WFgqq5bJrGdgAKMg==
+"@tsconfig/node22@^22.0.2":
+  version "22.0.2"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node22/-/node22-22.0.2.tgz#1e04e2c5cc946dac787d69bb502462a851ae51b6"
+  integrity sha512-Kmwj4u8sDRDrMYRoN9FDEcXD8UpBSaPQQ24Gz+Gamqfm7xxn+GBR7ge/Z7pK8OXNGyUzbSwJj+TH6B+DS/epyA==

 "@types/auto-launch@^5.0.5":
  version "5.0.5"
@@ -385,85 +392,85 @@
  dependencies:
    "@types/node" "*"

-"@typescript-eslint/eslint-plugin@8.31.1":
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.31.1.tgz#62f1befe59647524994e89de4516d8dcba7a850a"
-  integrity sha512-oUlH4h1ABavI4F0Xnl8/fOtML/eu8nI2A1nYd+f+55XI0BLu+RIqKoCiZKNo6DtqZBEQm5aNKA20G3Z5w3R6GQ==
+"@typescript-eslint/eslint-plugin@8.32.1":
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz#9185b3eaa3b083d8318910e12d56c68b3c4f45b4"
+  integrity sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==
  dependencies:
    "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "8.31.1"
-    "@typescript-eslint/type-utils" "8.31.1"
-    "@typescript-eslint/utils" "8.31.1"
-    "@typescript-eslint/visitor-keys" "8.31.1"
+    "@typescript-eslint/scope-manager" "8.32.1"
+    "@typescript-eslint/type-utils" "8.32.1"
+    "@typescript-eslint/utils" "8.32.1"
+    "@typescript-eslint/visitor-keys" "8.32.1"
    graphemer "^1.4.0"
-    ignore "^5.3.1"
+    ignore "^7.0.0"
    natural-compare "^1.4.0"
-    ts-api-utils "^2.0.1"
+    ts-api-utils "^2.1.0"

-"@typescript-eslint/parser@8.31.1":
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.31.1.tgz#e9b0ccf30d37dde724ee4d15f4dbc195995cce1b"
-  integrity sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==
+"@typescript-eslint/parser@8.32.1":
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.32.1.tgz#18b0e53315e0bc22b2619d398ae49a968370935e"
+  integrity sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==
  dependencies:
-    "@typescript-eslint/scope-manager" "8.31.1"
-    "@typescript-eslint/types" "8.31.1"
-    "@typescript-eslint/typescript-estree" "8.31.1"
-    "@typescript-eslint/visitor-keys" "8.31.1"
+    "@typescript-eslint/scope-manager" "8.32.1"
+    "@typescript-eslint/types" "8.32.1"
+    "@typescript-eslint/typescript-estree" "8.32.1"
+    "@typescript-eslint/visitor-keys" "8.32.1"
    debug "^4.3.4"

-"@typescript-eslint/scope-manager@8.31.1":
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.31.1.tgz#1eb52e76878f545e4add142e0d8e3e97e7aa443b"
-  integrity sha512-BMNLOElPxrtNQMIsFHE+3P0Yf1z0dJqV9zLdDxN/xLlWMlXK/ApEsVEKzpizg9oal8bAT5Sc7+ocal7AC1HCVw==
+"@typescript-eslint/scope-manager@8.32.1":
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz#9a6bf5fb2c5380e14fe9d38ccac6e4bbe17e8afc"
+  integrity sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==
  dependencies:
-    "@typescript-eslint/types" "8.31.1"
-    "@typescript-eslint/visitor-keys" "8.31.1"
+    "@typescript-eslint/types" "8.32.1"
+    "@typescript-eslint/visitor-keys" "8.32.1"

-"@typescript-eslint/type-utils@8.31.1":
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.31.1.tgz#be0f438fb24b03568e282a0aed85f776409f970c"
-  integrity sha512-fNaT/m9n0+dpSp8G/iOQ05GoHYXbxw81x+yvr7TArTuZuCA6VVKbqWYVZrV5dVagpDTtj/O8k5HBEE/p/HM5LA==
+"@typescript-eslint/type-utils@8.32.1":
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz#b9292a45f69ecdb7db74d1696e57d1a89514d21e"
+  integrity sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==
  dependencies:
-    "@typescript-eslint/typescript-estree" "8.31.1"
-    "@typescript-eslint/utils" "8.31.1"
+    "@typescript-eslint/typescript-estree" "8.32.1"
+    "@typescript-eslint/utils" "8.32.1"
    debug "^4.3.4"
-    ts-api-utils "^2.0.1"
+    ts-api-utils "^2.1.0"

-"@typescript-eslint/types@8.31.1":
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.31.1.tgz#478ed6f7e8aee1be7b63a60212b6bffe1423b5d4"
-  integrity sha512-SfepaEFUDQYRoA70DD9GtytljBePSj17qPxFHA/h3eg6lPTqGJ5mWOtbXCk1YrVU1cTJRd14nhaXWFu0l2troQ==
+"@typescript-eslint/types@8.32.1":
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.32.1.tgz#b19fe4ac0dc08317bae0ce9ec1168123576c1d4b"
+  integrity sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==

-"@typescript-eslint/typescript-estree@8.31.1":
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.31.1.tgz#37792fe7ef4d3021c7580067c8f1ae66daabacdf"
-  integrity sha512-kaA0ueLe2v7KunYOyWYtlf/QhhZb7+qh4Yw6Ni5kgukMIG+iP773tjgBiLWIXYumWCwEq3nLW+TUywEp8uEeag==
+"@typescript-eslint/typescript-estree@8.32.1":
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz#9023720ca4ecf4f59c275a05b5fed69b1276face"
+  integrity sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==
  dependencies:
-    "@typescript-eslint/types" "8.31.1"
-    "@typescript-eslint/visitor-keys" "8.31.1"
+    "@typescript-eslint/types" "8.32.1"
+    "@typescript-eslint/visitor-keys" "8.32.1"
    debug "^4.3.4"
    fast-glob "^3.3.2"
    is-glob "^4.0.3"
    minimatch "^9.0.4"
    semver "^7.6.0"
-    ts-api-utils "^2.0.1"
+    ts-api-utils "^2.1.0"

-"@typescript-eslint/utils@8.31.1":
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.31.1.tgz#5628ea0393598a0b2f143d0fc6d019f0dee9dd14"
-  integrity sha512-2DSI4SNfF5T4oRveQ4nUrSjUqjMND0nLq9rEkz0gfGr3tg0S5KB6DhwR+WZPCjzkZl3cH+4x2ce3EsL50FubjQ==
+"@typescript-eslint/utils@8.32.1":
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.32.1.tgz#4d6d5d29b9e519e9a85e9a74e9f7bdb58abe9704"
+  integrity sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==
  dependencies:
-    "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "8.31.1"
-    "@typescript-eslint/types" "8.31.1"
-    "@typescript-eslint/typescript-estree" "8.31.1"
+    "@eslint-community/eslint-utils" "^4.7.0"
+    "@typescript-eslint/scope-manager" "8.32.1"
+    "@typescript-eslint/types" "8.32.1"
+    "@typescript-eslint/typescript-estree" "8.32.1"

-"@typescript-eslint/visitor-keys@8.31.1":
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.31.1.tgz#6742b0e3ba1e0c1e35bdaf78c03e759eb8dd8e75"
-  integrity sha512-I+/rgqOVBn6f0o7NDTmAPWWC6NuqhV174lfYvAm9fUaWeiefLdux9/YI3/nLugEn9L8fcSi0XmpKi/r5u0nmpw==
+"@typescript-eslint/visitor-keys@8.32.1":
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz#4321395cc55c2eb46036cbbb03e101994d11ddca"
+  integrity sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==
  dependencies:
-    "@typescript-eslint/types" "8.31.1"
+    "@typescript-eslint/types" "8.32.1"
    eslint-visitor-keys "^4.2.0"

 "@xmldom/xmldom@^0.8.8":
@@ -1007,6 +1014,17 @@ cross-env@^7.0.3:
  dependencies:
    cross-spawn "^7.0.1"

+cross-spawn@^6.0.0:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.6:
  version "7.0.6"
  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
@@ -1087,7 +1105,7 @@ detect-libc@^2.0.1:
  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
  integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==

-detect-newline@^4.0.0:
+detect-newline@^4.0.1:
  version "4.0.1"
  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-4.0.1.tgz#fcefdb5713e1fb8cb2839b8b6ee22e6716ab8f23"
  integrity sha512-qE3Veg1YXzGHQhlA6jzebZN2qVf6NX+A7m7qlhCGG30dJixrAQhYOsJjsnBjJkCSmuOPpCk30145fr8FV0bzog==
@@ -1216,10 +1234,10 @@ electron-updater@^6.6.3:
    semver "^7.6.3"
    tiny-typed-emitter "^2.1.0"

-electron@^36.1.0:
-  version "36.1.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-36.1.0.tgz#9919b77e61cd1400acc6dd24f9db8451fba5f8eb"
-  integrity sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg==
+electron@^36.3.2:
+  version "36.3.2"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-36.3.2.tgz#4a60f95e8d3858d01570c03b58dc2fb2f17ee8b6"
+  integrity sha512-v0/j7n22CL3OYv9BIhq6JJz2+e1HmY9H4bjTk8/WzVT9JwVX/T/21YNdR7xuQ6XDSEo9gP5JnqmjOamE+CUY8Q==
  dependencies:
    "@electron/get" "^2.0.0"
    "@types/node" "^22.7.7"
@@ -1289,7 +1307,7 @@ eslint-scope@^8.0.2:
    esrecurse "^4.3.0"
    estraverse "^5.2.0"

-eslint-visitor-keys@^3.3.0:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3:
  version "3.4.3"
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
  integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
@@ -1372,6 +1390,19 @@ esutils@^2.0.2:
  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==

+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
+  dependencies:
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
+
 exponential-backoff@^3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
@@ -1438,10 +1469,10 @@ fd-slicer@~1.1.0:
  dependencies:
    pend "~1.2.0"

-fdir@^6.4.2:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
-  integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
+fdir@^6.4.4:
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.4.tgz#1cfcf86f875a883e19a8fab53622cfe992e8d2f9"
+  integrity sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==

 ffmpeg-static@^5.2.0:
  version "5.2.0"
@@ -1589,10 +1620,12 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
    has-symbols "^1.0.3"
    hasown "^2.0.0"

-get-stdin@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
-  integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"

 get-stream@^5.1.0:
  version "5.2.0"
@@ -1601,10 +1634,10 @@ get-stream@^5.1.0:
  dependencies:
    pump "^3.0.0"

-git-hooks-list@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-3.1.0.tgz#386dc531dcc17474cf094743ff30987a3d3e70fc"
-  integrity sha512-LF8VeHeR7v+wAbXqfgRlTSX/1BJR9Q1vEMR8JAz1cEg6GX07+zyj3sAdDvYjj/xnlIfVuGgj4qBei1K3hKH+PA==
+git-hooks-list@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-4.1.1.tgz#ae340b82a9312354c73b48007f33840bbd83d3c0"
+  integrity sha512-cmP497iLq54AZnv4YRAEMnEyQ1eIn4tGKbmswqwmFV4GBnAqE8NLtWxxdXa++AalfgL5EBH4IxTPyquEuGY/jA==

 glob-parent@^5.1.2:
  version "5.1.2"
@@ -1632,7 +1665,7 @@ glob@^10.3.12, glob@^10.3.7:
    package-json-from-dist "^1.0.0"
    path-scurry "^1.11.1"

-glob@^7.0.0, glob@^7.1.3, glob@^7.1.6:
+glob@^7.1.3, glob@^7.1.6:
  version "7.2.3"
  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -1830,11 +1863,16 @@ ieee754@^1.1.13:
  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==

-ignore@^5.2.0, ignore@^5.3.1:
+ignore@^5.2.0:
  version "5.3.2"
  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==

+ignore@^7.0.0:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-7.0.4.tgz#a12c70d0f2607c5bf508fb65a40c75f037d7a078"
+  integrity sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==
+
 import-fresh@^3.2.1:
  version "3.3.0"
  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -1945,6 +1983,11 @@ is-plain-obj@^4.1.0:
  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==

+is-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+  integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==
+
 is-unicode-supported@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
@@ -2244,7 +2287,7 @@ minimatch@^9.0.3, minimatch@^9.0.4:
  dependencies:
    brace-expansion "^2.0.1"

-minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8:
  version "1.2.8"
  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -2363,6 +2406,11 @@ next-electron-server@^1.0.0:
  resolved "https://registry.yarnpkg.com/next-electron-server/-/next-electron-server-1.0.0.tgz#03e133ed64a5ef671b6c6409f908c4901b1828cb"
  integrity sha512-fTUaHwT0Jry2fbdUSIkAiIqgDAInI5BJFF4/j90/okvZCYlyx6yxpXB30KpzmOG6TN/ESwyvsFJVvS2WHT8PAA==

+nice-try@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
+  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
+
 node-abi@^3.45.0:
  version "3.67.0"
  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.67.0.tgz#1d159907f18d18e18809dbbb5df47ed2426a08df"
@@ -2399,6 +2447,13 @@ normalize-url@^6.0.1:
  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==

+npm-run-path@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
+  dependencies:
+    path-key "^2.0.0"
+
 object-keys@^1.1.1:
  version "1.1.1"
  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
@@ -2463,6 +2518,11 @@ p-cancelable@^2.0.0:
  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==

+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
+
 p-limit@^2.0.0:
  version "2.3.0"
  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -2535,6 +2595,11 @@ path-is-absolute@^1.0.0:
  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==

+path-key@^2.0.0, path-key@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
+
 path-key@^3.1.0:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -2599,13 +2664,13 @@ prettier-plugin-organize-imports@^4.1.0:
  resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-4.1.0.tgz#f3d3764046a8e7ba6491431158b9be6ffd83b90f"
  integrity sha512-5aWRdCgv645xaa58X8lOxzZoiHAldAPChljr/MT0crXVOWTZ+Svl4hIWlz+niYSlO6ikE5UXkN1JrRvIP2ut0A==

-prettier-plugin-packagejson@^2.5.10:
-  version "2.5.10"
-  resolved "https://registry.yarnpkg.com/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.5.10.tgz#f47068d0aa12efcdddb802189d8adae874ba00e7"
-  integrity sha512-LUxATI5YsImIVSaaLJlJ3aE6wTD+nvots18U3GuQMJpUyClChaZlQrqx3dBnbhF20OnKWZyx8EgyZypQtBDtgQ==
+prettier-plugin-packagejson@^2.5.14:
+  version "2.5.14"
+  resolved "https://registry.yarnpkg.com/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.5.14.tgz#8ada09114ff60c7f42c3f8755ffb2f8152f3624f"
+  integrity sha512-h+3tSpr2nVpp+YOK1MDIYtYhHVXr8/0V59UUbJpIJFaqi3w4fvUokJo6eV8W+vELrUXIZzJ+DKm5G7lYzrMcKQ==
  dependencies:
-    sort-package-json "2.15.1"
-    synckit "0.9.2"
+    sort-package-json "3.2.1"
+    synckit "0.11.6"

 prettier@3.5.3:
  version "3.5.3"
@@ -2829,6 +2894,11 @@ semver@^7.3.2, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.6.0, semve
  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==

+semver@^7.7.1:
+  version "7.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
+  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+
 serialize-error@^7.0.1:
  version "7.0.1"
  resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
@@ -2836,6 +2906,13 @@ serialize-error@^7.0.1:
  dependencies:
    type-fest "^0.13.1"

+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
+  dependencies:
+    shebang-regex "^1.0.0"
+
 shebang-command@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -2843,6 +2920,11 @@ shebang-command@^2.0.0:
  dependencies:
    shebang-regex "^3.0.0"

+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
+
 shebang-regex@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -2853,24 +2935,25 @@ shell-quote@^1.8.1:
  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==

-shelljs@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
-  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
+shelljs@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.9.2.tgz#a8ac724434520cd7ae24d52071e37a18ac2bb183"
+  integrity sha512-S3I64fEiKgTZzKCC46zT/Ib9meqofLrQVbpSswtjFfAVDW+AZ54WTnAM/3/yENoxz/V1Cy6u3kiiEbQ4DNphvw==
  dependencies:
-    glob "^7.0.0"
+    execa "^1.0.0"
+    fast-glob "^3.3.2"
    interpret "^1.0.0"
    rechoir "^0.6.2"

-shx@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.4.tgz#74289230b4b663979167f94e1935901406e40f02"
-  integrity sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g==
+shx@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/shx/-/shx-0.4.0.tgz#c6ea6ace7e778da0ab32d2eab9def59d788e9336"
+  integrity sha512-Z0KixSIlGPpijKgcH6oCMCbltPImvaKy0sGH8AkLRXw1KyzpKtaCTizP2xen+hNDqVF4xxgvA0KXSb9o4Q6hnA==
  dependencies:
-    minimist "^1.2.3"
-    shelljs "^0.8.5"
+    minimist "^1.2.8"
+    shelljs "^0.9.2"

-signal-exit@^3.0.2:
+signal-exit@^3.0.0, signal-exit@^3.0.2:
  version "3.0.7"
  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -2923,19 +3006,18 @@ sort-object-keys@^1.1.3:
  resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
  integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==

-sort-package-json@2.15.1:
-  version "2.15.1"
-  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-2.15.1.tgz#e5a035fad7da277b1947b9eecc93ea09c1c2526e"
-  integrity sha512-9x9+o8krTT2saA9liI4BljNjwAbvUnWf11Wq+i/iZt8nl2UGYnf3TH5uBydE7VALmP7AGwlfszuEeL8BDyb0YA==
+sort-package-json@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-3.2.1.tgz#889f3bdf43ceeff5fa4278a7c53ae5b1520d287e"
+  integrity sha512-rTfRdb20vuoAn7LDlEtCqOkYfl2X+Qze6cLbNOzcDpbmKEhJI30tTN44d5shbKJnXsvz24QQhlCm81Bag7EOKg==
  dependencies:
    detect-indent "^7.0.1"
-    detect-newline "^4.0.0"
-    get-stdin "^9.0.0"
-    git-hooks-list "^3.0.0"
+    detect-newline "^4.0.1"
+    git-hooks-list "^4.0.0"
    is-plain-obj "^4.1.0"
-    semver "^7.6.0"
+    semver "^7.7.1"
    sort-object-keys "^1.1.3"
-    tinyglobby "^0.2.9"
+    tinyglobby "^0.2.12"

 source-map-support@^0.5.19:
  version "0.5.21"
@@ -2990,6 +3072,11 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
  dependencies:
    ansi-regex "^5.0.1"

+strip-eof@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
+
 strip-json-comments@^3.1.1:
  version "3.1.1"
  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -3021,13 +3108,12 @@ supports-preserve-symlinks-flag@^1.0.0:
  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==

-synckit@0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.9.2.tgz#a3a935eca7922d48b9e7d6c61822ee6c3ae4ec62"
-  integrity sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==
+synckit@0.11.6:
+  version "0.11.6"
+  resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.11.6.tgz#e742a0c27bbc1fbc96f2010770521015cca7ed5c"
+  integrity sha512-2pR2ubZSV64f/vqm9eLPz/KOvR9Dm+Co/5ChLgeHl0yEDRc6h5hXHoxEQH8Y5Ljycozd3p1k5TTSVdzYGkPvLw==
  dependencies:
-    "@pkgr/core" "^0.1.0"
-    tslib "^2.6.2"
+    "@pkgr/core" "^0.2.4"

 tar@^6.0.5, tar@^6.1.11, tar@^6.1.12, tar@^6.2.1:
  version "6.2.1"
@@ -3078,12 +3164,12 @@ tiny-typed-emitter@^2.1.0:
  resolved "https://registry.yarnpkg.com/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz#b3b027fdd389ff81a152c8e847ee2f5be9fad7b5"
  integrity sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==

-tinyglobby@^0.2.9:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.10.tgz#e712cf2dc9b95a1f5c5bbd159720e15833977a0f"
-  integrity sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==
+tinyglobby@^0.2.12:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.13.tgz#a0e46515ce6cbcd65331537e57484af5a7b2ff7e"
+  integrity sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==
  dependencies:
-    fdir "^6.4.2"
+    fdir "^6.4.4"
    picomatch "^4.0.2"

 tmp-promise@^3.0.2:
@@ -3117,12 +3203,12 @@ truncate-utf8-bytes@^1.0.0:
  dependencies:
    utf8-byte-length "^1.0.1"

-ts-api-utils@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.0.1.tgz#660729385b625b939aaa58054f45c058f33f10cd"
-  integrity sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==
+ts-api-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-2.1.0.tgz#595f7094e46eed364c13fd23e75f9513d29baf91"
+  integrity sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==

-tslib@^2.1.0, tslib@^2.6.2:
+tslib@^2.1.0:
  version "2.7.0"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
  integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
@@ -3149,14 +3235,14 @@ typedarray@^0.0.6:
  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==

-typescript-eslint@^8.31.1:
-  version "8.31.1"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.31.1.tgz#b77ab1e48ced2daab9225ff94bab54391a4af69b"
-  integrity sha512-j6DsEotD/fH39qKzXTQRwYYWlt7D+0HmfpOK+DVhwJOFLcdmn92hq3mBb7HlKJHbjjI/gTOqEcc9d6JfpFf/VA==
+typescript-eslint@^8.32.1:
+  version "8.32.1"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.32.1.tgz#1784335c781491be528ff84ab666e2f0f7591fd1"
+  integrity sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==
  dependencies:
-    "@typescript-eslint/eslint-plugin" "8.31.1"
-    "@typescript-eslint/parser" "8.31.1"
-    "@typescript-eslint/utils" "8.31.1"
+    "@typescript-eslint/eslint-plugin" "8.32.1"
+    "@typescript-eslint/parser" "8.32.1"
+    "@typescript-eslint/utils" "8.32.1"

 typescript@^5.4.3, typescript@^5.8.3:
  version "5.8.3"
@@ -3230,6 +3316,13 @@ wcwidth@^1.0.1:
  dependencies:
    defaults "^1.0.3"

+which@^1.2.9:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
 which@^2.0.1, which@^2.0.2:
  version "2.0.2"
  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -3311,3 +3404,8 @@ yocto-queue@^0.1.0:
  version "0.1.0"
  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
+zod@^3.25.23:
+  version "3.25.23"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.23.tgz#128fb02f3619a8bca6bbbf6b07b457236cf33391"
+  integrity sha512-Od2bdMosahjSrSgJtakrwjMDb1zM1A3VIHCPGveZt/3/wlrTWBya2lmEh2OYe4OIu8mPTmmr0gnLHIWQXdtWBg==
--- a/docs/docs/auth/faq/index.md
+++ b/docs/docs/auth/faq/index.md
@@ -41,6 +41,16 @@ Usually, this discrepancy occurs because the time in your browser might be
 incorrect. In particular, multiple users have reported that Firefox provides
 incorrect time when certain privacy settings are enabled.

+> [!TIP]
+>
+> Newer Ente Auth clients (upcoming 4.4.0+) will automatically try to correct
+> for incorrect system time, so you should be seeing correct codes even if your
+> system time is out of sync. However, this automatic correction will not work
+> if you're using Ente Auth in offline mode.
+>
+> If you've recently changed your system time and the codes are still incorrect,
+> try to refresh / restart the app if needed.
+
 ### Can I access my codes on web?

 You can access your codes on the web at [auth.ente.io](https://auth.ente.io).
--- a/docs/docs/photos/faq/export.md
+++ b/docs/docs/photos/faq/export.md
@@ -21,7 +21,7 @@ always available on your machine.
  background without you needing to run any other cron jobs. See
  [migration/export](/photos/migration/export/) for more details.

-## Does the exported data preserve folder structure?
+## Does the exported data preserve album structure?

 Yes. When you export your data for local backup, it will maintain the exact
 album structure how you have set up within Ente.
--- a/docs/docs/photos/faq/video-streaming.md
+++ b/docs/docs/photos/faq/video-streaming.md
@@ -8,22 +8,43 @@ description:

 > [!NOTE]
 >
-> Video streaming is available in beta on mobile apps starting v0.9.98.
+> Video streaming is available in beta on mobile apps starting v0.9.98 and on
+> desktop starting v1.7.13.

 ### How to enable video streaming?

+#### On mobile
+
 - Open Settings -> General -> Advanced
- Switch on the toggle for `Video streaming`
+- Enable the toggle for `Streamable videos`
+
+#### On desktop
+
+- Open Settings -> Preferences
+- Enable the toggle for `Streamable videos`

 ### What happens when I enable video streaming?

+#### On mobile
+
 Enabling video streaming will start processing videos captured in the last 30
 days, generating streams for each. Both local and remote videos will be
 processed, so this may consume bandwidth for downloading of remote files and
 uploading of the generated streams.

+#### On desktop
+
+When enabled, the desktop app will generate streams both for new uploads, and
+also for all existing videos that were previously uploaded.
+
+Stream generation is CPU intensive and can take time so the app will continue
+processing them in the background. Clicking on search bar will show "Processing
+videos..." when stream generation is happening.
+
 ### How can I view video streams?

+### On mobile
+
 Settings -> Backup > Backup status will show details regarding the processing
 status for videos. Processed videos will have a green play button next to them.
 You can open these videos by tapping on them.
@@ -34,6 +55,12 @@ play the stream.
 Clicking on the `Info` icon within the original video will show details about
 the generated stream.

+### On desktop and web
+
+Desktop and web app will automatically play the streaming version of a video if
+it has been already generated. The quality selector will show "Auto" when
+playing the stream.
+
 ### What is a stream?

 Stream is an encrypted HLS file with an `.m3u8` playlist that helps play a video
--- a/docs/docs/self-hosting/guides/admin.md
+++ b/docs/docs/self-hosting/guides/admin.md
@@ -3,32 +3,6 @@ title: Server admin
 description: Administering your custom self-hosted Ente instance using the CLI
 ---

-# Administering your custom server
-
-You can use
-[Ente's CLI](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0) to
-administer your self hosted server.
-
-First we need to get your CLI to connect to your custom server. Define a
-config.yaml and put it either in the same directory as CLI or path defined in
-env variable `ENTE_CLI_CONFIG_PATH`
-
-```yaml
-endpoint:
-    api: "http://localhost:8080"
-```
-
-Now you should be able to
-[add an account](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_add.md),
-and subsequently increase the
-[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
-using the CLI.
-
-> [!NOTE]
->
-> The CLI command to add an account does not create Ente accounts. It only adds
-> existing accounts to the list of (existing) accounts that the CLI can use.
-
 ## Becoming an admin

 By default, the first user (and only the first user) created on the system is
@@ -40,7 +14,7 @@ explicit whitelist of admins.

 > [!NOTE]
 >
-> The first user is only treated as the admin if the list of admins in the
+> The first user is only treated as the admin if the list of admins in the 
 > configuration is empty.
 >
 > Also, if at some point you delete the first user, then you will need to define
@@ -78,6 +52,38 @@ You can use
 [account list](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_list.md)
 command to find the user id of any account.

+# Administering your custom server
+
+> [!NOTE]
+> For the first user (admin) to perform administrative actions using the CLI, their
+> userID must be whitelisted in the `museum.yaml` configuration file under
+> `internal.admins`. While the first user is automatically granted admin privileges
+> on the server, this additional step is required for CLI operations.
+
+You can use
+[Ente's CLI](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0) to
+administer your self hosted server.
+
+First we need to get your CLI to connect to your custom server. Define a
+config.yaml and put it either in the same directory as CLI or path defined in
+env variable `ENTE_CLI_CONFIG_PATH`
+
+```yaml
+endpoint:
+    api: "http://localhost:8080"
+```
+
+Now you should be able to
+[add an account](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_add.md),
+and subsequently increase the
+[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md)
+using the CLI.
+
+> [!NOTE]
+>
+> The CLI command to add an account does not create Ente accounts. It only adds
+> existing accounts to the list of (existing) accounts that the CLI can use.
+
 ## Backups

 See this [FAQ](/self-hosting/faq/backup).
--- a/docs/docs/self-hosting/museum.md
+++ b/docs/docs/self-hosting/museum.md
@@ -49,10 +49,10 @@ For example,

 ```yaml
 apps:
-    public-albums: albums.myente.xyz
-    cast: cast.myente.xyz
-    accounts: accounts.myente.xyz
-    family: family.myente.xyz
+    public-albums: https://albums.myente.xyz
+    cast: https://cast.myente.xyz
+    accounts: https://accounts.myente.xyz
+    family: https://family.myente.xyz
 ```

 >[!IMPORTANT]
@@ -74,4 +74,4 @@ functionalities like SMTP, Discord notifications, Hardcoded-OTTs, etc.

 ## References

- [Environment variables and ports](/self-hosting/faq/environment)
+- [Environment variables and ports](/self-hosting/faq/environment)
--- a/docs/docs/self-hosting/troubleshooting/uploads.md
+++ b/docs/docs/self-hosting/troubleshooting/uploads.md
@@ -3,14 +3,14 @@ title: Uploads
 description: Fixing upload errors when trying to self host Ente
 ---

-# Troubleshooting upload failures 
+# Troubleshooting upload failures

 Here are some errors our community members frequently encountered with the
 context and potential fixes.

 Fundamentally in most situations, the problem is because of minor mistakes or
-misconfiguration. Please make sure to reverse proxy museum and MinIO API 
-endpoint to a domain and check your S3 credentials and whole configuration 
+misconfiguration. Please make sure to reverse proxy museum and MinIO API
+endpoint to a domain and check your S3 credentials and whole configuration
 file for any minor misconfigurations.

 It is also suggested that the user setups bucket CORS on MinIO or any external
@@ -21,10 +21,10 @@ this](/self-hosting/troubleshooting/bucket-cors).

 S3 is an cloud storage protocol made by Amazon (specifically AWS). S3 is designed to store
 files and data as objects inside Buckets and it is mostly used for Online
-Backups and storing different types of files. 
+Backups and storing different types of files.

-Ente's Docker setup is shipped with [MinIO](https://min.io/) as its default S3 provider. 
-MinIO supports the Amazon S3 protocol and leverages your disk storage to 
+Ente's Docker setup is shipped with [MinIO](https://min.io/) as its default S3 provider.
+MinIO supports the Amazon S3 protocol and leverages your disk storage to
 dump all the uploaded files as encrypted object blobs.

 ## 403 Forbidden
@@ -40,15 +40,15 @@ This could be because

 1.  The bucket CORS rules do not allow museum to access these objects. For
    uploading files from the browser, you will need to set `allowedOrigins` to
-    `*`, and allow the `X-Auth-Token`, `X-Client-Package` headers configuration
-    too. [Here is an example of a working
+    `*`, and allow the `X-Auth-Token`, `X-Client-Package`, `X-Client-Version`
+    headers configuration too. [Here is an example of a working
    configuration](https://github.com/ente-io/ente/discussions/1764#discussioncomment-9478204).

 2.  The credentials are not being picked up (you might be setting the correct
    credentials, but not in the place where museum reads them from).

-## Mismatch in file size 
+## Mismatch in file size

 The "Mismatch in file size" error mostly occurs in a situation where the client is re-uploading a file which is already in the bucket with a different
 file size. The reason for re-upload could be anything including network issue,
-sudden killing of app before the upload is complete and etc. 
+sudden killing of app before the upload is complete and etc.
--- a/infra/copycat-db/src/backup.sh
+++ b/infra/copycat-db/src/backup.sh
@@ -36,7 +36,7 @@ else
    BACKUP_ID=$(scw rdb backup create instance-id=$SCW_RDB_INSTANCE_ID \
        name=$BACKUP_NAME expires-at=$EXPIRY \
        database-name=ente_db -o json | jq -r '.id')
-    scw rdb backup wait $BACKUP_ID timeout=5h
+    scw rdb backup wait $BACKUP_ID timeout=8h
    scw rdb backup download output=$BACKUP_FILE \
        $(scw rdb backup export $BACKUP_ID --wait -o json | jq -r '.id')
 fi
--- a/infra/workers/csp-reporter/package.json
+++ b/infra/workers/csp-reporter/package.json
@@ -0,0 +1,5 @@
+{
+    "name": "csp-reporter",
+    "version": "0.0.0",
+    "private": true
+}
--- a/infra/workers/csp-reporter/src/index.ts
+++ b/infra/workers/csp-reporter/src/index.ts
@@ -0,0 +1,23 @@
+/**
+ * Log CSP reports.
+ *
+ * See _headers in the web app source.
+ */
+
+export default {
+    async fetch(request: Request) {
+        switch (request.method) {
+            case "POST":
+                return handlePOST(request);
+            default:
+                console.log(`Unsupported HTTP method ${request.method}`);
+                return new Response(null, { status: 405 });
+        }
+    },
+} satisfies ExportedHandler;
+
+const handlePOST = async (request: Request) => {
+    // {job="worker"} |= `[csp-report]` | json log="logs[0]" | keep log
+    console.log("[csp-report]", await request.text());
+    return new Response(null, { status: 200 });
+};
--- a/infra/workers/csp-reporter/tsconfig.json
+++ b/infra/workers/csp-reporter/tsconfig.json
@@ -0,0 +1 @@
+{ "extends": "../tsconfig.base.json", "include": ["src"] }
--- a/infra/workers/csp-reporter/wrangler.toml
+++ b/infra/workers/csp-reporter/wrangler.toml
@@ -0,0 +1,9 @@
+name = "csp-reporter"
+main = "src/index.ts"
+compatibility_date = "2025-05-19"
+
+routes = [
+    { pattern = "csp-reporter.ente.io", custom_domain = true }
+]
+
+tail_consumers = [{ service = "tail" }]
--- a/infra/workers/files/src/index.ts
+++ b/infra/workers/files/src/index.ts
@@ -21,7 +21,7 @@ const handleOPTIONS = (request: Request) => {
        headers: {
            "Access-Control-Allow-Origin": "*",
            "Access-Control-Allow-Methods": "GET, OPTIONS",
-            "Access-Control-Allow-Headers": "X-Auth-Token, X-Client-Package",
+            "Access-Control-Allow-Headers": "X-Auth-Token, X-Client-Package, X-Client-Version",
            "Access-Control-Max-Age": "86400",
        },
    });
--- a/infra/workers/package.json
+++ b/infra/workers/package.json
@@ -2,10 +2,10 @@
    "name": "workers",
    "private": true,
    "devDependencies": {
-        "@cloudflare/workers-types": "^4.20240614.0",
-        "typescript": "^5",
-        "wrangler": "^3",
-        "prettier": "^3.3.4"
+        "@cloudflare/workers-types": "^4.20250519.0",
+        "typescript": "^5.8.3",
+        "wrangler": "^4.15.2",
+        "prettier": "^3.5.3"
    },
    "workspaces": [
        "*"
--- a/infra/workers/public-albums/src/index.ts
+++ b/infra/workers/public-albums/src/index.ts
@@ -22,7 +22,7 @@ const handleOPTIONS = (request: Request) => {
            "Access-Control-Allow-Origin": "*",
            "Access-Control-Allow-Methods": "GET, OPTIONS",
            "Access-Control-Allow-Headers":
-                "X-Auth-Access-Token, X-Auth-Access-Token-JWT, X-Client-Package",
+                "X-Auth-Access-Token, X-Auth-Access-Token-JWT, X-Client-Package, X-Client-Version",
            "Access-Control-Max-Age": "86400",
        },
    });
--- a/infra/workers/thumbnails/src/index.ts
+++ b/infra/workers/thumbnails/src/index.ts
@@ -21,7 +21,7 @@ const handleOPTIONS = (request: Request) => {
        headers: {
            "Access-Control-Allow-Origin": "*",
            "Access-Control-Allow-Methods": "GET, OPTIONS",
-            "Access-Control-Allow-Headers": "X-Auth-Token, X-Client-Package",
+            "Access-Control-Allow-Headers": "X-Auth-Token, X-Client-Package, X-Client-Version",
            "Access-Control-Max-Age": "86400",
        },
    });
--- a/infra/workers/uploader/src/index.ts
+++ b/infra/workers/uploader/src/index.ts
@@ -28,7 +28,7 @@ const handleOPTIONS = (request: Request) => {
            "Access-Control-Allow-Origin": "*",
            "Access-Control-Allow-Methods": "POST, PUT, OPTIONS",
            "Access-Control-Allow-Headers":
-                "Content-Type, UPLOAD-URL, X-Client-Package",
+                "Content-Type, UPLOAD-URL, X-Client-Package, X-Client-Version",
            "Access-Control-Expose-Headers": "X-Request-Id, CF-Ray",
            "Access-Control-Max-Age": "86400",
        },
--- a/mobile/analysis_options.yaml
+++ b/mobile/analysis_options.yaml
@@ -53,7 +53,7 @@ analyzer:
    sort_child_properties_last: warning
    sort_pub_dependencies: warning
    library_private_types_in_public_api: warning
-    constant_identifier_names: warning
+    constant_identifier_names: ignore
    prefer_const_constructors: warning
    prefer_const_declarations: warning
    prefer_const_constructors_in_immutables: warning
--- a/mobile/android/app/src/main/AndroidManifest.xml
+++ b/mobile/android/app/src/main/AndroidManifest.xml
@@ -8,7 +8,10 @@
        android:requestLegacyExternalStorage="true"
        android:allowBackup="false"
        android:fullBackupContent="false"
-        android:largeHeap="true">
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:largeHeap="true"
+        android:networkSecurityConfig="@xml/network_security_config"    
+    >

        <activity android:name=".MainActivity" android:launchMode="singleTask"
            android:theme="@style/LaunchTheme"
@@ -150,6 +153,29 @@
            <meta-data android:name="android.appwidget.provider"
                android:resource="@xml/memory_widget" />
        </receiver>
+        <receiver android:name="EnteAlbumsWidgetProvider" android:label="Albums" android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/albums_widget" />
+        </receiver>
+        <receiver android:name="EntePeopleWidgetProvider" android:label="People" android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/people_widget" />
+        </receiver>
+        <receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver" />  <!-- Needed for scheduling notifications -->
+        <receiver android:exported="false" android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationBootReceiver">    <!-- Needed for scheduling notifications -->
+            <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+            <action android:name="android.intent.action.QUICKBOOT_POWERON" />
+            <action android:name="com.htc.intent.action.QUICKBOOT_POWERON"/>
+            </intent-filter>
+        </receiver>
    </application>

    <!-- Android 11: https://developer.android.com/preview/privacy/package-visibility -->
@@ -177,4 +203,6 @@
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="com.android.vending.BILLING" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>   <!-- Needed for scheduling notifications -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <!-- Needed for scheduling notifications -->
 </manifest>
--- a/mobile/android/app/src/main/kotlin/io/ente/photos/EnteAlbumsWidgetProvider.kt
+++ b/mobile/android/app/src/main/kotlin/io/ente/photos/EnteAlbumsWidgetProvider.kt
@@ -0,0 +1,195 @@
+package io.ente.photos
+
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.content.SharedPreferences
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.util.Log
+import android.view.View
+import android.widget.RemoteViews
+import androidx.core.content.ContextCompat
+import es.antonborri.home_widget.HomeWidgetLaunchIntent
+import es.antonborri.home_widget.HomeWidgetProvider
+import java.io.File
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+
+@Serializable
+data class AlbumsFileData(
+        val title: String?,
+        val subText: String?,
+        val generatedId: Int?,
+        val mainKey: String?
+)
+
+class EnteAlbumsWidgetProvider : HomeWidgetProvider() {
+        override fun onUpdate(
+                context: Context,
+                appWidgetManager: AppWidgetManager,
+                appWidgetIds: IntArray,
+                widgetData: SharedPreferences
+        ) {
+                appWidgetIds.forEach { widgetId ->
+                        val views =
+                                RemoteViews(context.packageName, R.layout.albums_widget_layout)
+                                        .apply {
+                                                val totalAlbums =
+                                                        widgetData.getInt("totalAlbums", 0)
+                                                var randomNumber = -1
+                                                var imagePath: String? = null
+                                                if (totalAlbums > 0) {
+                                                        randomNumber =
+                                                                (0 until totalAlbums!!).random()
+                                                        imagePath =
+                                                                widgetData.getString(
+                                                                        "albums_widget_" +
+                                                                                randomNumber,
+                                                                        null
+                                                                )
+                                                }
+                                                var imageExists: Boolean = false
+                                                if (imagePath != null) {
+                                                        val imageFile = File(imagePath)
+                                                        imageExists = imageFile.exists()
+                                                }
+                                                if (imageExists) {
+                                                        val data =
+                                                                widgetData.getString(
+                                                                        "albums_widget_${randomNumber}_data",
+                                                                        null
+                                                                )
+                                                        val decoded: AlbumsFileData? =
+                                                                data?.let {
+                                                                        Json.decodeFromString<
+                                                                                AlbumsFileData>(it)
+                                                                }
+                                                        val title = decoded?.title
+                                                        val subText = decoded?.subText
+                                                        val generatedId = decoded?.generatedId
+                                                        val mainKey = decoded?.mainKey
+
+                                                        val deepLinkUri =
+                                                                Uri.parse(
+                                                                        "albumwidget://message?generatedId=${generatedId}&mainKey=${mainKey}&homeWidget"
+                                                                )
+
+                                                        val pendingIntent =
+                                                                HomeWidgetLaunchIntent.getActivity(
+                                                                        context,
+                                                                        MainActivity::class.java,
+                                                                        deepLinkUri
+                                                                )
+
+                                                        setOnClickPendingIntent(
+                                                                R.id.widget_container,
+                                                                pendingIntent
+                                                        )
+
+                                                        Log.d(
+                                                                "EnteAlbumsWidgetProvider",
+                                                                "Image exists: $imagePath"
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_img,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_subtitle,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_title,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_overlay,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder_text,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder_container,
+                                                                View.GONE
+                                                        )
+
+                                                        val bitmap: Bitmap =
+                                                                BitmapFactory.decodeFile(imagePath)
+                                                        setImageViewBitmap(R.id.widget_img, bitmap)
+                                                        setTextViewText(R.id.widget_title, title)
+                                                        setTextViewText(
+                                                                R.id.widget_subtitle,
+                                                                subText
+                                                        )
+                                                } else {
+                                                        // Open App on Widget Click
+                                                        val pendingIntent =
+                                                                HomeWidgetLaunchIntent.getActivity(
+                                                                        context,
+                                                                        MainActivity::class.java
+                                                                )
+                                                        setOnClickPendingIntent(
+                                                                R.id.widget_container,
+                                                                pendingIntent
+                                                        )
+
+                                                        Log.d(
+                                                                "EnteAlbumsWidgetProvider",
+                                                                "Image doesn't exists"
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_img,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_subtitle,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_title,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_overlay,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder_text,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder_container,
+                                                                View.VISIBLE
+                                                        )
+
+                                                        val drawable =
+                                                                ContextCompat.getDrawable(
+                                                                        context,
+                                                                        R.drawable.ic_albums_widget
+                                                                )
+                                                        val bitmap =
+                                                                (drawable as BitmapDrawable).bitmap
+                                                        setImageViewBitmap(
+                                                                R.id.widget_placeholder,
+                                                                bitmap
+                                                        )
+                                                }
+                                        }
+
+                        appWidgetManager.updateAppWidget(widgetId, views)
+                }
+        }
+}
--- a/mobile/android/app/src/main/kotlin/io/ente/photos/EnteMemoryWidgetProvider.kt
+++ b/mobile/android/app/src/main/kotlin/io/ente/photos/EnteMemoryWidgetProvider.kt
@@ -91,10 +91,6 @@ class EnteMemoryWidgetProvider : HomeWidgetProvider() {
                                                                R.id.widget_img,
                                                                View.VISIBLE
                                                        )
-                                                        setViewVisibility(
-                                                                R.id.widget_placeholder_container,
-                                                                View.VISIBLE
-                                                        )
                                                        setViewVisibility(
                                                                R.id.widget_subtitle,
                                                                View.VISIBLE
@@ -148,10 +144,6 @@ class EnteMemoryWidgetProvider : HomeWidgetProvider() {
                                                                R.id.widget_img,
                                                                View.GONE
                                                        )
-                                                        setViewVisibility(
-                                                                R.id.widget_placeholder_container,
-                                                                View.GONE
-                                                        )
                                                        setViewVisibility(
                                                                R.id.widget_subtitle,
                                                                View.GONE
@@ -181,7 +173,7 @@ class EnteMemoryWidgetProvider : HomeWidgetProvider() {
                                                                ContextCompat.getDrawable(
                                                                        context,
                                                                        R.drawable
-                                                                                .ic_home_widget_default
+                                                                                .ic_memories_widget
                                                                )
                                                        val bitmap =
                                                                (drawable as BitmapDrawable).bitmap
--- a/mobile/android/app/src/main/kotlin/io/ente/photos/EntePeopleWidgetProvider.kt
+++ b/mobile/android/app/src/main/kotlin/io/ente/photos/EntePeopleWidgetProvider.kt
@@ -0,0 +1,195 @@
+package io.ente.photos
+
+import android.appwidget.AppWidgetManager
+import android.content.Context
+import android.content.SharedPreferences
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import android.net.Uri
+import android.util.Log
+import android.view.View
+import android.widget.RemoteViews
+import androidx.core.content.ContextCompat
+import es.antonborri.home_widget.HomeWidgetLaunchIntent
+import es.antonborri.home_widget.HomeWidgetProvider
+import java.io.File
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.decodeFromString
+import kotlinx.serialization.json.Json
+
+@Serializable
+data class PeopleFileData(
+        val title: String?,
+        val subText: String?,
+        val generatedId: Int?,
+        val mainKey: String?
+)
+
+class EntePeopleWidgetProvider : HomeWidgetProvider() {
+        override fun onUpdate(
+                context: Context,
+                appWidgetManager: AppWidgetManager,
+                appWidgetIds: IntArray,
+                widgetData: SharedPreferences
+        ) {
+                appWidgetIds.forEach { widgetId ->
+                        val views =
+                                RemoteViews(context.packageName, R.layout.people_widget_layout)
+                                        .apply {
+                                                val totalPeople =
+                                                        widgetData.getInt("totalPeople", 0)
+                                                var randomNumber = -1
+                                                var imagePath: String? = null
+                                                if (totalPeople > 0) {
+                                                        randomNumber =
+                                                                (0 until totalPeople!!).random()
+                                                        imagePath =
+                                                                widgetData.getString(
+                                                                        "people_widget_" +
+                                                                                randomNumber,
+                                                                        null
+                                                                )
+                                                }
+                                                var imageExists: Boolean = false
+                                                if (imagePath != null) {
+                                                        val imageFile = File(imagePath)
+                                                        imageExists = imageFile.exists()
+                                                }
+                                                if (imageExists) {
+                                                        val data =
+                                                                widgetData.getString(
+                                                                        "people_widget_${randomNumber}_data",
+                                                                        null
+                                                                )
+                                                        val decoded: PeopleFileData? =
+                                                                data?.let {
+                                                                        Json.decodeFromString<
+                                                                                PeopleFileData>(it)
+                                                                }
+                                                        val title = decoded?.title
+                                                        val subText = decoded?.subText
+                                                        val generatedId = decoded?.generatedId
+                                                        val mainKey = decoded?.mainKey
+
+                                                        val deepLinkUri =
+                                                                Uri.parse(
+                                                                        "peoplewidget://message?generatedId=${generatedId}&mainKey=${mainKey}&homeWidget"
+                                                                )
+
+                                                        val pendingIntent =
+                                                                HomeWidgetLaunchIntent.getActivity(
+                                                                        context,
+                                                                        MainActivity::class.java,
+                                                                        deepLinkUri
+                                                                )
+
+                                                        setOnClickPendingIntent(
+                                                                R.id.widget_container,
+                                                                pendingIntent
+                                                        )
+
+                                                        Log.d(
+                                                                "EntePeopleWidgetProvider",
+                                                                "Image exists: $imagePath"
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_img,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_subtitle,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_title,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_overlay,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder_text,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder_container,
+                                                                View.GONE
+                                                        )
+
+                                                        val bitmap: Bitmap =
+                                                                BitmapFactory.decodeFile(imagePath)
+                                                        setImageViewBitmap(R.id.widget_img, bitmap)
+                                                        setTextViewText(R.id.widget_title, title)
+                                                        setTextViewText(
+                                                                R.id.widget_subtitle,
+                                                                subText
+                                                        )
+                                                } else {
+                                                        // Open App on Widget Click
+                                                        val pendingIntent =
+                                                                HomeWidgetLaunchIntent.getActivity(
+                                                                        context,
+                                                                        MainActivity::class.java
+                                                                )
+                                                        setOnClickPendingIntent(
+                                                                R.id.widget_container,
+                                                                pendingIntent
+                                                        )
+
+                                                        Log.d(
+                                                                "EntePeopleWidgetProvider",
+                                                                "Image doesn't exists"
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_img,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_subtitle,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_title,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_overlay,
+                                                                View.GONE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder_text,
+                                                                View.VISIBLE
+                                                        )
+                                                        setViewVisibility(
+                                                                R.id.widget_placeholder_container,
+                                                                View.VISIBLE
+                                                        )
+
+                                                        val drawable =
+                                                                ContextCompat.getDrawable(
+                                                                        context,
+                                                                        R.drawable.ic_people_widget
+                                                                )
+                                                        val bitmap =
+                                                                (drawable as BitmapDrawable).bitmap
+                                                        setImageViewBitmap(
+                                                                R.id.widget_placeholder,
+                                                                bitmap
+                                                        )
+                                                }
+                                        }
+
+                        appWidgetManager.updateAppWidget(widgetId, views)
+                }
+        }
+}
--- a/mobile/android/app/src/main/res/drawable-hdpi/ic_albums_widget.png
+++ b/mobile/android/app/src/main/res/drawable-hdpi/ic_albums_widget.png
--- a/mobile/android/app/src/main/res/drawable-hdpi/ic_home_widget_default.png
+++ b/mobile/android/app/src/main/res/drawable-hdpi/ic_home_widget_default.png
--- a/mobile/android/app/src/main/res/drawable-hdpi/ic_memories_widget.png
+++ b/mobile/android/app/src/main/res/drawable-hdpi/ic_memories_widget.png
--- a/mobile/android/app/src/main/res/drawable-hdpi/ic_people_widget.png
+++ b/mobile/android/app/src/main/res/drawable-hdpi/ic_people_widget.png
--- a/mobile/android/app/src/main/res/drawable-mdpi/ic_albums_widget.png
+++ b/mobile/android/app/src/main/res/drawable-mdpi/ic_albums_widget.png
--- a/mobile/android/app/src/main/res/drawable-mdpi/ic_home_widget_default.png
+++ b/mobile/android/app/src/main/res/drawable-mdpi/ic_home_widget_default.png
--- a/mobile/android/app/src/main/res/drawable-mdpi/ic_memories_widget.png
+++ b/mobile/android/app/src/main/res/drawable-mdpi/ic_memories_widget.png
--- a/mobile/android/app/src/main/res/drawable-mdpi/ic_people_widget.png
+++ b/mobile/android/app/src/main/res/drawable-mdpi/ic_people_widget.png
--- a/mobile/android/app/src/main/res/drawable-xhdpi/ic_albums_widget.png
+++ b/mobile/android/app/src/main/res/drawable-xhdpi/ic_albums_widget.png
--- a/mobile/android/app/src/main/res/drawable-xhdpi/ic_home_widget_default.png
+++ b/mobile/android/app/src/main/res/drawable-xhdpi/ic_home_widget_default.png
--- a/mobile/android/app/src/main/res/drawable-xhdpi/ic_memories_widget.png
+++ b/mobile/android/app/src/main/res/drawable-xhdpi/ic_memories_widget.png
--- a/mobile/android/app/src/main/res/drawable-xhdpi/ic_people_widget.png
+++ b/mobile/android/app/src/main/res/drawable-xhdpi/ic_people_widget.png
--- a/mobile/android/app/src/main/res/drawable-xxhdpi/ic_albums_widget.png
+++ b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_albums_widget.png
--- a/mobile/android/app/src/main/res/drawable-xxhdpi/ic_home_widget_default.png
+++ b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_home_widget_default.png
--- a/mobile/android/app/src/main/res/drawable-xxhdpi/ic_memories_widget.png
+++ b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_memories_widget.png
--- a/mobile/android/app/src/main/res/drawable-xxhdpi/ic_people_widget.png
+++ b/mobile/android/app/src/main/res/drawable-xxhdpi/ic_people_widget.png
--- a/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_albums_widget.png
+++ b/mobile/android/app/src/main/res/drawable-xxxhdpi/ic_albums_widget.png
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<svg width="1400" height="1400" xmlns="http://www.w3.org/2000/svg"><path d="M699.914 0C1004.659 0 1263.915 194.786 1360 466.662l-399.246-.003C896.674 395.059 803.556 350 699.914 350c-193.276 0-349.957 156.7-349.957 350s156.681 350 349.957 350c103.641 0 196.76-45.059 260.84-116.658L1360 933.34C1263.915 1205.214 1004.659 1400 699.914 1400 313.362 1400 0 1086.6 0 700S313.362 0 699.914 0zm347.087 747.002L1398 747a696.274 696.274 0 0 1-12.453 93H1021a345.75 345.75 0 0 0 26.001-92.998zM1385.547 560A696.301 696.301 0 0 1 1398 653l-351-.002A345.762 345.762 0 0 0 1021 560h364.547z" fill-rule="evenodd"/></svg>
				`@@ -0,0 +1 @@`
				`<svg height="2100" viewBox="0 0 32 21" width="3200" xmlns="http://www.w3.org/2000/svg"><path d="m9.9 20.1c-5.5 0-9.9-4.4-9.9-9.9s4.4-9.9 9.9-9.9h11.6c5.5 0 9.9 4.4 9.9 9.9s-4.4 9.9-9.9 9.9zm11.3-3.5c3.6 0 6.4-2.9 6.4-6.4 0-3.6-2.9-6.4-6.4-6.4h-11c-3.6 0-6.4 2.9-6.4 6.4s2.9 6.4 6.4 6.4z" fill="#c74634"/></svg>`
				`@@ -0,0 +1 @@`
				`{ "extends": "../tsconfig.base.json", "include": ["src"] }`