Merge branch 'mob_release_15' into f-droid

Note: Not certain that this is the right way to update listing metadata. Read through this PR for a better idea why: https://github.com/ente-io/ente/pull/1313

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,21 +1,24 @@
 name: Report a bug
-description: For regressions only (things that were working earlier)
+description: Let us know if something's not working the way you expected.
 labels: []
 body:
     - type: markdown
       attributes:
           value: |
-              Before opening a new issue, **please** ensure
-              1. You are on the latest version,
-              2. You've searched for existing issues,
-              3. It was working earlier (otherwise use [this](https://github.com/ente-io/ente/discussions/categories/enhancements))
-              4. It is not about self hosting (otherwise use [this](https://github.com/ente-io/ente/discussions/categories/q-a))
+              Before opening a new bug report, please ensure
+              1. you are on the latest version (it might've already been fixed),
+              2. you've searched for existing issues (please add your observations as a comment there instead of creating a duplicate).
+
+              If you are self hosting, please create a community [Q&A](https://github.com/ente-io/ente/discussions/categories/q-a) instead.
     - type: textarea
       attributes:
           label: Description
           description: >
-              Describe the bug and steps to reproduce the behaviour, and how it
-              differs from the previously working behaviour.
+              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)).
       validations:
           required: true
     - type: input
@@ -23,17 +26,6 @@ body:
           label: Version
           description: The version can be seen at the bottom of settings.
           placeholder: e.g. v1.2.3
-    - type: input
-      attributes:
-          label: Last working version
-          description: >
-              The version where things were 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 working version, then please file
-              it as an
-              [enhancement](https://github.com/ente-io/ente/discussions/categories/enhancements))**
-              (where the community upvotes can be used to help prioritize).
-          placeholder: e.g. v1.2.3
     - type: dropdown
       attributes:
           label: What product are you using?

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-    - name: Enhacements, feature requests, feedback and questions
+    - name: Feature requests and questions
       url: https://github.com/ente-io/ente/discussions
       about: Please use Discussions for everything apart from the above.

.github/workflows/auth-release.yml

@@ -36,7 +36,7 @@ permissions:
 
 jobs:
     build-linux-latest:
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
 
         defaults:
             run:
@@ -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 --dart-define=cronetHttpNoPlay=true
+                  flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
@@ -93,7 +93,7 @@ jobs:
             - name: Install dependencies for desktop build
               run: |
                   sudo apt-get update -y
-                  sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff5 xz-utils libarchive-tools libcurl4-openssl-dev
+                  sudo apt-get install -y libsecret-1-dev libsodium-dev libfuse2 ninja-build libgtk-3-dev dpkg-dev pkg-config rpm patchelf libsqlite3-dev locate libayatana-appindicator3-dev libffi-dev libtiff6 xz-utils libarchive-tools libcurl4-openssl-dev
                   sudo updatedb --localpaths='/usr/lib/x86_64-linux-gnu'
 
             - name: Install appimagetool
@@ -117,9 +117,7 @@ jobs:
                   mv dist/**/*-*-linux.deb artifacts/ente-${{ github.ref_name }}-x86_64.deb
 
             - name: Generate checksums
-              run: |
-                sha256sum artifacts/ente-auth-*.apk >> artifacts/sha256sum-apk
-                sha256sum artifacts/ente-auth-*.deb artifacts/ente-auth-*.rpm artifacts/ente-auth-*.AppImage >> artifacts/sha256sum-linux
+              run: sha256sum artifacts/ente-* >> artifacts/sha256sum-rpm-appimage
 
             - name: Create a draft GitHub release
               uses: ncipollo/release-action@v1
@@ -141,7 +139,6 @@ jobs:
 
     build-windows:
         runs-on: windows-latest
-        environment: "auth-win-build"
 
         defaults:
             run:
@@ -175,22 +172,14 @@ jobs:
             - 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
+            - name: Code sign Windows installer and EXE
+              uses: dlemstra/code-sign-action@v1
               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  
-
+                  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
 
             - name: Zip Windows EXE and DLLs
               run: tar.exe -a -c -f artifacts/ente-${{ github.ref_name }}-windows.zip ente-${{ github.ref_name }}-windows

.github/workflows/auth-win-sign.yml

@@ -1,70 +0,0 @@
-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

.github/workflows/docs-lint.yml

@@ -1,32 +0,0 @@
-name: "Lint (docs)"
-
-on:
-    # Run on every pull request (open or push to it) that changes docs/
-    pull_request:
-        paths:
-            - "docs/**"
-            - ".github/workflows/docs-lint.yml"
-
-permissions:
-    contents: read
-
-jobs:
-    lint:
-        runs-on: ubuntu-latest
-        defaults:
-            run:
-                working-directory: docs
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Setup node and enable yarn caching
-              uses: actions/setup-node@v4
-              with:
-                  node-version: 22
-                  cache: "yarn"
-                  cache-dependency-path: "web/yarn.lock"
-
-            - run: yarn install
-
-            - run: yarn pretty:check

.github/workflows/mobile-internal-release-rust.yml

@@ -1,77 +0,0 @@
-name: "Internal release (photos)"
-
-on:
-    workflow_dispatch: # Allow manually running the action
-
-env:
-    FLUTTER_VERSION: "3.24.3"
-    RUST_VERSION: "1.85.1"
-
-permissions:
-    contents: write
-
-jobs:
-    build:
-        runs-on: ubuntu-latest
-
-        defaults:
-            run:
-                working-directory: mobile
-
-        steps:
-            - name: Checkout code and submodules
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup JDK 17
-              uses: actions/setup-java@v1
-              with:
-                  java-version: 17
-
-            - name: Install Flutter ${{ env.FLUTTER_VERSION  }}
-              uses: subosito/flutter-action@v2
-              with:
-                  channel: "stable"
-                  flutter-version: ${{ env.FLUTTER_VERSION  }}
-                  cache: true
-            
-            - name: Install Rust ${{ env.RUST_VERSION }}
-              uses: dtolnay/rust-toolchain@master
-              with:
-                toolchain: ${{ env.RUST_VERSION }}
-
-            - name: Install Flutter Rust Bridge
-              run: cargo install flutter_rust_bridge_codegen
-
-            - name: Setup keys
-              uses: timheuer/base64-to-file@v1
-              with:
-                  fileName: "keystore/ente_photos_key.jks"
-                  encodedString: ${{ secrets.SIGNING_KEY_PHOTOS }}
-
-            - name: Build PlayStore AAB
-              run: |
-                  flutter build appbundle --dart-define=cronetHttpNoPlay=true --release --flavor playstore
-              env:
-                  SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_photos_key.jks"
-                  SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS_PHOTOS }}
-                  SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD_PHOTOS }}
-                  SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD_PHOTOS }}
-
-            - name: Upload AAB to PlayStore
-              uses: r0adkll/upload-google-play@v1
-              with:
-                  serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-                  packageName: io.ente.photos
-                  releaseFiles: mobile/build/app/outputs/bundle/playstoreRelease/app-playstore-release.aab
-                  track: internal
-
-            - name: Notify Discord
-              uses: sarisia/actions-status-discord@v1
-              with:
-                  webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
-                  nodetail: true
-                  title: "🏆 Internal release available for Photos"
-                  description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
-                  color: 0x00ff00

.github/workflows/mobile-internal-release.yml

@@ -63,6 +63,6 @@ jobs:
               with:
                   webhook: ${{ secrets.DISCORD_INTERNAL_RELEASE_WEBHOOK }}
                   nodetail: true
-                  title: "🏆 Internal release Photos (Branch: ${{ github.ref_name }})"
+                  title: "🏆 Internal release available for Photos"
                   description: "[Download](https://play.google.com/store/apps/details?id=io.ente.photos)"
                   color: 0x00ff00

.gitmodules

@@ -9,3 +9,6 @@
 [submodule "auth/assets/simple-icons"]
 	path = auth/assets/simple-icons
 	url = https://github.com/simple-icons/simple-icons.git
+[submodule "mobile/thirdparty/flutter"]
+	path = mobile/thirdparty/flutter
+	url = https://github.com/flutter/flutter.git

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=enhancements),
+Discussions](https://github.com/ente-io/ente/discussions/new?category=feature-requests),
 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
-[discussions](https://github.com/ente-io/ente/discussions) instead of performing
+For anything beyond trivial bug fixes, please use [features requests and
+discussions](https://github.com/ente-io/ente/discussions) instead of performing
 code changes directly.
 
 > [!TIP]

auth/.fvmrc

@@ -1,3 +0,0 @@
-{
-  "flutter": "3.24.3"
-}

auth/.gitignore

@@ -41,7 +41,4 @@ lib/generated_plugin_registrant.dart
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 
 android/key.properties
-dist/
-
-# FVM Version Cache
-.fvm/
+dist/

auth/android/.gitignore

@@ -5,8 +5,6 @@ gradle-wrapper.jar
 /gradlew.bat
 /local.properties
 GeneratedPluginRegistrant.java
-/app/.cxx/
-/.kotlin/
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app

auth/android/app/src/main/res/mipmap-anydpi-v26/launcher_icon.xml

@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@drawable/ic_launcher_background"/>
-  <foreground>
-      <inset
-          android:drawable="@drawable/ic_launcher_foreground"
-          android:inset="0%" />
-  </foreground>
-  <monochrome>
-      <inset
-          android:drawable="@drawable/ic_launcher_monochrome"
-          android:inset="0%" />
-  </monochrome>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

auth/assets/custom-icons/_data/custom-icons.json

@@ -43,13 +43,7 @@
       "title": "Anycoin Direct",
       "slug": "anycoindirect"
     },
-    {
-      "title": "AR24",
-      "altNames": [
-        "Docaposte AR24"
-      ]
-    },
-    {
+     {
       "title": "Aruba",
       "slug": "aruba",
       "hex": "ef8a33"
@@ -138,14 +132,6 @@
         "Binance US"
       ]
     },
-    {
-      "title": "Bitazza",
-      "slug": "bitazza"
-    },
-    {
-      "title": "Bitkub",
-      "slug": "bitkub"
-    },
     {
       "title": "Bitfinex"
     },
@@ -197,13 +183,6 @@
       "title": "Bluesky",
       "slug": "blue_sky"
     },
-    {
-      "title": "bonify",
-      "slug": "bonify",
-      "altNames": [
-        "bonify.de"
-      ]
-    },
     {
       "title": "Booking",
       "altNames": [
@@ -229,13 +208,6 @@
     {
       "title": "Bugzilla"
     },
-    {
-      "title": "Bundesagentur für Arbeit",
-      "slug": "bundesagentur_fur_arbeit",
-      "altNames": [
-        "Agentur für Arbeit"
-      ]
-    },
     {
       "title": "ButterflyMX",
       "slug": "butterflymx"
@@ -306,15 +278,6 @@
     {
       "title": "CSAM"
     },
-    {
-      "title": "CSSBuy",
-      "slug": "cssbuy",
-      "altNames": [
-        "CSS Buy",
-        "CSS-Buy",
-        "cssbuy.com"
-      ]
-    },
     {
       "title": "CSFloat"
     },
@@ -322,10 +285,6 @@
       "title": "CSGORoll",
       "slug": "csgoroll"
     },
-    {
-      "title": "Cryptee",
-      "slug": "cryptee"
-    },
     {
       "title": "Cwallet",
       "altNames": [
@@ -426,13 +385,6 @@
       ],
       "hex": "858585"
     },
-    {
-      "title": "Fanatical",
-      "slug": "fanatical",
-      "altNames": [
-        "FANATICAL"
-      ]
-    },
     {
       "title": "Fastmail"
     },
@@ -458,16 +410,10 @@
       "title": "Finanzfluss",
       "slug": "finanzfluss"
     },
-    {
-      "title": "Finary"
-    },
     {
       "title": "Firefox",
       "slug": "mozilla"
     },
-    {
-      "title": "fortrabbit"
-    },
     {
       "title": "ForUsAll"
     },
@@ -482,9 +428,6 @@
       "title": "Gate.io",
       "slug": "gateio.svg"
     },
-    {
-      "title": "GERID"
-    },
     {
       "title": "GitHub"
     },
@@ -565,19 +508,12 @@
       "slug": "id_me"
     },
     {
-      "title": "ImmoScout24",
-      "slug": "immo_scout_24",
-      "altNames": [
-        "ImmobilienScout24"
-      ]
+      "title": "Infomaniak"
     },
     {
       "title": "Impact.com",
       "slug": "impact"
     },
-    {
-      "title": "Infomaniak"
-    },
     {
       "title": "ING"
     },
@@ -679,7 +615,8 @@
     },
     {
       "title": "LinkedIn",
-      "slug": "linkedin"
+      "slug": "linkedin",
+      "hex": "2596be"
     },
     {
       "title": "Linux.Do",
@@ -766,7 +703,6 @@
     {
       "title": "Mistral",
       "altNames": [
-        "Le Chat",
         "Mistral AI",
         "MistralAI"
       ]
@@ -911,15 +847,11 @@
         "欧易"
       ]
     },
-    {
+     {
       "title": "OnShape",
       "slug": "onshape",
       "hex": "7abb5e"
     },
-    {
-      "title": "Oracle Cloud",
-      "slug": "oracle_cloud"
-    },
     {
       "title": "Parqet",
       "slug": "parqet"
@@ -1039,7 +971,7 @@
       "title": "RealMe",
       "slug": "realme"
     },
-    {
+     {
       "title": "RealVNC",
       "slug": "realvnc",
       "hex": "488aec"
@@ -1306,14 +1238,6 @@
       "title": "US Mobile",
       "slug": "us_mobile"
     },
-    {
-      "title": "uollet",
-      "slug": "uollet",
-      "altNames": [
-        "UOLLET",
-        "uollet.com.br"
-      ]
-    },
     {
       "title": "Vikunja"
     },
@@ -1401,4 +1325,4 @@
       "title": "CoinSpot"
     }
   ]
-}
+}

auth/assets/custom-icons/icons/ar24.svg

@@ -1,6 +0,0 @@
-<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>

auth/assets/custom-icons/icons/bingx.svg

@@ -1,20 +1 @@
-<?xml version='1.0' encoding='utf-8'?>
-<svg xmlns="http://www.w3.org/2000/svg" id="a" viewBox="0 0 150 150">
-    <defs>
-        <linearGradient id="d" x1="17.68" y1="116.45" x2="132.14" y2="32.11"
-            gradientTransform="matrix(1, 0, 0, 1, 0, 0)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#2a54ff" />
-            <stop offset=".52" stop-color="#2143cb" />
-            <stop offset="1" stop-color="#2a54ff" />
-        </linearGradient>
-    </defs>
-    <g id="b">
-        <path id="c" d="M0,0H150V150H0V0Z" fill="none" />
-    </g>
-    <path
-        d="M140.2,22.33c-25.18-.09-49.79,10.83-66.63,29.47-6.06,6.27-10.1,13.95-14.96,21.06-11.64,15.93-29.81,25.14-49.5,25.13h0v28.65h0c25.17,.1,49.78-10.86,66.63-29.5,6.03-6.27,10.13-13.94,14.96-21.06,11.64-15.91,29.81-25.12,49.5-25.11V22.33h0Z"
-        fill="url(#d)" />
-    <path
-        d="M140.2,97.99c-19.68,0-37.86-9.2-49.5-25.11-4.81-7.12-8.92-14.78-14.94-21.06C58.95,33.18,34.3,22.24,9.13,22.35h0v28.65h0c21.8-.11,42.05,11.62,53.01,30.46,3.22,5.62,7.06,10.9,11.45,15.74,16.83,18.63,41.46,29.59,66.63,29.5l-.02-28.7h0Z"
-        fill="#2a54ff" />
-</svg>
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 150 150"><defs><style>.e{fill:#2a54ff;}.f{fill:url(#d);}.g{fill:none;}</style><linearGradient id="d" x1="17.68" y1="116.45" x2="132.14" y2="32.11" gradientTransform="matrix(1, 0, 0, 1, 0, 0)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2a54ff"/><stop offset=".52" stop-color="#2143cb"/><stop offset="1" stop-color="#2a54ff"/></linearGradient></defs><g id="b"><path id="c" class="g" d="M0,0H150V150H0V0Z"/></g><path class="f" d="M140.2,22.33c-25.18-.09-49.79,10.83-66.63,29.47-6.06,6.27-10.1,13.95-14.96,21.06-11.64,15.93-29.81,25.14-49.5,25.13h0v28.65h0c25.17,.1,49.78-10.86,66.63-29.5,6.03-6.27,10.13-13.94,14.96-21.06,11.64-15.91,29.81-25.12,49.5-25.11V22.33h0Z"/><path class="e" d="M140.2,97.99c-19.68,0-37.86-9.2-49.5-25.11-4.81-7.12-8.92-14.78-14.94-21.06C58.95,33.18,34.3,22.24,9.13,22.35h0v28.65h0c21.8-.11,42.05,11.62,53.01,30.46,3.22,5.62,7.06,10.9,11.45,15.74,16.83,18.63,41.46,29.59,66.63,29.5l-.02-28.7h0Z"/></svg>

auth/assets/custom-icons/icons/bitazza.svg

@@ -1,28 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="836.84424" height="914.80933">
-    <defs>
-        <clipPath id="a">
-            <path stroke-linecap="round" d="M-186.41-125.66h372.816v351.267H-186.41Z"/>
-        </clipPath>
-        <clipPath id="b">
-            <path stroke-linecap="round" d="M-186.41-95.22h372.816v351.267H-186.41Z"/>
-        </clipPath>
-        <clipPath id="c">
-            <path stroke-linecap="round" d="M-160.08-140.83h372.816v351.267H-160.08Z"/>
-        </clipPath>
-        <clipPath id="d">
-            <path stroke-linecap="round" d="M-212.74-140.83h372.816v351.267H-212.74Z"/>
-        </clipPath>
-    </defs>
-    <g clip-path="url(#a)" transform="translate(418.40805 457.4024)scale(3.64)">
-        <path d="m298.246 129.84-6.486-4.585 6.486-4.586c12.26215-8.68661 19.24883-23.025924 18.53269-38.036075-.71613-15.010151-9.03624-28.619172-22.06969-36.098925l-.568-.349c-12.19994-7.033047-27.02434-7.819595-39.9-2.117l-7.053 3.144-.83-7.687c-1.51376-14.021838-9.62342-26.481265-21.832-33.542l-.2-.087C217.64616 2.0246361 210.0606-.00958995 202.34 0c-8.04957.00100343-15.94637 2.1978633-22.84 6.354l-1.114.677c-11.58345 7.090871-19.28369 19.094034-20.9 32.579l-.917 7.6-6.967-3.1c-12.8836-5.747507-27.74063-4.976398-39.96 2.074l-.7.394c-13.604075 7.890873-21.986349 22.420072-22.008 38.147v.787c.02516 14.283035 6.954274 27.67261 18.6 35.942L112 126.04l-6.463 4.586c-12.260313 8.67436-19.255033 22.99852-18.556462 38.00091.698572 15.00239 8.994121 28.61458 22.007462 36.11209l.633.393c12.22088 7.0137 27.04998 7.79342 39.939 2.1l7.054-3.123.807 7.687c1.51242 13.97659 9.57745 26.40246 21.727 33.475l.284.153c13.92748 8.0385 31.12909 7.84683 44.874-.5l1.092-.655c11.59433-7.07976 19.29833-19.08878 20.9-32.579l.9-7.6 6.987 3.123c12.9143 5.73028 27.78955 4.94317 40.027-2.118l.611-.372c13.60439-7.88085 21.98922-22.40383 22.012-38.126v-.808c-.0274-14.27871-6.94846-27.66532-18.583-35.943M292 166.591c-.0145 6.86067-3.67326 13.19693-9.608 16.639l-.654.394c-5.96032 3.4063-13.27768 3.4063-19.238 0l-17.884-10.351-22.841 13.211v20.133c-.0194 6.70609-3.51599 12.92214-9.237 16.421l-1.114.677c-5.99641 3.62641-13.48927 3.70989-19.565.218l-.24-.153c-5.94051-3.43919-9.60731-9.7748-9.63-16.639v-20.657l-22.841-13.211-17.884 10.351c-5.9447 3.40734-13.2503 3.40734-19.195 0l-.677-.415c-5.92257-3.40301-9.59053-9.69703-9.63171-16.52753-.0412-6.83049 3.5506-13.16829 9.43171-16.64247l18.648-11.027-.153-26.313-18.3-10.569c-5.94649-3.42296-9.61685-9.756715-9.63-16.618v-.787c.0184-6.865358 3.68634-13.20295 9.63-16.639l.655-.415c5.9528-3.406398 13.2642-3.406398 19.217 0l17.884 10.351 22.841-13.189V44.7c.0433-6.705114 3.54343-12.913272 9.258-16.421l1.114-.677c5.98556-3.637575 13.47843-3.721536 19.544-.219l.24.131c5.95616 3.434267 9.62726 9.785677 9.63 16.661v20.658l22.841 13.189L262.5 67.671c5.96032-3.406299 13.27768-3.406299 19.238 0l.654.415c5.91101 3.411809 9.56893 9.702792 9.61008 16.527659.0412 6.824866-3.54064 13.159502-9.41008 16.642341l-18.67 11.027.153 26.313 18.321 10.569c5.93573 3.43032 9.59519 9.76235 9.604 16.618z" style="opacity:1;fill:#10f48b;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" transform="translate(-201.88 -125.66)" vector-effect="non-scaling-stroke"/>
-    </g>
-    <g clip-path="url(#b)" transform="translate(418.40805 346.6008)scale(3.64)">
-        <path d="m255.89 111.218-37.166 21.432-37.165-21.432 37.165-21.463Z" style="opacity:1;fill:#10f48b;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" transform="translate(-218.72 -111.2)" vector-effect="non-scaling-stroke"/>
-    </g>
-    <g clip-path="url(#c)" transform="translate(322.56685 512.6212)scale(3.64)">
-        <path d="M209.3 153.613v42.927l-37.166-21.463v-42.9z" style="opacity:1;fill:#10f48b;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" transform="translate(-190.72 -164.36)" vector-effect="non-scaling-stroke"/>
-    </g>
-    <g clip-path="url(#d)" transform="translate(514.24925 512.6212)scale(3.64)">
-        <path d="M273.357 132.181v42.9l-37.166 21.459v-42.927z" style="opacity:1;fill:#10f48b;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0" transform="translate(-254.77 -164.36)" vector-effect="non-scaling-stroke"/>
-    </g>
-</svg>

auth/assets/custom-icons/icons/bitkub.svg

@@ -1 +0,0 @@
-<svg viewBox="0 0 245.73 156" xmlns="http://www.w3.org/2000/svg"><g fill="#4cba64"><path d="m167.87 0a23.32 23.32 0 0 0 0 33l44.89 44.9-45 45-22.89-22.9a23.34 23.34 0 0 0 -33 0l55.86 55.87 78-78z"/><circle cx="167.87" cy="78" r="16"/><path d="m77.87 156a23.34 23.34 0 0 0 0-33l-44.87-44.9 45-45 22.87 22.9a23.34 23.34 0 0 0 33 0l-55.87-55.87-78 78z"/><circle cx="77.87" cy="78" r="16"/></g></svg>

auth/assets/custom-icons/icons/bonify.svg

@@ -1,14 +0,0 @@
-<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>

auth/assets/custom-icons/icons/bundesagentur_fur_arbeit.svg

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Created with Inkscape (http://www.inkscape.org/) by Marsupilami -->
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="768" height="768" viewBox="-4.3240767 -4.3240767 152.8084434 152.7840434" id="svg7076">
-  <defs id="defs7078"/>
-  <path d="M 0,72.07202 C 0,32.27318 32.2935,0 72.08013,0 c 39.78662,0 72.08017,32.27318 72.08017,72.07202 0,39.80291 -32.29355,72.06387 -72.08017,72.06387 -17.63317,0 -33.75958,-6.32434 -46.30232,-16.82687 11.769,-19.46163 46.13944,-77.28864 46.13944,-77.28864 l 17.0223,28.5022 c 0,0 -8.95912,0.0448 -17.06303,0 -8.14464,-0.0448 -10.46588,1.7063 -14.00878,7.11027 -2.9321,4.4877 -9.85505,16.21193 -10.01793,16.42776 -0.81448,1.29093 -0.3258,2.54114 1.58818,2.54114 l 55.18001,0 28.01759,0 c 1.66968,0 2.64704,-1.16875 1.58822,-2.6226 L 73.34255,2.43932 c -0.81447,-1.37236 -2.11759,-1.25021 -2.85061,0 L 8.4704,105.97411 C 3.09495,95.87068 0,84.32969 0,72.07202" id="path8406" style="fill:#ec1c23;fill-rule:nonzero;stroke:none"/>
-</svg>
-<!-- version: 20110311, original size: 144.16029 144.13589, border: 3% -->

auth/assets/custom-icons/icons/coinspot.svg

@@ -1,59 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xml:space="preserve" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1"
-    viewBox="0 0 30 30">
-  <path d="M14.4 29.5h.4z" fill="#c5c8ca" />
-  <path fill="#9da4a8" d="M15.3 29.5h.1zc-.1 0 0 0 0 0" />
-  <path fill="#b7bbbd" d="M15.3 29.5h-.2z" />
-  <path d="M14.1 29.5h.2z" fill="#c5c8ca" />
-  <path fill="#bbbfc2" d="M13.9 29.5s.1 0 0 0h.2z" />
-  <path fill="#cacdce" d="M13.6 29.5h.1z" />
-  <path fill="#bfc3c5" d="M13.7 29.5q.15 0 0 0h.1z" />
-  <path fill="#bcc0c2" d="M13.3 29.4q.15 0 0 0" />
-  <path fill="#bdc1c4" d="M13.4 29.5c0-.1.1-.1 0 0q.15-.15 0 0m-.3-.1" />
-  <path fill="#c7cacc" d="M13.2 29.4q.15 0 0 0" />
-  <linearGradient id="SVGID_1_" x1="21.8812" x2="8.2545" y1="-88.078" y2="-104.6955" gradientTransform="matrix(1 0 0 -1 0 -81.48)" gradientUnits="userSpaceOnUse">
-    <stop offset="0" stop-color="#020037" />
-    <stop offset="1" stop-color="#050f62" />
-  </linearGradient>
-  <path fill="url(#SVGID_1_)" d="M15 .4C11.1.4 7.5 2 4.7 4.7 2 7.4.5 11.1.5 15q0 2.55.9 5.1h.8c2.9 0 5.8.9 8.2 2.6s4.2 4.1 5.1 6.9c3.8-.1 7.4-1.7 10-4.4s4.1-6.4 4.1-10.1c0-3.9-1.5-7.6-4.3-10.3C22.6 2 18.9.4 15 .4" />
-  <path fill="#fff" d="M20.7 22.5c0 .4.1.8.3 1s.6.3 1 .3c-.4 0-.7.1-1 .3-.2.2-.3.6-.3 1 0-.4-.1-.7-.3-1-.2-.2-.6-.3-1-.3.4 0 .7-.1 1-.3s.3-.6.3-1m-13.8-7c0 .4.1.8.3 1s.6.3 1 .3c-.4 0-.7.1-1 .3-.2.2-.3.6-.3 1 0-.4-.1-.7-.3-1-.2-.2-.6-.3-1-.3.4 0 .7-.1 1-.3.2-.3.3-.6.3-1m3.7-11.4q.15 0 0 0c0 .3.1.5.3.7s.4.3.7.2c-.3 0-.5.1-.7.2-.2.2-.3.4-.2.7 0-.3-.1-.5-.2-.7-.3-.1-.5-.2-.8-.1.3-.1.5-.1.7-.3s.3-.5.2-.7" />
-  <linearGradient id="SVGID_00000173122186048074043340000017421439166240502921_" x1="19.2457" x2="22.9553" y1="-89.3156" y2="-91.7188" gradientTransform="matrix(1 0 0 -1 0 -81.48)" gradientUnits="userSpaceOnUse">
-    <stop offset="0" stop-color="#e5e5e5" />
-    <stop offset="1" stop-color="#b7b8c1" />
-  </linearGradient>
-  <path fill="url(#SVGID_00000173122186048074043340000017421439166240502921_)" d="M21.8 1.2c-1.4.7-3 1.9-4.4 4.2-2.5 3.9-3.2 7.4-3.2 7.4L16 14l.3.2 1.9 1.2s2.9-2 5.4-5.9c1.5-2.3 2-4.3 2-5.8-.8-.1-1.5-.4-2.2-.8-.6-.4-1.2-1-1.6-1.7" />
-  <linearGradient id="SVGID_00000127763695479642710240000017533313096818365313_" x1="21.2378" x2="19.0472" y1="-99.9826" y2="-97.8815" gradientTransform="matrix(1 0 0 -1 0 -81.48)" gradientUnits="userSpaceOnUse">
-    <stop offset="0" stop-color="#ec4f4f" />
-    <stop offset="1" stop-color="#a91919" />
-  </linearGradient>
-  <path fill="url(#SVGID_00000127763695479642710240000017533313096818365313_)" d="M20.8 16.8c.9-1.4.3-3.2 0-3.8-.7.8-1.5 1.5-2.3 2.1.1.4.3.8.3 1.2 0 .1 0 .2-.1.3-.4.6-.8 1.3-1.1 2-.1.1-.1.2-.1.3-.1.2-.1.3 0 .5 0 .3.2.5.3.8l.1.1c.1 0 .1.1.2.1s.1 0 .2-.1.3-.2.4-.4c.8-.9 1.1-1.4 2.1-3.1" />
-  <linearGradient id="SVGID_00000060717637781723915790000002744012061535479481_" x1="11.3158" x2="14.8122" y1="-99.2586" y2="-101.5237" gradientTransform="matrix(1 0 0 -1 0 -81.48)" gradientUnits="userSpaceOnUse">
-    <stop offset="0" stop-color="#f2a518" />
-    <stop offset="1" stop-color="#f4e23e" />
-  </linearGradient>
-  <path fill="url(#SVGID_00000060717637781723915790000002744012061535479481_)" d="m15.1 15.7-1.7-1.1c-2 3.1-3.3 7-2.4 7.5.9.6 3.9-2.2 5.9-5.3z" />
-  <linearGradient id="SVGID_00000070084874335106853820000008402293642909580433_" x1="-4386.2534" x2="-4497.9517" y1="747.6443" y2="769.0099" gradientTransform="matrix(1 0 0 -1 0 -81.48)" gradientUnits="userSpaceOnUse">
-    <stop offset="0" stop-color="#ec4f4f" />
-    <stop offset="1" stop-color="#a91919" />
-  </linearGradient>
-  <path fill="url(#SVGID_00000070084874335106853820000008402293642909580433_)" d="M15.2 9.5c-.7-.1-2.5.1-3.4 1.5-1.1 1.6-1.5 2.1-2 3.2-.1.2-.1.3-.2.5v.2c0 .1.1.1.1.1s.1 0 .2.1c.3.1.6 0 .8 0s.3-.1.4-.2l.3-.3c.5-.6.9-1.2 1.3-1.8.1-.1.2-.2.3-.2.4-.1.8-.1 1.2-.2.3-1 .6-2 1-2.9" />
-  <path fill="#df3030" d="M25 .6c-.2-.1-1.5-.2-3.2.7.4.7 1 1.2 1.6 1.7.7.4 1.4.7 2.2.8.1-1.9-.5-3.1-.6-3.2m-6.6 14.9L14 12.7h-.2l-.9 1.4v.2l4.4 2.8h.2l.9-1.4z" />
-  <linearGradient id="SVGID_00000044894753735506851200000013592864944465274029_" x1="14.9436" x2="16.3716" y1="-95.9217" y2="-96.8468" gradientTransform="matrix(1 0 0 -1 0 -81.48)" gradientUnits="userSpaceOnUse">
-    <stop offset="0" stop-color="#b71e1e" />
-    <stop offset=".44" stop-color="#df3030" />
-    <stop offset="1" stop-color="#c51d1d" />
-  </linearGradient>
-  <path fill="url(#SVGID_00000044894753735506851200000013592864944465274029_)" d="M17.8 11.6c-.4-.2-2.1 1.6-3.2 3.3-.8 1.2-1.4 3-1.1 3.2.4.2 1.7-1 2.5-2.3 1.1-1.6 2.1-3.9 1.8-4.2" />
-  <path fill="#17181c" d="M21.2 8.6c1.3 0 2.3-1 2.3-2.3S22.5 4 21.2 4s-2.3 1-2.3 2.3 1.1 2.3 2.3 2.3" />
-  <linearGradient id="SVGID_00000090987122570624474440000002432161440392897685_" x1="20.068" x2="22.3556" y1="-87.0655" y2="-88.5473" gradientTransform="matrix(1 0 0 -1 0 -81.48)" gradientUnits="userSpaceOnUse">
-    <stop offset="0" stop-color="#ced1ec" />
-    <stop offset="1" stop-color="#fff" />
-  </linearGradient>
-  <path fill="url(#SVGID_00000090987122570624474440000002432161440392897685_)" d="M21.2 7.7c.8 0 1.4-.6 1.4-1.4S22 5 21.2 5s-1.4.6-1.4 1.4.7 1.3 1.4 1.3" />
-  <linearGradient id="SVGID_00000044151119195171880090000016489263670362291109_" x1="14.4192" x2="2.0973" y1="-110.4727" y2="-101.7197" gradientTransform="matrix(1 0 0 -1 0 -81.48)" gradientUnits="userSpaceOnUse">
-    <stop offset="0" stop-color="#b7b7bd" />
-    <stop offset=".68" stop-color="#efefef" />
-  </linearGradient>
-  <path fill="url(#SVGID_00000044151119195171880090000016489263670362291109_)" d="M2.1 20h-.8c1 2.8 2.9 5.2 5.3 6.9s5.3 2.6 8.3 2.6h.4c-.9-2.8-2.7-5.2-5.1-6.9C7.9 20.9 5.1 20 2.1 20" />
-</svg>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 30 30" style="enable-background:new 0 0 30 30;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#C5C8CA;}
+	.st1{fill:#9DA4A8;}
+	.st2{fill:#B7BBBD;}
+	.st3{fill:#CBCFD1;}
+	.st4{fill:#BBBFC2;}
+	.st5{fill:#CACDCE;}
+	.st6{fill:#BFC3C5;}
+	.st7{fill:#BCC0C2;}
+	.st8{fill:#BDC1C4;}
+	.st9{fill:#C7CACC;}
+	.st10{fill:url(#SVGID_1_);}
+	.st11{fill:#FFFFFF;}
+	.st12{fill:#B8BCBF;}
+	.st13{fill:#C4C7C9;}
+	.st14{fill:#C1C5C7;}
+	.st15{fill:url(#SVGID_00000003093454306001190100000011813141018663887528_);}
+	.st16{fill:url(#SVGID_00000017503418065689336600000007511615486600436881_);}
+	.st17{fill:url(#SVGID_00000057845154053127761930000017803385842445649033_);}
+	.st18{fill:url(#SVGID_00000156571711195124538550000006687723982713171592_);}
+	.st19{fill:#DF3030;}
+	.st20{fill:url(#SVGID_00000001636660173574603980000008731795684331757470_);}
+	.st21{fill:#17181C;}
+	.st22{fill:url(#SVGID_00000180343933242210086490000003762167186865041053_);}
+	.st23{fill:url(#SVGID_00000015338415700440354440000005681408021599925436_);}
+</style>
+<g>
+	<path class="st0" d="M14.4,29.5c0.1,0,0.1,0,0.2,0c0.1,0,0.2,0,0.2,0H14.4z"/>
+	<path class="st1" d="M15.3,29.5h0.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0L15.3,29.5
+		C15.2,29.5,15.3,29.5,15.3,29.5z"/>
+	<path class="st2" d="M15.3,29.5L15.3,29.5l-0.2,0C15.2,29.5,15.2,29.5,15.3,29.5z"/>
+	<path class="st3" d="M15.5,29.5L15.5,29.5L15.5,29.5L15.5,29.5L15.5,29.5z"/>
+	<path class="st0" d="M14.1,29.5c0.1,0,0.1,0,0.2,0H14.1z"/>
+	<path class="st4" d="M13.9,29.5C13.9,29.5,14,29.5,13.9,29.5c0.1,0,0.1,0,0.2,0H13.9z"/>
+	<path class="st5" d="M13.6,29.5C13.6,29.5,13.6,29.5,13.6,29.5c0.1,0,0.1,0,0.1,0H13.6z"/>
+	<path class="st6" d="M13.7,29.5C13.8,29.5,13.8,29.5,13.7,29.5c0.1,0,0.1,0,0.1,0H13.7z"/>
+	<path class="st7" d="M13.3,29.4C13.3,29.4,13.3,29.4,13.3,29.4C13.4,29.4,13.4,29.4,13.3,29.4L13.3,29.4z"/>
+	<path class="st8" d="M13.4,29.5C13.4,29.4,13.5,29.4,13.4,29.5C13.5,29.4,13.5,29.4,13.4,29.5L13.4,29.5z"/>
+	<path class="st8" d="M13.1,29.4C13.1,29.4,13.1,29.4,13.1,29.4C13.1,29.4,13.1,29.4,13.1,29.4L13.1,29.4z"/>
+	<path class="st9" d="M13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4C13.2,29.4,13.2,29.4,13.2,29.4
+		C13.3,29.4,13.3,29.4,13.2,29.4L13.2,29.4z"/>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.8812" y1="-88.078" x2="8.2545" y2="-104.6955" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#020037"/>
+		<stop  offset="1" style="stop-color:#050F62"/>
+	</linearGradient>
+	<path class="st10" d="M15,0.4C11.1,0.4,7.5,2,4.7,4.7C2,7.4,0.5,11.1,0.5,15c0,1.7,0.3,3.4,0.9,5.1c0.3,0,0.5,0,0.8,0
+		c2.9,0,5.8,0.9,8.2,2.6c2.4,1.7,4.2,4.1,5.1,6.9c3.8-0.1,7.4-1.7,10-4.4c2.6-2.7,4.1-6.4,4.1-10.1c0-3.9-1.5-7.6-4.3-10.3
+		C22.6,2,18.9,0.4,15,0.4"/>
+	<path class="st11" d="M20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5L20.7,22.5c0,0.4,0.1,0.8,0.3,1c0.2,0.2,0.6,0.3,1,0.3c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c-0.4,0-0.7,0.1-1,0.3c-0.2,0.2-0.3,0.6-0.3,1c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0c0-0.4-0.1-0.7-0.3-1c-0.2-0.2-0.6-0.3-1-0.3c0,0,0,0,0,0l0,0c0,0,0,0,0,0s0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0.4,0,0.7-0.1,1-0.3S20.7,22.9,20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5C20.7,22.5,20.7,22.5,20.7,22.5z"/>
+	<path class="st11" d="M6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5L6.9,15.5c0,0.4,0.1,0.8,0.3,1c0.2,0.2,0.6,0.3,1,0.3c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c-0.4,0-0.7,0.1-1,0.3c-0.2,0.2-0.3,0.6-0.3,1c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0,0,0,0,0,0h0l0,0c0-0.4-0.1-0.7-0.3-1c-0.2-0.2-0.6-0.3-1-0.3c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
+		c0,0,0,0,0,0c0.4,0,0.7-0.1,1-0.3C6.8,16.2,6.9,15.9,6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5C6.9,15.5,6.9,15.5,6.9,15.5z"/>
+	<path class="st11" d="M10.6,4.1L10.6,4.1C10.7,4.1,10.7,4.1,10.6,4.1c0,0.3,0.1,0.5,0.3,0.7c0.2,0.2,0.4,0.3,0.7,0.2h0v0l0,0l0,0
+		l0,0l0,0c-0.3,0-0.5,0.1-0.7,0.2c-0.2,0.2-0.3,0.4-0.2,0.7l0,0l0,0l0,0l0,0h0v0c0-0.3-0.1-0.5-0.2-0.7C10.2,5.1,10,5,9.7,5.1h0v0v0
+		h0C10,5,10.2,5,10.4,4.8C10.6,4.6,10.7,4.3,10.6,4.1C10.6,4.1,10.6,4.1,10.6,4.1C10.6,4.1,10.6,4.1,10.6,4.1z"/>
+	<path class="st12" d="M12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4C12.8,29.4,12.8,29.4,12.8,29.4
+		C12.8,29.4,12.8,29.4,12.8,29.4L12.8,29.4z"/>
+	<path class="st13" d="M13,29.4C13,29.4,13,29.4,13,29.4C13,29.4,13,29.4,13,29.4L13,29.4z"/>
+	<path class="st14" d="M12.9,29.4C12.9,29.4,12.9,29.4,12.9,29.4C12.9,29.4,12.9,29.4,12.9,29.4L12.9,29.4z"/>
+	
+		<linearGradient id="SVGID_00000173122186048074043340000017421439166240502921_" gradientUnits="userSpaceOnUse" x1="19.2457" y1="-89.3156" x2="22.9553" y2="-91.7188" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#E5E5E5"/>
+		<stop  offset="1" style="stop-color:#B7B8C1"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000173122186048074043340000017421439166240502921_);" d="M21.8,1.2c-1.4,0.7-3,1.9-4.4,4.2
+		c-2.5,3.9-3.2,7.4-3.2,7.4L16,14l0.3,0.2l1.9,1.2c0,0,2.9-2,5.4-5.9c1.5-2.3,2-4.3,2-5.8c-0.8-0.1-1.5-0.4-2.2-0.8
+		C22.8,2.5,22.2,1.9,21.8,1.2z"/>
+	
+		<linearGradient id="SVGID_00000127763695479642710240000017533313096818365313_" gradientUnits="userSpaceOnUse" x1="21.2378" y1="-99.9826" x2="19.0472" y2="-97.8815" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#EC4F4F"/>
+		<stop  offset="1" style="stop-color:#A91919"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000127763695479642710240000017533313096818365313_);" d="M20.8,16.8c0.9-1.4,0.3-3.2,0-3.8
+		c-0.7,0.8-1.5,1.5-2.3,2.1c0.1,0.4,0.3,0.8,0.3,1.2c0,0.1,0,0.2-0.1,0.3c-0.4,0.6-0.8,1.3-1.1,2c-0.1,0.1-0.1,0.2-0.1,0.3
+		c-0.1,0.2-0.1,0.3,0,0.5c0,0.3,0.2,0.5,0.3,0.8c0,0,0.1,0.1,0.1,0.1c0.1,0,0.1,0.1,0.2,0.1s0.1,0,0.2-0.1c0.1-0.1,0.3-0.2,0.4-0.4
+		C19.5,19,19.8,18.5,20.8,16.8z"/>
+	
+		<linearGradient id="SVGID_00000060717637781723915790000002744012061535479481_" gradientUnits="userSpaceOnUse" x1="11.3158" y1="-99.2586" x2="14.8122" y2="-101.5237" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#F2A518"/>
+		<stop  offset="1" style="stop-color:#F4E23E"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000060717637781723915790000002744012061535479481_);" d="M15.1,15.7l-1.7-1.1c-2,3.1-3.3,7-2.4,7.5
+		c0.9,0.6,3.9-2.2,5.9-5.3L15.1,15.7z"/>
+	
+		<linearGradient id="SVGID_00000070084874335106853820000008402293642909580433_" gradientUnits="userSpaceOnUse" x1="-4386.2534" y1="747.6443" x2="-4497.9517" y2="769.0099" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#EC4F4F"/>
+		<stop  offset="1" style="stop-color:#A91919"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000070084874335106853820000008402293642909580433_);" d="M15.2,9.5c-0.7-0.1-2.5,0.1-3.4,1.5
+		c-1.1,1.6-1.5,2.1-2,3.2c-0.1,0.2-0.1,0.3-0.2,0.5c0,0.1,0,0.1,0,0.2C9.6,15,9.7,15,9.7,15c0,0,0.1,0,0.2,0.1c0.3,0.1,0.6,0,0.8,0
+		c0.2,0,0.3-0.1,0.4-0.2c0.1-0.1,0.2-0.2,0.3-0.3c0.5-0.6,0.9-1.2,1.3-1.8c0.1-0.1,0.2-0.2,0.3-0.2c0.4-0.1,0.8-0.1,1.2-0.2l0,0
+		C14.5,11.4,14.8,10.4,15.2,9.5z"/>
+	<path class="st19" d="M25,0.6c-0.2-0.1-1.5-0.2-3.2,0.7c0.4,0.7,1,1.2,1.6,1.7c0.7,0.4,1.4,0.7,2.2,0.8C25.7,1.9,25.1,0.7,25,0.6z"
+		/>
+	<path class="st19" d="M18.4,15.5L14,12.7c-0.1,0-0.1,0-0.2,0l-0.9,1.4c0,0.1,0,0.1,0,0.2l4.4,2.8c0.1,0,0.1,0,0.2,0l0.9-1.4
+		C18.4,15.6,18.4,15.6,18.4,15.5z"/>
+	
+		<linearGradient id="SVGID_00000044894753735506851200000013592864944465274029_" gradientUnits="userSpaceOnUse" x1="14.9436" y1="-95.9217" x2="16.3716" y2="-96.8468" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#B71E1E"/>
+		<stop  offset="0.44" style="stop-color:#DF3030"/>
+		<stop  offset="1" style="stop-color:#C51D1D"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000044894753735506851200000013592864944465274029_);" d="M17.8,11.6c-0.4-0.2-2.1,1.6-3.2,3.3
+		c-0.8,1.2-1.4,3-1.1,3.2c0.4,0.2,1.7-1,2.5-2.3C17.1,14.2,18.1,11.9,17.8,11.6z"/>
+	<path class="st21" d="M21.2,8.6c1.3,0,2.3-1,2.3-2.3s-1-2.3-2.3-2.3c-1.3,0-2.3,1-2.3,2.3S20,8.6,21.2,8.6z"/>
+	
+		<linearGradient id="SVGID_00000090987122570624474440000002432161440392897685_" gradientUnits="userSpaceOnUse" x1="20.068" y1="-87.0655" x2="22.3556" y2="-88.5473" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#CED1EC"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000090987122570624474440000002432161440392897685_);" d="M21.2,7.7c0.8,0,1.4-0.6,1.4-1.4
+		S22,5,21.2,5c-0.8,0-1.4,0.6-1.4,1.4S20.5,7.7,21.2,7.7z"/>
+	
+		<linearGradient id="SVGID_00000044151119195171880090000016489263670362291109_" gradientUnits="userSpaceOnUse" x1="14.4192" y1="-110.4727" x2="2.0973" y2="-101.7197" gradientTransform="matrix(1 0 0 -1 0 -81.48)">
+		<stop  offset="0" style="stop-color:#B7B7BD"/>
+		<stop  offset="0.68" style="stop-color:#EFEFEF"/>
+	</linearGradient>
+	<path style="fill:url(#SVGID_00000044151119195171880090000016489263670362291109_);" d="M2.1,20c-0.3,0-0.5,0-0.8,0
+		c1,2.8,2.9,5.2,5.3,6.9s5.3,2.6,8.3,2.6c0.1,0,0.3,0,0.4,0c-0.9-2.8-2.7-5.2-5.1-6.9C7.9,20.9,5.1,20,2.1,20z"/>
+</g>
+</svg>

auth/assets/custom-icons/icons/cryptee.svg

@@ -1 +0,0 @@
-<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>

auth/assets/custom-icons/icons/cssbuy.svg

@@ -1,9 +0,0 @@
-<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>

auth/assets/custom-icons/icons/fanatical.svg

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   viewBox="0 0 399.76401 400"
-   preserveAspectRatio="xMinYMid"
-   aria-labelledby="navbar-fanatical-logo"
-   version="1.1"
-   id="svg2"
-   sodipodi:docname="Untitled.svg"
-   width="399.76401"
-   height="400"
-   inkscape:version="1.4 (e7c3feb100, 2024-10-09)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="namedview2"
-     pagecolor="#505050"
-     bordercolor="#ffffff"
-     borderopacity="1"
-     inkscape:showpageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="1"
-     inkscape:deskcolor="#505050"
-     inkscape:zoom="0.69295302"
-     inkscape:cx="205.64165"
-     inkscape:cy="207.08475"
-     inkscape:window-width="1920"
-     inkscape:window-height="938"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <g
-     fill="none"
-     id="g2">
-    <path
-       fill="#ff9800"
-       d="m 2.8756,166.0056 h 284.671 a 2.9981,2.9981 0 0 0 2.7221,-1.7424 l 25.8632,-56.0452 c 0.6946,-1.504 0.0391,-3.2867 -1.464,-3.9817 a 2.9968,2.9968 0 0 0 -1.258,-0.2767 L 24.4917,103.9952 C 58.4482,42.0187 124.261,0 199.882,0 c 110.3917,0 199.882,89.543 199.882,200 0,110.457 -89.4903,200 -199.882,200 C 89.4902,400 0,310.457 0,200 0,188.412 0.985,177.054 2.8756,166.0056 Z M 125.9256,328 c 0,2.2091 1.7898,4 3.9977,4 h 5.1722 l 62.8312,-79.0111 h 49.4291 a 2.9981,2.9981 0 0 0 2.722,-1.7422 l 25.835,-55.976 a 3.0015,3.0015 0 0 0 0.2761,-1.2577 c 0,-1.6569 -1.3423,-3 -2.9982,-3 H 125.9257 V 328 Z"
-       id="path1" />
-  </g>
-</svg>

auth/assets/custom-icons/icons/finary.svg

@@ -1,3 +0,0 @@
-<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>

auth/assets/custom-icons/icons/fortrabbit.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><path d="M115 144c0 6-2 12-7 16s-9 7-16 7-11-3-16-7-6-10-6-16 2-12 6-16 10-7 16-7 12 3 16 7c5 5 7 10 7 16zm71-23-8 38-7 34a63 63 0 0 1-36 42c-5 2-11 3-17 3s-10 0-14-2l-7-4c-2-1-4-3-4-5l-1-6c0-4 1-7 3-9s6-4 10-4l9 2c3 1 4 4 6 6l4 8 3 7c3-3 5-7 7-13l7-22 16-75h-18l2-9h18l1-7c1-6 4-11 7-17s7-10 12-14c4-4 10-8 16-10s11-4 17-4l13 1 8 4 4 6 1 6a15 15 0 0 1-3 8l-4 4-7 1-8-2-6-6-4-8-3-7c-3 3-5 7-7 12l-6 23-2 10h22l-2 9h-22z"/></svg>

auth/assets/custom-icons/icons/gerid.svg

@@ -1,8 +0,0 @@
-<?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>

auth/assets/custom-icons/icons/luma.svg

@@ -1,5 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 724 264">
-    <path
-        d="M38.53 260.65H.43V27.86h38.1zm86.46 2.77c-42.25 0-66.48-22.96-66.48-63V89.33h38.1v108.28c0 23.61 8.7 32.39 32.12 32.39 30.35 0 42.73-14.54 42.73-50.17v-90.5h38.1v171.33h-36.54v-29.91c-4.99 22.98-27.12 32.67-48.03 32.67zm347.2-2.77H434.4V149.87c0-22.5-7.01-30.87-25.88-30.87-24.28 0-37.11 14.45-37.11 41.79v99.86h-37.79V149.87c0-21.93-7.23-30.87-24.94-30.87-31.59 0-38.05 32.96-38.05 41.79v99.86h-38.1V89.33h36.54v29.96c6.49-21.02 27.02-33.71 47.72-33.71 20.69 0 38.09 7.9 45.64 33.71 10.13-26.76 28.35-33.71 50.15-33.71 37.88 0 59.61 18.88 59.61 51.81v123.26h0zm76.65 2.77c-52.62 0-61.55-33.45-61.55-50.52 0-20.1 8.83-38.21 27.93-45.55 8.41-3.11 16.52-5.43 24.84-7.1 7.33-1.47 18.64-3.03 26.91-4.17l2.73-.38c14.38-2 29.67-9.21 29.67-18.62 0-16-20.51-18.39-32.74-18.39-13.87 0-23.64 3.57-27.53 10.05-3.49 6.46-3.73 7.97-4.62 13.6l-.62 4.43h-38.1l.68-5.61c1.35-11.14 3.41-19.03 6.48-24.83 10.54-20.39 31.77-30.75 63.08-30.75 26.11 0 44.63 8.23 53.26 15.94 5.31 4.6 9.1 9.84 11.89 16.46 5.84 12.36 6.32 20.63 6.32 29.4v86.43c0 8.07.78 14.97 2.31 20.5l1.76 6.35h-38.91l-.7-4.19c-.5-2.96-.67-19.75-.88-26.23-8.99 23.61-28.27 33.18-52.21 33.18zm50.53-93.72c-7.97 6.11-20.47 9.6-38.62 13.23-31.27 5.78-36.54 13.06-36.54 27.22 0 12.5 10.63 20.26 27.75 20.26 33.23 0 47.41-15.48 47.41-51.77v-8.94zm124.2-105.51C688.46 64.19 660 35.73 660 .62c0 35.11-28.46 63.57-63.57 63.57h0c35.11 0 63.57 28.46 63.57 63.57h0c0-35.11 28.46-63.57 63.57-63.57z"
-        fill="#ffffff" style="mix-blend-mode: difference;" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 724 264">
+    <path
+        d="M38.53 260.65H.43V27.86h38.1zm86.46 2.77c-42.25 0-66.48-22.96-66.48-63V89.33h38.1v108.28c0 23.61 8.7 32.39 32.12 32.39 30.35 0 42.73-14.54 42.73-50.17v-90.5h38.1v171.33h-36.54v-29.91c-4.99 22.98-27.12 32.67-48.03 32.67zm347.2-2.77H434.4V149.87c0-22.5-7.01-30.87-25.88-30.87-24.28 0-37.11 14.45-37.11 41.79v99.86h-37.79V149.87c0-21.93-7.23-30.87-24.94-30.87-31.59 0-38.05 32.96-38.05 41.79v99.86h-38.1V89.33h36.54v29.96c6.49-21.02 27.02-33.71 47.72-33.71 20.69 0 38.09 7.9 45.64 33.71 10.13-26.76 28.35-33.71 50.15-33.71 37.88 0 59.61 18.88 59.61 51.81v123.26h0zm76.65 2.77c-52.62 0-61.55-33.45-61.55-50.52 0-20.1 8.83-38.21 27.93-45.55 8.41-3.11 16.52-5.43 24.84-7.1 7.33-1.47 18.64-3.03 26.91-4.17l2.73-.38c14.38-2 29.67-9.21 29.67-18.62 0-16-20.51-18.39-32.74-18.39-13.87 0-23.64 3.57-27.53 10.05-3.49 6.46-3.73 7.97-4.62 13.6l-.62 4.43h-38.1l.68-5.61c1.35-11.14 3.41-19.03 6.48-24.83 10.54-20.39 31.77-30.75 63.08-30.75 26.11 0 44.63 8.23 53.26 15.94 5.31 4.6 9.1 9.84 11.89 16.46 5.84 12.36 6.32 20.63 6.32 29.4v86.43c0 8.07.78 14.97 2.31 20.5l1.76 6.35h-38.91l-.7-4.19c-.5-2.96-.67-19.75-.88-26.23-8.99 23.61-28.27 33.18-52.21 33.18zm50.53-93.72c-7.97 6.11-20.47 9.6-38.62 13.23-31.27 5.78-36.54 13.06-36.54 27.22 0 12.5 10.63 20.26 27.75 20.26 33.23 0 47.41-15.48 47.41-51.77v-8.94zm124.2-105.51C688.46 64.19 660 35.73 660 .62c0 35.11-28.46 63.57-63.57 63.57h0c35.11 0 63.57 28.46 63.57 63.57h0c0-35.11 28.46-63.57 63.57-63.57z" />
+</svg>

auth/assets/custom-icons/icons/mistral.svg

@@ -1,7 +1,15 @@
-<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>
+<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>

auth/assets/custom-icons/icons/oracle_cloud.svg

@@ -1 +0,0 @@
-<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>

auth/assets/custom-icons/icons/uollet.svg

@@ -1,15 +0,0 @@
-<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>

auth/ios/Podfile.lock

@@ -90,11 +90,11 @@ PODS:
   - SDWebImage (5.21.0):
     - SDWebImage/Core (= 5.21.0)
   - SDWebImage/Core (5.21.0)
-  - Sentry/HybridSDK (8.46.0)
-  - sentry_flutter (8.14.2):
+  - Sentry/HybridSDK (8.36.0)
+  - sentry_flutter (8.9.0):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.46.0)
+    - Sentry/HybridSDK (= 8.36.0)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
@@ -232,44 +232,44 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  app_links: 3da4c36b46cac3bf24eb897f1a6ce80bda109874
-  connectivity_plus: 3f6c9057f4cd64198dc826edfb0542892f825343
-  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
-  device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
+  app_links: e7a6750a915a9e161c58d91bc610e8cd1d4d0ad0
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
+  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517
-  file_saver: 6cdbcddd690cb02b0c1a0c225b37cd805c2bf8b6
-  fk_user_agent: 137145b086229251761678fe034da53753f4ce59
+  file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
+  file_saver: 503e386464dbe118f630e17b4c2e1190fa0cf808
+  fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_email_sender: 2397f5e84aaacfb61af569637a963e7c687858d8
-  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
-  flutter_local_authentication: 989278c681612f1ee0e36019e149137f114b9d7f
-  flutter_local_notifications: ad39620c743ea4c15127860f4b5641649a988100
-  flutter_native_splash: 35ddbc7228eafcb3969dcc5f1fbbe27c1145a4f0
-  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
-  fluttertoast: 76fea30fcf04176325f6864c87306927bd7d2038
-  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
-  move_to_background: 155f7bfbd34d43ad847cb630d2d2d87c17199710
+  flutter_email_sender: 10a22605f92809a11ef52b2f412db806c6082d40
+  flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
+  flutter_local_authentication: 1172a4dd88f6306dadce067454e2c4caf07977bb
+  flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
+  flutter_native_splash: edf599c81f74d093a4daf8e17bd7a018854bc778
+  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
+  fluttertoast: e9a18c7be5413da53898f660530c56f35edfba9c
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
+  move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  objective_c: 89e720c30d716b036faf9c9684022048eee1eee2
+  objective_c: 77e887b5ba1827970907e10e832eec1683f3431d
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: 580e9a5f1b6ca5594e7c9ed5f92d1dfb2a66b5e1
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
-  qr_code_scanner: d77f94ecc9abf96d9b9b8fc04ef13f611e5a147a
+  package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  privacy_screen: 1a131c052ceb3c3659934b003b0d397c2381a24e
+  qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
-  Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
-  sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
-  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sodium_libs: 6c6d0e83f4ee427c6464caa1f1bdc2abf3ca0b7f
-  sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3
+  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
+  sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
+  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sodium_libs: 1faae17af662384acbd13e41867a0008cd2e2318
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
-  sqlite3_flutter_libs: 9379996d65aa23dcda7585a5b58766cebe0aa042
+  sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: 78f002751f1a8f65042b8da97902ba4124271c5a
 

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/enhancements?discussions_q=is%3Aopen%+label%3A%22-+auth%22+sort%3Atop";
+    "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";
 const int microSecondsInDay = 86400000000;
 const int android11SDKINT = 30;
 const int galleryLoadStartTime = -8000000000000000; // Wednesday, March 6, 1748

auth/lib/gateway/authenticator.dart

@@ -73,10 +73,7 @@ class AuthenticatorGateway {
     );
   }
 
-  Future<(List<AuthEntity>, int?)> getDiff(
-    int sinceTime, {
-    int limit = 500,
-  }) async {
+  Future<List<AuthEntity>> getDiff(int sinceTime, {int limit = 500}) async {
     try {
       final response = await _enteDio.get(
         "/authenticator/entity/diff",
@@ -87,12 +84,11 @@ 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, unixTimeInMicroSeconds);
+      return authEntities;
     } catch (e) {
       if (e is DioException && e.response?.statusCode == 401) {
         throw UnauthorizedError();

auth/lib/l10n/arb/app_ar.arb

@@ -47,7 +47,7 @@
   "saveAction": "حفظ",
   "nextTotpTitle": "التالي",
   "deleteCodeTitle": "حذف الرمز؟",
-  "deleteCodeMessage": "هل أنت متيقِّن من أنك تريد حذف هذه الشيفرة؟ هذا الإجراء لا رجعة فيه.",
+  "deleteCodeMessage": "هل أنت متأكد من أنك تريد حذف هذه الشيفرة؟ هذا الإجراء لا رجعة فيه.",
   "trashCode": "حذف الكود؟",
   "trashCodeMessage": "هل أنت متيقِّن أنك تريد حذف الكود الخاص بـ {account}؟",
   "trash": "سلة المهملات",
@@ -173,7 +173,6 @@
   "invalidQRCode": "شيفرة استجابة سريعة غير صالحة",
   "noRecoveryKeyTitle": "لا يوجد مفتاح استرجاع؟",
   "enterEmailHint": "أدخل عنوان البريد الإلكتروني الخاص بك",
-  "enterNewEmailHint": "أدخل عنوان بريدك الإلكتروني الجديد",
   "invalidEmailTitle": "عنوان البريد الإلكتروني غير صالح",
   "invalidEmailMessage": "الرجاء إدخال بريد إلكتروني صالح.",
   "deleteAccount": "إزالة الحساب",
@@ -514,10 +513,5 @@
   "free5GB": "5GB  مجانًا على <bold-green>ente</bold-green> صور",
   "loginWithAuthAccount": "سجّل الدخول باستخدام حساب المُصادقة",
   "freeStorageOffer": "خَصْم 10٪ على صور <bold-green>ente</bold-green>",
-  "freeStorageOfferDescription": "استخدم الكود \"AUTH\" وأحصل على 10٪ خَصْم في السنة الأولى",
-  "advanced": "متقدم",
-  "algorithm": "الخوارزمية",
-  "type": "النوع",
-  "period": "المدّة",
-  "digits": "الأرقام"
+  "freeStorageOfferDescription": "استخدم الكود \"AUTH\" وأحصل على 10٪ خَصْم في السنة الأولى"
 }

auth/lib/l10n/arb/app_cs.arb

@@ -88,8 +88,6 @@
   "useRecoveryKey": "Použít obnovovací klíč",
   "incorrectPasswordTitle": "Nesprávné heslo",
   "welcomeBack": "Vítejte zpět!",
-  "emailAlreadyRegistered": "E-mail je již registrován.",
-  "emailNotRegistered": "E-mail není registrován.",
   "madeWithLoveAtPrefix": "vyrobeno s ❤️ v ",
   "supportDevs": "Předplaťte si <bold-green>ente</bold-green>, abyste nás podpořili",
   "supportDiscount": "Použijte kód \"AUTH\" pro získání 10% slevy na první rok",
@@ -497,18 +495,9 @@
   "appLockOfflineModeWarning": "Zvolili jste si pokračování bez zálohování. Pokud zapomenete heslo do aplikace, přístup k datům bude uzamčen.",
   "duplicateCodes": "Duplikovat kódy",
   "noDuplicates": "✨ Žádné duplikáty",
-  "youveNoDuplicateCodesThatCanBeCleared": "Nemáte žádné duplicitní kódy k odstranění",
   "deduplicateCodes": "Deduplikovat kódy",
   "deselectAll": "Zrušit výběr všech položek",
   "selectAll": "Vybrat vše",
   "deleteDuplicates": "Odstranit duplikáty",
-  "plainHTML": "Prosté HTML",
-  "tellUsWhatYouThink": "Sdělte nám svůj názor",
-  "dropReviewiOS": "Zanechat recenzi na App Store",
-  "dropReviewAndroid": "Zanechat recenzi na Play Store",
-  "supportEnte": "Podpořte <bold-green>ente</bold-green>",
-  "giveUsAStarOnGithub": "Dejte nám hvězdu na Githubu",
-  "free5GB": "5GB zdarma na <bold-green>ente</bold-green> Fotky",
-  "freeStorageOffer": "10% sleva na <bold-green>ente</bold-green> fotky",
-  "freeStorageOfferDescription": "Použijte kód \"AUTH\" pro získání 10% slevy na první rok"
+  "plainHTML": "Prosté HTML"
 }

auth/lib/l10n/arb/app_de.arb

@@ -91,39 +91,39 @@
   "emailAlreadyRegistered": "E-Mail ist bereits registriert.",
   "emailNotRegistered": "E-Mail-Adresse nicht registriert.",
   "madeWithLoveAtPrefix": "gemacht mit ❤️ bei ",
-  "supportDevs": "Abonnieren Sie <bold-green>ente</bold-green>, um das Projekt zu unterstützen",
+  "supportDevs": "Bei <bold-green>ente</bold-green> registrieren, um das Projekt zu unterstützen",
   "supportDiscount": "Benutzen Sie den Rabattcode \"AUTH\" für 10 % Rabatt im ersten Jahr",
   "changeEmail": "E-Mail ändern",
   "changePassword": "Passwort ändern",
-  "data": "Daten",
+  "data": "Datei",
   "importCodes": "Codes importieren",
   "importTypePlainText": "Klartext",
   "importTypeEnteEncrypted": "Verschlüsselter Ente-Export",
   "passwordForDecryptingExport": "Passwort um den Export zu entschlüsseln",
   "passwordEmptyError": "Passwort kann nicht leer sein",
-  "importFromApp": "Importieren Sie Codes von {appName}",
-  "importGoogleAuthGuide": "Exportieren Sie Ihre Accounts von Google Authenticator zu einem QR-Code, mithilfe der \"Konten übertragen\" Option. Scanne den QR-Code danach mit einem anderen Gerät.\n\nTipp: Sie können die Kamera eines Laptops verwenden, um ein Foto vom QR-Code zu erstellen.",
-  "importSelectJsonFile": "Wählen Sie eine JSON-Datei",
+  "importFromApp": "Importiere Codes von {appName}",
+  "importGoogleAuthGuide": "Exportiere deine Accounts von Google Authenticator zu einem QR-Code, durch die \"Konten übertragen\" Option. Scanne den QR-Code danach mit einem anderen Gerät.\n\nTipp: Du kannst die Kamera eines Laptops verwenden, um ein Foto den dem QR-Code zu erstellen.",
+  "importSelectJsonFile": "Wähle eine JSON-Datei",
   "importSelectAppExport": "{appName} Exportdatei auswählen",
-  "importEnteEncGuide": "Wählen Sie die von Ente exportierte, verschlüsselte JSON-Datei",
-  "importRaivoGuide": "Verwenden Sie die Option \"Export OTPs to Zip archive\" in den Einstellungen von Raivo.\n\nEntpacken Sie die Zip-Datei und importieren Sie die JSON-Datei.",
+  "importEnteEncGuide": "Wähle die von Ente exportierte, verschlüsselte JSON-Datei",
+  "importRaivoGuide": "Verwenden Sie die Option \"Export OTPs to Zip archive\" in den Raivo-Einstellungen.\n\nEntpacken Sie die Zip-Datei und importieren Sie die JSON-Datei.",
   "importBitwardenGuide": "Verwenden Sie die Option \"Tresor exportieren\" innerhalb der Bitwarden Tools und importieren Sie die unverschlüsselte JSON-Datei.",
-  "importAegisGuide": "Verwenden Sie die Option \"Tresor exportieren\" in den Einstellungen von Aegis.\n\nFalls Ihr Tresor verschlüsselt ist, müssen Sie das Passwort für den Tresor eingeben, um ihn zu entschlüsseln.",
+  "importAegisGuide": "Verwenden Sie die Option \"Tresor exportieren\" in den Aegis-Einstellungen.\n\nFalls Ihr Tresor verschlüsselt ist, müssen Sie das Passwort für den Tresor eingeben, um ihn zu entschlüsseln.",
   "import2FasGuide": "Verwenden Sie unter \"Einstellungen → Backup\" die Option \"Exportieren\" in 2FAS.\n\nFalls Ihr Backup verschlüsselt ist, müssen Sie das Passwort eingeben, um das Backup zu entschlüsseln.",
   "importLastpassGuide": "Verwenden Sie die Option \"Konten übertragen → Konten in Datei exportieren\" in den Lastpass Authenticator Einstellungen. \nImportieren Sie anschließend die heruntergeladene JSON-Datei.",
   "exportCodes": "Codes exportieren",
   "importLabel": "Importieren",
-  "importInstruction": "Bitte wählen Sie eine Datei die Codes in folgendem Format beinhaltet",
-  "importCodeDelimiterInfo": "Codes können in einer neuen Zeile stehen oder durch ein Komma getrennt sein",
+  "importInstruction": "Bitte wählen sie eine Datei die Codes in folgendem Format beinhaltet",
+  "importCodeDelimiterInfo": "Codes können in einer neuen Zeile stehen oder durch Kommata getrennt sein",
   "selectFile": "Datei auswählen",
   "emailVerificationToggle": "E-Mail-Verifizierung",
-  "emailVerificationEnableWarning": "Um zu vermeiden, versehentlich aus Ihrem Konto ausgesperrt zu werden, stellen Sie sicher, dass Sie den Zwei-Faktor-Authentifizierungscode für Ihr E-Mail-Konto außerhalb von Ente Auth speichern, bevor Sie die E-Mail-Verifizierung aktivieren.",
-  "authToChangeEmailVerificationSetting": "Bitte authentifizieren, um die E-Mail Bestätigung zu ändern",
+  "emailVerificationEnableWarning": "Stellen Sie sicher, eine Kopie Ihrer Zwei-Faktor-Authentifizierung an anderer Stelle zu speichern, um zu vermeiden, dass Sie sich versehentlich aus Ihrem Account aussperren.",
+  "authToChangeEmailVerificationSetting": "Bitte Authentifizieren um die E-Mail Bestätigung zu ändern",
   "authenticateGeneric": "Bitte authentifizieren",
-  "authToViewYourRecoveryKey": "Bitte authentifizieren, um Ihren Wiederherstellungscode anzuzeigen",
-  "authToChangeYourEmail": "Bitte authentifizieren, um Ihre E-Mail-Adresse zu ändern",
-  "authToChangeYourPassword": "Bitte authentifizieren, um Ihr Passwort zu ändern",
-  "authToViewSecrets": "Bitte authentifizieren, um Ihren Wiederherstellungscode anzuzeigen",
+  "authToViewYourRecoveryKey": "Bitte authentifizieren um ihren Wiederherstellungscode anzuzeigen",
+  "authToChangeYourEmail": "Bitte authentifizieren um ihre Emailadresse zu ändern",
+  "authToChangeYourPassword": "Bitte authentifizieren um ihr Passwort zu ändern",
+  "authToViewSecrets": "Bitte authentifizieren Sie sich, um ihren Wiederherstellungscode anzuzeigen",
   "authToInitiateSignIn": "Bitte authentifizieren, um die Anmeldung zum Backup zu starten.",
   "ok": "Ok",
   "cancel": "Abbrechen",
@@ -140,18 +140,18 @@
   "delete": "Löschen",
   "enterYourPasswordHint": "Geben Sie Ihr Passwort ein",
   "forgotPassword": "Passwort vergessen",
-  "oops": "Hoppla",
+  "oops": "Hopla",
   "suggestFeatures": "Features vorschlagen",
   "faq": "FAQ",
   "somethingWentWrongMessage": "Ein Fehler ist aufgetreten, bitte versuchen Sie es erneut",
   "leaveFamily": "Familie verlassen",
   "leaveFamilyMessage": "Sind Sie sicher, dass Sie den Familien-Plan verlassen wollen?",
   "inFamilyPlanMessage": "Sie haben einen Familien-Plan!",
-  "hintForMobile": "Lange auf einen Code drücken, um ihn zu bearbeiten oder zu entfernen.",
+  "hintForMobile": "Lange drücken, um den Code zu bearbeiten oder zu entfernen.",
   "hintForDesktop": "Klicken Sie mit der rechten Maustaste auf einen Code zum Bearbeiten oder Entfernen.",
   "scan": "Scannen",
   "scanACode": "Scan einen Code",
-  "verify": "Verifizieren",
+  "verify": "Überprüfen Sie",
   "verifyEmail": "E-Mail-Adresse verifizieren",
   "enterCodeHint": "Geben Sie den 6-stelligen Code \naus Ihrer Authentifikator-App ein.",
   "lostDeviceTitle": "Gerät verloren?",
@@ -172,10 +172,9 @@
   },
   "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.",
+  "enterEmailHint": "Geben Sie Ihre 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",
   "deleteAccountQuery": "Es tut uns leid, dass Sie gehen. Haben Sie ein Problem?",
   "yesSendFeedbackAction": "Ja, Feedback senden",
@@ -188,7 +187,7 @@
   "moderateStrength": "Mittel",
   "confirmPassword": "Bestätigen Sie das Passwort",
   "close": "Schließen",
-  "oopsSomethingWentWrong": "Hoppla, da ist etwas schiefgelaufen.",
+  "oopsSomethingWentWrong": "Ups, da ist etwas schief gelaufen.",
   "selectLanguage": "Sprache auswählen",
   "language": "Sprache",
   "social": "Social",
@@ -204,26 +203,26 @@
   "noResult": "Kein Ergebnis",
   "addCode": "Code hinzufügen",
   "scanAQrCode": "QR-Code scannen",
-  "enterDetailsManually": "Daten manuell hinzufügen",
+  "enterDetailsManually": "Details manuell hinzufügen",
   "edit": "Editieren",
   "share": "Teilen",
   "shareCodes": "Codes teilen",
   "shareCodesDuration": "Wählen Sie die Dauer aus, für die Sie die Codes teilen möchten.",
   "restore": "Wiederherstellen",
-  "copiedToClipboard": "In die Zwischenablage kopiert",
-  "copiedNextToClipboard": "Nächster Code in die Zwischenablage kopiert",
+  "copiedToClipboard": "In die Zwischenablage kopieren",
+  "copiedNextToClipboard": "Nächster Code wurde in die Zwischenablage kopiert",
   "error": "Fehler",
   "recoveryKeyCopiedToClipboard": "Wiederherstellungsschlüssel in die Zwischenablage kopiert",
   "recoveryKeyOnForgotPassword": "Sollten sie ihr Passwort vergessen, dann ist dieser Schlüssel die einzige Möglichkeit ihre Daten wiederherzustellen.",
-  "recoveryKeySaveDescription": "Wir speichern diesen Schlüssel nicht. Sichern Sie diesen Schlüssel bestehend aus 24 Wörtern an einem sicheren Platz.",
+  "recoveryKeySaveDescription": "Wir speichern diesen Schlüssel nicht. Sichern sie dieses diesen Schlüssel bestehend aus 24 Wörtern an einem sicheren Platz.",
   "doThisLater": "Auf später verschieben",
   "saveKey": "Schlüssel speichern",
   "save": "Speichern",
   "send": "Senden",
-  "saveOrSendDescription": "Möchtest du dies in deinem Speicher (standardmäßig im Ordner Downloads) speichern oder an andere Apps senden?",
+  "saveOrSendDescription": "Möchtest du dies in deinem Speicher (standardmäßig im Ordner Downloads) oder an andere Apps senden?",
   "saveOnlyDescription": "Möchtest du dies in deinem Speicher (standardmäßig im Ordner Downloads) speichern?",
   "back": "Zurück",
-  "createAccount": "Konto erstellen",
+  "createAccount": "Account erstellen",
   "passwordStrength": "Passwortstärke: {passwordStrengthValue}",
   "@passwordStrength": {
     "description": "Text to indicate the password strength",
@@ -245,17 +244,17 @@
   "changePasswordTitle": "Passwort ändern",
   "resetPasswordTitle": "Passwort zurücksetzen",
   "encryptionKeys": "Verschlüsselungsschlüssel",
-  "passwordWarning": "Wir speichern dieses Passwort nicht. Wenn Sie es vergessen, <underline>können wir Ihre Daten nicht entschlüsseln</underline>",
-  "enterPasswordToEncrypt": "Geben Sie ein Passwort ein, mit dem wir Ihre Daten verschlüsseln können",
-  "enterNewPasswordToEncrypt": "Geben Sie ein neues Passwort ein, mit dem wir Ihre Daten verschlüsseln können",
+  "passwordWarning": "Wir speichern dieses Passwort nicht. Wenn du es vergisst, <underline>können wir deine Daten nicht entschlüsseln</underline>",
+  "enterPasswordToEncrypt": "Gib ein Passwort ein, mit dem wir deine Daten verschlüsseln können",
+  "enterNewPasswordToEncrypt": "Gib ein neues Passwort ein, mit dem wir deine Daten verschlüsseln können",
   "passwordChangedSuccessfully": "Passwort erfolgreich geändert",
   "generatingEncryptionKeys": "Generierung von Verschlüsselungsschlüsseln...",
   "continueLabel": "Weiter",
   "insecureDevice": "Unsicheres Gerät",
   "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Es tut uns leid, wir konnten keine sicheren Schlüssel auf diesem Gerät generieren.\n\nBitte registrieren Sie sich auf einem anderen Gerät.",
   "howItWorks": "So funktioniert's",
-  "ackPasswordLostWarning": "Ich verstehe, dass der Verlust meines Passworts zum Verlust meiner Daten führen kann, denn diese sind <underline>Ende-zu-Ende verschlüsselt</underline>.",
-  "loginTerms": "Durch das Klicken auf den Login-Button, stimme ich den <u-terms> Nutzungsbedingungen</u-terms> und den <u-policy>Datenschutzbestimmungen</u-policy> zu",
+  "ackPasswordLostWarning": "Ich verstehe, dass der Verlust meines Passworts zum Verlust meiner Daten führen kann, denn diese ist <underline>Ende-zu-Ende verschlüsselt</underline>.",
+  "loginTerms": "Durch das Klicken auf den Login-Button, stimme ich <u-terms>den Nutzungsbedingungen</u-terms> und den <u-policy>Datenschutzbestimmungen</u-policy> zu",
   "logInLabel": "Einloggen",
   "logout": "Ausloggen",
   "areYouSureYouWantToLogout": "Sind sie sicher, dass sie sich ausloggen möchten?",
@@ -267,7 +266,7 @@
   "systemTheme": "System",
   "verifyingRecoveryKey": "Verifiziere Wiederherstellungsschlüssel...",
   "recoveryKeyVerified": "Wiederherstellungsschlüssel verifiziert",
-  "recoveryKeySuccessBody": "Großartig! Ihr Wiederherstellungsschlüssel ist gültig. Vielen Dank für die Verifizierung.\n\nBitte denken Sie daran, den Wiederherstellungsschlüssel sicher aufzubewahren.",
+  "recoveryKeySuccessBody": "Großartig! Ihr Wiederherstellungsschlüssel ist gültig. Vielen Dank für die Verifizierung.\n\nBitte denken sie daran, dass sie ihren Wiederherstellungsschlüssel sicher aufbewahren.",
   "invalidRecoveryKey": "Der eingegebene Wiederherstellungsschlüssel ist nicht gültig. Bitte stellen sie sicher, dass er aus 24 Wörtern besteht und prüfen sie die Schreibweise eines jeden.\n\nSollten sie einen Wiederherstellungsschlüssel im alten Format eingegeben haben vergewissern sie sich, dass er 64 Zeichen lang ist und prüfen sie jedes dieser Zeichen.",
   "recreatePasswordTitle": "Neues Passwort erstellen",
   "recreatePasswordBody": "Das benutzte Gerät ist nicht leistungsfähig genug das Passwort zu prüfen. Wir können es aber neu erstellen damit es auf jedem Gerät funktioniert. \n\nBitte loggen sie sich mit ihrem Wiederherstellungsschlüssel ein und erstellen sie ein neues Passwort (Sie können das selbe Passwort wieder verwenden, wenn sie möchten).",
@@ -278,15 +277,15 @@
   "recoveryKeyVerifyReason": "Ihr Wiederherstellungsschlüssel ist der einzige Weg ihre Fotos wiederherzustellen sollten, sie ihr Passwort vergessen. Sie finden ihren Wiederherstellungsschlüssel unter Einstellungen > Account.\n\nBitte tragen sie ihren Wiederherstellungsschlüssel hier ein um zu prüfen ob sie in korrekt abgespeichert haben.",
   "confirmYourRecoveryKey": "Wiederherstellungsschlüssel bestätigen",
   "confirm": "Bestätigen",
-  "emailYourLogs": "E-Mail mit Logs senden",
+  "emailYourLogs": "Email mit Logs senden",
   "pleaseSendTheLogsTo": "Bitte Logs an {toEmail} senden",
-  "copyEmailAddress": "E-Mail-Adresse kopieren",
+  "copyEmailAddress": "Emailadresse kopieren",
   "exportLogs": "Logs exportieren",
   "enterYourRecoveryKey": "Wiederherstellungsschlüssel eingeben",
-  "tempErrorContactSupportIfPersists": "Etwas ist schiefgelaufen. Bitte versuchen Sie es später noch einmal. Sollte der Fehler weiter bestehen, kontaktieren sie unser Supportteam.",
+  "tempErrorContactSupportIfPersists": "Etwas ist schiefgelaufen. Bitte versuchen sie es später noch einmal. Sollte der Fehler weiter bestehen, kontaktieren sie unser Supportteam.",
   "networkHostLookUpErr": "Ente ist im Moment nicht erreichbar. Bitte überprüfen Sie Ihre Netzwerkeinstellungen. Sollte das Problem bestehen bleiben, wenden Sie sich bitte an den Support.",
   "networkConnectionRefusedErr": "Ente ist im Moment nicht erreichbar. Bitte versuchen Sie es später erneut. Sollte das Problem bestehen bleiben, wenden Sie sich bitte an den Support.",
-  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Etwas ist schiefgelaufen. Bitte versuchen Sie es später noch einmal. Sollte der Fehler weiter bestehen, kontaktieren Sie unser Supportteam.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Etwas ist schiefgelaufen. Bitte versuchen sie es später noch einmal. Sollte der Fehler weiter bestehen, kontaktieren sie unser Supportteam.",
   "about": "Über uns",
   "weAreOpenSource": "Wir sind Opensource!",
   "privacy": "Datenschutz",
@@ -317,10 +316,10 @@
       }
     }
   },
-  "sorry": "Entschuldigen Sie",
-  "importFailureDesc": "Ausgewählte Datei ließ sich nicht verarbeiten.\nBitte wenden Sie sich an support@ente.io für Hilfe!",
+  "sorry": "Entschuldigen sie",
+  "importFailureDesc": "Ausgewählte Datei ließ sich nicht verarbeiten.\nBitte wenden sie sich an support@ente.io für Hilfe!",
   "pendingSyncs": "Warnung",
-  "pendingSyncsWarningBody": "Einige Codes wurden nicht gesichert.\n\nBitte gehen Sie sicher, dass Sie einen Backupcode für diese Codes haben bevor Sie sich ausloggen.",
+  "pendingSyncsWarningBody": "Einige Codes wurden nicht gesichert.\n\nBitte gehen sie sicher, dass sie einen Backupcode für diese Codes haben bevor sie sich ausloggen.",
   "checkInboxAndSpamFolder": "Bitte überprüfe deinen E-Mail-Posteingang (und Spam), um die Verifizierung abzuschließen",
   "tapToEnterCode": "Antippen, um den Code einzugeben",
   "resendEmail": "E-Mail erneut senden",
@@ -340,10 +339,10 @@
   "mostFrequentlyUsed": "Häufig verwendet",
   "mostRecentlyUsed": "Zuletzt verwendet",
   "activeSessions": "Aktive Sitzungen",
-  "somethingWentWrongPleaseTryAgain": "Ein Fehler ist aufgetreten, bitte erneut versuchen",
-  "thisWillLogYouOutOfThisDevice": "Dadurch werden Sie von diesem Gerät abgemeldet!",
-  "thisWillLogYouOutOfTheFollowingDevice": "Dadurch werden Sie vom folgendem Gerät abgemeldet:",
-  "terminateSession": "Sitzung beenden?",
+  "somethingWentWrongPleaseTryAgain": "Ein Fehler ist aufgetreten, bitte versuche es erneut",
+  "thisWillLogYouOutOfThisDevice": "Dadurch wirst du von diesem Gerät abgemeldet!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Dadurch wirst du von folgendem Gerät abgemeldet:",
+  "terminateSession": "Sitzungen beenden?",
   "terminate": "Beenden",
   "thisDevice": "Dieses Gerät",
   "toResetVerifyEmail": "Um Ihr Passwort zurückzusetzen, verifizieren Sie bitte zuerst Ihre E-Mail-Adresse.",
@@ -353,7 +352,7 @@
   "incorrectCode": "Falscher Code",
   "sorryTheCodeYouveEnteredIsIncorrect": "Leider ist der eingegebene Code falsch",
   "emailChangedTo": "E-Mail-Adresse geändert zu {newEmail}",
-  "authenticationFailedPleaseTryAgain": "Authentifizierung fehlgeschlagen, bitte erneut versuchen",
+  "authenticationFailedPleaseTryAgain": "Authentifizierung fehlgeschlagen, versuchen Sie es bitte erneut",
   "authenticationSuccessful": "Authentifizierung erfolgreich!",
   "twofactorAuthenticationSuccessfullyReset": "Zwei-Faktor-Authentifizierung (2FA) erfolgreich zurückgesetzt",
   "incorrectRecoveryKey": "Falscher Wiederherstellungs-Schlüssel",
@@ -366,22 +365,22 @@
   "passwordToEncryptExport": "Passwort zum Verschlüssen des Exports",
   "export": "Export",
   "useOffline": "Ohne Backup verwenden",
-  "signInToBackup": "Melden Sie sich an, um Ihre Codes zu sichern",
+  "signInToBackup": "Melde dich an, um deine Codes zu sichern",
   "singIn": "Anmelden",
-  "sigInBackupReminder": "Bitte exportieren Sie Ihre Codes, um sicherzustellen, dass Sie ein Backup haben, das Sie wiederherstellen können.",
+  "sigInBackupReminder": "Bitte exportieren Sie Ihre Codes, um sicherzustellen, dass Sie ein Backup haben, aus dem Sie wiederherstellen können.",
   "offlineModeWarning": "Sie haben sich dafür entschieden, ohne Sicherungen fortzufahren. Bitte führen Sie manuelle Sicherungen durch, um sicherzustellen, dass Ihre Codes sicher sind.",
   "showLargeIcons": "Große Symbole anzeigen",
   "compactMode": "Kompaktmodus",
   "shouldHideCode": "Codes ausblenden",
   "doubleTapToViewHiddenCode": "Sie können auf einen Eintrag doppelt tippen, um den Code anzuzeigen",
-  "focusOnSearchBar": "Suche beim App-Start fokussieren",
-  "confirmUpdatingkey": "Sind Sie sich sicher, dass Sie den geheimen Schlüssel bearbeiten wollen?",
+  "focusOnSearchBar": "Suche bei App-Start automatisch öffnen",
+  "confirmUpdatingkey": "Sind Sie sich sicher, dass Sie den Secret Key bearbeiten wollen?",
   "minimizeAppOnCopy": "Beim Kopieren App minimieren",
   "editCodeAuthMessage": "Authentifizieren, um Code zu bearbeiten",
   "deleteCodeAuthMessage": "Authentifizieren, um Code zu löschen",
   "showQRAuthMessage": "Authentifizieren, um QR-Code anzuzeigen",
   "confirmAccountDeleteTitle": "Kontolöschung bestätigen",
-  "confirmAccountDeleteMessage": "Dieses Konto ist mit anderen Ente-Apps verknüpft, falls Sie welche verwenden.\n\nIhre hochgeladenen Daten werden in allen Ente-Apps zur Löschung vorgemerkt und Ihr Konto wird endgültig gelöscht.",
+  "confirmAccountDeleteMessage": "Dieses Konto ist mit anderen Ente-Apps verknüpft, falls du welche verwendest.\n\nDeine hochgeladenen Daten werden in allen Ente-Apps zur Löschung vorgemerkt und dein Konto wird endgültig gelöscht.",
   "androidBiometricHint": "Identität bestätigen",
   "@androidBiometricHint": {
     "description": "Hint message advising the user how to authenticate with biometrics. It is used on Android side. Maximum 60 characters."
@@ -418,7 +417,7 @@
   "@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": "Auf Ihrem Gerät ist keine biometrische Authentifizierung eingerichtet. Gehen Sie zu 'Einstellungen > Sicherheit', um die biometrische Authentifizierung hinzuzufügen.",
+  "androidGoToSettingsDescription": "Auf Ihrem Gerät ist keine biometrische Authentifizierung eingerichtet. Gehen Sie „Einstellungen“ > „Sicherheit“, um die biometrische Authentifizierung hinzuzufügen.",
   "@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."
   },
@@ -435,9 +434,9 @@
     "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": "Keine Internetverbindung",
-  "pleaseCheckYourInternetConnectionAndTryAgain": "Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie erneut.",
+  "pleaseCheckYourInternetConnectionAndTryAgain": "Bitte überprüfe deine Internetverbindung und versuche es erneut.",
   "signOutFromOtherDevices": "Von anderen Geräten abmelden",
-  "signOutOtherBody": "Falls Sie denken, dass jemand Ihr Passwort kennen könnte, können Sie alle anderen Geräte forcieren, sich von Ihrem Konto abzumelden.",
+  "signOutOtherBody": "Falls du denkst, dass jemand dein Passwort kennen könnte, kannst du alle anderen Geräte von deinem Account abmelden.",
   "signOutOtherDevices": "Andere Geräte abmelden",
   "doNotSignOut": "Nicht abmelden",
   "hearUsWhereTitle": "Wie hast du von Ente erfahren? (optional)",
@@ -459,7 +458,7 @@
   "pinText": "Anpinnen",
   "unpinText": "Lösen",
   "pinnedCodeMessage": "{code} wurde angepinnt",
-  "unpinnedCodeMessage": "{code} wurde losgelöst",
+  "unpinnedCodeMessage": "{code} wird nicht weiter angepinnt",
   "pinned": "Angeheftet",
   "tags": "Tags",
   "createNewTag": "Neuen Tag erstellen",
@@ -475,7 +474,7 @@
   "rawCodeData": "Rohcode Daten",
   "appLock": "App-Sperre",
   "noSystemLockFound": "Keine Systemsperre gefunden",
-  "toEnableAppLockPleaseSetupDevicePasscodeOrScreen": "Um die App-Sperre zu aktivieren, konfigurieren Sie bitte den Gerätepasscode oder die Bildschirmsperre in den Systemeinstellungen.",
+  "toEnableAppLockPleaseSetupDevicePasscodeOrScreen": "Um die App-Sperre zu aktivieren, konfiguriere bitte den Gerätepasscode oder die Bildschirmsperre in den Systemeinstellungen.",
   "autoLock": "Automatisches Sperren",
   "immediately": "Sofort",
   "reEnterPassword": "Passwort erneut eingeben",
@@ -495,29 +494,22 @@
   "setNewPin": "Neue PIN festlegen",
   "importFailureDescNew": "Die ausgewählte Datei konnte nicht verarbeitet werden.",
   "appLockNotEnabled": "App-Sperre nicht aktiviert",
-  "appLockNotEnabledDescription": "Bitte aktivieren Sie die App-Sperre über Sicherheit > App-Sperre",
-  "authToViewPasskey": "Bitte authentifizieren, um Ihren Passkey zu sehen",
-  "appLockOfflineModeWarning": "Sie haben sich dazu entschieden, ohne Sicherungen fortzufahren. Wenn Sie Ihre App-Sperre vergessen, können Sie nicht mehr auf Ihre Daten zugreifen.",
-  "duplicateCodes": "Codes duplizieren",
+  "appLockNotEnabledDescription": "Bitte aktivieren Sie die App-Sperre über Security > App-Sperre",
+  "authToViewPasskey": "Bitte authentifizieren, um deinen Passkey zu sehen",
+  "duplicateCodes": "Doppelte Codes",
   "noDuplicates": "✨ Keine Duplikate",
   "youveNoDuplicateCodesThatCanBeCleared": "Du hast keine doppelten Codes, die bereinigt werden können",
-  "deduplicateCodes": "Codes deduplizieren",
   "deselectAll": "Alle abwählen",
-  "selectAll": "Alle auswählen",
+  "selectAll": "Alles auswählen",
   "deleteDuplicates": "Duplikate löschen",
   "plainHTML": "Reines HTML",
   "tellUsWhatYouThink": "Sagen Sie uns, was Sie denken",
-  "dropReviewiOS": "Hinterlassen Sie eine Rezension im App Store",
-  "dropReviewAndroid": "Hinterlassen Sie eine Rezension im Google Play Store",
-  "supportEnte": "Unterstütze <bold-green>ente</bold-green>",
+  "dropReviewiOS": "Hinterlasse eine Rezension im App Store",
+  "dropReviewAndroid": "Hinterlasse eine Rezension im Google Play Store",
+  "supportEnte": "Support <bold-green>ente</bold-green>",
   "giveUsAStarOnGithub": "Gib uns einen Stern auf Github",
   "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",
-  "advanced": "Erweitert",
-  "algorithm": "Algorithmus",
-  "type": "Typ",
-  "period": "Periode",
-  "digits": "Ziffern"
+  "freeStorageOfferDescription": "Verwende den Code \"AUTH\", um 10% im 1. Jahr zu sparen"
 }

auth/lib/l10n/arb/app_en.arb

@@ -173,7 +173,6 @@
   "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",
@@ -514,10 +513,5 @@
   "free5GB": "5GB free on <bold-green>ente</bold-green> Photos",
   "loginWithAuthAccount": "Login with your Auth account",
   "freeStorageOffer": "10% off on <bold-green>ente</bold-green> photos",
-  "freeStorageOfferDescription": "Use code \"AUTH\" to get 10% off first year",
-  "advanced": "Advanced",
-  "algorithm": "Algorithm",
-  "type": "Type",
-  "period": "Period",
-  "digits": "Digits"
+  "freeStorageOfferDescription": "Use code \"AUTH\" to get 10% off first year"
 }

auth/lib/l10n/arb/app_fr.arb

@@ -173,7 +173,6 @@
   "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",
@@ -514,10 +513,5 @@
   "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",
-  "advanced": "Avancé",
-  "algorithm": "Algorithme",
-  "type": "Type",
-  "period": "Période",
-  "digits": "Chiffres"
+  "freeStorageOfferDescription": "Utilisez le code coupon \"AUTH\" pour obtenir 10% de réduction la première année"
 }

auth/lib/l10n/arb/app_hu.arb

@@ -79,7 +79,7 @@
   "contactSupport": "Lépj kapcsolatba az Ügyfélszolgálattal",
   "rateUsOnStore": "Értékelj minket a következőn: {storeName}",
   "blog": "Blog",
-  "merchandise": "Ajándéktárgyak",
+  "merchandise": "Áru",
   "verifyPassword": "Jelszó megerősítése",
   "pleaseWait": "Kérem várjon...",
   "generatingEncryptionKeysTitle": "Titkosítási kulcs generálása...",
@@ -173,7 +173,6 @@
   "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",
@@ -500,20 +499,16 @@
   "appLockOfflineModeWarning": "Úgy döntött, hogy biztonsági mentés nélkül folytatja. Ha elfelejti az alkalmazászárat, akkor nem férhet hozzá adataihoz.",
   "duplicateCodes": "Ismétlődő kódok",
   "noDuplicates": "✨Nincs ismétlődés",
-  "youveNoDuplicateCodesThatCanBeCleared": "Nincsenek törölhető ismétlődő kódok",
   "deduplicateCodes": "Ismétlődő kódok",
   "deselectAll": "Összes kijelölés megszüntetése",
   "selectAll": "Összes kijelölése",
   "deleteDuplicates": "Ismétlődések törlése",
   "plainHTML": "Sima HTML kód",
   "tellUsWhatYouThink": "Mondja el mit gondol",
-  "dropReviewiOS": "Írj véleményt az App Store-ban",
-  "dropReviewAndroid": "Írj véleményt a Play Store-ban",
   "supportEnte": "Támogassa <bold-green>ente <bold-green>",
   "giveUsAStarOnGithub": "Adj nekünk egy csillagot a Githubon",
   "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",
-  "type": "Típus"
+  "freeStorageOfferDescription": "Használja az \"AUTH\" kódot, hogy 10% kedvezményt kapjon az első évben"
 }

auth/lib/l10n/arb/app_id.arb

@@ -88,8 +88,6 @@
   "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",
@@ -173,7 +171,6 @@
   "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",
@@ -504,12 +501,5 @@
   "deselectAll": "Batalkan semua pilihan",
   "selectAll": "Pilih semua",
   "deleteDuplicates": "Hapus duplikat",
-  "plainHTML": "HTML Sederhana",
-  "tellUsWhatYouThink": "Berikan pendapatmu",
-  "dropReviewAndroid": "Berikan ulasan di Play Store",
-  "advanced": "Lanjutan",
-  "algorithm": "Algoritma",
-  "type": "Tipe",
-  "period": "Periode",
-  "digits": "Digit"
+  "plainHTML": "HTML Sederhana"
 }

auth/lib/l10n/arb/app_it.arb

@@ -173,7 +173,6 @@
   "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",
@@ -514,10 +513,5 @@
   "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",
-  "advanced": "Avanzate",
-  "algorithm": "Algoritmo",
-  "type": "Tipo",
-  "period": "Periodo",
-  "digits": "Cifre"
+  "freeStorageOfferDescription": "Utilizzare il codice \"AUTH\" per ottenere il 10% di sconto al primo anno"
 }

auth/lib/l10n/arb/app_lt.arb

@@ -508,15 +508,9 @@
   "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. ",
-  "advanced": "Išplėstiniai",
-  "algorithm": "Algoritmas",
-  "type": "Tipas",
-  "period": "Laikotarpis",
-  "digits": "Skaitmenys"
+  "freeStorageOfferDescription": "Naudokite kodą „AUTH“, kad gautumėte 10 % nuolaida pirmiesiems metams. "
 }

auth/lib/l10n/arb/app_nl.arb

@@ -173,7 +173,6 @@
   "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",
@@ -514,10 +513,5 @@
   "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",
-  "advanced": "Geavanceerd",
-  "algorithm": "Algoritme",
-  "type": "Type",
-  "period": "Periode",
-  "digits": "Cijfers"
+  "freeStorageOfferDescription": "Gebruik de code \"AUTH\" voor 10% korting op je eerste jaar"
 }

auth/lib/l10n/arb/app_pl.arb

@@ -173,7 +173,6 @@
   "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",
@@ -514,10 +513,5 @@
   "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",
-  "advanced": "Zaawansowane",
-  "algorithm": "Algorytm",
-  "type": "Rodzaj",
-  "period": "Okres",
-  "digits": "Cyfry"
+  "freeStorageOfferDescription": "Użyj kodu „AUTH”, aby uzyskać 10% zniżki na pierwszy rok"
 }

auth/lib/l10n/arb/app_pt.arb

@@ -173,7 +173,6 @@
   "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",
@@ -514,10 +513,5 @@
   "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",
-  "advanced": "Avançado",
-  "algorithm": "Algoritmo",
-  "type": "Tipo",
-  "period": "Período",
-  "digits": "Dígitos"
+  "freeStorageOfferDescription": "Use o cupom \"AUTH\" para obter 10% de desconto no primeiro ano"
 }

auth/lib/l10n/arb/app_sr.arb

@@ -1,523 +0,0 @@
-{
-  "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": "Цифре"
-}

auth/lib/l10n/arb/app_ta.arb

@@ -1,3 +1 @@
-{
-  "importScanQrCode": ""
-}
+{}

auth/lib/l10n/arb/app_tr.arb

@@ -6,10 +6,10 @@
   "@counterAppBarTitle": {
     "description": "Text shown in the AppBar of the Counter Page"
   },
-  "onBoardingBody": "2FA kodlarınızı güvenli bir şekilde yedekleyin",
+  "onBoardingBody": "2 Faktörlü Kimlik Doğrulama kodlarınızı koruyun",
   "onBoardingGetStarted": "Başlayın",
   "setupFirstAccount": "İlk hesabınızı ekleyin",
-  "importScanQrCode": "QR kod tara",
+  "importScanQrCode": "Karekod tara",
   "qrCode": "QR Kodu",
   "importEnterSetupKey": "Kurulum anahtarını giriniz",
   "importAccountPageTitle": "Hesap bilgilerinizi girin",
@@ -51,11 +51,11 @@
   "trashCode": "Kod çöpe atılsın mı?",
   "trashCodeMessage": "{account} için kodu çöpe atmak istediğinize emin misiniz?",
   "trash": "Çöp",
-  "viewLogsAction": "Kayıtları görüntüle",
-  "sendLogsDescription": "Kayıtlarınız hatanızı çözmemize yardımcı olacaktır. Hassas bilginin kaydedilmediğine dikkat etsek de bu günlükleri paylaşmadan önce kontrol etmenizi isteriz.",
-  "preparingLogsTitle": "Kayıtlar hazırlanıyor...",
-  "emailLogsTitle": "Kayıtları e-posta olarak gönder",
-  "emailLogsMessage": "Lütfen kayıtlarınızı {email} adresine gönderin",
+  "viewLogsAction": "Günlüğü görüntüle",
+  "sendLogsDescription": "Günlüğünüz hatanızı çözmemize yardımcı olacaktır. Hassas bilginin kaydedilmediğine dikkat etsek de bu günlükleri paylaşmadan önce kontrol etmenizi isteriz.",
+  "preparingLogsTitle": "Günlük hazırlanıyor...",
+  "emailLogsTitle": "Günlüğü e-posta olarak gönder",
+  "emailLogsMessage": "Lütfen günlüğünüzü {email} adresine gönderin",
   "@emailLogsMessage": {
     "placeholders": {
       "email": {
@@ -64,7 +64,7 @@
     }
   },
   "copyEmailAction": "E-postayı Kopyala",
-  "exportLogsAction": "Kayıtları dışa aktar",
+  "exportLogsAction": "Günlüğü dışa aktar",
   "reportABug": "Hata bildirin",
   "crashAndErrorReporting": "Çökme ve hata bildirimi",
   "reportBug": "Hata bildir",
@@ -90,7 +90,7 @@
   "welcomeBack": "Tekrar hoş geldiniz!",
   "emailAlreadyRegistered": "E-posta zaten kayıtlı.",
   "emailNotRegistered": "E-posta kayıtlı değil.",
-  "madeWithLoveAtPrefix": "❤️ ile yapılmıştır ",
+  "madeWithLoveAtPrefix": "❤️ ile şurada yapılmıştır ",
   "supportDevs": "Bu projeyi desteklemek için <bold-green>ente</bold-green> kanalına abone olun",
   "supportDiscount": "İlk yılda %10 indirim için \"AUTH\" kupon kodunu kullanın",
   "changeEmail": "E-posta adresini değiştir",
@@ -173,11 +173,10 @@
   "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",
-  "deleteAccountQuery": "Sizin gittiğinizi görmekten üzüleceğiz. Bazı problemlerle mi karşılaşıyorsunuz?",
+  "deleteAccountQuery": "Sizin gitmenizi görmekten üzüleceğiz. Bazı problemlerle mi karşılaşıyorsunuz?",
   "yesSendFeedbackAction": "Evet, geri bildirimi gönder",
   "noDeleteAccountAction": "Hayır, hesabı sil",
   "initiateAccountDeleteTitle": "Hesap silme işlemini yapabilmek için lütfen kimliğinizi doğrulayın",
@@ -254,8 +253,8 @@
   "insecureDevice": "Güvenli olmayan cihaz",
   "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Üzgünüz, bu cihazda güvenli anahtarlar oluşturamadık.\n\nlütfen farklı bir cihazdan kaydolun.",
   "howItWorks": "Nasıl çalışır",
-  "ackPasswordLostWarning": "Eğer şifremi kaybedersem, verilerim <underline> uçtan uca şifrelendiğinden </underline> verilerimi kaybedebileceğimi anladım.",
-  "loginTerms": "Giriş yaparak, <u-terms> kullanım şartları </u-terms>nı ve <u-policy> gizlilik politikası </u-policy>nı onaylıyorum",
+  "ackPasswordLostWarning": "Eğer şifremi kaybedersem, verilerim <underline>uçtan uca şifrelendiğinden</underline> verilerimi kaybedebileceğimi anladım.",
+  "loginTerms": "Giriş yaparak, <u-terms>kullanım şartları</u-terms>nı ve <u-policy>gizlilik politikası</u-policy>nı onaylıyorum",
   "logInLabel": "Giriş yapın",
   "logout": "Çıkış yap",
   "areYouSureYouWantToLogout": "Çıkış yapmak istediğinize emin misiniz?",
@@ -278,10 +277,10 @@
   "recoveryKeyVerifyReason": "Kurtarma anahtarınız, şifrenizi unutmanız durumunda fotoğraflarınızı kurtarmanın tek yoludur. Kurtarma anahtarınızı Ayarlar > Hesap bölümünde bulabilirsiniz.\n\nDoğru kaydettiğinizi doğrulamak için lütfen kurtarma anahtarınızı buraya girin.",
   "confirmYourRecoveryKey": "Kurtarma anahtarınızı doğrulayın",
   "confirm": "Doğrula",
-  "emailYourLogs": "Kayıtlarınızı e-postayla gönderin",
-  "pleaseSendTheLogsTo": "Lütfen kayıtları şu adrese gönderin\n{toEmail}",
+  "emailYourLogs": "Günlüklerinizi e-postayla gönderin",
+  "pleaseSendTheLogsTo": "Lütfen günlükleri şu adrese gönderin\n{toEmail}",
   "copyEmailAddress": "E-posta adresini kopyala",
-  "exportLogs": "Kayıtları dışa aktar",
+  "exportLogs": "Günlüğü dışa aktar",
   "enterYourRecoveryKey": "Kurtarma anahtarınızı girin",
   "tempErrorContactSupportIfPersists": "Bir şeyler ters gitmiş gibi görünüyor. Lütfen bir süre sonra tekrar deneyin. Hata devam ederse, lütfen destek ekibimizle iletişime geçin.",
   "networkHostLookUpErr": "Ente'ye bağlanılamıyor, lütfen ağ ayarlarınızı kontrol edin ve hata devam ederse desteğe başvurun.",
@@ -500,24 +499,10 @@
   "appLockOfflineModeWarning": "Yedekleme olmadan devam etmeyi seçtiniz. Eğer uygulama parolanızı unutursanız, verilerinize erişiminiz engellenir.",
   "duplicateCodes": "Yinelenen kodlar",
   "noDuplicates": "✨ Yinelenen yok",
-  "youveNoDuplicateCodesThatCanBeCleared": "Temizlenebilecek herhangi bir yinelenen kodunuz yok",
   "deduplicateCodes": "Kodları tekilleştir",
   "deselectAll": "Tümünün seçimini kaldır",
   "selectAll": "Tümünü seç",
   "deleteDuplicates": "Yinelenenleri sil",
   "plainHTML": "Sade HTML",
-  "tellUsWhatYouThink": "Bize ne düşündüğünü söyle",
-  "dropReviewiOS": "App Store'da bir inceleme bırakın",
-  "dropReviewAndroid": "Play Store'da bir inceleme bırakın",
-  "supportEnte": "<bold-Green>Ente</bold-Green>'yi destekle",
-  "giveUsAStarOnGithub": "Github'da bize bir yıldız verin",
-  "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",
-  "advanced": "Gelişmiş",
-  "algorithm": "Algoritma",
-  "type": "Tür",
-  "period": "Zaman Aralığı",
-  "digits": "Uzunluk"
+  "supportEnte": "<bold-Green>Ente</bold-Green>'yi destekle"
 }

auth/lib/l10n/arb/app_vi.arb

@@ -51,7 +51,7 @@
   "trashCode": "Xóa mã?",
   "trashCodeMessage": "Bạn có chắc chắn muốn xóa mã cho {account} không?",
   "trash": "Xóa",
-  "viewLogsAction": "Xem nhật ký",
+  "viewLogsAction": "Xem các bản ghi",
   "sendLogsDescription": "Thao tác này sẽ gửi nhật ký để giúp chúng tôi gỡ lỗi sự cố của bạn. Mặc dù chúng tôi thực hiện các biện pháp phòng ngừa để đảm bảo rằng thông tin nhạy cảm không được ghi lại, nhưng chúng tôi khuyến khích bạn xem các nhật ký này trước khi chia sẻ chúng.",
   "preparingLogsTitle": "Đang chuẩn bị nhật ký...",
   "emailLogsTitle": "Nhật ký email",
@@ -506,8 +506,6 @@
   "deleteDuplicates": "Xóa trùng lặp",
   "plainHTML": "HTML thuần",
   "tellUsWhatYouThink": "Hãy cho chúng tôi biết bạn nghĩ gì",
-  "dropReviewiOS": "Đánh giá ngay trên App Store",
-  "dropReviewAndroid": "Đánh giá ngay trên Play Store",
   "supportEnte": "Hỗ trợ <bold-green>ente</bold-green>",
   "giveUsAStarOnGithub": "Cho chúng tôi ngôi sao trên Github",
   "free5GB": "Miễn phí 5GB cho <bold-green>ente</bold-green> Hình ảnh",

auth/lib/l10n/arb/app_zh_CN.arb

@@ -173,7 +173,6 @@
   "invalidQRCode": "二维码无效",
   "noRecoveryKeyTitle": "没有恢复密钥吗？",
   "enterEmailHint": "请输入您的电子邮件地址",
-  "enterNewEmailHint": "请输入您的新电子邮件地址",
   "invalidEmailTitle": "无效的电子邮件地址",
   "invalidEmailMessage": "请输入一个有效的电子邮件地址。",
   "deleteAccount": "删除账户",
@@ -514,10 +513,5 @@
   "free5GB": "<bold-green>ente</bold-green> Photos 上 5GB 可用空间",
   "loginWithAuthAccount": "使用您的认证账户登录",
   "freeStorageOffer": "购买 <bold-green>ente</bold-green> Photos 可享受 10% 优惠",
-  "freeStorageOfferDescription": "使用优惠码“AUTH”可享受首年 10% 折扣",
-  "advanced": "高级",
-  "algorithm": "算法",
-  "type": "类型",
-  "period": "周期",
-  "digits": "数字"
+  "freeStorageOfferDescription": "使用优惠码“AUTH”可享受首年 10% 折扣"
 }

auth/lib/l10n/arb/app_zh_TW.arb

@@ -504,7 +504,7 @@
   "deselectAll": "取消全選",
   "selectAll": "全選",
   "deleteDuplicates": "刪除重複項",
-  "plainHTML": "純HTML",
+  "plainHTML": "Plain HTML",
   "tellUsWhatYouThink": "告訴我們您的想法",
   "dropReviewiOS": "在 App Store 上發表意見",
   "dropReviewAndroid": "在 Play 商店上發表評測",
@@ -513,10 +513,5 @@
   "free5GB": "<bold-green>ente</bold-green> Photos 上 5GB 可用空間",
   "loginWithAuthAccount": "使用您的認證帳戶登錄",
   "freeStorageOffer": "購買 <bold-green>ente</bold-green> Photos 可享受 10% 優惠",
-  "freeStorageOfferDescription": "使用優惠碼“AUTH”可享受首年 10% 折扣",
-  "advanced": "進階",
-  "algorithm": "演算法",
-  "type": "類型",
-  "period": "期間",
-  "digits": "數位"
+  "freeStorageOfferDescription": "使用優惠碼“AUTH”可享受首年 10% 折扣"
 }

auth/lib/locale.dart

@@ -38,28 +38,28 @@ const List<Locale> appSupportedLocales = <Locale>[
 ];
 
 Locale? autoDetectedLocale;
-// 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
+Locale localResolutionCallBack(locales, supportedLocales) {
+  Locale? languageCodeMatch;
+  final Map<String, Locale> languageCodeToLocale = {
+    for (Locale supportedLocale in appSupportedLocales)
+      supportedLocale.languageCode: supportedLocale,
+  };
+
+  for (Locale locale in locales) {
     if (appSupportedLocales.contains(locale)) {
       autoDetectedLocale = locale;
       return locale;
     }
-    // check if language code is supported, if yes, return it
-    if (languageSupport.contains(locale.languageCode)) {
-      autoDetectedLocale = locale;
-      return locale;
+
+    if (languageCodeMatch == null &&
+        languageCodeToLocale.containsKey(locale.languageCode)) {
+      languageCodeMatch = languageCodeToLocale[locale.languageCode];
+      autoDetectedLocale = languageCodeMatch;
     }
   }
+
   // Return the first language code match or default to 'en'
-  return autoDetectedLocale ?? const Locale('en');
+  return languageCodeMatch ?? const Locale('en');
 }
 
 Future<Locale?> getLocale({

auth/lib/onboarding/view/setup_enter_secret_key_page.dart

@@ -293,6 +293,10 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                     ],
                   ),
                   const SizedBox(height: 12),
+                  widget.code == null
+                      ? advanceOptionWidget()
+                      : const SizedBox.shrink(),
+                  const SizedBox(height: 12),
                   Wrap(
                     spacing: 12,
                     alignment: WrapAlignment.start,
@@ -339,10 +343,6 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                       ),
                     ],
                   ),
-                  const SizedBox(height: 12),
-                  widget.code == null
-                      ? advanceOptionWidget()
-                      : const SizedBox.shrink(),
                   const SizedBox(height: 40),
                   SizedBox(
                     width: 400,
@@ -525,7 +525,6 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
   }
 
   Widget advanceOptionWidget() {
-    final l10n = context.l10n;
     return Padding(
       padding: const EdgeInsets.only(top: 16.0),
       child: Column(
@@ -538,7 +537,9 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                Text(l10n.advanced),
+                const Text(
+                  'Advanced',
+                ),
                 ValueListenableBuilder<bool>(
                   valueListenable: showAdvancedOptions,
                   builder: (context, isExpanded, child) {
@@ -582,7 +583,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                               Row(
                                 mainAxisAlignment: MainAxisAlignment.start,
                                 children: [
-                                  FieldLabel(l10n.algorithm, width: 60),
+                                  const FieldLabel("Algorithm", width: 60),
                                   AlgorithmSelectorWidget(
                                     currentAlgorithm: _algorithm,
                                     onSelected: (newAlgorithm) async {
@@ -596,7 +597,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                               Row(
                                 mainAxisAlignment: MainAxisAlignment.start,
                                 children: [
-                                  FieldLabel(l10n.type, width: 60),
+                                  const FieldLabel("Type", width: 60),
                                   ToptSelectorWidget(
                                     currentTopt: _type,
                                     onSelected: (newTopt) async {
@@ -609,7 +610,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                               ),
                               Row(
                                 children: [
-                                  FieldLabel(l10n.period, width: 60),
+                                  const FieldLabel("Period", width: 60),
                                   Expanded(
                                     child: TextFormField(
                                       keyboardType: TextInputType.number,
@@ -638,7 +639,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                               ),
                               Row(
                                 children: [
-                                  FieldLabel(l10n.digits, width: 60),
+                                  const FieldLabel("Digits", width: 60),
                                   Expanded(
                                     child: TextFormField(
                                       keyboardType: TextInputType.number,

auth/lib/services/authenticator_service.dart

@@ -13,7 +13,6 @@ 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';
@@ -195,13 +194,8 @@ class AuthenticatorService {
     final int lastSyncTime = _prefs.getInt(_lastEntitySyncTime) ?? 0;
     _logger.info("Current sync is $lastSyncTime");
     const int fetchLimit = 500;
-    late final List<AuthEntity> result;
-    late final int? epochTimeInMicroseconds;
-    (result, epochTimeInMicroseconds) =
+    final List<AuthEntity> result =
         await _gateway.getDiff(lastSyncTime, limit: fetchLimit);
-    PreferenceService.instance
-        .computeAndStoreTimeOffset(epochTimeInMicroseconds);
-
     _logger.info("${result.length} entries fetched from remote");
     if (result.isEmpty) {
       return;

auth/lib/services/preference_service.dart

@@ -18,7 +18,6 @@ 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";
@@ -115,24 +114,4 @@ 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);
-  }
 }

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.enterNewEmailHint),
+      title: Text(l10n.enterEmailHint),
       content: SingleChildScrollView(
         child: Column(
           mainAxisAlignment: MainAxisAlignment.start,

auth/lib/ui/code_timer_progress.dart

@@ -7,12 +7,10 @@ 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
@@ -22,7 +20,7 @@ class CodeTimerProgress extends StatefulWidget {
 class _CodeTimerProgressState extends State<CodeTimerProgress> {
   late final Timer _timer;
   late final ValueNotifier<double> _progress;
-  late final int _periodInMilii;
+  late final int _periodInMicros;
 
   // Reduce update frequency
   final int _updateIntervalMs =
@@ -31,30 +29,29 @@ class _CodeTimerProgressState extends State<CodeTimerProgress> {
   @override
   void initState() {
     super.initState();
-    _periodInMilii = widget.period * 1000;
+    _periodInMicros = widget.period * 1000000;
     _progress = ValueNotifier<double>(0.0);
-    _updateTimeRemaining(DateTime.now().millisecondsSinceEpoch);
+    _updateTimeRemaining(DateTime.now().microsecondsSinceEpoch);
 
     _timer = Timer.periodic(Duration(milliseconds: _updateIntervalMs), (timer) {
-      final now = DateTime.now().millisecondsSinceEpoch;
+      final now = DateTime.now().microsecondsSinceEpoch;
       _updateTimeRemaining(now);
     });
   }
 
-  void _updateTimeRemaining(int currentMilliSeconds) {
+  void _updateTimeRemaining(int currentMicros) {
     // More efficient time calculation using modulo
-    final elapsed = (currentMilliSeconds + widget.timeOffsetInMilliseconds) %
-        _periodInMilii;
-    final timeRemaining = _periodInMilii - elapsed;
-    _progress.value = timeRemaining / _periodInMilii;
+    final elapsed = (currentMicros) % _periodInMicros;
+    final timeRemaining = _periodInMicros - elapsed;
+    _progress.value = timeRemaining / _periodInMicros;
   }
 
   @override
   void didUpdateWidget(covariant CodeTimerProgress oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.period != widget.period) {
-      _periodInMilii = widget.period * 1000;
-      _updateTimeRemaining(DateTime.now().millisecondsSinceEpoch);
+      _periodInMicros = widget.period * 1000000;
+      _updateTimeRemaining(DateTime.now().microsecondsSinceEpoch);
     }
   }
 

auth/lib/ui/code_widget.dart

@@ -152,8 +152,6 @@ 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)

auth/lib/utils/totp_util.dart

@@ -1,14 +1,8 @@
 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);
@@ -18,7 +12,7 @@ String getOTP(Code code) {
   }
   return otp.OTP.generateTOTPCodeString(
     getSanitizedSecret(code.secret),
-    millisecondsSinceEpoch(),
+    DateTime.now().millisecondsSinceEpoch,
     length: code.digits,
     interval: code.period,
     algorithm: _getAlgorithm(code),
@@ -40,7 +34,7 @@ String _getSteamCode(Code code, [bool isNext = false]) {
   final SteamTOTP steamtotp = SteamTOTP(secret: code.secret);
 
   return steamtotp.generate(
-    millisecondsSinceEpoch() ~/ 1000 + (isNext ? code.period : 0),
+    DateTime.now().millisecondsSinceEpoch ~/ 1000 + (isNext ? code.period : 0),
   );
 }
 
@@ -50,7 +44,7 @@ String getNextTotp(Code code) {
   }
   return otp.OTP.generateTOTPCodeString(
     getSanitizedSecret(code.secret),
-    millisecondsSinceEpoch() + code.period * 1000,
+    DateTime.now().millisecondsSinceEpoch + code.period * 1000,
     length: code.digits,
     interval: code.period,
     algorithm: _getAlgorithm(code),
@@ -62,7 +56,9 @@ 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 =
-      ((millisecondsSinceEpoch() ~/ 1000) ~/ code.period) * code.period * 1000;
+      ((DateTime.now().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') {

auth/linux/packaging/enteauth.appdata.xml

@@ -18,8 +18,6 @@
         </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>
@@ -35,4 +33,4 @@
         <color type="primary" scheme_preference="light">#ffffff</color>
         <color type="primary" scheme_preference="dark">#000000</color>
     </branding>
-</component>
+</component>

auth/macos/Podfile.lock

@@ -34,11 +34,11 @@ PODS:
     - FlutterMacOS
   - screen_retriever (0.0.1):
     - FlutterMacOS
-  - Sentry/HybridSDK (8.46.0)
-  - sentry_flutter (8.14.2):
+  - Sentry/HybridSDK (8.36.0)
+  - sentry_flutter (8.9.0):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 8.46.0)
+    - Sentry/HybridSDK (= 8.36.0)
   - share_plus (0.0.1):
     - FlutterMacOS
   - shared_preferences_foundation (0.0.1):
@@ -157,33 +157,33 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
 
 SPEC CHECKSUMS:
-  app_links: 9028728e32c83a0831d9db8cf91c526d16cc5468
-  connectivity_plus: 3f6c9057f4cd64198dc826edfb0542892f825343
-  cupertino_http: 94ac07f5ff090b8effa6c5e2c47871d48ab7c86c
-  device_info_plus: b0fafc687fb901e2af612763340f1b0d4352f8e5
-  file_saver: e35bd97de451dde55ff8c38862ed7ad0f3418d0f
-  flutter_inappwebview_macos: c2d68649f9f8f1831bfcd98d73fd6256366d9d1d
-  flutter_local_authentication: 2f9a2682f498abcc12d7e9729b5007a947170fdc
-  flutter_local_notifications: 453432cd6399a07d072885bc7828fb2307868856
-  flutter_secure_storage_macos: b2d62a774c23b060f0b99d0173b0b36abb4a8632
+  app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
+  connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db
+  cupertino_http: 947a233f40cfea55167a49f2facc18434ea117ba
+  device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
+  file_saver: 44e6fbf666677faf097302460e214e977fdd977b
+  flutter_inappwebview_macos: bdf207b8f4ebd58e86ae06cd96b147de99a67c9b
+  flutter_local_authentication: 85674893931e1c9cfa7c9e4f5973cb8c56b018b0
+  flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
+  flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  local_auth_darwin: 553ce4f9b16d3fdfeafce9cf042e7c9f77c1c391
-  objective_c: ec13431e45ba099cb734eb2829a5c1cd37986cba
+  local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3
+  objective_c: e5f8194456e8fc943e034d1af00510a1bc29c067
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: a8a591e70e87ce97ce5d21b2594f69cea9e0312f
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
-  screen_retriever: 4f97c103641aab8ce183fa5af3b87029df167936
-  Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
-  sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
-  share_plus: 11c7b7fa7020465584eca3ff6392c5bc1e399d6e
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  sodium_libs: b9459e5bfc1185349f43472e79fc5d8e526b2bda
-  sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3
+  package_info_plus: fa739dd842b393193c5ca93c26798dff6e3d0e0c
+  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38
+  Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
+  sentry_flutter: 0eb93e5279eb41e2392212afe1ccd2fecb4f8cbe
+  share_plus: 36537c04ce0c3e3f5bd297ce4318b6d5ee5fd6cf
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sodium_libs: d39bd76697736cb11ce4a0be73b9b4bc64466d6f
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb
-  sqlite3_flutter_libs: 03311aede9d32fb2d24e32bebb8cd01c3b2e6239
-  tray_manager: a104b5c81b578d83f3c3d0f40a997c8b10810166
-  url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
-  window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c
+  sqlite3_flutter_libs: 5ca46c1a04eddfbeeb5b16566164aa7ad1616e7b
+  tray_manager: 9064e219c56d75c476e46b9a21182087930baf90
+  url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
+  window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
 
 PODFILE CHECKSUM: 6ff827273ace187339fc5d3684072a26ad85c298
 

auth/pubspec.lock

@@ -675,13 +675,14 @@ packages:
     source: hosted
     version: "9.2.2"
   flutter_secure_storage_linux:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: flutter_secure_storage_linux
-      sha256: be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.3"
+      path: flutter_secure_storage_linux
+      ref: develop
+      resolved-ref: "5a5692b609b3886cdd49b2ed06b9c079ecdff996"
+      url: "https://github.com/mogol/flutter_secure_storage.git"
+    source: git
+    version: "1.2.1"
   flutter_secure_storage_macos:
     dependency: transitive
     description:
@@ -1360,18 +1361,18 @@ packages:
     dependency: "direct main"
     description:
       name: sentry
-      sha256: "599701ca0693a74da361bc780b0752e1abc98226cf5095f6b069648116c896bb"
+      sha256: "033287044a6644a93498969449d57c37907e56f5cedb17b88a3ff20a882261dd"
       url: "https://pub.dev"
     source: hosted
-    version: "8.14.2"
+    version: "8.9.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
-      sha256: "5ba2cf40646a77d113b37a07bd69f61bb3ec8a73cbabe5537b05a7c89d2656f8"
+      sha256: "3780b5a0bb6afd476857cfbc6c7444d969c29a4d9bd1aa5b6960aa76c65b737a"
       url: "https://pub.dev"
     source: hosted
-    version: "8.14.2"
+    version: "8.9.0"
   share_plus:
     dependency: "direct main"
     description:

auth/pubspec.yaml

@@ -1,7 +1,7 @@
 
 name: ente_auth
 description: ente two-factor authenticator
-version: 4.4.0+440
+version: 4.3.3+433
 publish_to: none
 
 environment:
@@ -84,8 +84,8 @@ dependencies:
   protobuf: ^3.0.0
   qr_code_scanner: ^1.0.1
   qr_flutter: ^4.1.0 
-  sentry: ^8.14.2
-  sentry_flutter: ^8.14.2
+  sentry: ^8.7.0
+  sentry_flutter: ^8.7.0
   share_plus: ^10.0.2
   shared_preferences: ^2.0.5
   sqflite:
@@ -107,6 +107,12 @@ dependencies:
   window_manager: ^0.4.2
   xdg_directories: ^1.0.4
 
+dependency_overrides:
+  flutter_secure_storage_linux:
+    git:
+      url: https://github.com/mogol/flutter_secure_storage.git
+      ref: develop
+      path: flutter_secure_storage_linux
 dev_dependencies:
   build_runner: ^2.1.11
   flutter_test:
@@ -142,17 +148,12 @@ flutter:
       fonts:
         - asset: fonts/Montserrat-Bold.ttf
 
-# run "dart run flutter_launcher_icons" to generate icons
-flutter_launcher_icons:
-  image_path: "assets/generation-icons/icon-light.png"
-
+flutter_icons:
   android: "launcher_icon"
   adaptive_icon_foreground: "assets/generation-icons/icon-light-adaptive-fg.png"
   adaptive_icon_background: "assets/generation-icons/icon-light-adaptive-bg.png"
-  adaptive_icon_monochrome: "assets/generation-icons/icon-monochrome.png"
-  adaptive_icon_foreground_inset: 0
-
   ios: true
+  image_path: "assets/generation-icons/icon-light.png"
   remove_alpha_ios: true
 
 flutter_native_splash:

auth/scripts/release_tag.sh

@@ -1,70 +0,0 @@
-#!/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

auth/windows/flutter/generated_plugin_registrant.cc

@@ -14,7 +14,6 @@
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
 #include <local_auth_windows/local_auth_plugin.h>
 #include <screen_retriever/screen_retriever_plugin.h>
-#include <sentry_flutter/sentry_flutter_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <sodium_libs/sodium_libs_plugin_c_api.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
@@ -39,8 +38,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("LocalAuthPlugin"));
   ScreenRetrieverPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("ScreenRetrieverPlugin"));
-  SentryFlutterPluginRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("SentryFlutterPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   SodiumLibsPluginCApiRegisterWithRegistrar(

auth/windows/flutter/generated_plugins.cmake

@@ -11,7 +11,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
   flutter_secure_storage_windows
   local_auth_windows
   screen_retriever
-  sentry_flutter
   share_plus
   sodium_libs
   sqlite3_flutter_libs
@@ -22,6 +21,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
   jni
+  sentry_flutter
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)

cli/internal/api/login.go

@@ -83,14 +83,13 @@ func (c *Client) VerifySRPSession(
 	return &res, nil
 }
 
-func (c *Client) SendLoginOTP(
+func (c *Client) SendEmailOTP(
 	ctx context.Context,
 	email string,
 ) error {
 	var res AuthorizationResponse
 	payload := map[string]interface{}{
-		"email":   email,
-		"purpose": "login",
+		"email": email,
 	}
 	r, err := c.restClient.R().
 		SetContext(ctx).

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.SendLoginOTP(ctx, email)
+	err := c.Client.SendEmailOTP(ctx, email)
 	if err != nil {
 		return nil, err
 	}

desktop/CHANGELOG.md

@@ -1,23 +1,9 @@
 # CHANGELOG
 
-## v1.7.14 (Unreleased)
+## v1.7.12 (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
-
-- Improved video player with streaming support (for already processed videos).
-- Support Arabic translations.
-
 ## v1.7.11
 
 - Improved file viewer.

desktop/eslint.config.mjs

@@ -39,15 +39,6 @@ export default ts.config(
                 "error",
                 { allowTernary: true },
             ],
-            // Allow force unwrapping potentially optional values.
-            //
-            // See: [Note: non-null-assertions have better stack trace]
-            "@typescript-eslint/no-non-null-assertion": "off",
-            // Allow `while(true)` etc.
-            "@typescript-eslint/no-unnecessary-condition": [
-                "error",
-                { allowConstantLoopConditions: true },
-            ],
         },
     },
 );

desktop/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ente",
-    "version": "1.7.14-beta",
+    "version": "1.7.12-beta",
     "private": true,
     "description": "Desktop client for Ente Photos",
     "repository": "github:ente-io/photos-desktop",
@@ -31,33 +31,32 @@
         "clip-bpe-js": "^0.0.6",
         "comlink": "^4.4.2",
         "compare-versions": "^6.1.1",
-        "electron-log": "^5.4.0",
+        "electron-log": "^5.3.3",
         "electron-store": "^8.2.0",
-        "electron-updater": "^6.6.3",
+        "electron-updater": "^6.6.2",
         "ffmpeg-static": "^5.2.0",
         "lru-cache": "^11.1.0",
         "next-electron-server": "^1.0.0",
         "node-stream-zip": "^1.15.0",
-        "onnxruntime-node": "^1.20.1",
-        "zod": "^3.25.51"
+        "onnxruntime-node": "^1.20.1"
     },
     "devDependencies": {
-        "@eslint/js": "^9.28.0",
-        "@tsconfig/node22": "^22.0.2",
+        "@eslint/js": "^9.24.0",
+        "@tsconfig/node22": "^22.0.1",
         "@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.4.0",
-        "electron-builder": "^26.0.14",
+        "electron": "^35.1.4",
+        "electron-builder": "^26.0.12",
         "eslint": "^9",
         "prettier": "3.5.3",
         "prettier-plugin-organize-imports": "^4.1.0",
-        "prettier-plugin-packagejson": "^2.5.15",
-        "shx": "^0.4.0",
+        "prettier-plugin-packagejson": "^2.5.10",
+        "shx": "^0.3.4",
         "typescript": "^5.8.3",
-        "typescript-eslint": "^8.33.1"
+        "typescript-eslint": "^8.29.1"
     },
     "packageManager": "yarn@1.22.22",
     "productName": "ente"

desktop/src/main.ts

@@ -78,14 +78,6 @@ 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();
@@ -431,14 +423,7 @@ const createMainWindow = () => {
     window.on("hide", () => {
         // On macOS, when hiding the window also hide the app's icon in the dock
         // unless the user has unchecked the Settings > Hide dock icon checkbox.
-        if (shouldHideDockIcon()) {
-            // macOS emits a window "hide" event when going fullscreen, and if
-            // we hide the dock icon there then the window disappears. So ignore
-            // this scenario.
-            if (!window.isFullScreen()) {
-                app.dock?.hide();
-            }
-        }
+        if (shouldHideDockIcon()) app.dock?.hide();
     });
 
     window.on("show", () => void app.dock?.show());

desktop/src/main/ipc.ts

@@ -13,10 +13,8 @@ import type { BrowserWindow } from "electron";
 import { ipcMain } from "electron/main";
 import type {
     CollectionMapping,
-    FFmpegCommand,
     FolderWatch,
     PendingUploads,
-    UtilityProcessType,
     ZipItem,
 } from "../types/ipc";
 import { logToDisk } from "./log";
@@ -32,7 +30,7 @@ import {
     openLogDirectory,
     selectDirectory,
 } from "./services/dir";
-import { ffmpegDetermineVideoDuration, ffmpegExec } from "./services/ffmpeg";
+import { ffmpegExec } from "./services/ffmpeg";
 import {
     fsExists,
     fsFindFiles,
@@ -42,12 +40,12 @@ import {
     fsRename,
     fsRm,
     fsRmdir,
-    fsStatMtime,
     fsWriteFile,
     fsWriteFileViaBackup,
 } from "./services/fs";
 import { convertToJPEG, generateImageThumbnail } from "./services/image";
 import { logout } from "./services/logout";
+import { createMLWorker } from "./services/ml";
 import {
     lastShownChangelogVersion,
     masterKeyB64,
@@ -57,8 +55,8 @@ import {
 import {
     clearPendingUploads,
     listZipItems,
-    markUploadedFile,
-    markUploadedZipItem,
+    markUploadedFiles,
+    markUploadedZipItems,
     pathOrZipItemSize,
     pendingUploads,
     setPendingUploads,
@@ -70,7 +68,6 @@ import {
     watchUpdateIgnoredFiles,
     watchUpdateSyncedFiles,
 } from "./services/watch";
-import { triggerCreateUtilityProcess } from "./services/workers";
 
 /**
  * Listen for IPC events sent/invoked by the renderer process, and route them to
@@ -166,8 +163,6 @@ export const attachIPCHandlers = () => {
 
     ipcMain.handle("fsIsDir", (_, dirPath: string) => fsIsDir(dirPath));
 
-    ipcMain.handle("fsStatMtime", (_, path: string) => fsStatMtime(path));
-
     ipcMain.handle("fsFindFiles", (_, folderPath: string) =>
         fsFindFiles(folderPath),
     );
@@ -182,26 +177,20 @@ export const attachIPCHandlers = () => {
         "generateImageThumbnail",
         (
             _,
-            pathOrZipItem: string | ZipItem,
+            dataOrPathOrZipItem: Uint8Array | string | ZipItem,
             maxDimension: number,
             maxSize: number,
-        ) => generateImageThumbnail(pathOrZipItem, maxDimension, maxSize),
+        ) => generateImageThumbnail(dataOrPathOrZipItem, maxDimension, maxSize),
     );
 
     ipcMain.handle(
         "ffmpegExec",
         (
             _,
-            command: FFmpegCommand,
-            pathOrZipItem: string | ZipItem,
+            command: string[],
+            dataOrPathOrZipItem: Uint8Array | string | ZipItem,
             outputFileExtension: string,
-        ) => ffmpegExec(command, pathOrZipItem, outputFileExtension),
-    );
-
-    ipcMain.handle(
-        "ffmpegDetermineVideoDuration",
-        (_, pathOrZipItem: string | ZipItem) =>
-            ffmpegDetermineVideoDuration(pathOrZipItem),
+        ) => ffmpegExec(command, dataOrPathOrZipItem, outputFileExtension),
     );
 
     // - Upload
@@ -221,15 +210,13 @@ export const attachIPCHandlers = () => {
     );
 
     ipcMain.handle(
-        "markUploadedFile",
-        (_, path: string, associatedPath: string | undefined) =>
-            markUploadedFile(path, associatedPath),
+        "markUploadedFiles",
+        (_, paths: PendingUploads["filePaths"]) => markUploadedFiles(paths),
     );
 
     ipcMain.handle(
-        "markUploadedZipItem",
-        (_, item: ZipItem, associatedItem: ZipItem | undefined) =>
-            markUploadedZipItem(item, associatedItem),
+        "markUploadedZipItems",
+        (_, items: PendingUploads["zipItems"]) => markUploadedZipItems(items),
     );
 
     ipcMain.handle("clearPendingUploads", () => clearPendingUploads());
@@ -240,11 +227,9 @@ export const attachIPCHandlers = () => {
  * the main window to do their thing.
  */
 export const attachMainWindowIPCHandlers = (mainWindow: BrowserWindow) => {
-    // - Utility processes
+    // - ML
 
-    ipcMain.on("triggerCreateUtilityProcess", (_, type: UtilityProcessType) =>
-        triggerCreateUtilityProcess(type, mainWindow),
-    );
+    ipcMain.on("createMLWorker", () => createMLWorker(mainWindow));
 };
 
 /**

desktop/src/main/log-worker.ts

@@ -1,59 +0,0 @@
-/**
- * A object that behaves similar to the default export of "./log", except this
- * can be used from within a utility process.
- *
- * ---
- *
- * We cannot directly do
- *
- *     import log from "../log";
- *
- * because that requires the Electron APIs that are not available to a utility
- * process (See: [Note: Using Electron APIs in UtilityProcess]).
- *
- * But even if that were to work, logging will still be problematic since we'd
- * try opening the log file from two different Node.js processes (this one, and
- * the main one), and I didn't find any indication in the electron-log
- * repository that the log file's integrity would be maintained in such cases.
- *
- * So instead we provide this proxy log object that uses the
- * `process.parentPort` to transport the logs over to the main process, where
- * the {@link processUtilityProcessLogMessage} function in the main process is
- * expected to handle these (sending them to the actual log).
- */
-export default {
-    error: (s: string, e?: unknown) =>
-        mainProcess("log.errorString", messageWithError(s, e)),
-    warn: (s: string, e?: unknown) =>
-        mainProcess("log.warnString", messageWithError(s, e)),
-    info: (...ms: unknown[]) => mainProcess("log.info", ms),
-    /**
-     * Unlike the real {@link log.debug}, this is (a) eagerly evaluated, and (b)
-     * accepts only strings.
-     */
-    debugString: (s: string) => mainProcess("log.debugString", s),
-};
-
-/**
- * Send a message to the main process using a barebones RPC protocol.
- */
-const mainProcess = (method: string, param: unknown) =>
-    process.parentPort.postMessage({ method, p: param });
-
-// Duplicated verbatim from ./log.ts
-const messageWithError = (message: string, e?: unknown) => {
-    if (!e) return message;
-
-    let es: string;
-    if (e instanceof Error) {
-        // In practice, we expect ourselves to be called with Error objects, so
-        // this is the happy path so to say.
-        es = [`${e.name}: ${e.message}`, e.stack].filter((x) => x).join("\n");
-    } else {
-        // For the rest rare cases, use the default string serialization of e.
-        // eslint-disable-next-line @typescript-eslint/no-base-to-string
-        es = String(e);
-    }
-
-    return `${message}: ${es}`;
-};

desktop/src/main/log.ts

@@ -83,56 +83,6 @@ const logDebug = (param: () => unknown) => {
     }
 };
 
-/**
- * Handle log messages posted from the utility process in the main process.
- *
- * See: [Note: Using Electron APIs in UtilityProcess]
- *
- * @param message The arbitrary message that was received as an argument to the
- * "message" event invoked on a {@link UtilityProcess}.
- *
- * @returns true if the message was recognized and handled, and false otherwise.
- */
-export const processUtilityProcessLogMessage = (
-    logTag: string,
-    message: unknown,
-) => {
-    const m = message; /* shorter alias */
-    if (m && typeof m == "object" && "method" in m && "p" in m) {
-        const p = m.p;
-        switch (m.method) {
-            case "log.errorString":
-                if (typeof p == "string") {
-                    logError(`${logTag} ${p}`);
-                    return true;
-                }
-                break;
-            case "log.warnString":
-                if (typeof p == "string") {
-                    logWarn(`${logTag} ${p}`);
-                    return true;
-                }
-                break;
-            case "log.info":
-                if (Array.isArray(p)) {
-                    // Need to cast from any[] to unknown[]
-                    logInfo(logTag, ...(p as unknown[]));
-                    return true;
-                }
-                break;
-            case "log.debugString":
-                if (typeof p == "string") {
-                    logDebug(() => `${logTag} ${p}`);
-                    return true;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    return false;
-};
-
 /**
  * Ente's logger.
  *

desktop/src/main/services/ffmpeg.ts

@@ -1,77 +1,132 @@
-/**
- * @file A bridge to the ffmpeg utility process. This code runs in the main
- * process.
- */
-
-import { wrap } from "comlink";
+import pathToFfmpeg from "ffmpeg-static";
 import fs from "node:fs/promises";
-import type { FFmpegCommand, ZipItem } from "../../types/ipc";
+import type { ZipItem } from "../../types/ipc";
+import { ensure } from "../utils/common";
+import { execAsync } from "../utils/electron";
 import {
     deleteTempFileIgnoringErrors,
-    makeFileForStreamOrPathOrZipItem,
+    makeFileForDataOrPathOrZipItem,
     makeTempFilePath,
 } from "../utils/temp";
-import type { FFmpegUtilityProcess } from "./ffmpeg-worker";
-import { ffmpegUtilityProcessEndpoint } from "./workers";
+
+/* Ditto in the web app's code (used by the Wasm FFmpeg invocation). */
+const ffmpegPathPlaceholder = "FFMPEG";
+const inputPathPlaceholder = "INPUT";
+const outputPathPlaceholder = "OUTPUT";
 
 /**
- * Return a handle to the ffmpeg utility process, starting it if needed.
- */
-export const ffmpegUtilityProcess = () =>
-    ffmpegUtilityProcessEndpoint().then((port) =>
-        wrap<FFmpegUtilityProcess>(port),
-    );
-
-/**
- * Implement the IPC "ffmpegExec" contract, writing the input and output to
- * temporary files as needed, and then forward to the {@link ffmpegExec} running
- * in the utility process.
+ * Run a FFmpeg command
+ *
+ * [Note: FFmpeg in Electron]
+ *
+ * There is a Wasm build of FFmpeg, but that is currently 10-20 times slower
+ * that the native build. That is slow enough to be unusable for our purposes.
+ * https://ffmpegwasm.netlify.app/docs/performance
+ *
+ * So the alternative is to bundle a FFmpeg executable binary with our app. e.g.
+ *
+ *     yarn add fluent-ffmpeg ffmpeg-static ffprobe-static
+ *
+ * (we only use ffmpeg-static, the rest are mentioned for completeness' sake).
+ *
+ * Interestingly, Electron already bundles an binary FFmpeg library (it comes
+ * from the ffmpeg fork maintained by Chromium).
+ * https://chromium.googlesource.com/chromium/third_party/ffmpeg
+ * https://stackoverflow.com/questions/53963672/what-version-of-ffmpeg-is-bundled-inside-electron
+ *
+ * This can be found in (e.g. on macOS) at
+ *
+ *     $ file ente.app/Contents/Frameworks/Electron\ Framework.framework/Versions/Current/Libraries/libffmpeg.dylib
+ *     .../libffmpeg.dylib: Mach-O 64-bit dynamically linked shared library arm64
+ *
+ * But I'm not sure if our code is supposed to be able to use it, and how.
  */
 export const ffmpegExec = async (
-    command: FFmpegCommand,
-    pathOrZipItem: string | ZipItem,
+    command: string[],
+    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
     outputFileExtension: string,
-): 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();
-
+): Promise<Uint8Array> => {
     const {
         path: inputFilePath,
         isFileTemporary: isInputFileTemporary,
         writeToTemporaryFile: writeToTemporaryInputFile,
-    } = await makeFileForStreamOrPathOrZipItem(pathOrZipItem);
+    } = await makeFileForDataOrPathOrZipItem(dataOrPathOrZipItem);
 
+    const outputFilePath = await makeTempFilePath(outputFileExtension);
     try {
         await writeToTemporaryInputFile();
 
-        return await f(worker, inputFilePath);
+        const cmd = substitutePlaceholders(
+            command,
+            inputFilePath,
+            outputFilePath,
+        );
+
+        await execAsync(cmd);
+
+        return await fs.readFile(outputFilePath);
     } finally {
         if (isInputFileTemporary)
             await deleteTempFileIgnoringErrors(inputFilePath);
+        await deleteTempFileIgnoringErrors(outputFilePath);
     }
 };
 
+const substitutePlaceholders = (
+    command: string[],
+    inputFilePath: string,
+    outputFilePath: string,
+) =>
+    command.map((segment) => {
+        if (segment == ffmpegPathPlaceholder) {
+            return ffmpegBinaryPath();
+        } else if (segment == inputPathPlaceholder) {
+            return inputFilePath;
+        } else if (segment == outputPathPlaceholder) {
+            return outputFilePath;
+        } else {
+            return segment;
+        }
+    });
+
 /**
- * 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.
+ * Return the path to the `ffmpeg` binary.
+ *
+ * At runtime, the FFmpeg binary is present in a path like (macOS example):
+ * `ente.app/Contents/Resources/app.asar.unpacked/node_modules/ffmpeg-static/ffmpeg`
  */
-export const ffmpegDetermineVideoDuration = async (
-    pathOrZipItem: string | ZipItem,
-): Promise<number> =>
-    withInputFile(pathOrZipItem, async (worker, inputFilePath) =>
-        worker.ffmpegDetermineVideoDuration(inputFilePath),
-    );
+const ffmpegBinaryPath = () => {
+    // This substitution of app.asar by app.asar.unpacked is suggested by the
+    // ffmpeg-static library author themselves:
+    // https://github.com/eugeneware/ffmpeg-static/issues/16
+    return ensure(pathToFfmpeg).replace("app.asar", "app.asar.unpacked");
+};
+
+/**
+ * A variant of {@link ffmpegExec} adapted to work with streams so that it can
+ * handle the MP4 conversion of large video files.
+ *
+ * See: [Note: Convert to MP4]
+
+ * @param inputFilePath The path to a file on the user's local file system. This
+ * is the video we want to convert.
+ * @param inputFilePath The path to a file on the user's local file system where
+ * we should write the converted MP4 video.
+ */
+export const ffmpegConvertToMP4 = async (
+    inputFilePath: string,
+    outputFilePath: string,
+): Promise<void> => {
+    const command = [
+        ffmpegPathPlaceholder,
+        "-i",
+        inputPathPlaceholder,
+        "-preset",
+        "ultrafast",
+        outputPathPlaceholder,
+    ];
+
+    const cmd = substitutePlaceholders(command, inputFilePath, outputFilePath);
+
+    await execAsync(cmd);
+};

desktop/src/main/services/fs.ts

@@ -36,17 +36,6 @@ export const fsIsDir = async (dirPath: string) => {
     return stat.isDirectory();
 };
 
-export const fsStatMtime = (path: string) =>
-    // [Note: Integral last modified time]
-    //
-    // Whenever we need to find the modified time of a file, use the
-    // `mtime.getTime()` instead of `mtimeMs` of the stat; this way, it is
-    // guaranteed that the times are integral (we persist these values to remote
-    // in some cases, and the contract is for them to be integral; mtimeMs is a
-    // float with sub-millisecond precision), and that all places use the same
-    // value so that they're comparable.
-    fs.stat(path).then((st) => st.mtime.getTime());
-
 export const fsFindFiles = async (dirPath: string) => {
     const items = await fs.readdir(dirPath, { withFileTypes: true });
     let paths: string[] = [];

desktop/src/main/services/image.ts

@@ -6,7 +6,7 @@ import { type ZipItem } from "../../types/ipc";
 import { execAsync, isDev } from "../utils/electron";
 import {
     deleteTempFileIgnoringErrors,
-    makeFileForStreamOrPathOrZipItem,
+    makeFileForDataOrPathOrZipItem,
     makeTempFilePath,
 } from "../utils/temp";
 
@@ -61,7 +61,7 @@ const vipsPath = () =>
     );
 
 export const generateImageThumbnail = async (
-    pathOrZipItem: string | ZipItem,
+    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
     maxDimension: number,
     maxSize: number,
 ): Promise<Uint8Array> => {
@@ -69,7 +69,7 @@ export const generateImageThumbnail = async (
         path: inputFilePath,
         isFileTemporary: isInputFileTemporary,
         writeToTemporaryFile: writeToTemporaryInputFile,
-    } = await makeFileForStreamOrPathOrZipItem(pathOrZipItem);
+    } = await makeFileForDataOrPathOrZipItem(dataOrPathOrZipItem);
 
     const outputFilePath = await makeTempFilePath("jpeg");
 

desktop/src/main/services/logout.ts

@@ -1,9 +1,8 @@
 import type { FSWatcher } from "chokidar";
 import log from "../log";
-import { clearPendingVideoResults } from "../stream";
+import { clearConvertToMP4Results } from "../stream";
 import { clearStores } from "./store";
 import { watchReset } from "./watch";
-import { terminateUtilityProcesses } from "./workers";
 import { clearOpenZipCache } from "./zip";
 
 /**
@@ -23,9 +22,9 @@ export const logout = (watcher: FSWatcher) => {
         ignoreError("FS watch", e);
     }
     try {
-        clearPendingVideoResults();
+        clearConvertToMP4Results();
     } catch (e) {
-        ignoreError("video", e);
+        ignoreError("convert-to-mp4", e);
     }
     try {
         clearStores();
@@ -37,9 +36,4 @@ export const logout = (watcher: FSWatcher) => {
     } catch (e) {
         ignoreError("zip cache", e);
     }
-    try {
-        terminateUtilityProcesses();
-    } catch (e) {
-        ignoreError("utility processes", e);
-    }
 };

desktop/src/main/services/ml-worker.ts

@@ -15,16 +15,46 @@ 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/v4";
-import log from "../log-worker";
 import { messagePortMainEndpoint } from "../utils/comlink";
-import { wait } from "../utils/common";
+import { ensure, wait } from "../utils/common";
 import { writeStream } from "../utils/stream";
-import { fsStatMtime } from "./fs";
 
-log.debugString("Started ML utility process");
+/**
+ * We cannot do
+ *
+ *     import log from "../log";
+ *
+ * because that requires the Electron APIs that are not available to a utility
+ * process (See: [Note: Using Electron APIs in UtilityProcess]). But even if
+ * that were to work, logging will still be problematic since we'd try opening
+ * the log file from two different Node.js processes (this one, and the main
+ * one), and I didn't find any indication in the electron-log repository that
+ * the log file's integrity would be maintained in such cases.
+ *
+ * So instead we create this proxy log object that uses `process.parentPort` to
+ * transport the logs over to the main process.
+ */
+const log = {
+    /**
+     * Unlike the real {@link log.error}, this accepts only the first string
+     * argument, not the second optional error one.
+     */
+    errorString: (s: string) => mainProcess("log.errorString", s),
+    info: (...ms: unknown[]) => mainProcess("log.info", ms),
+    /**
+     * Unlike the real {@link log.debug}, this is (a) eagerly evaluated, and (b)
+     * accepts only strings.
+     */
+    debugString: (s: string) => mainProcess("log.debugString", s),
+};
 
-process.on("uncaughtException", (e, origin) => log.error(origin, e));
+/**
+ * Send a message to the main process using a barebones RPC protocol.
+ */
+const mainProcess = (method: string, param: unknown) =>
+    process.parentPort.postMessage({ method, p: param });
+
+log.debugString(`Started ML worker process`);
 
 process.parentPort.once("message", (e) => {
     // Initialize ourselves with the data we got from our parent.
@@ -33,13 +63,12 @@ process.parentPort.once("message", (e) => {
     // parent.
     expose(
         {
-            fsStatMtime,
             computeCLIPImageEmbedding,
             computeCLIPTextEmbeddingIfAvailable,
             detectFaces,
             computeFaceEmbeddings,
         },
-        messagePortMainEndpoint(e.ports[0]!),
+        messagePortMainEndpoint(ensure(e.ports[0])),
     );
 });
 
@@ -51,12 +80,19 @@ process.parentPort.once("message", (e) => {
 let _userDataPath: string | undefined;
 
 /** Equivalent to app.getPath("userData") */
-const userDataPath = () => _userDataPath!;
-
-const MLWorkerInitData = z.object({ userDataPath: z.string() });
+const userDataPath = () => ensure(_userDataPath);
 
 const parseInitData = (data: unknown) => {
-    _userDataPath = MLWorkerInitData.parse(data).userDataPath;
+    if (
+        data &&
+        typeof data == "object" &&
+        "userDataPath" in data &&
+        typeof data.userDataPath == "string"
+    ) {
+        _userDataPath = data.userDataPath;
+    } else {
+        log.errorString("Unparseable initialization data");
+    }
 };
 
 /**
@@ -123,7 +159,7 @@ const modelPathDownloadingIfNeeded = async (
     } else {
         const size = (await fs.stat(modelPath)).size;
         if (size !== expectedByteSize) {
-            log.error(
+            log.errorString(
                 `The size ${size} of model ${modelName} does not match the expected size, downloading again`,
             );
             await downloadModel(modelPath, modelName);
@@ -214,7 +250,7 @@ export const computeCLIPImageEmbedding = async (
     const results = await session.run(feeds);
     log.debugString(`ONNX/CLIP image embedding took ${Date.now() - t} ms`);
     /* Need these model specific casts to type the result */
-    return results.output!.data as Float32Array;
+    return ensure(results.output).data as Float32Array;
 };
 
 const cachedCLIPTextSession = makeCachedInferenceSession(
@@ -254,7 +290,7 @@ export const computeCLIPTextEmbeddingIfAvailable = async (text: string) => {
     const t = Date.now();
     const results = await session.run(feeds);
     log.debugString(`ONNX/CLIP text embedding took ${Date.now() - t} ms`);
-    return results.output!.data as Float32Array;
+    return ensure(results.output).data as Float32Array;
 };
 
 const cachedFaceDetectionSession = makeCachedInferenceSession(
@@ -275,7 +311,7 @@ export const detectFaces = async (
     const t = Date.now();
     const results = await session.run(feeds);
     log.debugString(`ONNX/YOLO face detection took ${Date.now() - t} ms`);
-    return results.output!.data;
+    return ensure(results.output).data;
 };
 
 const cachedFaceEmbeddingSession = makeCachedInferenceSession(

desktop/src/main/services/ml.ts

@@ -0,0 +1,147 @@
+/**
+ * @file ML related functionality. This code runs in the main process.
+ */
+
+import {
+    MessageChannelMain,
+    type BrowserWindow,
+    type UtilityProcess,
+} from "electron";
+import { app, utilityProcess } from "electron/main";
+import path from "node:path";
+import log from "../log";
+
+/** The active ML worker (utility) process, if any. */
+let _child: UtilityProcess | undefined;
+
+/**
+ * Create a new ML worker process, terminating the older ones (if any).
+ *
+ * [Note: ML IPC]
+ *
+ * The primary reason for doing ML tasks in the Node.js layer is so that we can
+ * use the binary ONNX runtime, which is 10-20x faster than the Wasm one that
+ * can be used directly on the web layer.
+ *
+ * For this to work, the main and renderer process need to communicate with each
+ * other. Further, in the web layer the ML indexing runs in a web worker (so as
+ * to not get in the way of the main thread). So the communication has 2 hops:
+ *
+ *     Node.js main <-> Renderer main <-> Renderer web worker
+ *
+ * This naive way works, but has a problem. The Node.js main process is in the
+ * code path for delivering user events to the renderer process. The ML tasks we
+ * do take in the order of 100-300 ms (possibly more) for each individual
+ * inference. Thus, the Node.js main process is busy for those 100-300 ms, and
+ * does not forward events to the renderer, causing the UI to jitter.
+ *
+ * The solution for this is to spawn an Electron UtilityProcess, which we can
+ * think of a regular Node.js child process.  This frees up the Node.js main
+ * process, and would remove the jitter.
+ * https://www.electronjs.org/docs/latest/tutorial/process-model
+ *
+ * It would seem that this introduces another hop in our IPC
+ *
+ *     Node.js utility process <-> Node.js main <-> ...
+ *
+ * but here we can use the special bit about Electron utility processes that
+ * separates them from regular Node.js child processes: their support for
+ * message ports. https://www.electronjs.org/docs/latest/tutorial/message-ports
+ *
+ * As a brief summary, a MessagePort is a web feature that allows two contexts
+ * to communicate. A pair of message ports is called a message channel. The cool
+ * thing about these is that we can pass these ports themselves over IPC.
+ *
+ * > One caveat here is that the message ports can only be passed using the
+ * > `postMessage` APIs, not the usual send/invoke APIs.
+ *
+ * So we
+ *
+ * 1. In the utility process create a message channel.
+ * 2. Spawn a utility process, and send one port of the pair to it.
+ * 3. Send the other port of the pair to the renderer.
+ *
+ * The renderer will forward that port to the web worker that is coordinating
+ * the ML indexing on the web layer. Thereafter, the utility process and web
+ * worker can directly talk to each other!
+ *
+ *     Node.js utility process <-> Renderer web worker
+ *
+ * The RPC protocol is handled using comlink on both ends. The port itself needs
+ * to be relayed using `postMessage`.
+ */
+export const createMLWorker = (window: BrowserWindow) => {
+    if (_child) {
+        log.debug(() => "Terminating previous ML worker process");
+        _child.kill();
+        _child = undefined;
+    }
+
+    const { port1, port2 } = new MessageChannelMain();
+
+    const child = utilityProcess.fork(path.join(__dirname, "ml-worker.js"));
+    const userDataPath = app.getPath("userData");
+    child.postMessage({ userDataPath }, [port1]);
+
+    window.webContents.postMessage("createMLWorker/port", undefined, [port2]);
+
+    handleMessagesFromUtilityProcess(child);
+
+    _child = child;
+};
+
+/**
+ * Handle messages posted from the utility process.
+ *
+ * [Note: Using Electron APIs in UtilityProcess]
+ *
+ * Only a small subset of the Electron APIs are available to a UtilityProcess.
+ * As of writing (Jul 2024, Electron 30), only the following are available:
+ *
+ * - net
+ * - systemPreferences
+ *
+ * In particular, `app` is not available.
+ *
+ * We structure our code so that it doesn't need anything apart from `net`.
+ *
+ * For the other cases,
+ *
+ * -  Additional parameters to the utility process are passed alongwith the
+ *    initial message where we provide it the message port.
+ *
+ * -  When we need to communicate from the utility process to the main process,
+ *    we use the `parentPort` in the utility process.
+ */
+const handleMessagesFromUtilityProcess = (child: UtilityProcess) => {
+    const logTag = "[ml-worker]";
+    child.on("message", (m: unknown) => {
+        if (m && typeof m == "object" && "method" in m && "p" in m) {
+            const p = m.p;
+            switch (m.method) {
+                case "log.errorString":
+                    if (typeof p == "string") {
+                        log.error(`${logTag} ${p}`);
+                        return;
+                    }
+                    break;
+                case "log.info":
+                    if (Array.isArray(p)) {
+                        // Need to cast from any[] to unknown[]
+                        log.info(logTag, ...(p as unknown[]));
+                        return;
+                    }
+                    break;
+                case "log.debugString":
+                    if (typeof p == "string") {
+                        log.debug(() => `${logTag} ${p}`);
+                        return;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        }
+        log.info("Ignoring unknown message from ML worker", m);
+    });
+};

desktop/src/main/services/upload.ts

@@ -135,35 +135,22 @@ export const setPendingUploads = ({
     });
 };
 
-export const markUploadedFile = (
-    path: string,
-    associatedPath: string | undefined,
-) => {
+export const markUploadedFiles = (paths: string[]) => {
     const existing = uploadStatusStore.get("filePaths") ?? [];
-    const updated = existing.filter((p) => p != path && p != associatedPath);
+    const updated = existing.filter((p) => !paths.includes(p));
     uploadStatusStore.set("filePaths", updated);
-    // See: [Note: Integral last modified time]
-    return fs.stat(path).then((st) => st.mtime.getTime());
 };
 
-export const markUploadedZipItem = (
-    item: ZipItem,
-    associatedItem: ZipItem | undefined,
+export const markUploadedZipItems = (
+    items: [zipPath: string, entryName: string][],
 ) => {
     const existing = uploadStatusStore.get("zipItems") ?? [];
-    const updated = exceptZipItem(
-        exceptZipItem(existing, item),
-        associatedItem,
+    const updated = existing.filter(
+        (z) => !items.some((e) => z[0] == e[0] && z[1] == e[1]),
     );
     uploadStatusStore.set("zipItems", updated);
-    return fs.stat(item[0]).then((st) => st.mtime.getTime());
 };
 
-const exceptZipItem = (items: ZipItem[], item: ZipItem | undefined) =>
-    item
-        ? items.filter((zi) => !(zi[0] == item[0] && zi[1] == item[1]))
-        : items;
-
 export const clearPendingUploads = () => {
     uploadStatusStore.clear();
     clearOpenZipCache();

desktop/src/main/services/watch.ts

@@ -28,13 +28,6 @@ export const createWatcher = (mainWindow: BrowserWindow) => {
         // Ask the watcher to wait for a the file size to stabilize before
         // telling us about a new file. By default, it waits for 2 seconds.
         awaitWriteFinish: true,
-        // On macOS we start getting "EMFILE: too many open files" when watching
-        // large folders. This is a known regression in Chokidar v4:
-        // https://github.com/paulmillr/chokidar/issues/1385
-        //
-        // The recommended workaround for now is to enable usePolling. Since it
-        // comes at a performance cost, we only do it where needed (macOS).
-        ...(process.platform == "darwin" ? { usePolling: true } : {}),
     });
 
     watcher

desktop/src/main/services/workers.ts

@@ -1,241 +0,0 @@
-/**
- * @file This main process code and interface for dealing with the various
- * utility processes that we create.
- */
-
-import type { Endpoint } from "comlink";
-import {
-    MessageChannelMain,
-    type BrowserWindow,
-    type UtilityProcess,
-} from "electron";
-import { app, utilityProcess } from "electron/main";
-import path from "node:path";
-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).
- */
-let _utilityProcessFFmpegEndpoint: Promise<Endpoint> | undefined;
-
-/**
- * Create a new utility process of the given {@link type}, terminating the older
- * ones (if any).
- *
- * Currently the only type is "ml". The following note explains the reasoning
- * why utility processes were used for the first workload (ML) that was handled
- * this way. Similar reasoning applies to subsequent workloads (ffmpeg) that
- * have been offloaded to utility processes in a slightly different manner to
- * avoid stutter in the UI.
- *
- * [Note: ML IPC]
- *
- * The primary reason for doing ML tasks in the Node.js layer is so that we can
- * use the binary ONNX runtime, which is 10-20x faster than the Wasm one that
- * can be used directly on the web layer.
- *
- * For this to work, the main and renderer process need to communicate with each
- * other. Further, in the web layer the ML indexing runs in a web worker (so as
- * to not get in the way of the main thread). So the communication has 2 hops:
- *
- *     Node.js main <-> Renderer main <-> Renderer web worker
- *
- * This naive way works, but has a problem. The Node.js main process is in the
- * code path for delivering user events to the renderer process. The ML tasks we
- * do take in the order of 100-300 ms (possibly more) for each individual
- * inference. Thus, the Node.js main process is busy for those 100-300 ms, and
- * does not forward events to the renderer, causing the UI to jitter.
- *
- * The solution for this is to spawn an Electron UtilityProcess, which we can
- * think of a regular Node.js child process. This frees up the Node.js main
- * process, and would remove the jitter.
- * https://www.electronjs.org/docs/latest/tutorial/process-model
- *
- * It would seem that this introduces another hop in our IPC
- *
- *     Node.js utility process <-> Node.js main <-> ...
- *
- * but here we can use the special bit about Electron utility processes that
- * separates them from regular Node.js child processes: their support for
- * message ports. https://www.electronjs.org/docs/latest/tutorial/message-ports
- *
- * As a brief summary, a MessagePort is a web feature that allows two contexts
- * to communicate. A pair of message ports is called a message channel. The cool
- * thing about these is that we can pass these ports themselves over IPC.
- *
- * > One caveat here is that the message ports can only be passed using the
- * > `postMessage` APIs, not the usual send/invoke APIs.
- *
- * So we
- *
- * 1. In the utility process create a message channel.
- * 2. Spawn a utility process, and send one port of the pair to it.
- * 3. Send the other port of the pair to the renderer.
- *
- * The renderer will forward that port to the web worker that is coordinating
- * the ML indexing on the web layer. Thereafter, the utility process and web
- * worker can directly talk to each other!
- *
- *     Node.js utility process <-> Renderer web worker
- *
- * The RPC protocol is handled using comlink on both ends. The port itself needs
- * to be relayed using `postMessage`.
- */
-export const triggerCreateUtilityProcess = (
-    type: UtilityProcessType,
-    window: BrowserWindow,
-) => triggerCreateMLUtilityProcess(window);
-
-const terminateMLProcessIfRunning = () => {
-    if (_utilityProcessML) {
-        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(/* MLWorkerInitData */ { userDataPath }, [port1]);
-
-    window.webContents.postMessage("utilityProcessPort/ml", undefined, [port2]);
-
-    handleMessagesFromMLUtilityProcess(child);
-
-    _utilityProcessML = child;
-};
-
-/**
- * Handle messages posted from the utility process.
- *
- * [Note: Using Electron APIs in UtilityProcess]
- *
- * Only a small subset of the Electron APIs are available to a UtilityProcess.
- * As of writing (Jul 2024, Electron 30), only the following are available:
- *
- * - net
- * - systemPreferences
- *
- * In particular, `app` is not available.
- *
- * We structure our code so that it doesn't need anything apart from `net`.
- *
- * For the other cases,
- *
- * -  Additional parameters to the utility process are passed alongwith the
- *    initial message where we provide it the message port.
- *
- * -  When we need to communicate from the utility process to the main process,
- *    we use the `parentPort` in the utility process.
- */
-const handleMessagesFromMLUtilityProcess = (child: UtilityProcess) => {
-    child.on("message", (m: unknown) => {
-        if (processUtilityProcessLogMessage("[ml-worker]", m)) {
-            return;
-        }
-        log.info("Ignoring unknown message from ML utility process", m);
-    });
-};
-
-/**
- * A comlink endpoint that can be used to communicate with the ffmpeg utility
- * process. If there is no ffmpeg utility process, a new one is created on
- * demand.
- *
- * See [Note: ML IPC] for a general outline of why utility processes are needed
- * (tl;dr; to avoid stutter on the UI).
- *
- * In the case of ffmpeg, the IPC flow is a bit different: the utility process
- * is not exposed to the web layer, and is internal to the node layer. The
- * reason for this difference is that we need to create temporary files etc, and
- * doing it a utility process requires access to the `app` module which are not
- * accessible (See: [Note: Using Electron APIs in UtilityProcess]).
- *
- * There could've been possible reasonable workarounds, but the architecture
- * we've adopted of three layers:
- *
- *     Renderer (web) <-> Node.js main <-> Node.js ffmpeg utility process
- *
- * The temporary file creation etc is handled in the Node.js main process, and
- * paths to the files are forwarded to the ffmpeg utility process to act on.
- *
- * @returns an endpoint that can be used to communicate with the utility
- * process. The utility process is expected to expose an object that conforms to
- * the {@link ElectronFFmpegWorkerNode} interface on this endpoint.
- */
-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));
-
-    const { port1, port2 } = new MessageChannelMain();
-
-    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 (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) {
-            switch (m.method) {
-                case "ack":
-                    resolve!(messagePortMainEndpoint(port2));
-                    return;
-            }
-        }
-
-        if (processUtilityProcessLogMessage("[ffmpeg-worker]", m)) {
-            return;
-        }
-
-        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;
-};

desktop/src/main/stream.ts

@@ -7,14 +7,13 @@ import fs from "node:fs/promises";
 import { Writable } from "node:stream";
 import { pathToFileURL } from "node:url";
 import log from "./log";
-import { ffmpegUtilityProcess } from "./services/ffmpeg";
-import { type FFmpegGenerateHLSPlaylistAndSegmentsResult } from "./services/ffmpeg-worker";
+import { ffmpegConvertToMP4 } from "./services/ffmpeg";
 import { markClosableZip, openZip } from "./services/zip";
+import { ensure } from "./utils/common";
 import { writeStream } from "./utils/stream";
 import {
     deleteTempFile,
     deleteTempFileIgnoringErrors,
-    makeFileForStreamOrPathOrZipItem,
     makeTempFilePath,
 } from "./utils/temp";
 
@@ -58,39 +57,25 @@ const handleStreamRequest = async (request: Request): Promise<Response> => {
     const { host, searchParams } = new URL(url);
     switch (host) {
         case "read":
-            return handleRead(searchParams.get("path")!);
+            return handleRead(ensure(searchParams.get("path")));
 
         case "read-zip":
             return handleReadZip(
-                searchParams.get("zipPath")!,
-                searchParams.get("entryName")!,
+                ensure(searchParams.get("zipPath")),
+                ensure(searchParams.get("entryName")),
             );
 
         case "write":
-            return handleWrite(searchParams.get("path")!, request);
-
-        case "video": {
-            const op = searchParams.get("op");
-            if (op) {
-                switch (op) {
-                    case "convert-to-mp4":
-                        return handleConvertToMP4Write(request);
-                    case "generate-hls":
-                        return handleGenerateHLSWrite(request, searchParams);
-                    default:
-                        return new Response(`Unknown op ${op}`, {
-                            status: 404,
-                        });
-                }
-            }
+            return handleWrite(ensure(searchParams.get("path")), request);
 
+        case "convert-to-mp4": {
             const token = searchParams.get("token");
             const done = searchParams.get("done") !== null;
-            if (!token) {
-                return new Response("Missing token", { status: 404 });
-            }
-
-            return done ? handleVideoDone(token) : handleVideoRead(token);
+            return token
+                ? done
+                    ? handleConvertToMP4ReadDone(token)
+                    : handleConvertToMP4Read(token)
+                : handleConvertToMP4Write(request);
         }
 
         default:
@@ -120,7 +105,6 @@ const handleRead = async (path: string) => {
         res.headers.set("Content-Length", `${fileSize}`);
 
         // Add the file's last modified time (as epoch milliseconds).
-        // See: [Note: Integral last modified time]
         const mtimeMs = stat.mtime.getTime();
         res.headers.set("X-Last-Modified-Ms", `${mtimeMs}`);
     }
@@ -182,21 +166,21 @@ const handleReadZip = async (zipPath: string, entryName: string) => {
 };
 
 const handleWrite = async (path: string, request: Request) => {
-    await writeStream(path, request.body!);
+    await writeStream(path, ensure(request.body));
     return new Response("", { status: 200 });
 };
 
 /**
- * A map from token to file paths generated as a result of stream://video
- * requests we have received.
+ * A map from token to file paths for convert-to-mp4 requests that we have
+ * received.
  */
-const pendingVideoResults = new Map<string, string>();
+const convertToMP4Results = new Map<string, string>();
 
 /**
- * Clear any in-memory state for in-flight streamed video processing requests.
- * Meant to be called during logout.
+ * Clear any in-memory state for in-flight convert-to-mp4 requests. Meant to be
+ * called during logout.
  */
-export const clearPendingVideoResults = () => pendingVideoResults.clear();
+export const clearConvertToMP4Results = () => convertToMP4Results.clear();
 
 /**
  * [Note: Convert to MP4]
@@ -211,32 +195,30 @@ export const clearPendingVideoResults = () => pendingVideoResults.clear();
  * mode for the Web fetch API). So we need to simulate that using two different
  * streaming requests.
  *
- *     renderer → main  stream://video?op=convert-to-mp4
+ *     renderer → main  stream://convert-to-mp4
  *                      → request.body is the original video
- *                      ← response is [token]
+ *                      ← response is a token
  *
- *     renderer → main  stream://video?token=<token>
+ *     renderer → main  stream://convert-to-mp4?token=<token>
  *                      ← response.body is the converted video
  *
- *     renderer → main  stream://video?token=<token>&done
+ *     renderer → main  stream://convert-to-mp4?token=<token>&done
  *                      ← 200 OK
  *
  * Note that the conversion itself is not streaming. The conversion still
- * happens in a single invocation of ffmpeg, we are just streaming the data
- * across the IPC boundary to allow us to pass large amounts of data without
- * running out of memory.
+ * happens in a single shot, we are just streaming the data across the IPC
+ * boundary to allow us to pass large amounts of data without running out of
+ * memory.
  *
  * See also: [Note: IPC streams]
  */
 const handleConvertToMP4Write = async (request: Request) => {
-    const worker = await ffmpegUtilityProcess();
-
     const inputTempFilePath = await makeTempFilePath();
-    await writeStream(inputTempFilePath, request.body!);
+    await writeStream(inputTempFilePath, ensure(request.body));
 
     const outputTempFilePath = await makeTempFilePath("mp4");
     try {
-        await worker.ffmpegConvertToMP4(inputTempFilePath, outputTempFilePath);
+        await ffmpegConvertToMP4(inputTempFilePath, outputTempFilePath);
     } catch (e) {
         log.error("Conversion to MP4 failed", e);
         await deleteTempFileIgnoringErrors(outputTempFilePath);
@@ -246,112 +228,25 @@ const handleConvertToMP4Write = async (request: Request) => {
     }
 
     const token = randomUUID();
-    pendingVideoResults.set(token, outputTempFilePath);
+    convertToMP4Results.set(token, outputTempFilePath);
     return new Response(token, { status: 200 });
 };
 
-const handleVideoRead = async (token: string) => {
-    const filePath = pendingVideoResults.get(token);
+const handleConvertToMP4Read = async (token: string) => {
+    const filePath = convertToMP4Results.get(token);
     if (!filePath)
         return new Response(`Unknown token ${token}`, { status: 404 });
 
     return net.fetch(pathToFileURL(filePath).toString());
 };
 
-const handleVideoDone = async (token: string) => {
-    const filePath = pendingVideoResults.get(token);
+const handleConvertToMP4ReadDone = async (token: string) => {
+    const filePath = convertToMP4Results.get(token);
     if (!filePath)
         return new Response(`Unknown token ${token}`, { status: 404 });
 
     await deleteTempFile(filePath);
 
-    pendingVideoResults.delete(token);
+    convertToMP4Results.delete(token);
     return new Response("", { status: 200 });
 };
-
-/**
- * Generate a HLS playlist for the given video.
- *
- * See: [Note: Convert to MP4] for the general architecture of commands that do
- * renderer <-> main I/O using streams.
- *
- * 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 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
- *   no stream is generated.
- */
-const handleGenerateHLSWrite = async (
-    request: Request,
-    params: URLSearchParams,
-) => {
-    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 makeFileForStreamOrPathOrZipItem>[0];
-    const path = params.get("path");
-    if (path) {
-        inputItem = path;
-    } else {
-        const zipPath = params.get("zipPath");
-        const entryName = params.get("entryName");
-        if (zipPath && entryName) {
-            inputItem = [zipPath, entryName];
-        } else {
-            const body = request.body;
-            if (!body) throw new Error("Missing body");
-            inputItem = body;
-        }
-    }
-
-    const worker = await ffmpegUtilityProcess();
-
-    const {
-        path: inputFilePath,
-        isFileTemporary: isInputFileTemporary,
-        writeToTemporaryFile: writeToTemporaryInputFile,
-    } = await makeFileForStreamOrPathOrZipItem(inputItem);
-
-    const outputFilePathPrefix = await makeTempFilePath();
-    let result: FFmpegGenerateHLSPlaylistAndSegmentsResult | undefined;
-    try {
-        await writeToTemporaryInputFile();
-
-        result = await worker.ffmpegGenerateHLSPlaylistAndSegments(
-            inputFilePath,
-            outputFilePathPrefix,
-            fileID,
-            fetchURL,
-            authToken,
-        );
-
-        if (!result) {
-            // This video doesn't require stream generation.
-            return new Response(null, { status: 204 });
-        }
-
-        const { playlistPath, dimensions, videoSize, videoObjectID } = result;
-
-        const playlistToken = randomUUID();
-        pendingVideoResults.set(playlistToken, playlistPath);
-
-        return new Response(
-            JSON.stringify({
-                playlistToken,
-                dimensions,
-                videoSize,
-                videoObjectID,
-            }),
-            { status: 200 },
-        );
-    } finally {
-        if (isInputFileTemporary)
-            await deleteTempFileIgnoringErrors(inputFilePath);
-    }
-};

desktop/src/main/utils/comlink.ts

@@ -19,7 +19,7 @@ export const messagePortMainEndpoint = (mp: MessagePortMain): Endpoint => {
     const listeners = new WeakMap<NL, EL>();
     return {
         postMessage: (message, transfer) => {
-            mp.postMessage(message, (transfer ?? []) as MessagePortMain[]);
+            mp.postMessage(message, transfer as unknown as MessagePortMain[]);
         },
         addEventListener: (_, eh) => {
             const l: EL = (data) =>

desktop/src/main/utils/common.ts

@@ -5,21 +5,20 @@
  * currently a common package that both of them share.
  */
 
+/**
+ * Throw an exception if the given value is `null` or `undefined`.
+ */
+export const ensure = <T>(v: T | null | undefined): T => {
+    if (v === null) throw new Error("Required value was null");
+    if (v === undefined) throw new Error("Required value was not found");
+    return v;
+};
+
 /**
  * Wait for {@link ms} milliseconds
  *
  * This function is a promisified `setTimeout`. It returns a promise that
  * resolves after {@link ms} milliseconds.
- *
- * Duplicated from `web/packages/utils/promise.ts`.
  */
 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;

desktop/src/main/utils/exec-worker.ts

@@ -1,23 +0,0 @@
-import shellescape from "any-shell-escape";
-import { exec } from "node:child_process";
-import { promisify } from "node:util";
-import log from "../log-worker";
-
-/**
- * Run a shell command asynchronously (utility process edition).
- *
- * This is an almost verbatim copy of {@link execAsync} from `electron.ts`,
- * except it is meant to be usable from a utility process where only a subset of
- * imports are available. See [Note: Using Electron APIs in UtilityProcess].
- */
-export const execAsyncWorker = async (command: string | string[]) => {
-    const escapedCommand = Array.isArray(command)
-        ? shellescape(command)
-        : command;
-    const startTime = Date.now();
-    const result = await execAsync_(escapedCommand);
-    log.debugString(`${escapedCommand} (${Date.now() - startTime} ms)`);
-    return result;
-};
-
-const execAsync_ = promisify(exec);

desktop/src/main/utils/http.ts

@@ -1,31 +0,0 @@
-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,
-});

desktop/src/main/utils/temp.ts

@@ -5,7 +5,7 @@ import path from "node:path";
 import type { ZipItem } from "../../types/ipc";
 import log from "../log";
 import { markClosableZip, openZip } from "../services/zip";
-import { writeStream } from "./stream";
+import { ensure } from "./common";
 
 /**
  * Our very own directory within the system temp directory. Go crazy, but
@@ -20,21 +20,17 @@ const enteTempDirPath = async () => {
 /** Generate a random string suitable for being used as a file name prefix */
 const randomPrefix = () => {
     const ch = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    const randomChar = () => ch[Math.floor(Math.random() * ch.length)]!;
+    const randomChar = () => ensure(ch[Math.floor(Math.random() * ch.length)]);
 
     return Array(10).fill("").map(randomChar).join("");
 };
 
 /**
- * Return the path to a temporary file with an optional {@link extension}.
+ * Return the path to a temporary file with the given {@link suffix}.
  *
  * The function returns the path to a file in the system temp directory (in an
  * Ente specific folder therin) with a random prefix and an (optional)
- * {@link extension}. The parent directory is guaranteed to exist.
- *
- * @param extension A string, if provided, is used as the extension for the
- * generated path. It will be automatically prefixed by a dot, so don't include
- * the dot in the provided string.
+ * {@link extension}.
  *
  * It ensures that there is no existing item with the same name already.
  *
@@ -80,8 +76,8 @@ export const deleteTempFileIgnoringErrors = async (tempFilePath: string) => {
     }
 };
 
-/** The result of {@link makeFileForStreamOrPathOrZipItem}. */
-interface FileForStreamOrPathOrZipItem {
+/** The result of {@link makeFileForDataOrPathOrZipItem}. */
+interface FileForDataOrPathOrZipItem {
     /**
      * The path to the file (possibly temporary).
      */
@@ -105,32 +101,33 @@ interface FileForStreamOrPathOrZipItem {
 /**
  * Return the path to a file, a boolean indicating if this is a temporary path
  * that needs to be deleted after processing, and a function to write the given
- * {@link item} into that temporary file if needed.
+ * {@link dataOrPathOrZipItem} into that temporary file if needed.
  *
- * @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.
+ * @param dataOrPathOrZipItem 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 makeFileForStreamOrPathOrZipItem = async (
-    item: ReadableStream | string | ZipItem,
-): Promise<FileForStreamOrPathOrZipItem> => {
+export const makeFileForDataOrPathOrZipItem = async (
+    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
+): Promise<FileForDataOrPathOrZipItem> => {
     let path: string;
     let isFileTemporary: boolean;
     let writeToTemporaryFile = async () => {
         /* no-op */
     };
 
-    if (typeof item == "string") {
-        path = item;
+    if (typeof dataOrPathOrZipItem == "string") {
+        path = dataOrPathOrZipItem;
         isFileTemporary = false;
     } else {
         path = await makeTempFilePath();
         isFileTemporary = true;
-        if (item instanceof ReadableStream) {
-            writeToTemporaryFile = () => writeStream(path, item);
+        if (dataOrPathOrZipItem instanceof Uint8Array) {
+            writeToTemporaryFile = () =>
+                fs.writeFile(path, dataOrPathOrZipItem);
         } else {
             writeToTemporaryFile = async () => {
-                const [zipPath, entryName] = item;
+                const [zipPath, entryName] = dataOrPathOrZipItem;
                 const zip = openZip(zipPath);
                 try {
                     await zip.extract(entryName, path);

desktop/src/preload.ts

@@ -66,10 +66,8 @@ import type { IpcRendererEvent } from "electron";
 import type {
     AppUpdate,
     CollectionMapping,
-    FFmpegCommand,
     FolderWatch,
     PendingUploads,
-    UtilityProcessType,
     ZipItem,
 } from "./types/ipc";
 
@@ -185,53 +183,47 @@ const fsWriteFileViaBackup = (path: string, contents: string) =>
 
 const fsIsDir = (dirPath: string) => ipcRenderer.invoke("fsIsDir", dirPath);
 
-const fsStatMtime = (path: string) => ipcRenderer.invoke("fsStatMtime", path);
-
 // - Conversion
 
 const convertToJPEG = (imageData: Uint8Array) =>
     ipcRenderer.invoke("convertToJPEG", imageData);
 
 const generateImageThumbnail = (
-    pathOrZipItem: string | ZipItem,
+    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
     maxDimension: number,
     maxSize: number,
 ) =>
     ipcRenderer.invoke(
         "generateImageThumbnail",
-        pathOrZipItem,
+        dataOrPathOrZipItem,
         maxDimension,
         maxSize,
     );
 
 const ffmpegExec = (
-    command: FFmpegCommand,
-    pathOrZipItem: string | ZipItem,
+    command: string[],
+    dataOrPathOrZipItem: Uint8Array | string | ZipItem,
     outputFileExtension: string,
 ) =>
     ipcRenderer.invoke(
         "ffmpegExec",
         command,
-        pathOrZipItem,
+        dataOrPathOrZipItem,
         outputFileExtension,
     );
 
-const ffmpegDetermineVideoDuration = (pathOrZipItem: string | ZipItem) =>
-    ipcRenderer.invoke("ffmpegDetermineVideoDuration", pathOrZipItem);
+// - ML
 
-// - Utility processes
-
-const triggerCreateUtilityProcess = (type: UtilityProcessType) => {
-    const portEvent = `utilityProcessPort/${type}`;
+const createMLWorker = () => {
     const l = (event: IpcRendererEvent) => {
         void windowLoaded.then(() => {
             // "*"" is the origin to send to.
-            window.postMessage(portEvent, "*", event.ports);
-            ipcRenderer.off(portEvent, l);
+            window.postMessage("createMLWorker/port", "*", event.ports);
+            ipcRenderer.off("createMLWorker/port", l);
         });
     };
-    ipcRenderer.on(portEvent, l);
-    ipcRenderer.send("triggerCreateUtilityProcess", type);
+    ipcRenderer.on("createMLWorker/port", l);
+    ipcRenderer.send("createMLWorker");
 };
 
 // - Watch
@@ -297,11 +289,11 @@ const pendingUploads = () => ipcRenderer.invoke("pendingUploads");
 const setPendingUploads = (pendingUploads: PendingUploads) =>
     ipcRenderer.invoke("setPendingUploads", pendingUploads);
 
-const markUploadedFile = (path: string, associatedPath?: string) =>
-    ipcRenderer.invoke("markUploadedFile", path, associatedPath);
+const markUploadedFiles = (paths: PendingUploads["filePaths"]) =>
+    ipcRenderer.invoke("markUploadedFiles", paths);
 
-const markUploadedZipItem = (item: ZipItem, associatedItem?: ZipItem) =>
-    ipcRenderer.invoke("markUploadedZipItem", item, associatedItem);
+const markUploadedZipItems = (items: PendingUploads["zipItems"]) =>
+    ipcRenderer.invoke("markUploadedZipItems", items);
 
 const clearPendingUploads = () => ipcRenderer.invoke("clearPendingUploads");
 
@@ -386,7 +378,6 @@ contextBridge.exposeInMainWorld("electron", {
         writeFile: fsWriteFile,
         writeFileViaBackup: fsWriteFileViaBackup,
         isDir: fsIsDir,
-        statMtime: fsStatMtime,
         findFiles: fsFindFiles,
     },
 
@@ -395,11 +386,10 @@ contextBridge.exposeInMainWorld("electron", {
     convertToJPEG,
     generateImageThumbnail,
     ffmpegExec,
-    ffmpegDetermineVideoDuration,
 
     // - ML
 
-    triggerCreateUtilityProcess,
+    createMLWorker,
 
     // - Watch
 
@@ -420,7 +410,7 @@ contextBridge.exposeInMainWorld("electron", {
     pathOrZipItemSize,
     pendingUploads,
     setPendingUploads,
-    markUploadedFile,
-    markUploadedZipItem,
+    markUploadedFiles,
+    markUploadedZipItems,
     clearPendingUploads,
 });