v2.0.4

This reverts commit 945d6d6728.

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Flutter CI
+name: release
 
 # This workflow is triggered on pushes to the repository.
 on:
@@ -25,7 +25,7 @@ jobs:
             - uses: subosito/flutter-action@v2
               with:
                   channel: "stable"
-                  flutter-version: "3.3.8"
+                  flutter-version: "3.10.6"
 
             # Fetch sub modules
             - run: git submodule update --init --recursive
@@ -41,7 +41,7 @@ jobs:
 
             # Build independent apk.
             - name: Build
-              run: flutter build apk --release --flavor independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-auth.apk
+              run: flutter build apk --release --flavor independent --dart-define=app.flavor=independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-auth.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
@@ -50,7 +50,7 @@ jobs:
 
             # Build Play store aab.
             - name: Build
-              run: flutter build appbundle --release --flavor playstore
+              run: 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 }}

.github/workflows/cla.yaml

@@ -1,38 +0,0 @@
-name: "CLA Assistant"
-on:
-    issue_comment:
-        types: [created]
-    pull_request_target:
-        types: [opened, closed, synchronize]
-
-jobs:
-    CLAAssistant:
-        # This job only runs for pull request comments
-        if: ${{ github.event.issue.pull_request }}
-        runs-on: ubuntu-latest
-        steps:
-            - name: "CLA Assistant"
-              if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-              # Beta Release
-              uses: contributor-assistant/github-action@v2.2.1
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  # the below token should have repo scope and must be manually added by you in the repository's secret
-                  PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-              with:
-                  path-to-signatures: "signatures/version1/cla.json"
-                  path-to-document: "https://github.com/ente-io/cla/blob/main/CLA.md" # e.g. a CLA or a DCO document
-                  # branch should not be protected
-                  branch: "main"
-                  allowlist: enteio
-
-                  # the followings are the optional inputs - If the optional inputs are not given, then default values will be taken
-                  #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository)
-                  remote-repository-name: cla
-                  #create-file-commit-message: 'For example: Creating file for storing CLA Signatures'
-                  #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo'
-                  #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign'
-                  #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
-                  #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
-                  #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
-                  #use-dco-flag: true - If you are using DCO instead of CLA

.github/workflows/l18n-crowdin.yml

@@ -0,0 +1,35 @@
+name: Sync crowdin translation
+
+on:
+  push:
+    paths: # run action automatically when app_en.arb file is changed
+      - 'lib/l10n/arb/app_en.arb'
+    branches: [ main ]
+  schedule:
+    - cron: '0 */12 * * *' # Every 12 hours - https://crontab.guru/#0_*/12_*_*_*
+  workflow_dispatch: # for manually running the action
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: crowdin action
+        uses: crowdin/github-action@v1
+        with:
+          upload_sources: true
+          upload_translations: true
+          download_translations: true
+          localization_branch_name: l10n_translations
+          create_pull_request: true
+          skip_untranslated_strings: true
+          pull_request_title: 'New Translations'
+          pull_request_body: 'New translations via [Crowdin GH Action](https://github.com/crowdin/github-action)'
+          pull_request_base_branch_name: 'main'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.gitmodules

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

CLA.md

@@ -1,98 +0,0 @@
-## Contributor License Agreement
-
-Thank you for your contribution to ente projects.
-
-This contributor license agreement documents the rights granted by contributors
-to Ente Technologies, Inc ("ente"). This license is for your protection as a
-Contributor as well as the protection of ente, its users, and its licensees; you
-may still license your own Contributions under other terms.
-
-In exchange for the ability to participate in the ente community and for other
-good consideration, the receipt of which is hereby acknowledged, you accept and
-agree to the following terms and conditions for Your present and future
-Contributions submitted to ente. Except for the license granted herein to ente
-and recipients of software distributed by ente, You reserve all right, title,
-and interest in and to Your Contributions.
-
-1. Definitions.
-
-   "You" (or "Your") shall mean the copyright owner or legal entity authorized
-   by the copyright owner that is making this Agreement with ente. For legal
-   entities, the entity making a Contribution and all other entities that
-   control, are controlled by, or are under common control with that entity are
-   considered to be a single Contributor. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the direction or
-   management of such entity, whether by contract or otherwise, or (ii)
-   ownership of fifty percent (50%) or more of the outstanding shares, or (iii)
-   beneficial ownership of such entity.
-
-   "Contribution" shall mean any original work of authorship or invention,
-   including any modifications or additions to an existing work, that is
-   intentionally submitted by You to ente for inclusion in, or documentation of,
-   any of the products owned or managed by ente (the "Work"). For the purposes
-   of this definition, "submitted" means any form of electronic, verbal, or
-   written communication sent to ente or its representatives, including but not
-   limited to communication on electronic mailing lists, source code control
-   systems, and issue tracking systems that are managed by, or on behalf of,
-   ente for the purpose of discussing and improving the Work, but excluding
-   communication that is conspicuously marked or otherwise designated in writing
-   by You as "Not a Contribution."
-
-2. Grant of Copyright License. Subject to the terms and conditions of this
-   Agreement, You hereby grant to ente and to recipients of software distributed
-   by ente a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-   irrevocable copyright license to reproduce, prepare derivative works of,
-   publicly display, publicly perform, and distribute Your Contributions and
-   such derivative works.
-
-3. Grant of Patent License. Subject to the terms and conditions of this
-   Agreement, You hereby grant to ente and to recipients of software distributed
-   by ente a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-   irrevocable (except as stated in this section) patent license to make, have
-   made, use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable by You that
-   are necessarily infringed by Your Contribution(s) alone or by combination of
-   Your Contribution(s) with the Work to which such Contribution(s) was
-   submitted. If any entity institutes patent litigation against You or any
-   other entity (including a cross-claim or counterclaim in a lawsuit) alleging
-   that your Contribution, or the Work to which you have contributed,
-   constitutes direct or contributory patent infringement, then any patent
-   licenses granted to that entity under this Agreement for that Contribution or
-   Work shall terminate as of the date such litigation is filed.
-
-4. You represent that you are legally entitled to grant the above license. If
-   your employer(s) has rights to intellectual property that you create that
-   includes your Contributions, you represent that you have received permission
-   to make Contributions on behalf of that employer, that your employer has
-   waived such rights for your contributions to ente, or that your employer has
-   executed with ente a separate contributor license agreement substantially
-   similar to this Agreement. If You are a current employee or contractor of
-   ente, then the terms of your existing Employment Agreement or Consulting
-   Services Agreement shall supersede this CLA, and remain in full effect.
-
-5. You represent that each of Your Contributions is Your original creation (see
-   section 7 for submissions on behalf of others). You represent that Your
-   Contribution submissions include complete details of any third-party license
-   or other restriction (including, but not limited to, related patents and
-   trademarks) of which you are personally aware and which are associated with
-   any part of Your Contributions.
-
-6. You are not expected to provide support for Your Contributions, except to the
-   extent You desire to provide support. You may provide support for free, for
-   a fee, or not at all. Unless required by applicable law or agreed to in
-   writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT
-   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including,
-   without limitation, any warranties or conditions of title, non-infringement,
-   merchantability, or fitness for a particular purpose.
-
-7. Should You wish to submit work that is not Your original creation, You may
-   submit it to ente separately from any Contribution, identifying the complete
-   details of its source and of any license or other restriction (including, but
-   not limited to, related patents, trademarks, and license agreements) of which
-   you are personally aware, and conspicuously marking the work as "Not a
-   Contribution". Third-party materials licensed pursuant to: [license name(s)
-   here]" (substituting the bracketed text with the appropriate license
-   name(s)).
-
-8. You agree to notify ente of any facts or circumstances of which you become
-   aware that would make these representations inaccurate in any respect.

CONTRIBUTING.md

@@ -0,0 +1,56 @@
+# Contributing
+
+Thank you for showing interest in contributing to ente Authenticator. There are a couple of ways to help
+out. This document contains some general guidelines for each type of
+contribution.
+
+
+## Translations
+[![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app)
+
+We use [Crowdin](https://crowdin.com/project/ente-authenticator-app) to crowdsource
+translations of ente Authenticator. 
+If your language is not listed for translation, feel free to [create a GitHub issue](https://github.com/ente-io/auth/issues/new?title=Request+for+New+Language+Translation&body=Language+name%3A) to have it added.
+
+## Icons
+
+ente Auth supports the icon pack provided by
+[simple-icons](https://github.com/simple-icons/simple-icons).
+
+If you would like to add your own custom icon, please open a pull-request
+with the relevant SVG and color
+code ([example PR](https://github.com/ente-io/auth/pull/213/files)).
+
+
+## Development
+
+If you're planning on adding a new feature or making other changes, please
+discuss it with us by creating [an
+issue](https://github.com/ente-io/auth/issues/new)
+on GitHub. Discussing your idea with us first ensures that everyone is on the
+same page before you start working on your change.
+
+### 💻  Setup
+
+1. [Install Flutter v3.10.6](https://flutter.dev/docs/get-started/install)
+2. Clone this repository with `git clone git@github.com:ente-io/auth.git` 
+3. Pull in all submodules with `git submodule update --init --recursive`
+4. For Android, run 
+    ```bash
+    flutter run -t lib/main.dart --flavor independent
+    ```
+5. For iOS, run `flutter run` 
+
+
+#### Localization
+If the feature requires adding new strings, you can do that by following these steps:
+
+1. Add a new entry inside [app_en.arb](https://github.com/ente-io/auth/blob/main/lib/l10n/arb/app_en.arb) (Remember to save)
+2.  In your dart file, add follwing import
+    ```dart
+    import "package:ente_auth/l10n/l10n.dart";
+    ```
+3. Refer to the string using `context.l10n.<keyName>`. For example 
+    ```dart
+    context.l10n.account
+    ```

README.md

@@ -1,5 +1,9 @@
 # ente Authenticator
 
+![Build](https://github.com/ente-io/auth/actions/workflows/ci.yml/badge.svg?branch=)
+[![Crowdin](https://badges.crowdin.net/ente-authenticator-app/localized.svg)](https://crowdin.com/project/ente-authenticator-app) 
+ [![Matrix](https://img.shields.io/matrix/ente:matrix.org?color=blue)](https://matrix.to/#/#ente:matrix.org)
+
 ente's Authenticator app helps you generate and store 2 step verification (2FA)
 tokens on your mobile devices.
 
@@ -25,22 +29,23 @@ your devices. Every new device you sign into will have access to these tokens.
 ### Offline Mode
 
 ente generates 2FA tokens offline, so your network connectivity will not get in
-the way of your workflow.
+the way of your workflow. If you wish to use the app without an account for e2ee
+backups, you can do that as well.
 
 ### Import and Export Tokens
 
 You can add tokens to ente by one of the following methods:
 1. Scanning a QR code
 2. Manually entering (copy-pasting) a 2FA secret
-3. Bulk importing from a file that contains a list of codes in the following
-   format:
-```
-otpauth://totp/ACCOUNT?secret=SUPERSECRET&issuer=SERVICE
-```
-The codes maybe separated by new lines or commas.
+3. Bulk importing from other popular 2FA apps and from a file  that contains a list of codes in the following format:.
+    ```
+    otpauth://totp/provider.com:you@email.com?secret=YOUR_SECRET
+    ```
 
-You can also export the codes you have added to ente, to an **unencrypted** text
-file, that adheres to the above format.
+You can export the codes you have added to ente, to either an **encrypted** or
+plain text file. The encrypted backups can be accessed through the app, as well
+as a standalone CLI tool. [Read
+more](migration-guides/encrypted_export.md#how-to-use-the-exported-data).
 
 
 ## 📲 Download
@@ -52,26 +57,29 @@ releases](https://github.com/ente-io/auth/releases/latest/download/ente-auth.apk
 contains APKs, built straight from source. These builds keep themselves updated,
 without relying on third party stores.
 
-You can alternatively install the build from PlayStore.
+You can alternatively install the build from PlayStore or F-Droid.
 
 <a href="https://play.google.com/store/apps/details?id=io.ente.auth"> <img
   width="197" alt="Get it on Google Play"
 src="https://ente.io/static/ed265c3abdcd3efa5e29f64b927bcb44/e230a/play-store-badge.webp">
 </a>
 
-### iOS
+<a href="https://f-droid.org/packages/io.ente.auth/">
+  <img width="197" alt="Get it on F-Droid" src="https://ente.io/static/5378d3de690a04a5011268b9caf739f5/e230a/f-droid-badge.webp">
+</a>
+
+### iPhone / Apple Silicon
+
 
 <a href="https://apps.apple.com/us/app/ente-authenticator/id6444121398"> <img
   width="197" alt="Download on AppStore"
 src="https://user-images.githubusercontent.com/1161789/154795157-c4468ff9-97fd-46f3-87fe-dca789d8733a.png">
 </a>
 
-### Desktop
+### Web / Desktop
 
-Support for desktop platforms (Linux, Mac and Windows) is a [work in
-progress](https://github.com/ente-io/auth/tree/desktop).
+You can view your 2FA codes at [auth.ente.io](https://auth.ente.io). For adding or managing your secrets, please use our mobile app.
 
-Please ⭐ this repo to be notified of updates.
 
 
 ## 🔩 Architecture
@@ -80,27 +88,38 @@ The architecture that powers end-to-end encrypted storage and sync of your
 tokens has been documented [here](architecture/README.md).
 
 
-## 🧑‍💻 Building from source
+## 🧑‍💻 Build from source
 
 1. [Install Flutter](https://flutter.dev/docs/get-started/install)
 2. Clone this repository with `git clone git@github.com:ente-io/auth.git` 
 3. Pull in all submodules with `git submodule update --init --recursive`
-4. For Android, run `flutter build apk --release --flavor independent`
+4. For Android, [setup your keystore](https://docs.flutter.dev/deployment/android#create-an-upload-keystore) and run `flutter build apk --release --flavor independent`
 5. For iOS, run `flutter build ios` 
 
 For maintainers, there is [additional documentation](RELEASES.md) on
 automatically publishing the main branch to App store, Play store and GitHub
 releases.
 
-## 🙋‍♂️ Support
+
+## 🧑‍🔧 Contribute
+
+Please refer to our [contribution guide](./CONTRIBUTING.md) if you wish to add
+an icon, assist with translation, or develop new features.
+
+You can also support us by giving this project a ⭐ star on GitHub or by leaving
+a review on
+[PlayStore](https://play.google.com/store/apps/details?id=io.ente.auth),
+[AppStore](https://apps.apple.com/us/app/ente-authenticator/id6444121398) or
+[AlternativeTo](https://alternativeto.net/software/ente-authenticator/).
+
+
+## 🙋‍♂️ Help
 
 If you need help, please reach out to support@ente.io, and a human will get in
 touch with you.
 
 If you have feature requests, please create a [GitHub issue](https://github.com/ente-io/auth/issues/).
 
-If you wish to support us, please ⭐
-[star](https://github.com/ente-io/auth/stargazers) this project.
 
 
 ## 💜 Community

analysis_options.yaml

@@ -48,4 +48,5 @@ analyzer:
     avoid_renaming_method_parameters: ignore # incorrect warnings for `equals` overrides
 
   exclude:
-    - thirdparty/**
+    - thirdparty/**
+    - flutter/**

android/app/src/main/AndroidManifest.xml

@@ -25,7 +25,14 @@
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:scheme="ente"/>
+                <data android:scheme="ente-auth"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="otpauth" />
             </intent-filter>
 
         </activity>
@@ -54,4 +61,4 @@
             tools:ignore="ScopedStorage"/>
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
 
-</manifest>
+</manifest>

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

@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
   <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

assets/build/.last_build_id

@@ -0,0 +1 @@
+f23611a675a8c9bc71eb16e8a1108cf8

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

@@ -0,0 +1,12 @@
+{
+    "icons": [
+        {
+            "title": "ente",
+            "hex": "1DB954"
+        },
+        {
+            "title": "Github",
+            "hex": "858585"
+        }
+    ]
+}

assets/custom-icons/icons/ente.svg

@@ -0,0 +1,3 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.06803 7.096C3.33203 7.096 2.68403 6.952 2.12403 6.664C1.57203 6.376 1.14403 5.984 0.840033 5.488C0.536033 4.984 0.384033 4.412 0.384033 3.772C0.384033 3.124 0.532033 2.552 0.828033 2.056C1.13203 1.552 1.54403 1.16 2.06403 0.879997C2.58403 0.591998 3.17203 0.447998 3.82803 0.447998C4.46003 0.447998 5.02803 0.583998 5.53203 0.855998C6.04403 1.12 6.44803 1.504 6.74403 2.008C7.04003 2.504 7.18803 3.1 7.18803 3.796C7.18803 3.868 7.18403 3.952 7.17603 4.048C7.16803 4.136 7.16003 4.22 7.15203 4.3H1.90803V3.208H6.16803L5.44803 3.532C5.44803 3.196 5.38003 2.904 5.24403 2.656C5.10803 2.408 4.92003 2.216 4.68003 2.08C4.44003 1.936 4.16003 1.864 3.84003 1.864C3.52003 1.864 3.23603 1.936 2.98803 2.08C2.74803 2.216 2.56003 2.412 2.42403 2.668C2.28803 2.916 2.22003 3.212 2.22003 3.556V3.844C2.22003 4.196 2.29603 4.508 2.44803 4.78C2.60803 5.044 2.82803 5.248 3.10803 5.392C3.39603 5.528 3.73203 5.596 4.11603 5.596C4.46003 5.596 4.76003 5.544 5.01603 5.44C5.28003 5.336 5.52003 5.18 5.73603 4.972L6.73203 6.052C6.43603 6.388 6.06403 6.648 5.61603 6.832C5.16803 7.008 4.65203 7.096 4.06803 7.096Z" fill="black" style="fill:black;fill:black;fill-opacity:1;"/>
+</svg>

assets/custom-icons/icons/github.svg

@@ -0,0 +1 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>

crowdin.yml

@@ -0,0 +1,6 @@
+project_id_env: CROWDIN_PROJECT_ID
+api_token_env: CROWDIN_PERSONAL_TOKEN
+
+files:
+  - source: /lib/l10n/arb/app_en.arb
+    translation: /lib/l10n/arb/app_%two_letters_code%.arb

fastlane/metadata/android/en-US/changelogs/39.txt

@@ -0,0 +1,3 @@
+- Added OTPAuth URL Scheme Support: Our Two-Factor Authenticator app now supports the otpauth:// URL scheme for easy setup and configuration of your one-time password (OTP) accounts.
+
+- Expanded Language Support: Thanks to the help from our community, in addition to English, French, and Spanish, our app now supports German, Spanish, Dutch, Brazilian Portuguese, Russian, and Simplified Chinese. To change your language preferences, go to Settings > Account > Language.

fastlane/metadata/android/en-US/full_description.txt

@@ -1,30 +1,33 @@
-ente authenticator provides end-to-end encrypted cloud backups so that you don't have to worry about losing your tokens. We use the same protocols [ente
-Photos](https://ente.io) uses to encrypt and preserve your data.
+ente's Authenticator app helps you generate and store 2 step verification (2FA)
+tokens on your mobile devices.
 
 
-Multi Device Synchronization
+FEATURES
 
+- Secure Backups
+ente provides end-to-end encrypted cloud backups so that you don't have to worry
+about losing your tokens. We use the same protocols ente Photos uses to encrypt
+and preserve your data.
+
+- Multi Device Synchronization
 ente will automatically sync the 2FA tokens you add to your account, across all
 your devices. Every new device you sign into will have access to these tokens.
 
+- Web access
+You can access your 2FA code from any web browser by visiting https://auth.ente.io .
 
- Mode
-
+- Offline Mode
 ente generates 2FA tokens offline, so your network connectivity will not get in
 the way of your workflow.
 
-Import and Export Tokens
-
-You can add tokens to ente by one of the following methods:
+- Import and Export Tokens
+You can add tokens to ente by one of the following methods: 
 1. Scanning a QR code
 2. Manually entering (copy-pasting) a 2FA secret
-3. Bulk importing from a file that contains a list of codes in the following
-   format:
+3. Bulk importing from a file that contains a list of codes in the following format:
 
-```
-otpauth://totp/ACCOUNT?secret=SUPERSECRET&issuer=SERVICE
+otpauth://totp/provider.com:you@email.com?secret=YOUR_SECRET
 
-```
 The codes maybe separated by new lines or commas.
 
 You can also export the codes you have added to ente, to an **unencrypted** text
@@ -32,4 +35,6 @@ file, that adheres to the above format.
 
 
 SUPPORT
-We take pride in offering human support. If you are our paid customer, you can reach out to team@ente.io and expect a response from our team within 24 hours.
+
+If you need help, please reach out to support@ente.io, and a human will get in touch with you.
+If you have feature requests, please create an issue @ https://github.com/ente-io/auth

ios/Podfile.lock

@@ -64,7 +64,7 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - local_auth (0.0.1):
+  - local_auth_ios (0.0.1):
     - Flutter
   - move_to_background (0.0.1):
     - Flutter
@@ -81,24 +81,28 @@ PODS:
     - Flutter
     - MTBBarcodeScanner
   - Reachability (3.2)
-  - SDWebImage (5.15.0):
-    - SDWebImage/Core (= 5.15.0)
-  - SDWebImage/Core (5.15.0)
-  - Sentry/HybridSDK (7.31.5)
+  - SDWebImage (5.17.0):
+    - SDWebImage/Core (= 5.17.0)
+  - SDWebImage/Core (5.17.0)
+  - Sentry/HybridSDK (8.9.1):
+    - SentryPrivate (= 8.9.1)
   - sentry_flutter (0.0.1):
     - Flutter
     - FlutterMacOS
-    - Sentry/HybridSDK (= 7.31.5)
+    - Sentry/HybridSDK (= 8.9.1)
+  - SentryPrivate (8.9.1)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.2):
+  - sqflite (0.0.3):
     - Flutter
     - FMDB (>= 2.7.5)
   - SwiftyGif (5.4.4)
   - Toast (4.0.0)
+  - uni_links (0.0.1):
+    - Flutter
   - url_launcher_ios (0.0.1):
     - Flutter
 
@@ -115,16 +119,17 @@ DEPENDENCIES:
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
   - flutter_sodium (from `.symlinks/plugins/flutter_sodium/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
-  - local_auth (from `.symlinks/plugins/local_auth/ios`)
+  - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
   - move_to_background (from `.symlinks/plugins/move_to_background/ios`)
   - open_filex (from `.symlinks/plugins/open_filex/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`)
   - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - uni_links (from `.symlinks/plugins/uni_links/ios`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
@@ -137,6 +142,7 @@ SPEC REPOS:
     - Reachability
     - SDWebImage
     - Sentry
+    - SentryPrivate
     - SwiftyGif
     - Toast
 
@@ -165,8 +171,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_sodium/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
-  local_auth:
-    :path: ".symlinks/plugins/local_auth/ios"
+  local_auth_ios:
+    :path: ".symlinks/plugins/local_auth_ios/ios"
   move_to_background:
     :path: ".symlinks/plugins/move_to_background/ios"
   open_filex:
@@ -174,7 +180,7 @@ EXTERNAL SOURCES:
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   qr_code_scanner:
     :path: ".symlinks/plugins/qr_code_scanner/ios"
   sentry_flutter:
@@ -182,9 +188,11 @@ EXTERNAL SOURCES:
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
     :path: ".symlinks/plugins/sqflite/ios"
+  uni_links:
+    :path: ".symlinks/plugins/uni_links/ios"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
@@ -202,27 +210,29 @@ SPEC CHECKSUMS:
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   flutter_sodium: c84426b4de738514b5b66cfdeb8a06634e72fe0b
-  fluttertoast: eb263d302cc92e04176c053d2385237e9f43fad0
+  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  local_auth: 1740f55d7af0a2e2a8684ce225fe79d8931e808c
+  local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
   move_to_background: 39a5b79b26d577b0372cbe8a8c55e7aa9fcd3a2d
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
-  path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
+  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  SDWebImage: 9bec4c5cdd9579e1f57104735ee0c37df274d593
-  Sentry: 4c9babff9034785067c896fd580b1f7de44da020
-  sentry_flutter: b10ae7a5ddcbc7f04648eeb2672b5747230172f1
+  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
+  Sentry: e3203780941722a1fcfee99e351de14244c7f806
+  sentry_flutter: 8f0ffd53088e6a4d50c095852c5cad9e4405025c
+  SentryPrivate: 5e3683390f66611fc7c6215e27645873adb55d13
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: 297b3ebca31b34ec92be11acd7fb0ba932c822ca
-  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
+  uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
+  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
 PODFILE CHECKSUM: b4e3a7eabb03395b66e81fc061789f61526ee6bb
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

ios/Runner.xcodeproj/project.pbxproj

@@ -225,6 +225,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -257,7 +258,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
@@ -265,7 +266,7 @@
 			name = "Run Script";
 			outputPaths = (
 			);
-			runOnlyForDeploymentPostprocessing = 1;
+			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};

ios/Runner/Info.plist

@@ -1,66 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
-		<key>CADisableMinimumFrameDurationOnPhone</key>
-		<true/>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>$(DEVELOPMENT_LANGUAGE)</string>
-		<key>CFBundleDisplayName</key>
-		<string>auth</string>
-		<key>CFBundleExecutable</key>
-		<string>$(EXECUTABLE_NAME)</string>
-		<key>CFBundleIdentifier</key>
-		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundleLocalizations</key>
-		<array>
-			<string>en</string>
-			<string>es</string>
-		</array>
-		<key>CFBundleName</key>
-		<string>auth</string>
-		<key>CFBundlePackageType</key>
-		<string>APPL</string>
-		<key>CFBundleShortVersionString</key>
-		<string>$(FLUTTER_BUILD_NAME)</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleVersion</key>
-		<string>$(FLUTTER_BUILD_NUMBER)</string>
-		<key>LSRequiresIPhoneOS</key>
-		<true/>
-		<key>ITSAppUsesNonExemptEncryption</key>
-		<false/>
-		<key>MinimumOSVersion</key>
-		<string>12.0</string>
-		<key>NSCameraUsageDescription</key>
-		<string>This app needs camera access to scan QR codes</string>
-		<key>UILaunchStoryboardName</key>
-		<string>LaunchScreen</string>
-		<key>UIMainStoryboardFile</key>
-		<string>Main</string>
-		<key>UIStatusBarHidden</key>
-		<false/>
-		<key>UISupportedInterfaceOrientations</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UISupportedInterfaceOrientations~ipad</key>
-		<array>
-			<string>UIInterfaceOrientationPortrait</string>
-			<string>UIInterfaceOrientationPortraitUpsideDown</string>
-			<string>UIInterfaceOrientationLandscapeLeft</string>
-			<string>UIInterfaceOrientationLandscapeRight</string>
-		</array>
-		<key>UIViewControllerBasedStatusBarAppearance</key>
-		<false/>
-		<key>NSFaceIDUsageDescription</key>
-		<string>Please allow auth to lock itself with FaceID or TouchID</string>
-		<key>NSPhotoLibraryUsageDescription</key>
-		<string>Please allow auth to pick a file to import data from</string>
-	</dict>
+<dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleDisplayName</key>
+	<string>auth</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>en</string>
+		<string>es</string>
+	</array>
+	<key>CFBundleName</key>
+	<string>auth</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(FLUTTER_BUILD_NAME)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>otpauth</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>MinimumOSVersion</key>
+	<string>12.0</string>
+	<key>NSCameraUsageDescription</key>
+	<string>This app needs camera access to scan QR codes</string>
+	<key>NSFaceIDUsageDescription</key>
+	<string>Please allow auth to lock itself with FaceID or TouchID</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Please allow auth to pick a file to import data from</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIMainStoryboardFile</key>
+	<string>Main</string>
+	<key>UIStatusBarHidden</key>
+	<false/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
 </plist>

lib/app/app.dart

@@ -1,2 +1,2 @@
-// @dart=2.9
+
 export "view/app.dart";

lib/app/view/app.dart

@@ -1,4 +1,3 @@
-// @dart=2.9
 import 'dart:async';
 import 'dart:io';
 
@@ -9,27 +8,38 @@ import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/events/signed_in_event.dart';
 import 'package:ente_auth/events/signed_out_event.dart';
 import "package:ente_auth/l10n/l10n.dart";
+import 'package:ente_auth/locale.dart';
 import "package:ente_auth/onboarding/view/onboarding_page.dart";
 import 'package:ente_auth/services/update_service.dart';
+import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/ui/home_page.dart';
 import 'package:ente_auth/ui/settings/app_update_dialog.dart';
 import 'package:flutter/foundation.dart';
 import "package:flutter/material.dart";
-import "package:flutter_localizations/flutter_localizations.dart";
+import 'package:flutter_localizations/flutter_localizations.dart';
 
 class App extends StatefulWidget {
-  const App({Key key});
+  final Locale locale;
+  const App({Key? key, this.locale = const Locale("en")}) : super(key: key);
+
+  static void setLocale(BuildContext context, Locale newLocale) {
+    _AppState state = context.findAncestorStateOfType<_AppState>()!;
+    state.setLocale(newLocale);
+  }
 
   @override
   State<App> createState() => _AppState();
 }
 
 class _AppState extends State<App> {
-  StreamSubscription<SignedOutEvent> _signedOutEvent;
-  StreamSubscription<SignedInEvent> _signedInEvent;
-  static const List<Locale> supportedLocales = <Locale>[
-    Locale('en'),
-  ];
+  late StreamSubscription<SignedOutEvent> _signedOutEvent;
+  late StreamSubscription<SignedInEvent> _signedInEvent;
+  Locale? locale;
+  setLocale(Locale newLocale) {
+    setState(() {
+      locale = newLocale;
+    });
+  }
 
   @override
   void initState() {
@@ -39,10 +49,12 @@ class _AppState extends State<App> {
       }
     });
     _signedInEvent = Bus.instance.on<SignedInEvent>().listen((event) {
+      UserService.instance.getUserDetailsV2().ignore();
       if (mounted) {
         setState(() {});
       }
     });
+    locale = widget.locale;
     UpdateService.instance.shouldUpdate().then((shouldUpdate) {
       if (shouldUpdate) {
         Future.delayed(Duration.zero, () {
@@ -81,17 +93,15 @@ class _AppState extends State<App> {
           theme: lightTheme,
           darkTheme: dartTheme,
           debugShowCheckedModeBanner: false,
-          supportedLocales: supportedLocales,
-          localeListResolutionCallback: (locales, supportedLocales) {
-            for (Locale locale in locales) {
-              if (supportedLocales.contains(locale)) {
-                return locale;
-              }
-            }
-            // if device language is not supported by the app, use en as default
-            return const Locale('en');
-          },
-          localizationsDelegates: AppLocalizations.localizationsDelegates,
+          locale: locale,
+          supportedLocales: appSupportedLocales,
+          localeListResolutionCallback: localResolutionCallBack,
+          localizationsDelegates: const [
+            AppLocalizations.delegate,
+            GlobalMaterialLocalizations.delegate,
+            GlobalCupertinoLocalizations.delegate,
+            GlobalWidgetsLocalizations.delegate,
+          ],
           routes: _getRoutes,
         ),
       );
@@ -102,16 +112,9 @@ class _AppState extends State<App> {
         theme: lightThemeData,
         darkTheme: darkThemeData,
         debugShowCheckedModeBanner: false,
-        supportedLocales: supportedLocales,
-        localeListResolutionCallback: (locales, supportedLocales) {
-          for (Locale locale in locales) {
-            if (supportedLocales.contains(locale)) {
-              return locale;
-            }
-          }
-          // if device language is not supported by the app, use en as default
-          return const Locale('en');
-        },
+        locale: locale,
+        supportedLocales: appSupportedLocales,
+        localeListResolutionCallback: localResolutionCallBack,
         localizationsDelegates: const [
           AppLocalizations.delegate,
           GlobalMaterialLocalizations.delegate,
@@ -125,7 +128,8 @@ class _AppState extends State<App> {
 
   Map<String, WidgetBuilder> get _getRoutes {
     return {
-      "/": (context) => Configuration.instance.hasConfiguredAccount()
+      "/": (context) => Configuration.instance.hasConfiguredAccount() ||
+              Configuration.instance.hasOptedForOfflineMode()
           ? const HomePage()
           : const OnboardingPage(),
     };

lib/app/view/app_theme_extension.dart

@@ -38,9 +38,7 @@ final darkTheme = ThemeData(
   fontFamily: "Inter",
   brightness: Brightness.dark,
   scaffoldBackgroundColor: Colors.black,
-  backgroundColor: Colors.black,
   appBarTheme: const AppBarTheme(color: Colors.orange),
-  colorScheme: const ColorScheme.dark(primary: Colors.white),
   textTheme: _buildTextTheme(Colors.white),
   outlinedButtonTheme: buildOutlinedButtonThemeData(
     bgDisabled: Colors.grey.shade500,
@@ -59,25 +57,25 @@ final darkTheme = ThemeData(
       borderSide: BorderSide.none,
       borderRadius: BorderRadius.circular(6),
     ),
-  ),
+  ), colorScheme: const ColorScheme.dark(primary: Colors.white).copyWith(background: Colors.black),
 );
 
 TextTheme _buildTextTheme(Color textColor) {
   return const TextTheme().copyWith(
-    headline4: TextStyle(
+    headlineMedium: TextStyle(
       color: textColor,
       fontSize: 32,
       fontWeight: FontWeight.w700,
       fontFamily: "Inter",
     ),
-    headline5: TextStyle(
+    headlineSmall: TextStyle(
       color: textColor,
       fontSize: 24,
       fontWeight: FontWeight.w600,
       fontFamily: "Inter",
     ),
     // AG: Body
-    headline6: TextStyle(
+    titleLarge: TextStyle(
       color: textColor,
       fontSize: 18,
       fontFamily: "Inter",
@@ -92,31 +90,31 @@ TextTheme _buildTextTheme(Color textColor) {
       height: 28,
     ),
 
-    subtitle1: TextStyle(
+    titleMedium: TextStyle(
       color: textColor,
       fontFamily: "Inter",
       fontSize: 16,
       fontWeight: FontWeight.w500,
     ),
-    subtitle2: TextStyle(
+    titleSmall: TextStyle(
       color: textColor,
       fontFamily: "Inter",
       fontSize: 14,
       fontWeight: FontWeight.w500,
     ),
-    bodyText1: TextStyle(
+    bodyLarge: TextStyle(
       fontFamily: "Inter",
       color: textColor,
       fontSize: 16,
       fontWeight: FontWeight.w500,
     ),
-    bodyText2: TextStyle(
+    bodyMedium: TextStyle(
       fontFamily: "Inter",
       color: textColor,
       fontSize: 14,
       fontWeight: FontWeight.w500,
     ),
-    caption: TextStyle(
+    bodySmall: TextStyle(
       color: textColor.withOpacity(0.6),
       fontSize: 14,
       fontWeight: FontWeight.w500,

lib/core/configuration.dart

@@ -1,12 +1,11 @@
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io' as io;
 import 'dart:typed_data';
 
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:ente_auth/core/constants.dart';
-import 'package:ente_auth/core/errors.dart';
 import 'package:ente_auth/core/event_bus.dart';
-// ignore: import_of_legacy_library_into_null_safe
 import 'package:ente_auth/events/signed_in_event.dart';
 import 'package:ente_auth/events/signed_out_event.dart';
 import 'package:ente_auth/models/key_attributes.dart';
@@ -19,6 +18,7 @@ import 'package:flutter_sodium/flutter_sodium.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:tuple/tuple.dart';
 
 class Configuration {
   Configuration._privateConstructor();
@@ -30,16 +30,23 @@ class Configuration {
   );
   static const emailKey = "email";
   static const keyAttributesKey = "key_attributes";
-  static const keyKey = "key";
+
   static const keyShouldShowLockScreen = "should_show_lock_screen";
   static const lastTempFolderClearTimeKey = "last_temp_folder_clear_time";
+  static const keyKey = "key";
   static const secretKeyKey = "secret_key";
   static const authSecretKeyKey = "auth_secret_key";
+  static const offlineAuthSecretKey = "offline_auth_secret_key";
   static const tokenKey = "token";
   static const encryptedTokenKey = "encrypted_token";
   static const userIDKey = "user_id";
-  static const hasMigratedSecureStorageToFirstUnlockKey =
-      "has_migrated_secure_storage_to_first_unlock";
+  static const hasMigratedSecureStorageKey = "has_migrated_secure_storage";
+  static const hasOptedForOfflineModeKey = "has_opted_for_offline_mode";
+  final List<String> onlineSecureKeys = [
+    keyKey,
+    secretKeyKey,
+    authSecretKeyKey
+  ];
 
   final kTempFolderDeletionTimeBuffer = const Duration(days: 1).inMicroseconds;
 
@@ -47,26 +54,19 @@ class Configuration {
 
   String? _cachedToken;
   late String _documentsDirectory;
-  String? _key;
   late SharedPreferences _preferences;
+  String? _key;
   String? _secretKey;
   String? _authSecretKey;
+  String? _offlineAuthKey;
   late FlutterSecureStorage _secureStorage;
   late String _tempDirectory;
-  late String _thumbnailCacheDirectory;
 
-  // 6th July 22: Remove this after 3 months. Hopefully, active users
-  // will migrate to newer version of the app, where shared media is stored
-  // on appSupport directory which OS won't clean up automatically
-  late String _sharedTempMediaDirectory;
-
-  late String _sharedDocumentsMediaDirectory;
   String? _volatilePassword;
 
-  final _secureStorageOptionsIOS =
-      const IOSOptions(accessibility: KeychainAccessibility.first_unlock);
-
-  // const IOSOptions(accessibility: IOSAccessibility.first_unlock);
+  final _secureStorageOptionsIOS = const IOSOptions(
+    accessibility: KeychainAccessibility.first_unlock_this_device,
+  );
 
   Future<void> init() async {
     _preferences = await SharedPreferences.getInstance();
@@ -89,15 +89,27 @@ class Configuration {
       _logger.warning(e);
     }
     tempDirectory.createSync(recursive: true);
-    final tempDirectoryPath = (await getTemporaryDirectory()).path;
-    _thumbnailCacheDirectory = tempDirectoryPath + "/thumbnail-cache";
-    io.Directory(_thumbnailCacheDirectory).createSync(recursive: true);
-    _sharedTempMediaDirectory = tempDirectoryPath + "/ente-shared-media";
-    io.Directory(_sharedTempMediaDirectory).createSync(recursive: true);
-    _sharedDocumentsMediaDirectory = _documentsDirectory + "/ente-shared-media";
-    io.Directory(_sharedDocumentsMediaDirectory).createSync(recursive: true);
+    await _initOnlineAccount();
+    await _initOfflineAccount();
+  }
+
+  Future<void> _initOfflineAccount() async {
+    _offlineAuthKey = await _secureStorage.read(
+      key: offlineAuthSecretKey,
+      iOptions: _secureStorageOptionsIOS,
+    );
+  }
+
+  Future<void> _initOnlineAccount() async {
     if (!_preferences.containsKey(tokenKey)) {
-      await _secureStorage.deleteAll(iOptions: _secureStorageOptionsIOS);
+      for (final key in onlineSecureKeys) {
+        unawaited(
+          _secureStorage.delete(
+            key: key,
+            iOptions: _secureStorageOptionsIOS,
+          ),
+        );
+      }
     } else {
       _key = await _secureStorage.read(
         key: keyKey,
@@ -114,13 +126,17 @@ class Configuration {
       if (_key == null) {
         await logout(autoLogout: true);
       }
-      await _migrateSecurityStorageToFirstUnlock();
     }
   }
 
   Future<void> logout({bool autoLogout = false}) async {
     await _preferences.clear();
-    await _secureStorage.deleteAll(iOptions: _secureStorageOptionsIOS);
+    for (String key in onlineSecureKeys) {
+      await _secureStorage.delete(
+        key: key,
+        iOptions: _secureStorageOptionsIOS,
+      );
+    }
     await AuthenticatorDB.instance.clearTable();
     _key = null;
     _cachedToken = null;
@@ -147,6 +163,7 @@ class Configuration {
       utf8.encode(password) as Uint8List,
       kekSalt,
     );
+    final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);
 
     // Encrypt the key with this derived key
     final encryptedKeyData =
@@ -176,10 +193,12 @@ class Configuration {
       Sodium.bin2hex(recoveryKey),
       Sodium.bin2base64(keyPair.sk),
     );
-    return KeyGenResult(attributes, privateAttributes);
+    return KeyGenResult(attributes, privateAttributes, loginKey);
   }
 
-  Future<KeyAttributes> updatePassword(String password) async {
+  Future<Tuple2<KeyAttributes, Uint8List>> getAttributesForNewPassword(
+    String password,
+  ) async {
     // Get master key
     final masterKey = getKey();
 
@@ -190,6 +209,7 @@ class Configuration {
       utf8.encode(password) as Uint8List,
       kekSalt,
     );
+    final loginKey = await CryptoUtil.deriveLoginKey(derivedKeyResult.key);
 
     // Encrypt the key with this derived key
     final encryptedKeyData =
@@ -197,42 +217,39 @@ class Configuration {
 
     final existingAttributes = getKeyAttributes();
 
-    return existingAttributes!.copyWith(
+    final updatedAttributes = existingAttributes!.copyWith(
       kekSalt: Sodium.bin2base64(kekSalt),
       encryptedKey: Sodium.bin2base64(encryptedKeyData.encryptedData!),
       keyDecryptionNonce: Sodium.bin2base64(encryptedKeyData.nonce!),
       memLimit: derivedKeyResult.memLimit,
       opsLimit: derivedKeyResult.opsLimit,
     );
+    return Tuple2(updatedAttributes, loginKey);
   }
 
-  Future<void> decryptAndSaveSecrets(
+  // decryptSecretsAndGetLoginKey decrypts the master key and recovery key
+  // with the given password and save them in local secure storage.
+  // This method also returns the keyEncKey that can be used for performing
+  // SRP setup for existing users.
+  Future<Uint8List> decryptSecretsAndGetKeyEncKey(
     String password,
-    KeyAttributes attributes,
-  ) async {
+    KeyAttributes attributes, {
+    Uint8List? keyEncryptionKey,
+  }) async {
     _logger.info('Start decryptAndSaveSecrets');
-    // validatePreVerificationStateCheck(
-    //   attributes,
-    //   password,
-    //   getEncryptedToken(),
-    // );
-    _logger.info('state validation done');
-    final kek = await CryptoUtil.deriveKey(
+    keyEncryptionKey ??= await CryptoUtil.deriveKey(
       utf8.encode(password) as Uint8List,
       Sodium.base642bin(attributes.kekSalt),
       attributes.memLimit,
       attributes.opsLimit,
-    ).onError((e, s) {
-      _logger.severe('deriveKey failed', e, s);
-      throw KeyDerivationError();
-    });
+    );
 
     _logger.info('user-key done');
     Uint8List key;
     try {
       key = CryptoUtil.decryptSync(
         Sodium.base642bin(attributes.encryptedKey),
-        kek,
+        keyEncryptionKey,
         Sodium.base642bin(attributes.keyDecryptionNonce),
       );
     } catch (e) {
@@ -257,6 +274,7 @@ class Configuration {
     await setToken(
       Sodium.bin2base64(token, variant: Sodium.base64VariantUrlsafe),
     );
+    return keyEncryptionKey;
   }
 
   Future<void> recover(String recoveryKey) async {
@@ -307,6 +325,10 @@ class Configuration {
     return _cachedToken;
   }
 
+  bool isLoggedIn() {
+    return getToken() != null;
+  }
+
   Future<void> setToken(String token) async {
     _cachedToken = token;
     await _preferences.setString(tokenKey, token);
@@ -350,52 +372,31 @@ class Configuration {
     }
   }
 
-  Future<void> setKey(String? key) async {
+  Future<void> setKey(String key) async {
     _key = key;
-    if (key == null) {
-      await _secureStorage.delete(
-        key: keyKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    } else {
-      await _secureStorage.write(
-        key: keyKey,
-        value: key,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    }
+    await _secureStorage.write(
+      key: keyKey,
+      value: key,
+      iOptions: _secureStorageOptionsIOS,
+    );
   }
 
   Future<void> setSecretKey(String? secretKey) async {
     _secretKey = secretKey;
-    if (secretKey == null) {
-      await _secureStorage.delete(
-        key: secretKeyKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    } else {
-      await _secureStorage.write(
-        key: secretKeyKey,
-        value: secretKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    }
+    await _secureStorage.write(
+      key: secretKeyKey,
+      value: secretKey,
+      iOptions: _secureStorageOptionsIOS,
+    );
   }
 
   Future<void> setAuthSecretKey(String? authSecretKey) async {
     _authSecretKey = authSecretKey;
-    if (authSecretKey == null) {
-      await _secureStorage.delete(
-        key: authSecretKeyKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    } else {
-      await _secureStorage.write(
-        key: authSecretKeyKey,
-        value: authSecretKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-    }
+    await _secureStorage.write(
+      key: authSecretKeyKey,
+      value: authSecretKey,
+      iOptions: _secureStorageOptionsIOS,
+    );
   }
 
   Uint8List? getKey() {
@@ -410,11 +411,15 @@ class Configuration {
     return _authSecretKey == null ? null : Sodium.base642bin(_authSecretKey!);
   }
 
+  Uint8List? getOfflineSecretKey() {
+    return _offlineAuthKey == null ? null : Sodium.base642bin(_offlineAuthKey!);
+  }
+
   Uint8List getRecoveryKey() {
     final keyAttributes = getKeyAttributes()!;
     return CryptoUtil.decryptSync(
       Sodium.base642bin(keyAttributes.recoveryKeyEncryptedWithMasterKey),
-      getKey(),
+      getKey()!,
       Sodium.base642bin(keyAttributes.recoveryKeyDecryptionNonce),
     );
   }
@@ -424,22 +429,34 @@ class Configuration {
     return _tempDirectory;
   }
 
-  String getThumbnailCacheDirectory() {
-    return _thumbnailCacheDirectory;
-  }
-
-  String getOldSharedMediaCacheDirectory() {
-    return _sharedTempMediaDirectory;
-  }
-
-  String getSharedMediaDirectory() {
-    return _sharedDocumentsMediaDirectory;
-  }
-
   bool hasConfiguredAccount() {
     return getToken() != null && _key != null;
   }
 
+  bool hasOptedForOfflineMode() {
+    return _preferences.getBool(hasOptedForOfflineModeKey) ?? false;
+  }
+
+  Future<void> optForOfflineMode() async {
+    if ((await _secureStorage.containsKey(
+      key: offlineAuthSecretKey,
+      iOptions: _secureStorageOptionsIOS,
+    ))) {
+      _offlineAuthKey = await _secureStorage.read(
+        key: offlineAuthSecretKey,
+        iOptions: _secureStorageOptionsIOS,
+      );
+    } else {
+      _offlineAuthKey = Sodium.bin2base64(CryptoUtil.generateKey());
+      await _secureStorage.write(
+        key: offlineAuthSecretKey,
+        value: _offlineAuthKey,
+        iOptions: _secureStorageOptionsIOS,
+      );
+    }
+    await _preferences.setBool(hasOptedForOfflineModeKey, true);
+  }
+
   bool shouldShowLockScreen() {
     if (_preferences.containsKey(keyShouldShowLockScreen)) {
       return _preferences.getBool(keyShouldShowLockScreen)!;
@@ -452,34 +469,11 @@ class Configuration {
     return _preferences.setBool(keyShouldShowLockScreen, value);
   }
 
-  void setVolatilePassword(String volatilePassword) {
+  void setVolatilePassword(String? volatilePassword) {
     _volatilePassword = volatilePassword;
   }
 
   String? getVolatilePassword() {
     return _volatilePassword;
   }
-
-  Future<void> _migrateSecurityStorageToFirstUnlock() async {
-    final hasMigratedSecureStorageToFirstUnlock =
-        _preferences.getBool(hasMigratedSecureStorageToFirstUnlockKey) ?? false;
-    if (!hasMigratedSecureStorageToFirstUnlock &&
-        _key != null &&
-        _secretKey != null) {
-      await _secureStorage.write(
-        key: keyKey,
-        value: _key,
-        iOptions: _secureStorageOptionsIOS,
-      );
-      await _secureStorage.write(
-        key: secretKeyKey,
-        value: _secretKey,
-        iOptions: _secureStorageOptionsIOS,
-      );
-      await _preferences.setBool(
-        hasMigratedSecureStorageToFirstUnlockKey,
-        true,
-      );
-    }
-  }
 }

lib/core/constants.dart

@@ -7,6 +7,7 @@ const String sentryDSN =
     "https://ed4ddd6309b847ba8849935e26e9b648@sentry.ente.io/9";
 const String sentryTunnel = "https://sentry-reporter.ente.io";
 const String roadmapURL = "https://roadmap.ente.io";
+const String githubIssuesUrl = "https://github.com/ente-io/auth/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc";
 const int microSecondsInDay = 86400000000;
 const int android11SDKINT = 30;
 const int galleryLoadStartTime = -8000000000000000; // Wednesday, March 6, 1748

lib/core/errors.dart

@@ -41,4 +41,6 @@ class InvalidStateError extends AssertionError {
 
 class KeyDerivationError extends Error {}
 
+class SrpSetupNotCompleteError extends Error {}
+
 class AuthenticatorKeyNotFound extends Error {}

lib/core/logging/super_logging.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 library super_logging;
 
 import 'dart:async';
@@ -8,6 +6,7 @@ import 'dart:core';
 import 'dart:io';
 
 import 'package:ente_auth/core/logging/tunneled_transport.dart';
+import 'package:ente_auth/models/typedefs.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:http/http.dart' as http;
@@ -20,8 +19,6 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uuid/uuid.dart';
 
-typedef FutureOrVoidCallback = FutureOr<void> Function();
-
 extension SuperString on String {
   Iterable<String> chunked(int chunkSize) sync* {
     var start = 0;
@@ -40,7 +37,7 @@ extension SuperString on String {
 }
 
 extension SuperLogRecord on LogRecord {
-  String toPrettyString([String extraLines]) {
+  String toPrettyString([String? extraLines]) {
     final header = "[$loggerName] [$level] [$time]";
 
     var msg = "$header $message";
@@ -78,9 +75,9 @@ class LogConfig {
   /// ```
   ///
   /// If this is [null], Sentry logger is completely disabled (default).
-  String sentryDsn;
+  String? sentryDsn;
 
-  String tunnel;
+  String? tunnel;
 
   /// A built-in retry mechanism for sending errors to sentry.
   ///
@@ -97,7 +94,7 @@ class LogConfig {
   /// A non-empty string will be treated as an explicit path to a directory.
   ///
   /// The chosen directory can be accessed using [SuperLogging.logFile.parent].
-  String logDirPath;
+  String? logDirPath;
 
   /// The maximum number of log files inside [logDirPath].
   ///
@@ -115,12 +112,12 @@ class LogConfig {
   /// any uncaught errors during its execution will be reported.
   ///
   /// Works by using [FlutterError.onError] and [runZoned].
-  FutureOrVoidCallback body;
+  FutureOrVoidCallback? body;
 
   /// The date format for storing log files.
   ///
   /// `DateFormat('y-M-d')` by default.
-  DateFormat dateFmt;
+  DateFormat? dateFmt;
 
   String prefix;
 
@@ -144,77 +141,78 @@ class SuperLogging {
   static final $ = Logger('ente_logging');
 
   /// The current super logging configuration
-  static LogConfig config;
+  static late LogConfig config;
 
-  static SharedPreferences _preferences;
+  static late SharedPreferences _preferences;
 
   static const keyShouldReportErrors = "should_report_errors";
 
   static const keyAnonymousUserID = "anonymous_user_id";
 
-  static Future<void> main([LogConfig config]) async {
-    config ??= LogConfig();
-
-    SuperLogging.config = config;
+  static Future<void> main([LogConfig? appConfig]) async {
+    appConfig ??= LogConfig();
+    SuperLogging.config = appConfig;
 
     WidgetsFlutterBinding.ensureInitialized();
-
     _preferences = await SharedPreferences.getInstance();
 
     appVersion ??= await getAppVersion();
 
-    final loggingEnabled = config.enableInDebugMode || kReleaseMode;
+    final enable = appConfig.enableInDebugMode || kReleaseMode;
     sentryIsEnabled =
-        loggingEnabled && config.sentryDsn != null && shouldReportErrors();
-    fileIsEnabled = loggingEnabled && config.logDirPath != null;
+        enable && appConfig.sentryDsn != null && shouldReportErrors();
+    fileIsEnabled = enable && appConfig.logDirPath != null;
 
     if (fileIsEnabled) {
       await setupLogDir();
     }
+    if (sentryIsEnabled) {
+      setupSentry();
+    }
 
     Logger.root.level = Level.ALL;
     Logger.root.onRecord.listen(onLogRecord);
 
-    if (sentryIsEnabled) {
-      setupSentry();
-    } else {
-      $.info("Sentry is disabled");
-    }
-
-    if (!loggingEnabled) {
+    if (!enable) {
       $.info("detected debug mode; sentry & file logging disabled.");
     }
     if (fileIsEnabled) {
-      $.info("log file for today: $logFile with prefix ${config.prefix}");
+      $.info("log file for today: $logFile with prefix ${appConfig.prefix}");
+    }
+    if (sentryIsEnabled) {
+      $.info("sentry uploader started");
     }
 
-    if (config.body == null) return;
+    if (appConfig.body == null) return;
 
-    if (loggingEnabled && sentryIsEnabled) {
+    if (enable && sentryIsEnabled) {
       await SentryFlutter.init(
         (options) {
-          options.dsn = config.sentryDsn;
+          options.dsn = appConfig!.sentryDsn;
           options.httpClient = http.Client();
-          if (config.tunnel != null) {
+          if (appConfig.tunnel != null) {
             options.transport =
-                TunneledTransport(Uri.parse(config.tunnel), options);
+                TunneledTransport(Uri.parse(appConfig.tunnel!), options);
           }
         },
-        appRunner: () => config.body(),
+        appRunner: () => appConfig!.body!(),
       );
     } else {
-      await config.body();
+      await appConfig.body!();
     }
   }
 
   static void setUserID(String userID) async {
-    if (config?.sentryDsn != null) {
-      Sentry.configureScope((scope) => scope.user = SentryUser(id: userID));
+    if (config.sentryDsn != null) {
+      Sentry.configureScope((scope) => scope.setUser(SentryUser(id: userID)));
       $.info("setting sentry user ID to: $userID");
     }
   }
 
-  static Future<void> _sendErrorToSentry(Object error, StackTrace stack) async {
+  static Future<void> _sendErrorToSentry(
+    Object error,
+    StackTrace? stack,
+  ) async {
     try {
       await Sentry.captureException(
         error,
@@ -230,14 +228,14 @@ class SuperLogging {
 
   static Future onLogRecord(LogRecord rec) async {
     // log misc info if it changed
-    String extraLines = "app version: '$appVersion'\n";
+    String? extraLines = "app version: '$appVersion'\n";
     if (extraLines != _lastExtraLines) {
       _lastExtraLines = extraLines;
     } else {
       extraLines = null;
     }
 
-    final str = config.prefix + " " + rec.toPrettyString(extraLines);
+    final str = (config.prefix) + " " + rec.toPrettyString(extraLines);
 
     // write to stdout
     printLog(str);
@@ -251,16 +249,8 @@ class SuperLogging {
     }
 
     // add error to sentry queue
-    if (sentryIsEnabled) {
-      if (rec.error != null) {
-        _sendErrorToSentry(rec.error, null);
-      } else if (rec.level == Level.SEVERE || rec.level == Level.SHOUT) {
-        if (rec.error != null) {
-          _sendErrorToSentry(rec.error, null);
-        } else {
-          _sendErrorToSentry(rec.message, null);
-        }
-      }
+    if (sentryIsEnabled && rec.error != null) {
+      _sendErrorToSentry(rec.error!, null);
     }
   }
 
@@ -268,12 +258,12 @@ class SuperLogging {
   static bool isFlushing = false;
 
   static void flushQueue() async {
-    if (isFlushing) {
+    if (isFlushing || logFile == null) {
       return;
     }
     isFlushing = true;
     final entry = fileQueueEntries.removeFirst();
-    await logFile.writeAsString(entry, mode: FileMode.append, flush: true);
+    await logFile!.writeAsString(entry, mode: FileMode.append, flush: true);
     isFlushing = false;
     if (fileQueueEntries.isNotEmpty) {
       flushQueue();
@@ -292,7 +282,7 @@ class SuperLogging {
   static final sentryQueueControl = StreamController<Error>();
 
   /// Whether sentry logging is currently enabled or not.
-  static bool sentryIsEnabled;
+  static bool sentryIsEnabled = false;
 
   static Future<void> setupSentry() async {
     $.info("Setting up sentry");
@@ -318,9 +308,9 @@ class SuperLogging {
 
   static bool shouldReportErrors() {
     if (_preferences.containsKey(keyShouldReportErrors)) {
-      return _preferences.getBool(keyShouldReportErrors);
+      return _preferences.getBool(keyShouldReportErrors)!;
     } else {
-      return false;
+      return kDebugMode;
     }
   }
 
@@ -333,22 +323,22 @@ class SuperLogging {
       //ignore: prefer_const_constructors
       await _preferences.setString(keyAnonymousUserID, Uuid().v4());
     }
-    return _preferences.getString(keyAnonymousUserID);
+    return _preferences.getString(keyAnonymousUserID)!;
   }
 
   /// The log file currently in use.
-  static File logFile;
+  static File? logFile;
 
   /// Whether file logging is currently enabled or not.
-  static bool fileIsEnabled;
+  static bool fileIsEnabled = false;
 
   static Future<void> setupLogDir() async {
     var dirPath = config.logDirPath;
 
     // choose [logDir]
-    if (dirPath.isEmpty) {
+    if (dirPath == null || dirPath.isEmpty) {
       final root = await getExternalStorageDirectory();
-      dirPath = '${root.path}/logs';
+      dirPath = '${root!.path}/logs';
     }
 
     // create [logDir]
@@ -361,16 +351,19 @@ class SuperLogging {
     // collect all log files with valid names
     await for (final file in dir.list()) {
       try {
-        final date = config.dateFmt.parse(basename(file.path));
+        final date = config.dateFmt!.parse(basename(file.path));
         dates[file as File] = date;
         files.add(file);
       } on FormatException {}
     }
+    final nowTime = DateTime.now();
 
     // delete old log files, if [maxLogFiles] is exceeded.
     if (files.length > config.maxLogFiles) {
       // sort files based on ascending order of date (older first)
-      files.sort((a, b) => dates[a].compareTo(dates[b]));
+      files.sort(
+        (a, b) => (dates[a] ?? nowTime).compareTo((dates[b] ?? nowTime)),
+      );
 
       final extra = files.length - config.maxLogFiles;
       final toDelete = files.sublist(0, extra);
@@ -385,13 +378,13 @@ class SuperLogging {
       }
     }
 
-    logFile = File("$dirPath/${config.dateFmt.format(DateTime.now())}.txt");
+    logFile = File("$dirPath/${config.dateFmt!.format(DateTime.now())}.txt");
   }
 
   /// Current app version, obtained from package_info plugin.
   ///
   /// See: [getAppVersion]
-  static String appVersion;
+  static String? appVersion;
 
   static Future<String> getAppVersion() async {
     final pkgInfo = await PackageInfo.fromPlatform();

lib/core/logging/tunneled_transport.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'dart:convert';
 
 import 'package:http/http.dart';
@@ -10,9 +8,9 @@ class TunneledTransport implements Transport {
   final Uri _tunnel;
   final SentryOptions _options;
 
-  final Dsn _dsn;
+  final Dsn? _dsn;
 
-  _CredentialBuilder _credentialBuilder;
+  _CredentialBuilder? _credentialBuilder;
 
   final Map<String, String> _headers;
 
@@ -21,20 +19,20 @@ class TunneledTransport implements Transport {
   }
 
   TunneledTransport._(this._tunnel, this._options)
-      : _dsn = Dsn.parse(_options.dsn),
+      : _dsn = _options.dsn != null ? Dsn.parse(_options.dsn!) : null,
         _headers = _buildHeaders(
           _options.platformChecker.isWeb,
-          _options.sdk.identifier,
+          _options.sentryClientName,
         ) {
     _credentialBuilder = _CredentialBuilder(
       _dsn,
-      _options.sdk.identifier,
+      _options.sentryClientName,
       _options.clock,
     );
   }
 
   @override
-  Future<SentryId> send(SentryEnvelope envelope) async {
+  Future<SentryId?> send(SentryEnvelope envelope) async {
     final streamedRequest = await _createStreamedRequest(envelope);
     final response = await _options.httpClient
         .send(streamedRequest)
@@ -47,7 +45,7 @@ class TunneledTransport implements Transport {
         _options.logger(
           SentryLevel.error,
           'API returned an error, statusCode = ${response.statusCode}, '
-          'body = ${response.body}',
+              'body = ${response.body}',
         );
       }
       return const SentryId.empty();
@@ -66,15 +64,15 @@ class TunneledTransport implements Transport {
   }
 
   Future<StreamedRequest> _createStreamedRequest(
-    SentryEnvelope envelope,
-  ) async {
+      SentryEnvelope envelope,
+      ) async {
     final streamedRequest = StreamedRequest('POST', _tunnel);
     envelope
         .envelopeStream(_options)
         .listen(streamedRequest.sink.add)
         .onDone(streamedRequest.sink.close);
 
-    streamedRequest.headers.addAll(_credentialBuilder.configure(_headers));
+    streamedRequest.headers.addAll(_credentialBuilder!.configure(_headers));
 
     return streamedRequest;
   }
@@ -92,13 +90,13 @@ class _CredentialBuilder {
         _clock = clock;
 
   factory _CredentialBuilder(
-    Dsn dsn,
-    String sdkIdentifier,
-    ClockProvider clock,
-  ) {
+      Dsn? dsn,
+      String sdkIdentifier,
+      ClockProvider clock,
+      ) {
     final authHeader = _buildAuthHeader(
-      publicKey: dsn.publicKey,
-      secretKey: dsn.secretKey,
+      publicKey: dsn?.publicKey,
+      secretKey: dsn?.secretKey,
       sdkIdentifier: sdkIdentifier,
     );
 
@@ -106,9 +104,9 @@ class _CredentialBuilder {
   }
 
   static String _buildAuthHeader({
-    String publicKey,
-    String secretKey,
-    String sdkIdentifier,
+    String? publicKey,
+    String? secretKey,
+    String? sdkIdentifier,
   }) {
     var header = 'Sentry sentry_version=7, sentry_client=$sdkIdentifier, '
         'sentry_key=$publicKey';

lib/core/network.dart

@@ -1,18 +1,29 @@
 import 'dart:io';
 
 import 'package:dio/dio.dart';
+import 'package:ente_auth/core/configuration.dart';
+import 'package:ente_auth/core/constants.dart';
 import 'package:fk_user_agent/fk_user_agent.dart';
+import 'package:flutter/foundation.dart';
 import 'package:package_info_plus/package_info_plus.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uuid/uuid.dart';
 
 int kConnectTimeout = 15000;
 
 class Network {
+  // apiEndpoint points to the Ente server's API endpoint
+  static const apiEndpoint = String.fromEnvironment(
+    "endpoint",
+    defaultValue: kDefaultProductionEndpoint,
+  );
   late Dio _dio;
+  late Dio _enteDio;
 
   Future<void> init() async {
     await FkUserAgent.init();
     final packageInfo = await PackageInfo.fromPlatform();
+    final preferences = await SharedPreferences.getInstance();
     _dio = Dio(
       BaseOptions(
         connectTimeout: kConnectTimeout,
@@ -24,6 +35,18 @@ class Network {
       ),
     );
     _dio.interceptors.add(RequestIdInterceptor());
+    _enteDio = Dio(
+      BaseOptions(
+        baseUrl: apiEndpoint,
+        connectTimeout: kConnectTimeout,
+        headers: {
+          HttpHeaders.userAgentHeader: FkUserAgent.userAgent,
+          'X-Client-Version': packageInfo.version,
+          'X-Client-Package': packageInfo.packageName,
+        },
+      ),
+    );
+    _enteDio.interceptors.add(EnteRequestInterceptor(preferences, apiEndpoint));
   }
 
   Network._privateConstructor();
@@ -31,6 +54,7 @@ class Network {
   static Network instance = Network._privateConstructor();
 
   Dio getDio() => _dio;
+  Dio get enteDio => _enteDio;
 }
 
 class RequestIdInterceptor extends Interceptor {
@@ -41,3 +65,27 @@ class RequestIdInterceptor extends Interceptor {
     return super.onRequest(options, handler);
   }
 }
+
+class EnteRequestInterceptor extends Interceptor {
+  final SharedPreferences _preferences;
+  final String enteEndpoint;
+
+  EnteRequestInterceptor(this._preferences, this.enteEndpoint);
+
+  @override
+  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
+    if (kDebugMode) {
+      assert(
+      options.baseUrl == enteEndpoint,
+      "interceptor should only be used for API endpoint",
+      );
+    }
+    // ignore: prefer_const_constructors
+    options.headers.putIfAbsent("x-request-id", () => Uuid().v4().toString());
+    final String? tokenValue = _preferences.getString(Configuration.tokenKey);
+    if (tokenValue != null) {
+      options.headers.putIfAbsent("X-Auth-Token", () => tokenValue);
+    }
+    return super.onRequest(options, handler);
+  }
+}

lib/ente_theme_data.dart

@@ -11,11 +11,6 @@ final lightThemeData = ThemeData(
   iconTheme: const IconThemeData(color: Colors.black),
   primaryIconTheme:
       const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0),
-  colorScheme: const ColorScheme.light(
-    primary: Colors.black,
-    secondary: Color.fromARGB(255, 163, 163, 163),
-  ),
-  accentColor: const Color.fromRGBO(0, 0, 0, 0.6),
   outlinedButtonTheme: buildOutlinedButtonThemeData(
     bgDisabled: const Color.fromRGBO(158, 158, 158, 1),
     bgEnabled: const Color.fromRGBO(0, 0, 0, 1),
@@ -26,9 +21,7 @@ final lightThemeData = ThemeData(
     onPrimary: const Color.fromRGBO(255, 255, 255, 1),
     primary: const Color.fromRGBO(0, 0, 0, 1),
   ),
-  toggleableActiveColor: const Color.fromRGBO(102, 187, 106, 1),
   scaffoldBackgroundColor: const Color.fromRGBO(255, 255, 255, 1),
-  backgroundColor: const Color.fromRGBO(255, 255, 255, 1),
   appBarTheme: const AppBarTheme().copyWith(
     backgroundColor: Colors.white,
     foregroundColor: Colors.black,
@@ -38,8 +31,8 @@ final lightThemeData = ThemeData(
   //https://api.flutter.dev/flutter/material/TextTheme-class.html
   textTheme: _buildTextTheme(const Color.fromRGBO(0, 0, 0, 1)),
   primaryTextTheme: const TextTheme().copyWith(
-    bodyText2: const TextStyle(color: Colors.yellow),
-    bodyText1: const TextStyle(color: Colors.orange),
+    bodyMedium: const TextStyle(color: Colors.yellow),
+    bodyLarge: const TextStyle(color: Colors.orange),
   ),
   cardColor: const Color.fromRGBO(250, 250, 250, 1.0),
   dialogTheme: const DialogTheme().copyWith(
@@ -79,7 +72,27 @@ final lightThemeData = ThemeData(
           ? const Color.fromRGBO(255, 255, 255, 1)
           : const Color.fromRGBO(0, 0, 0, 1);
     }),
-  ),
+  ),  radioTheme: RadioThemeData(
+ fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ ), switchTheme: SwitchThemeData(
+ thumbColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ trackColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ ), colorScheme: const ColorScheme.light(
+    primary: Colors.black,
+    secondary: Color.fromARGB(255, 163, 163, 163),
+  ).copyWith(background: const Color.fromRGBO(255, 255, 255, 1)),
 );
 
 final darkThemeData = ThemeData(
@@ -90,13 +103,10 @@ final darkThemeData = ThemeData(
   primaryIconTheme:
       const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0),
   hintColor: const Color.fromRGBO(158, 158, 158, 1),
-  colorScheme: const ColorScheme.dark(primary: Colors.white),
-  accentColor: const Color.fromRGBO(45, 194, 98, 0.2),
   buttonTheme: const ButtonThemeData().copyWith(
     buttonColor: const Color.fromRGBO(45, 194, 98, 1.0),
   ),
   textTheme: _buildTextTheme(const Color.fromRGBO(255, 255, 255, 1)),
-  toggleableActiveColor: const Color.fromRGBO(102, 187, 106, 1),
   outlinedButtonTheme: buildOutlinedButtonThemeData(
     bgDisabled: const Color.fromRGBO(158, 158, 158, 1),
     bgEnabled: const Color.fromRGBO(255, 255, 255, 1),
@@ -108,7 +118,6 @@ final darkThemeData = ThemeData(
     primary: const Color.fromRGBO(255, 255, 255, 1),
   ),
   scaffoldBackgroundColor: const Color.fromRGBO(0, 0, 0, 1),
-  backgroundColor: const Color.fromRGBO(0, 0, 0, 1),
   appBarTheme: const AppBarTheme().copyWith(
     color: Colors.black,
     elevation: 0,
@@ -155,59 +164,76 @@ final darkThemeData = ThemeData(
         return const Color.fromRGBO(158, 158, 158, 1);
       }
     }),
-  ),
+  ), radioTheme: RadioThemeData(
+ fillColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ ), switchTheme: SwitchThemeData(
+ thumbColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ trackColor: MaterialStateProperty.resolveWith<Color?>((Set<MaterialState> states) {
+ if (states.contains(MaterialState.disabled)) { return null; }
+ if (states.contains(MaterialState.selected)) { return const Color.fromRGBO(102, 187, 106, 1); }
+ return null;
+ }),
+ ), colorScheme: const ColorScheme.dark(primary: Colors.white).copyWith(background: const Color.fromRGBO(0, 0, 0, 1)),
 );
 
 TextTheme _buildTextTheme(Color textColor) {
   return const TextTheme().copyWith(
-    headline4: TextStyle(
+    headlineMedium: TextStyle(
       color: textColor,
       fontSize: 32,
       fontWeight: FontWeight.w600,
       fontFamily: 'Inter',
     ),
-    headline5: TextStyle(
+    headlineSmall: TextStyle(
       color: textColor,
       fontSize: 24,
       fontWeight: FontWeight.w600,
       fontFamily: 'Inter',
     ),
-    headline6: TextStyle(
+    titleLarge: TextStyle(
       color: textColor,
       fontSize: 18,
       fontFamily: 'Inter',
       fontWeight: FontWeight.w600,
     ),
-    subtitle1: TextStyle(
+    titleMedium: TextStyle(
       color: textColor,
       fontFamily: 'Inter',
       fontSize: 16,
       fontWeight: FontWeight.w500,
     ),
-    subtitle2: TextStyle(
+    titleSmall: TextStyle(
       color: textColor,
       fontFamily: 'Inter',
       fontSize: 14,
       fontWeight: FontWeight.w500,
     ),
-    bodyText1: TextStyle(
+    bodyLarge: TextStyle(
       fontFamily: 'Inter',
       color: textColor,
       fontSize: 16,
       fontWeight: FontWeight.w500,
     ),
-    bodyText2: TextStyle(
+    bodyMedium: TextStyle(
       fontFamily: 'Inter',
       color: textColor,
       fontSize: 14,
       fontWeight: FontWeight.w500,
     ),
-    caption: TextStyle(
+    bodySmall: TextStyle(
       color: textColor.withOpacity(0.4),
       fontSize: 10,
       fontWeight: FontWeight.w500,
     ),
-    overline: TextStyle(
+    labelSmall: TextStyle(
       fontFamily: 'Inter',
       color: textColor,
       fontSize: 14,
@@ -344,7 +370,7 @@ extension CustomColorScheme on ColorScheme {
       ? const Color.fromRGBO(245, 245, 245, 1.0)
       : const Color.fromRGBO(30, 30, 30, 1.0);
 
-  Color get searchResultsCountTextColor => brightness == Brightness.light
+  Color get mutedTextColor => brightness == Brightness.light
       ? const Color.fromRGBO(80, 80, 80, 1)
       : const Color.fromRGBO(150, 150, 150, 1);
 
@@ -358,6 +384,9 @@ extension CustomColorScheme on ColorScheme {
 
   EnteTheme get enteTheme =>
       brightness == Brightness.light ? lightTheme : darkTheme;
+
+  EnteTheme get inverseEnteTheme =>
+      brightness == Brightness.light ? darkTheme : lightTheme;
 }
 
 OutlinedButtonThemeData buildOutlinedButtonThemeData({
@@ -407,9 +436,7 @@ ElevatedButtonThemeData buildElevatedButtonThemeData({
 }) {
   return ElevatedButtonThemeData(
     style: ElevatedButton.styleFrom(
-      elevation: elevation,
-      onPrimary: onPrimary,
-      primary: primary,
+      foregroundColor: onPrimary, backgroundColor: primary, elevation: elevation,
       alignment: Alignment.center,
       textStyle: const TextStyle(
         fontWeight: FontWeight.w600,

lib/events/icons_changed_event.dart

@@ -0,0 +1,3 @@
+import 'package:ente_auth/events/event.dart';
+
+class IconsChangedEvent extends Event {}

lib/events/trigger_logout_event.dart

@@ -0,0 +1,3 @@
+import 'package:ente_auth/events/event.dart';
+
+class TriggerLogoutEvent extends Event {}

lib/gateway/authenticator.dart

@@ -103,24 +103,32 @@ class AuthenticatorGateway {
   }
 
   Future<List<AuthEntity>> getDiff(int sinceTime, {int limit = 500}) async {
-    final response = await _dio.get(
-      _basedEndpoint + "/entity/diff",
-      queryParameters: {
-        "sinceTime": sinceTime,
-        "limit": limit,
-      },
-      options: Options(
-        headers: {
-          "X-Auth-Token": _config.getToken(),
+    try {
+      final response = await _dio.get(
+        _basedEndpoint + "/entity/diff",
+        queryParameters: {
+          "sinceTime": sinceTime,
+          "limit": limit,
         },
-      ),
-    );
-    final List<AuthEntity> authEntities = <AuthEntity>[];
-    final diff = response.data["diff"] as List;
-    for (var entry in diff) {
-      final AuthEntity entity = AuthEntity.fromMap(entry);
-      authEntities.add(entity);
+        options: Options(
+          headers: {
+            "X-Auth-Token": _config.getToken(),
+          },
+        ),
+      );
+      final List<AuthEntity> authEntities = <AuthEntity>[];
+      final diff = response.data["diff"] as List;
+      for (var entry in diff) {
+        final AuthEntity entity = AuthEntity.fromMap(entry);
+        authEntities.add(entity);
+      }
+      return authEntities;
+    } catch (e) {
+      if (e is DioError && e.response?.statusCode == 401) {
+        throw UnauthorizedError();
+      } else {
+        rethrow;
+      }
     }
-    return authEntities;
   }
 }

lib/l10n/arb/app_de.arb

@@ -1,8 +1,9 @@
 {
-  "@@locale": "de",
+  "account": "Konto",
+  "recoveryKey": "Wiederherstellungsschlüssel",
   "counterAppBarTitle": "Zähler",
   "@counterAppBarTitle": {
-    "description": "Text, der in der AppBar der Zähler-Seite angezeigt wird"
+    "description": "Text shown in the AppBar of the Counter Page"
   },
   "onBoardingBody": "Sichern Sie Ihre 2FA-Codes",
   "onBoardingGetStarted": "Los geht's",
@@ -10,10 +11,20 @@
   "importScanQrCode": "Scannen eines QR-Codes",
   "importEnterSetupKey": "Einen Setup-Schlüssel eingeben",
   "importAccountPageTitle": "Kontodaten eingeben",
+  "secretCanNotBeEmpty": "Geheimnis darf nicht leer sein",
+  "bothIssuerAndAccountCanNotBeEmpty": "Sowohl Aussteller als auch Konto können nicht leer sein",
+  "incorrectDetails": "Falsche Angaben",
+  "pleaseVerifyDetails": "Überprüfe die Angaben und versuche es erneut",
   "codeIssuerHint": "Aussteller",
-  "codeSecretKeyHint" : "Geheimer Schlüssel",
+  "codeSecretKeyHint": "Geheimer Schlüssel",
   "codeAccountHint": "Konto (you@domain.com)",
   "accountKeyType": "Art des Schlüssels",
+  "sessionExpired": "Sitzung abgelaufen",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Bitte melden Sie sich wieder an",
+  "loggingOut": "Wird abgemeldet...",
   "timeBasedKeyType": "Zeitbasiert (TOTP)",
   "counterBasedKeyType": "Zählerbasiert (HOTP)",
   "saveAction": "Speichern",
@@ -47,30 +58,42 @@
   },
   "contactSupport": "Support kontaktieren",
   "verifyPassword": "Passwort überprüfen",
-  "pleaseWaitTitle": "Bitte warten...",
+  "pleaseWait": "Bitte warten...",
   "generatingEncryptionKeysTitle": "Generierung von Verschlüsselungsschlüsseln...",
   "recreatePassword": "Passwort wiederherstellen",
   "recreatePasswordMessage": "Das aktuelle Gerät ist nicht leistungsfähig genug, um Ihr Passwort zu verifizieren, daher müssen wir es einmalig auf eine Weise neu generieren, die mit allen Geräten funktioniert. \n\nBitte melden Sie sich mit Ihrem Wiederherstellungsschlüssel an und generieren Sie Ihr Passwort neu (Sie können dasselbe erneut verwenden, wenn Sie möchten).",
-  "useRecoveryKeyAction": "Wiederherstellungsschlüssel verwenden",
-  "incorrectPassword": "Falsches Passwort",
-  "welcomeBackTitle": "Willkommen zurück!",
+  "useRecoveryKey": "Wiederherstellungsschlüssel verwenden",
+  "incorrectPasswordTitle": "Falsches Passwort",
+  "welcomeBack": "Willkommen zurück!",
   "madeWithLoveAtPrefix": "gemacht mit ❤️ bei ",
+  "supportDevs": "Bei <bold-green>ente</bold-green> registrieren um das Projekt zu unterstützen.",
+  "supportDiscount": "Benutze den Rabattcode \"AUTH\" für 10% Rabatt im ersten Jahr",
   "changeEmail": "E-Mail ändern",
-  "ok": "OK",
+  "changePassword": "Passwort ändern",
+  "data": "Datei",
+  "importCodes": "Codes importieren",
+  "exportCodes": "Codes exportieren",
+  "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",
+  "authToViewYourRecoveryKey": "Bitte authentifizieren um ihren Wiederherstellungscode anzuzeigen",
+  "authToChangeYourEmail": "Bitte authentifizieren um ihre Emailadresse zu ändern",
+  "authToChangeYourPassword": "Bitte authentifizieren um ihr Passwort zu ändern",
+  "ok": "Ok",
   "cancel": "Abbrechen",
   "yes": "Ja",
   "no": "Nein",
   "email": "E-Mail",
-  "support": "Support",
+  "support": "Unterstützung",
   "settings": "Einstellungen",
   "copied": "Kopiert",
-  "tryAgainMessage": "Bitte versuchen Sie es erneut",
+  "pleaseTryAgain": "Bitte versuchen Sie es erneut",
   "existingUser": "Bestehender Benutzer",
-  "newUser" : "Neu bei ente",
+  "newUser": "Neu bei ente",
   "delete": "Löschen",
   "enterYourPasswordHint": "Geben Sie Ihr Passwort ein",
   "forgotPassword": "Passwort vergessen",
-  "oops": "Oops",
+  "oops": "Hopla",
   "somethingWentWrongMessage": "Ein Fehler ist aufgetreten, bitte versuchen Sie es erneut",
   "leaveFamily": "Familie verlassen",
   "leaveFamilyMessage": "Sind Sie sicher, dass Sie den Familien-Plan verlassen wollen?",
@@ -79,13 +102,14 @@
   "scan": "Scannen",
   "scanACode": "Scannen eines Codes",
   "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?",
   "twoFactorAuthTitle": "Zwei-Faktor-Authentifizierung",
   "recoverAccount": "Konto wiederherstellen",
   "enterRecoveryKeyHint": "Geben Sie Ihren Wiederherstellungsschlüssel ein",
   "recover": "Wiederherstellen",
-  "contactSupportViaEmailMessage":"Bitte senden Sie eine E-Mail an {email} von Ihrer registrierten E-Mail-Adresse",
+  "contactSupportViaEmailMessage": "Bitte senden Sie eine E-Mail an {email} von Ihrer registrierten E-Mail-Adresse",
   "@contactSupportViaEmailMessage": {
     "placeholders": {
       "email": {
@@ -106,11 +130,142 @@
   "confirmAccountDeleteMessage": "Ihre hochgeladenen Daten werden in allen Anwendungen (sowohl Fotos als auch Authenticator) zur Löschung vorgesehen und Ihr Konto wird dauerhaft gelöscht.",
   "sendEmail": "E-Mail senden",
   "createNewAccount": "Neues Konto erstellen",
-  "passwordStrengthWeak": "Schwach",
-  "passwordStrengthStrong": "Stark",
-  "passwordStrengthModerate": "Mittel",
+  "weakStrength": "Schwach",
+  "strongStrength": "Stark",
+  "moderateStrength": "Mittel",
   "confirmPassword": "Bestätigen Sie das Passwort",
   "close": "Schließen",
-  "oopsSomethingWentWrong": "Ups, da ist etwas schief gelaufen."
-
-}
+  "oopsSomethingWentWrong": "Ups, da ist etwas schief gelaufen.",
+  "selectLanguage": "Sprache auswählen",
+  "language": "Sprache",
+  "social": "Social",
+  "security": "Sicherheit",
+  "lockscreen": "Sperrbildschirm",
+  "authToChangeLockscreenSetting": "Bitte authentifizieren um die Einstellungen des Sperrbildschirms zu ändern",
+  "lockScreenEnablePreSteps": "Um den Sperrbildschirm zu aktivieren, konfigurieren sie ein Gerätekennwort oder Gerätesperre in ihren Systemeinstellungen.",
+  "viewActiveSessions": "Aktive Sitzungen anzeigen",
+  "authToViewYourActiveSessions": "Bitte authentifizieren um, die aktiven Sitzungen zu sehen",
+  "searchHint": "Suchen...",
+  "search": "Suchen",
+  "sorryUnableToGenCode": "Das Erstellen eines Codes für {issuerName} war leider nicht möglich",
+  "noResult": "Kein Ergebnis",
+  "addCode": "Code hinzufügen",
+  "scanAQrCode": "QR-Code scannen",
+  "enterDetailsManually": "Details manuell hinzufügen",
+  "edit": "Editieren",
+  "copiedToClipboard": "In die Zwischenablage kopieren",
+  "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 dieses diesen Schlüssel bestehend aus 24 Wörtern an einem sicheren Platz.",
+  "doThisLater": "Auf später verschieben",
+  "saveKey": "Schlüssel speichern",
+  "createAccount": "Account erstellen",
+  "passwordStrength": "Passwortstärke: {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": "Passwort",
+  "signUpTerms": "Ich stimme den <u-terms>Nutzerbedingungen</u-terms> und <u-policy>Datenschutzbestimmungen</u-policy> zu",
+  "privacyPolicyTitle": "Datenschutzbestimmungen",
+  "termsOfServicesTitle": "Bedingungen",
+  "encryption": "Verschlüsselung",
+  "setPasswordTitle": "Passwort setzen",
+  "changePasswordTitle": "Passwort ändern",
+  "resetPasswordTitle": "Passwort zurücksetzen",
+  "encryptionKeys": "Verschlüsselungsschlüssel",
+  "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 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?",
+  "yesLogout": "Ja ausloggen",
+  "exit": "Schließen",
+  "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, 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).",
+  "invalidKey": "Ungültiger Schlüssel",
+  "tryAgain": "Noch einmal versuchen",
+  "viewRecoveryKey": "Wiederherstellungsschlüssel anzeigen",
+  "confirmRecoveryKey": "Wiederherstellungsschlüssel bestätigen",
+  "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": "Email mit Logs senden",
+  "pleaseSendTheLogsTo": "Bitte Logs an {toEmail} senden",
+  "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.",
+  "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",
+  "terms": "Bestimmungen",
+  "checkForUpdates": "Auf Updates prüfen",
+  "checking": "Prüfe...",
+  "youAreOnTheLatestVersion": "Sie haben die aktuellste Version",
+  "warning": "Warnung",
+  "exportWarningDesc": "Die exportierte Datei enthält vertrauliche Informationen. Bitte sicher speichern.",
+  "iUnderStand": "Verstanden",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Bitte authentifizieren, um ihre Codes zu exportieren",
+  "importSuccessTitle": "Geschafft!",
+  "importSuccessDesc": "Sie haben {count} Codes importiert!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "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.",
+  "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",
+  "weHaveSendEmailTo": "Wir haben eine E-Mail an <green>{email}</green> gesendet",
+  "@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"
+      }
+    }
+  },
+  "activeSessions": "Aktive Sitzungen",
+  "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"
+}

lib/l10n/arb/app_en.arb

@@ -1,19 +1,31 @@
 {
-  "@@locale": "en",
+  "account": "Account",
+  "recoveryKey": "Recovery key",
   "counterAppBarTitle": "Counter",
   "@counterAppBarTitle": {
     "description": "Text shown in the AppBar of the Counter Page"
   },
-  "onBoardingBody": "Secure your 2FA codes",
+  "onBoardingBody": "Securely backup your 2FA codes",
   "onBoardingGetStarted": "Get Started",
   "setupFirstAccount": "Setup your first account",
   "importScanQrCode": "Scan a QR Code",
+  "qrCode": "QR Code",
   "importEnterSetupKey": "Enter a setup key",
   "importAccountPageTitle": "Enter account details",
+  "secretCanNotBeEmpty": "Secret can not be empty",
+  "bothIssuerAndAccountCanNotBeEmpty": "Both issuer and account can not be empty",
+  "incorrectDetails": "Incorrect details",
+  "pleaseVerifyDetails": "Please verify the details and try again",
   "codeIssuerHint": "Issuer",
-  "codeSecretKeyHint" : "Secret Key",
+  "codeSecretKeyHint": "Secret Key",
   "codeAccountHint": "Account (you@domain.com)",
   "accountKeyType": "Type of key",
+  "sessionExpired": "Session expired",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Please login again",
+  "loggingOut": "Logging out...",
   "timeBasedKeyType": "Time based (TOTP)",
   "counterBasedKeyType": "Counter based (HOTP)",
   "saveAction": "Save",
@@ -46,31 +58,72 @@
     }
   },
   "contactSupport": "Contact support",
+  "rateUsOnStore" : "Rate us on {storeName}",
+  "blog": "Blog",
+  "merchandise": "Merchandise",
   "verifyPassword": "Verify password",
-  "pleaseWaitTitle": "Please wait...",
+  "pleaseWait": "Please wait...",
   "generatingEncryptionKeysTitle": "Generating encryption keys...",
   "recreatePassword": "Recreate password",
   "recreatePasswordMessage": "The current device is not powerful enough to verify your password, so we need to regenerate it once in a way that works with all devices. \n\nPlease login using your recovery key and regenerate your password (you can use the same one again if you wish).",
-  "useRecoveryKeyAction": "Use recovery key",
-  "incorrectPassword": "Incorrect password",
-  "welcomeBackTitle": "Welcome back!",
+  "useRecoveryKey": "Use recovery key",
+  "incorrectPasswordTitle": "Incorrect password",
+  "welcomeBack": "Welcome back!",
   "madeWithLoveAtPrefix": "made with ❤️ at ",
-  "changeEmail": "change email",
-  "ok": "OK",
+  "supportDevs": "Subscribe to <bold-green>ente</bold-green> to support this project",
+  "supportDiscount": "Use coupon code \"AUTH\" to get 10% off first year",
+  "changeEmail": "Change email",
+  "changePassword": "Change password",
+  "data": "Data",
+  "importCodes": "Import codes",
+  "importTypePlainText": "Plain text",
+  "importTypeEnteEncrypted": "ente Encrypted export",
+  "passwordForDecryptingExport": "Password to decrypt export",
+  "passwordEmptyError": "Password can not be empty",
+  "importFromApp": "Import codes from {appName}",
+  "importGoogleAuthGuide": "Export your accounts from Google Authenticator to a QR code using the \"Transfer Accounts\" option. Then using another device, scan the QR code.\n\nTip: You can use your laptop's webcam to take a picture of the QR code.",
+  "importSelectJsonFile": "Select JSON file",
+  "importEnteEncGuide": "Select the encrypted JSON file exported from ente",
+  "importRaivoGuide": "Use the \"Export OTPs to Zip archive\" option in Raivo's Settings.\n\nExtract the zip file and import the JSON file.",
+  "importAegisGuide": "Use the \"Export the vault\" option in Aegis's Settings.\n\nIf your vault is encrypted, you will need to enter vault password to decrypt the vault.",
+  "exportCodes": "Export codes",
+  "importLabel": "Import",
+  "importInstruction": "Please select a file that contains a list of your codes in the following format",
+  "importCodeDelimiterInfo": "The codes can be separated by a comma or a new line",
+  "selectFile": "Select file",
+  "emailVerificationToggle": "Email verification",
+  "authToChangeEmailVerificationSetting": "Please authenticate to change email verification",
+  "authToViewYourRecoveryKey": "Please authenticate to view your recovery key",
+  "authToChangeYourEmail": "Please authenticate to change your email",
+  "authToChangeYourPassword": "Please authenticate to change your password",
+  "ok": "Ok",
   "cancel": "Cancel",
   "yes": "Yes",
   "no": "No",
   "email": "Email",
   "support": "Support",
+  "general": "General",
   "settings": "Settings",
   "copied": "Copied",
-  "tryAgainMessage": "Please try again",
+  "pleaseTryAgain": "Please try again",
   "existingUser": "Existing User",
-  "newUser" : "New to ente",
+  "newUser": "New to ente",
   "delete": "Delete",
   "enterYourPasswordHint": "Enter your password",
   "forgotPassword": "Forgot password",
   "oops": "Oops",
+  "suggestFeatures": "Suggest features",
+  "faq": "FAQ",
+  "faq_q_1": "How secure is ente Auth?",
+  "faq_a_1": "All codes you backup via ente is stored end-to-end encrypted. This means only you can access your codes. Our apps are open source and our cryptography has been externally audited.",
+  "faq_q_2": "Can I access my codes on desktop?",
+  "faq_a_2": "You can access your codes on the web @ auth.ente.io.",
+  "faq_q_3": "How can I delete codes?",
+  "faq_a_3": "You can delete a code by swiping left on that item.",
+  "faq_q_4": "How can I support this project?",
+  "faq_a_4": "You can support the development of this project by subscribing to our Photos app @ ente.io.",
+  "faq_q_5": "How can I enable FaceID lock in ente Auth",
+  "faq_a_5": "You can enable FaceID lock under Settings → Security → Lockscreen.",
   "somethingWentWrongMessage": "Something went wrong, please try again",
   "leaveFamily": "Leave family",
   "leaveFamilyMessage": "Are you sure that you want to leave the family plan?",
@@ -79,13 +132,14 @@
   "scan": "Scan",
   "scanACode": "Scan a code",
   "verify": "Verify",
+  "verifyEmail": "Verify email",
   "enterCodeHint": "Enter the 6-digit code from\nyour authenticator app",
   "lostDeviceTitle": "Lost device?",
   "twoFactorAuthTitle": "Two-factor authentication",
   "recoverAccount": "Recover account",
   "enterRecoveryKeyHint": "Enter your recovery key",
   "recover": "Recover",
-  "contactSupportViaEmailMessage":"Please drop an email to {email} from your registered email address",
+  "contactSupportViaEmailMessage": "Please drop an email to {email} from your registered email address",
   "@contactSupportViaEmailMessage": {
     "placeholders": {
       "email": {
@@ -106,11 +160,174 @@
   "confirmAccountDeleteMessage": "Your uploaded data, across all apps (Photos and Authenticator both), will be scheduled for deletion, and your account will be permanently deleted.",
   "sendEmail": "Send email",
   "createNewAccount": "Create new account",
-  "passwordStrengthWeak": "Weak",
-  "passwordStrengthStrong": "Strong",
-  "passwordStrengthModerate": "Moderate",
+  "weakStrength": "Weak",
+  "strongStrength": "Strong",
+  "moderateStrength": "Moderate",
   "confirmPassword": "Confirm password",
   "close": "Close",
-  "oopsSomethingWentWrong": "Oops, Something went wrong."
-
+  "oopsSomethingWentWrong": "Oops, Something went wrong.",
+  "selectLanguage": "Select language",
+  "language": "Language",
+  "social": "Social",
+  "security": "Security",
+  "lockscreen": "Lockscreen",
+  "authToChangeLockscreenSetting": "Please authenticate to change lockscreen setting",
+  "lockScreenEnablePreSteps": "To enable lockscreen, please setup device passcode or screen lock in your system settings.",
+  "viewActiveSessions": "View active sessions",
+  "authToViewYourActiveSessions": "Please authenticate to view your active sessions",
+  "searchHint": "Search...",
+  "search": "Search",
+  "sorryUnableToGenCode": "Sorry, unable to generate a code for {issuerName}",
+  "noResult": "No result",
+  "addCode": "Add code",
+  "scanAQrCode": "Scan a QR code",
+  "enterDetailsManually": "Enter details manually",
+  "edit": "Edit",
+  "copiedToClipboard": "Copied to clipboard",
+  "copiedNextToClipboard": "Copied next code to clipboard",
+  "error": "Error",
+  "recoveryKeyCopiedToClipboard": "Recovery key copied to clipboard",
+  "recoveryKeyOnForgotPassword": "If you forget your password, the only way you can recover your data is with this key.",
+  "recoveryKeySaveDescription": "We don't store this key, please save this 24 word key in a safe place.",
+  "doThisLater": "Do this later",
+  "saveKey": "Save key",
+  "back": "Back",
+  "createAccount": "Create account",
+  "passwordStrength": "Password strength: {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": "Password",
+  "signUpTerms": "I agree to the <u-terms>terms of service</u-terms> and <u-policy>privacy policy</u-policy>",
+  "privacyPolicyTitle": "Privacy Policy",
+  "termsOfServicesTitle": "Terms",
+  "encryption": "Encryption",
+  "setPasswordTitle": "Set password",
+  "changePasswordTitle": "Change password",
+  "resetPasswordTitle": "Reset password",
+  "encryptionKeys": "Encryption keys",
+  "passwordWarning": "We don't store this password, so if you forget, <underline>we cannot decrypt your data</underline>",
+  "enterPasswordToEncrypt": "Enter a password we can use to encrypt your data",
+  "enterNewPasswordToEncrypt": "Enter a new password we can use to encrypt your data",
+  "passwordChangedSuccessfully": "Password changed successfully",
+  "generatingEncryptionKeys": "Generating encryption keys...",
+  "continueLabel": "Continue",
+  "insecureDevice": "Insecure device",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Sorry, we could not generate secure keys on this device.\n\nplease sign up from a different device.",
+  "howItWorks": "How it works",
+  "ackPasswordLostWarning": "I understand that if I lose my password, I may lose my data since my data is <underline>end-to-end encrypted</underline>.",
+  "loginTerms": "By clicking log in, I agree to the <u-terms>terms of service</u-terms> and <u-policy>privacy policy</u-policy>",
+  "logInLabel": "Log in",
+  "logout": "Logout",
+  "areYouSureYouWantToLogout": "Are you sure you want to logout?",
+  "yesLogout": "Yes, logout",
+  "exit": "Exit",
+  "verifyingRecoveryKey": "Verifying recovery key...",
+  "recoveryKeyVerified": "Recovery key verified",
+  "recoveryKeySuccessBody": "Great! Your recovery key is valid. Thank you for verifying.\n\nPlease remember to keep your recovery key safely backed up.",
+  "invalidRecoveryKey": "The recovery key you entered is not valid. Please make sure it contains 24 words, and check the spelling of each.\n\nIf you entered an older recovery code, make sure it is 64 characters long, and check each of them.",
+  "recreatePasswordTitle": "Recreate password",
+  "recreatePasswordBody": "The current device is not powerful enough to verify your password, but we can regenerate in a way that works with all devices.\n\nPlease login using your recovery key and regenerate your password (you can use the same one again if you wish).",
+  "invalidKey": "Invalid key",
+  "tryAgain": "Try again",
+  "viewRecoveryKey": "View recovery key",
+  "confirmRecoveryKey": "Confirm recovery key",
+  "recoveryKeyVerifyReason": "Your recovery key is the only way to recover your photos if you forget your password. You can find your recovery key in Settings > Account.\n\nPlease enter your recovery key here to verify that you have saved it correctly.",
+  "confirmYourRecoveryKey": "Confirm your recovery key",
+  "confirm": "Confirm",
+  "emailYourLogs": "Email your logs",
+  "pleaseSendTheLogsTo": "Please send the logs to \n{toEmail}",
+  "copyEmailAddress": "Copy email address",
+  "exportLogs": "Export logs",
+  "enterYourRecoveryKey": "Enter your recovery key",
+  "tempErrorContactSupportIfPersists": "It looks like something went wrong. Please retry after some time. If the error persists, please contact our support team.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "It looks like something went wrong. Please retry after some time. If the error persists, please contact our support team.",
+  "about": "About",
+  "weAreOpenSource": "We are open source!",
+  "privacy": "Privacy",
+  "terms": "Terms",
+  "checkForUpdates": "Check for updates",
+  "downloadUpdate": "Download",
+  "criticalUpdateAvailable": "Critical update available",
+  "updateAvailable": "Update available",
+  "update": "Update",
+  "checking": "Checking...",
+  "youAreOnTheLatestVersion": "You are on the latest version",
+  "warning": "Warning",
+  "exportWarningDesc": "The exported file contains sensitive information. Please store this safely.",
+  "iUnderStand": "I understand",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Please authenticate to export your codes",
+  "importSuccessTitle": "Yay!",
+  "importSuccessDesc": "You have imported {count} codes!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Sorry",
+  "importFailureDesc": "Could not parse the selected file.\nPlease write to support@ente.io if you need help!",
+  "pendingSyncs": "Warning",
+  "pendingSyncsWarningBody": "Some of your codes have not been backed up.\n\nPlease ensure that you have a backup for these codes before you logout.",
+  "checkInboxAndSpamFolder": "Please check your inbox (and spam) to complete verification",
+  "tapToEnterCode": "Tap to enter code",
+  "resendEmail": "Resend email",
+  "weHaveSendEmailTo": "We have sent a mail to <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"
+      }
+    }
+  },
+  "activeSessions": "Active sessions",
+  "somethingWentWrongPleaseTryAgain": "Something went wrong, please try again",
+  "thisWillLogYouOutOfThisDevice": "This will log you out of this device!",
+  "thisWillLogYouOutOfTheFollowingDevice": "This will log you out of the following device:",
+  "terminateSession": "Terminate session?",
+  "terminate": "Terminate",
+  "thisDevice": "This device",
+  "toResetVerifyEmail": "To reset your password, please verify your email first.",
+  "thisEmailIsAlreadyInUse": "This email is already in use",
+  "verificationFailedPleaseTryAgain": "Verification failed, please try again",
+  "yourVerificationCodeHasExpired": "Your verification code has expired",
+  "incorrectCode": "Incorrect code",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Sorry, the code you've entered is incorrect",
+  "emailChangedTo": "Email changed to {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Authentication failed, please try again",
+  "authenticationSuccessful": "Authentication successful!",
+  "twofactorAuthenticationSuccessfullyReset": "Two-factor authentication successfully reset",
+  "incorrectRecoveryKey": "Incorrect recovery key",
+  "theRecoveryKeyYouEnteredIsIncorrect": "The recovery key you entered is incorrect",
+  "enterPassword": "Enter password",
+  "selectExportFormat": "Select export format",
+  "exportDialogDesc": "Encrypted exports will be protected by a password of your choice.",
+  "encrypted": "Encrypted",
+  "plainText": "Plain text",
+  "passwordToEncryptExport": "Password to encrypt export",
+  "export": "Export",
+  "useOffline": "Use without backups",
+  "signInToBackup": "Sign in to backup your codes",
+  "singIn": "Sign in",
+  "sigInBackupReminder": "Please export your codes to ensure that you have a backup you can restore from.",
+  "offlineModeWarning": "You have chosen to proceed without backups. Please take manual backups to make sure your codes are safe.",
+  "showLargeIcons": "Show large icons",
+  "focusOnSearchBar": "Focus search on app start"
 }

lib/l10n/arb/app_es.arb

@@ -1,7 +1,230 @@
 {
-    "@@locale": "es",
-    "counterAppBarTitle": "Contador",
-    "@counterAppBarTitle": {
-        "description": "Texto mostrado en la AppBar de la página del contador"
+  "account": "Cuenta",
+  "recoveryKey": "Clave de recuperación",
+  "counterAppBarTitle": "Contador",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Asegure sus códigos 2FA",
+  "onBoardingGetStarted": "Primeros pasos",
+  "setupFirstAccount": "Configura tu primera cuenta",
+  "importScanQrCode": "Escanear un código QR",
+  "importEnterSetupKey": "Ingrese una llave de configuración",
+  "importAccountPageTitle": "Ingrese los detalles de la cuenta",
+  "codeIssuerHint": "Emisor",
+  "codeSecretKeyHint": "Llave Secreta",
+  "codeAccountHint": "Cuenta (tu@dominio.com)",
+  "accountKeyType": "Tipo de llave",
+  "sessionExpired": "La sesión ha expirado",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Por favor, vuelva a iniciar sesión",
+  "loggingOut": "Cerrando sesión...",
+  "timeBasedKeyType": "Basado en el tiempo (TOTP)",
+  "counterBasedKeyType": "Basado en Contador (HOTP)",
+  "saveAction": "Guardar",
+  "nextTotpTitle": "siguiente",
+  "deleteCodeTitle": "¿Eliminar código?",
+  "deleteCodeMessage": "¿Está seguro que desea eliminar este código? Esta acción es irreversible.",
+  "viewLogsAction": "Ver Registros",
+  "sendLogsDescription": "Esto enviará registros para ayudarnos a depurar su problema. Aunque tomamos precauciones para asegurarnos que no se registre información sensible, le recomendamos que consulte estos registros antes de compartirlos.",
+  "preparingLogsTitle": "Preparando registros...",
+  "emailLogsTitle": "Enviar registros por email",
+  "emailLogsMessage": "Por favor, envíe los registros a {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
     }
+  },
+  "copyEmailAction": "Copiar correo electrónico",
+  "exportLogsAction": "Exportar registros",
+  "reportABug": "Reportar un error",
+  "crashAndErrorReporting": "Informes de errores y fallos",
+  "reportBug": "Reportar error",
+  "emailUsMessage": "Por favor, envíanos un correo electrónico a {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Ponerse en contacto con el equipo de soporte",
+  "verifyPassword": "Verificar contraseña",
+  "pleaseWait": "Por favor, espere...",
+  "generatingEncryptionKeysTitle": "Generando claves de encriptación...",
+  "recreatePassword": "Recrear contraseña",
+  "recreatePasswordMessage": "El dispositivo actual no es lo suficientemente potente para verificar su contraseña, así que necesitamos regenerarlo una vez de una manera que funcione con todos los dispositivos. \n\nPor favor Inicie sesión usando su clave de recuperación y regenere su contraseña (puede volver a utilizar la misma si lo desea).",
+  "useRecoveryKey": "Usar clave de recuperación",
+  "incorrectPasswordTitle": "Contraseña incorrecta",
+  "welcomeBack": "¡Te damos la bienvenida otra vez!",
+  "madeWithLoveAtPrefix": "hecho con ❤️ en ",
+  "supportDevs": "Suscríbase a <bold-green>ente</bold-green> para apoyar este proyecto.",
+  "supportDiscount": "Utiliza el cupón promocional \"AUTH\" para obtener un 10% de descuento en el primer año",
+  "changeEmail": "Cambiar correo electrónico",
+  "changePassword": "Cambiar contraseña",
+  "data": "Datos",
+  "importCodes": "Importar códigos",
+  "exportCodes": "Exportar códigos",
+  "importInstruction": "Por favor, seleccione un archivo que contenga una lista de sus códigos en el siguiente formato",
+  "importCodeDelimiterInfo": "Los códigos pueden separarse por una coma o una nueva línea",
+  "selectFile": "Seleccionar archivo",
+  "authToViewYourRecoveryKey": "Por favor, autentifíquese para ver su clave de recuperación",
+  "authToChangeYourEmail": "Por favor, autentifíquese para cambiar su correo electrónico",
+  "authToChangeYourPassword": "Por favor, autentifíquese para cambiar su contraseña",
+  "ok": "Ok",
+  "cancel": "Cancelar",
+  "yes": "Si",
+  "no": "No",
+  "email": "Correo electrónico",
+  "support": "Soporte",
+  "settings": "Configuración",
+  "copied": "Copiado",
+  "pleaseTryAgain": "Por favor, inténtalo nuevamente",
+  "existingUser": "Usuario existente",
+  "newUser": "Nuevo en ente",
+  "delete": "Borrar",
+  "enterYourPasswordHint": "Ingrese su contraseña",
+  "forgotPassword": "Olvidé mi contraseña",
+  "oops": "Ups",
+  "somethingWentWrongMessage": "Algo ha ido mal, por favor, prueba otra vez",
+  "leaveFamily": "Dejar plan familiar",
+  "leaveFamilyMessage": "¿Está seguro de que desea abandonar el plan familiar?",
+  "inFamilyPlanMessage": "¡Estás en un plan familiar!",
+  "swipeHint": "Deslice a la izquierda para editar o eliminar códigos",
+  "scan": "Escanear",
+  "scanACode": "Escanear un código",
+  "verify": "Verificar",
+  "verifyEmail": "Verificar correo electrónico",
+  "enterCodeHint": "Ingrese el código de seis dígitos de su aplicación de autenticación",
+  "lostDeviceTitle": "¿Perdió su dispositivo?",
+  "twoFactorAuthTitle": "Autenticación de dos factores",
+  "recoverAccount": "Recuperar cuenta",
+  "enterRecoveryKeyHint": "Introduzca su clave de recuperación",
+  "recover": "Recuperar",
+  "contactSupportViaEmailMessage": "Por favor, envíe un email a {email} desde su dirección de correo electrónico registrada",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "¿Sin clave de recuperación?",
+  "enterEmailHint": "Introduce tu dirección de correo electrónico",
+  "invalidEmailTitle": "Dirección de correo electrónico no válida",
+  "invalidEmailMessage": "Por favor, introduzca una dirección de correo electrónico válida.",
+  "deleteAccount": "Eliminar cuenta",
+  "deleteAccountQuery": "Lamentaremos que te vayas. ¿Estás enfrentando algún inconveniente?",
+  "yesSendFeedbackAction": "Sí, enviar comentarios",
+  "noDeleteAccountAction": "No, eliminar cuenta",
+  "initiateAccountDeleteTitle": "Por favor, autentifíquese para iniciar la eliminación de la cuenta",
+  "confirmAccountDeleteTitle": "¿Estás seguro de que quieres eliminar tu cuenta de ente?",
+  "confirmAccountDeleteMessage": "Sus datos subidos a través de todas las aplicaciones (fotos y autenticador), se programarán para su eliminación y su cuenta se eliminará permanentemente.",
+  "sendEmail": "Enviar correo electrónico",
+  "createNewAccount": "Crear nueva cuenta",
+  "weakStrength": "Poco segura",
+  "strongStrength": "Fuerte",
+  "moderateStrength": "Moderado",
+  "confirmPassword": "Confirmar contraseña",
+  "close": "Cerrar",
+  "oopsSomethingWentWrong": "Vaya, algo salió mal.",
+  "selectLanguage": "Seleccionar idioma",
+  "language": "Idioma",
+  "social": "Social",
+  "security": "Seguridad",
+  "lockscreen": "Pantalla de bloqueo",
+  "authToChangeLockscreenSetting": "Por favor autentifíquese para cambiar la configuración de bloqueo de pantalla",
+  "lockScreenEnablePreSteps": "Para activar la pantalla de bloqueo, por favor configure la contraseña del dispositivo o el bloqueo de pantalla en los ajustes de sistema.",
+  "viewActiveSessions": "Ver sesiones activas",
+  "searchHint": "Buscar...",
+  "search": "Buscar",
+  "sorryUnableToGenCode": "Lo sentimos, no se puede generar un código para {issuerName}",
+  "noResult": "Sin resultados",
+  "addCode": "Añadir código",
+  "scanAQrCode": "Escanear un código QR",
+  "enterDetailsManually": "Ingrese los detalles manualmente",
+  "edit": "Editar",
+  "copiedToClipboard": "Copiado al portapapeles",
+  "error": "Error",
+  "recoveryKeyCopiedToClipboard": "Llave de recuperación copiada al portapapeles",
+  "recoveryKeyOnForgotPassword": "Si olvida su contraseña, la única forma de recuperar sus datos es con esta clave.",
+  "recoveryKeySaveDescription": "Nosotros no almacenamos esta clave, por favor guarde dicha clave de 24 palabras en un lugar seguro.",
+  "doThisLater": "Hacer esto más tarde",
+  "saveKey": "Guardar Clave",
+  "createAccount": "Crear cuenta",
+  "passwordStrength": "Fortaleza de la contraseña: {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": "Contraseña",
+  "signUpTerms": "Estoy de acuerdo con los <u-terms>términos del servicio</u-terms> y <u-policy> la política de privacidad</u-policy>",
+  "privacyPolicyTitle": "Política de Privacidad",
+  "termsOfServicesTitle": "Términos",
+  "encryption": "Cifrado",
+  "setPasswordTitle": "Establecer contraseña",
+  "changePasswordTitle": "Cambiar contraseña",
+  "resetPasswordTitle": "Restablecer contraseña",
+  "encryptionKeys": "Claves de cifrado",
+  "passwordChangedSuccessfully": "Contraseña cambiada correctamente",
+  "generatingEncryptionKeys": "Generando claves de encriptación...",
+  "continueLabel": "Continuar",
+  "insecureDevice": "Dispositivo inseguro",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Lo sentimos, no hemos podido generar claves seguras en este dispositivo.\n\nRegístrate desde un dispositivo diferente.",
+  "howItWorks": "Cómo funciona",
+  "ackPasswordLostWarning": "Entiendo que si pierdo mi contraseña podría perder mis datos, ya que mis datos están <underline>cifrados de extremo a extremo</underline>.",
+  "loginTerms": "Al hacer clic en iniciar sesión, acepto los <u-terms>términos de servicio</u-terms> y <u-policy>la política de privacidad</u-policy>",
+  "logInLabel": "Iniciar sesión",
+  "logout": "Cerrar sesión",
+  "areYouSureYouWantToLogout": "¿Seguro que quiere cerrar la sesión?",
+  "yesLogout": "Sí, cerrar sesión",
+  "exit": "Salir",
+  "verifyingRecoveryKey": "Verificando clave de recuperación...",
+  "recoveryKeyVerified": "Clave de recuperación verificada",
+  "recoveryKeySuccessBody": "¡Genial! Su clave de recuperación es válida. Gracias por verificar.\n\nPor favor, recuerde mantener su clave de recuperación segura.",
+  "invalidRecoveryKey": "La clave de recuperación introducida no es válida. Por favor, asegúrese de que contiene 24 palabras y compruebe la ortografía de cada una.\n\nSi ha introducido un código de recuperación antiguo, asegúrese de que tiene 64 caracteres de largo y compruebe cada uno de ellos.",
+  "recreatePasswordTitle": "Recrear contraseña",
+  "recreatePasswordBody": "El dispositivo actual no es lo suficientemente potente para verificar su contraseña, pero podemos regenerarla de una manera que funcione con todos los dispositivos.\n\nPor favor inicie sesión usando su clave de recuperación y regenere su contraseña (puede volver a utilizar la misma si lo desea).",
+  "invalidKey": "Clave inválida",
+  "tryAgain": "Inténtelo de nuevo",
+  "viewRecoveryKey": "Ver código de recuperación",
+  "confirmRecoveryKey": "Confirmar clave de recuperación",
+  "recoveryKeyVerifyReason": "Su clave de recuperación es la única forma de recuperar sus fotos si olvida su contraseña. Puede encontrar su clave de recuperación en Ajustes > Cuenta.\n\nPor favor, introduzca su clave de recuperación aquí para verificar que la ha guardado correctamente.",
+  "confirmYourRecoveryKey": "Confirmar su clave de recuperación",
+  "confirm": "Confirmar",
+  "emailYourLogs": "Envíe sus registros por correo electrónico",
+  "pleaseSendTheLogsTo": "Por favor, envíe los registros a {toEmail}",
+  "copyEmailAddress": "Copiar dirección de correo electrónico",
+  "exportLogs": "Exportar registros",
+  "enterYourRecoveryKey": "Introduzca su clave de recuperación",
+  "tempErrorContactSupportIfPersists": "Parece que algo salió mal. Por favor, vuelve a intentarlo después de algún tiempo. Si el error persiste, ponte en contacto con nuestro equipo de soporte.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Parece que algo salió mal. Por favor, vuelve a intentarlo después de algún tiempo. Si el error persiste, ponte en contacto con nuestro equipo de soporte.",
+  "about": "Acerca de",
+  "weAreOpenSource": "¡Somos de código abierto!",
+  "privacy": "Privacidad",
+  "terms": "Términos",
+  "checkForUpdates": "Comprobar actualizaciones",
+  "checking": "Comprobando...",
+  "youAreOnTheLatestVersion": "Está usando la versión más reciente",
+  "warning": "Atención",
+  "exportWarningDesc": "El archivo exportado contiene información confidencial. Por favor, guárdelo de forma segura.",
+  "iUnderStand": "Entiendo",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Por favor, autentifíquese para exportar sus códigos",
+  "sorry": "Lo sentimos",
+  "importFailureDesc": "No se pudo analizar el archivo seleccionado.\n¡Por favor escriba a support@ente.io si necesita ayuda!",
+  "pendingSyncs": "Atención"
 }

lib/l10n/arb/app_fa.arb

@@ -0,0 +1,235 @@
+{
+  "account": "حساب کاربری",
+  "recoveryKey": "کلید بازیابی",
+  "counterAppBarTitle": "شمارنده",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "کدهای احراز هویت دوعاملی خود(2FA) را ایمن کنید",
+  "onBoardingGetStarted": "شروع کنید",
+  "setupFirstAccount": "اولین حساب خود را راه‌اندازی کنید",
+  "importScanQrCode": "اسکن کردن کد QR",
+  "importEnterSetupKey": "وارد کردن کلید تنظیم",
+  "importAccountPageTitle": "ورود اطلاعات حساب",
+  "codeIssuerHint": "صادر کننده",
+  "codeSecretKeyHint": "کلید مخفی",
+  "codeAccountHint": "حساب (you@domain.com)",
+  "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": "آیا مطمئن هستید که می خواهید این کد را حذف کنید؟ این کار غیرقابل تغییر است.",
+  "viewLogsAction": "نمایش لاگ‌ها",
+  "sendLogsDescription": "این باعث ارسال لاگ‌ها می‌شود تا به ما در رفع مشکل شما کمک کند. هرچند ما اقداماتی را جهت جلوگیری از ثبت اطلاعات حساس در لاگ انجام می‌دهیم، اما به شما توصیه می‌کنیم قبل از اشتراک گذاری لاگ‌ها آن‌ها را مشاهده کنید.",
+  "preparingLogsTitle": "در حال آماده‌سازی لاگ‌ها...",
+  "emailLogsTitle": "ایمیل کردن لاگ‌ها",
+  "emailLogsMessage": "لطفا لاگ‌ها را به {email} ارسال کنید",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "کپی کردن ایمیل",
+  "exportLogsAction": "صدور لاگ‌ها",
+  "reportABug": "گزارش یک اشکال",
+  "crashAndErrorReporting": "ﮔﺰﺍﺭﺵ ﺧﺮﺍﺑﯽ ﻭ ﺧﻄﺎ",
+  "reportBug": "گزارش اشکال",
+  "emailUsMessage": "لطفا به آدرس {email} به ما ایمیل بزنید",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "ارتباط با پشتیبانی",
+  "verifyPassword": "تایید رمز عبور",
+  "pleaseWait": "لطفا صبر کنید...",
+  "generatingEncryptionKeysTitle": "در حال تولید کلید‌های رمزگذاری...",
+  "recreatePassword": "بازتولید رمز عبور",
+  "recreatePasswordMessage": "دستگاه فعلی جهت تایید رمز عبور شما به اندازه کافی قدرتمند نیست، بنابراین ما باید یکبار آن را به گونه ای بازتولید کنیم که با همه دستگاه‌ها کار کند.\n\nلطفا با استفاده از کلید بازیابی خود وارد شوید و رمز عبور خود را دوباره ایجاد کنید (در صورت تمایل می‌توانید دوباره از همان رمز عبور استفاده کنید).",
+  "useRecoveryKey": "از کلید بازیابی استفاده کنید",
+  "incorrectPasswordTitle": "رمز عبور نادرست",
+  "welcomeBack": "خوش آمدید!",
+  "madeWithLoveAtPrefix": "ساخته شده با ❤️ در ",
+  "supportDevs": "برای حمایت از این پروژه در <bold-green>ente</bold-green> مشترک شوید.",
+  "supportDiscount": "برای دریافت ۱۰٪ تخفیف اولین سال، از کد \"AUTH\" استفاده کنید",
+  "changeEmail": "تغییر ایمیل",
+  "changePassword": "تغییر رمز عبور",
+  "data": "داده ها",
+  "importCodes": "ورود کدها",
+  "exportCodes": "صدور کدها",
+  "importInstruction": "لطفا یک فایل که حاوی لیستی از کدهای شما در قالب زیر است، انتخاب کنید",
+  "importCodeDelimiterInfo": "کدها می‌توانند با کاما یا یک خط جدید از یکدیگر جدا شوند",
+  "selectFile": "انتخاب فایل",
+  "authToViewYourRecoveryKey": "لطفا جهت نمایش کلید بازیابی خود، اعتبارسنجی کنید",
+  "authToChangeYourEmail": "لطفا جهت تغییر ایمیل خود، اعتبارسنجی کنید",
+  "authToChangeYourPassword": "لطفا جهت تغییر رمز عبور خود، اعتبارسنجی کنید",
+  "ok": "تایید",
+  "cancel": "لغو",
+  "yes": "بله",
+  "no": "خیر",
+  "email": "ایمیل",
+  "support": "پشتیبانی",
+  "settings": "تنظیمات",
+  "copied": "کپی شد",
+  "pleaseTryAgain": "لطفا دوباره تلاش کنید",
+  "existingUser": "کاربر موجود",
+  "newUser": "کاربر جدید ente",
+  "delete": "حذف",
+  "enterYourPasswordHint": "رمز عبور خود را وارد کنید",
+  "forgotPassword": "فراموشی رمز عبور",
+  "oops": "اوه",
+  "somethingWentWrongMessage": "مشکلی پیش آمده است، لطفا دوباره تلاش کنید",
+  "leaveFamily": "خروج از طرح خانواده",
+  "leaveFamilyMessage": "آیا مطمئنید که میخواهید از طرح خانواده خارج شوید؟",
+  "inFamilyPlanMessage": "طرح خانواده برای شما فعال است!",
+  "swipeHint": "برای ویرایش یا حذف کدها به چپ بکشید",
+  "scan": "اسکن",
+  "scanACode": "یک کد را اسکن کنید",
+  "verify": "تایید",
+  "enterCodeHint": "کد تایید ۶ رقمی را از برنامه\nاحراز هویت خود وارد کنید",
+  "lostDeviceTitle": "دستگاه را گم کرده‌اید؟",
+  "twoFactorAuthTitle": "احراز هویت دو مرحله‌ای",
+  "recoverAccount": "بازیابی حساب کاربری",
+  "enterRecoveryKeyHint": "کلید بازیابی خود را وارد کنید",
+  "recover": "بازیابی",
+  "contactSupportViaEmailMessage": "لطفا آدرس یکی از ایمیل‌هایی که با آن ثبت کرده‌اید را به {email} ارسال کنید",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "کلید بازیابی ندارید؟",
+  "enterEmailHint": "آدرس ایمیل خود را وارد کنید",
+  "invalidEmailTitle": "آدرس ایمیل نامعتبر است",
+  "invalidEmailMessage": "لطفا یک آدرس ایمیل معتبر وارد کنید.",
+  "deleteAccount": "حذف حساب کاربری",
+  "deleteAccountQuery": "از رفتن شما متاسفیم. آیا با مشکلی روبرو هستید؟",
+  "yesSendFeedbackAction": "بله، ارسال بازخورد",
+  "noDeleteAccountAction": "خیر، حساب کاربری را حذف کن",
+  "initiateAccountDeleteTitle": "لطفا جهت شروع فرآیند حذف حساب کاربری، اعتبارسنجی کنید",
+  "confirmAccountDeleteTitle": "آیا از حذف حساب کاربری خود اطمینان دارید؟",
+  "confirmAccountDeleteMessage": "داده‌های آپلود شده شما، در همه برنامه‌ها(هر دو برنامه عکس‌ها و احراز هویت)، طبق زمانبندی و حساب کاربری شما برای همیشه حذف خواهد شد.",
+  "sendEmail": "ارسال ایمیل",
+  "createNewAccount": "ایجاد حساب کاربری جدید",
+  "weakStrength": "ضعیف",
+  "strongStrength": "قوی",
+  "moderateStrength": "متوسط",
+  "confirmPassword": "تایید رمز عبور",
+  "close": "بستن",
+  "oopsSomethingWentWrong": "اوه، مشکلی پیش آمده است.",
+  "selectLanguage": "انتخاب زبان",
+  "language": "زبان",
+  "social": "شبکه اجتماعی",
+  "security": "امنیت",
+  "lockscreen": "قفل صفحه",
+  "authToChangeLockscreenSetting": "لطفا جهت تغییر تنظیمات قفل صفحه، اعتبارسنجی کنید",
+  "lockScreenEnablePreSteps": "جهت فعالسازی قفل صفحه، لطفا در تنظیمات سیستم خود یک رمز یا قفل صفحه را فعال کنید.",
+  "viewActiveSessions": "نمایش نشست‌های فعال",
+  "authToViewYourActiveSessions": "لطفا جهت نمایش نشست‌های فعال خود، اعتبارسنجی کنید",
+  "searchHint": "جستجو...",
+  "search": "جستجو",
+  "sorryUnableToGenCode": "با عرض پوزش، قادر به تولید کد برای {issuerName} نیستیم",
+  "noResult": "نتیجه ای یافت نشد",
+  "addCode": "اضافه کردن کد",
+  "scanAQrCode": "اسکن کردن کد QR",
+  "enterDetailsManually": "ورود دستی جزئیات",
+  "edit": "ویرایش",
+  "copiedToClipboard": "به حافظه موقت کپی شد",
+  "error": "خطا",
+  "recoveryKeyCopiedToClipboard": "کلید بازیابی به حافظه موقت کپی شد",
+  "recoveryKeyOnForgotPassword": "اگر رمز عبور خود را فراموش کرده‌اید، این کد تنها راهی است که با آن می‌توانید اطلاعات خود را بازیابی کنید.",
+  "recoveryKeySaveDescription": "ما این کلید را ذخیره نمی‌کنیم، لطفا این کلید ۲۴ کلمه‌ای را در مکانی امن ذخیره کنید.",
+  "doThisLater": "بعداً انجام شود",
+  "saveKey": "ذخیره کلید",
+  "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": "رمزگذاری",
+  "changePasswordTitle": "تغییر رمز عبور",
+  "resetPasswordTitle": "بازنشانی رمز عبور",
+  "ackPasswordLostWarning": "می‌دانم که اگر رمز عبور خود را گم کنم، از آنجایی که اطلاعات من <underline>رمزگذاری سرتاسری</underline> شده است، ممکن است اطلاعاتم را از دست بدهم.",
+  "loginTerms": "با کلیک روی ورود، با <u-terms>شرایط استفاده از خدمات</u-terms> و <u-policy>سیاست حفظ حریم خصوصی</u-policy> موافقت می‌کنم",
+  "logInLabel": "ورود",
+  "logout": "خروج از حساب",
+  "areYouSureYouWantToLogout": "آیا مطمئنید که می‌خواهید خارج شوید؟",
+  "yesLogout": "بله، خروج",
+  "exit": "خروج",
+  "verifyingRecoveryKey": "در حال تایید کلید بازیابی...",
+  "recoveryKeyVerified": "کلید بازیابی تایید شد",
+  "recoveryKeySuccessBody": "عالی! کلید بازیابی شما معتبر است. با تشکر از شما.\n\nلطفا به یاد داشته باشید که از کلید بازیابی خود به طور ایمن نسخه پشتیبان تهیه کنید.",
+  "invalidRecoveryKey": "کلید بازیابی که وارد کرده‌اید نامعتبر است. لطفا مطمئن شوید که شامل ۲۴ کلمه است و همه کلمات را صحیح نوشته‌اید.\n\nاگر کد بازیابی قدیمی تری را وارد کرده‌اید، مطمئن شوید که شامل ۶۴ حرف است و همه حروف را صحیح نوشته‌اید.",
+  "recreatePasswordTitle": "بازتولید رمز عبور",
+  "recreatePasswordBody": "دستگاه فعلی جهت تایید رمز عبور شما به اندازه کافی قدرتمند نیست، اما ما میتوانیم آن را به گونه ای بازتولید کنیم که با همه دستگاه‌ها کار کند.\n\nلطفا با استفاده از کلید بازیابی خود وارد شوید و رمز عبور خود را دوباره ایجاد کنید (در صورت تمایل می‌توانید دوباره از همان رمز عبور استفاده کنید).",
+  "invalidKey": "کلید نامعتبر",
+  "tryAgain": "دوباره امتحان کنید",
+  "viewRecoveryKey": "نمایش کلید بازیابی",
+  "confirmRecoveryKey": "تایید کلید بازیابی",
+  "recoveryKeyVerifyReason": "در صورتی که رمز عبور خود را فراموش کنید، کلید بازیابی شما تنها راه بازیابی عکس‌های شماست. شما می‌توانید کلید بازیابی خود را در قسمت تنظیمات > حساب کاربری پیدا کنید.\n\nلطفا کلید بازیابی خود را در اینجا وارد کنید تا اطمینان حاصل شود که آن را به درستی ذخیره کرده‌اید.",
+  "confirmYourRecoveryKey": "کلید بازیابی خود را تایید کنید",
+  "confirm": "تایید",
+  "emailYourLogs": "لاگ‌های خود را ایمیل کنید",
+  "pleaseSendTheLogsTo": "لطفا لاگ‌ها را به ایمیل زیر ارسال کنید \n{toEmail}",
+  "copyEmailAddress": "کپی آدرس ایمیل",
+  "exportLogs": "صدور لاگ‌ها",
+  "enterYourRecoveryKey": "کلید بازیابی خود را وارد کنید",
+  "tempErrorContactSupportIfPersists": "به نظر می‌رسد مشکلی وجود دارد. لطفا بعد از مدتی دوباره تلاش کنید. اگر همچنان با خطا مواجه می‌شوید، لطفا با تیم پشتیبانی ما ارتباط برقرار کنید.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "به نظر می‌رسد مشکلی پیش آمده است. لطفا بعد از مدتی دوباره تلاش کنید. اگر همچنان با خطا مواجه می‌شوید، لطفا با تیم پشتیبانی ما ارتباط برقرار کنید.",
+  "about": "درباره ما",
+  "weAreOpenSource": "برنامه های ما منبع باز هستند!",
+  "privacy": "حریم خصوصی",
+  "terms": "شرایط و ضوابط",
+  "checkForUpdates": "بررسی بروزرسانی",
+  "checking": "در حال بررسی...",
+  "youAreOnTheLatestVersion": "شما در حال اجرای آخرین نسخه هستید",
+  "warning": "اخطار",
+  "exportWarningDesc": "فایل صادر شده حاوی اطلاعات حساس است. لطفا این فایل را به صورت امن ذخیره کنید.",
+  "iUnderStand": "متوجه ام",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "لطفا جهت صدور کدهای خود، اعتبارسنجی کنید",
+  "importSuccessTitle": "آره!",
+  "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لطفا قبل از خروج، مطمئن شوید که یک نسخه پشتیبان برای این کدها دارید.",
+  "thisDevice": "این دستگاه"
+}

lib/l10n/arb/app_fi.arb

@@ -0,0 +1,123 @@
+{
+  "counterAppBarTitle": "Laskuri",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Turvaa 2FA-koodisi",
+  "onBoardingGetStarted": "Aloitetaan",
+  "setupFirstAccount": "Määritä ensimmäinen tilisi",
+  "importScanQrCode": "Lue QR-koodi",
+  "importEnterSetupKey": "Syötä asetusavain",
+  "importAccountPageTitle": "Syötä tilin tiedot",
+  "codeIssuerHint": "Myöntäjä",
+  "codeSecretKeyHint": "Salainen avain",
+  "codeAccountHint": "Tili (sinun@jokinosoite.com)",
+  "accountKeyType": "Avaimen tyyppi",
+  "sessionExpired": "Istunto on vanheutunut",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Sisäänkirjaudu uudestaan",
+  "loggingOut": "Kirjaudutaan ulos...",
+  "timeBasedKeyType": "Aikaperusteinen (TOTP)",
+  "counterBasedKeyType": "Laskuripohjainen (HOTP)",
+  "saveAction": "Tallenna",
+  "nextTotpTitle": "seuraava",
+  "deleteCodeTitle": "Poista koodi?",
+  "deleteCodeMessage": "Haluatko varmasti poistaa tämän koodin? Toimintoa ei voi peruuttaa.",
+  "viewLogsAction": "Näytä lokikirjaukset",
+  "sendLogsDescription": "Tämä toiminto lähettää lokin kirjaukset eteenpäin jotta saisimme apua ongelmasi ratkaisemiseen. Vaikkakin käytäntömme on olla kirjaamatta mitään arkaluontoista tietoa, suosittelemme että tarkistat nämä tiedot ennen niiden jakamista.",
+  "preparingLogsTitle": "Valmistellaan lokikirjaukset...",
+  "emailLogsTitle": "Toimita lokikirjaukset sähköpostilla",
+  "emailLogsMessage": "Lähetä lokikirjaukset osoitteeseen {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Jäljennä sähköpostiosoite leikepöydälle",
+  "exportLogsAction": "Vie lokikirjaukset",
+  "reportABug": "Ilmoita virhetoiminnosta",
+  "crashAndErrorReporting": "Kaatumis- ja virheraportointi",
+  "reportBug": "Ilmoita virheestä",
+  "emailUsMessage": "Lähetä meille sähköpostia osoitteeseen {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Ota yhteyttä käyttötukeen",
+  "verifyPassword": "Vahvista salasana",
+  "pleaseWait": "Odota hetki...",
+  "generatingEncryptionKeysTitle": "Luodaan salausavaimia...",
+  "recreatePassword": "Luo salasana uudelleen",
+  "recreatePasswordMessage": "Nykyinen laite ei ole riittävän tehokas salasanasi varmistamiseen, joten se on uudistettava kerran sillä tavalla että se toimii sen jälkeen kaikkien laitteiden kanssa. \n\nOle hyvä ja kirjaudu sisään palautusavaimellasi ja luo salasanasi uudelleen (voit halutessasi käyttää aivan samaa salasanaa).",
+  "useRecoveryKey": "Käytä palautusavainta",
+  "incorrectPasswordTitle": "Salasana on väärin",
+  "welcomeBack": "Tervetuloa takaisin!",
+  "madeWithLoveAtPrefix": "tehty ❤️:lla täällä ",
+  "supportDevs": "Tilaa <bold-green>ente</bold-green> tukeaksesi tätä hanketta.",
+  "supportDiscount": "Käytä kuponkikoodia \"AUTH\" saadaksesi 10% alennuksen ensimmäisestä vuodesta",
+  "changeEmail": "vaihda sähköpostiosoitteesi",
+  "selectFile": "Valitse tiedosto",
+  "ok": "Selvä",
+  "cancel": "Keskeytä",
+  "yes": "Kyllä",
+  "no": "Ei",
+  "email": "Sähköposti",
+  "support": "Tuki",
+  "settings": "Asetukset",
+  "copied": "Jäljennetty",
+  "pleaseTryAgain": "Yritä uudestaan",
+  "existingUser": "Jo valmiiksi olemassaoleva käyttäjä",
+  "newUser": "Uusi Ente-käyttäjä",
+  "delete": "Poista",
+  "enterYourPasswordHint": "Syötä salasanasi",
+  "forgotPassword": "Olen unohtanut salasanani",
+  "oops": "Hupsista",
+  "somethingWentWrongMessage": "Jokin meni pieleen, yritä uudelleen",
+  "leaveFamily": "Poistu perheestä",
+  "leaveFamilyMessage": "Oletko varma että haluat jättää tämän perhemallin?",
+  "inFamilyPlanMessage": "Olet perhemallissa!",
+  "swipeHint": "Pyyhkäise vasemmalle muokataksesi tai poistaaksesi koodeja",
+  "scan": "Lue",
+  "scanACode": "Lue koodi",
+  "verify": "Vahvista",
+  "enterCodeHint": "Syötä 6-merkkinen koodi varmennussovelluksestasi",
+  "lostDeviceTitle": "Kadonnut laite?",
+  "twoFactorAuthTitle": "Kaksivaiheinen vahvistus",
+  "recoverAccount": "Palauta tilisi",
+  "enterRecoveryKeyHint": "Syötä palautusavaimesi",
+  "recover": "Palauta",
+  "contactSupportViaEmailMessage": "Ole hyvä ja lähetä sähköpostia osoitteeseen {email} omasta rekisteröidystä sähköpostiosoitteestasi",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Ei palautusavainta?",
+  "enterEmailHint": "Syötä sähköpostiosoitteesi",
+  "invalidEmailTitle": "Epäkelpo sähköpostiosoite",
+  "invalidEmailMessage": "Syötä kelpoisa sähköpostiosoite.",
+  "deleteAccount": "Poista tili",
+  "deleteAccountQuery": "Olemme pahoillamme että lähdet keskuudestamme. Kohtasitko käytössä jonkin ongelman?",
+  "yesSendFeedbackAction": "Kyllä, lähetä palautetta",
+  "noDeleteAccountAction": "En, poista tili",
+  "initiateAccountDeleteTitle": "Ole hyvä ja tee todennus käynnistääksesi tilisi poistoprosessin",
+  "confirmAccountDeleteTitle": "Haluatko varmasti poistaa Ente-tilisi?",
+  "confirmAccountDeleteMessage": "Lataamasi tiedot kaikkien sovellusten kesken (molemmat, sekä kuvat ja todenteet) ajastetaan poistettavaksi ja tilisi poistetaan pysyvästi.",
+  "sendEmail": "Lähetä sähköpostia",
+  "createNewAccount": "Luo uusi tili",
+  "weakStrength": "Heikko salasana",
+  "strongStrength": "Vahva salasana",
+  "moderateStrength": "Kohtalainen salasana",
+  "confirmPassword": "Vahvista salasana",
+  "close": "Sulje",
+  "oopsSomethingWentWrong": "Hupsista! Jotakin meni nyt pieleen."
+}

lib/l10n/arb/app_fr.arb

@@ -0,0 +1,294 @@
+{
+  "account": "Compte",
+  "recoveryKey": "Clé de récupération",
+  "counterAppBarTitle": "Compteur",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Sécurisez vos codes 2FA",
+  "onBoardingGetStarted": "Premiers pas",
+  "setupFirstAccount": "Configurez votre premier compte",
+  "importScanQrCode": "Scannez un QR Code",
+  "importEnterSetupKey": "Saisir une clé de configuration",
+  "importAccountPageTitle": "Saisir les détails du compte",
+  "codeIssuerHint": "Émetteur",
+  "codeSecretKeyHint": "Clé secrète",
+  "codeAccountHint": "Compte (vous@domaine.fr)",
+  "accountKeyType": "Type de clé",
+  "sessionExpired": "Session expirée",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Veuillez vous reconnecter",
+  "loggingOut": "Deconnexion...",
+  "timeBasedKeyType": "Basé sur l'heure (TOTP)",
+  "counterBasedKeyType": "Basé sur le compteur (HOTP)",
+  "saveAction": "Sauvegarder",
+  "nextTotpTitle": "suivant",
+  "deleteCodeTitle": "Supprimer le code ?",
+  "deleteCodeMessage": "Êtes-vous sûr de vouloir supprimer ce code ? Cette action est irréversible.",
+  "viewLogsAction": "Afficher les journaux",
+  "sendLogsDescription": "Cela enverra des logs pour nous aider à déboguer votre problème. Bien que nous prenions des précautions pour nous assurer que les informations sensibles ne sont pas enregistrées, nous vous encourageons à consulter ces journaux avant de les partager.",
+  "preparingLogsTitle": "Préparation des journaux...",
+  "emailLogsTitle": "Journaux d'email",
+  "emailLogsMessage": "Envoyez les logs à {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Copier l’e-mail",
+  "exportLogsAction": "Exporter les journaux",
+  "reportABug": "Signaler un bug",
+  "crashAndErrorReporting": "Rapport de plantage et d'erreur",
+  "reportBug": "Signaler un bug",
+  "emailUsMessage": "Veuillez nous envoyer un e-mail à {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Contacter le support",
+  "verifyPassword": "Vérifier le mot de passe",
+  "pleaseWait": "Veuillez patienter...",
+  "generatingEncryptionKeysTitle": "Génération des clés de chiffrement...",
+  "recreatePassword": "Recréer le mot de passe",
+  "recreatePasswordMessage": "L'appareil actuel n'est pas assez puissant pour vérifier votre mot de passe, donc nous avons besoin de le régénérer une fois d'une manière qu'il fonctionne avec tous les périphériques.\n\nVeuillez vous connecter en utilisant votre clé de récupération et régénérer votre mot de passe (vous pouvez utiliser le même si vous le souhaitez).",
+  "useRecoveryKey": "Utiliser la clé de récupération",
+  "incorrectPasswordTitle": "Mot de passe incorrect",
+  "welcomeBack": "Bon retour parmi nous !",
+  "madeWithLoveAtPrefix": "fait avec ❤️ à ",
+  "supportDevs": "Abonnez-vous à <bold-green>ente</bold-green> pour soutenir ce projet.",
+  "supportDiscount": "Utilisez le code coupon \"AUTH\" pour obtenir 10% de réduction sur la première année",
+  "changeEmail": "Modifier l'e-mail",
+  "changePassword": "Modifier le mot de passe",
+  "data": "Données",
+  "importCodes": "Importer les codes",
+  "importSelectJsonFile": "Sélectionnez un fichier JSON",
+  "importEnteEncGuide": "Sélectionnez le fichier JSON chiffré exporté à partir de ente",
+  "exportCodes": "Exporter les codes",
+  "importInstruction": "Veuillez sélectionner un fichier qui contient une liste de vos codes dans le format suivant",
+  "importCodeDelimiterInfo": "Les codes peuvent être séparés par une virgule ou un retour à la ligne",
+  "selectFile": "Sélectionner le fichier",
+  "emailVerificationToggle": "Vérification de l'adresse e-mail",
+  "authToChangeEmailVerificationSetting": "Veuillez vous authentifier pour modifier votre adresse e-mail",
+  "authToViewYourRecoveryKey": "Veuillez vous authentifier pour afficher votre clé de récupération",
+  "authToChangeYourEmail": "Veuillez vous authentifier pour modifier votre adresse e-mail",
+  "authToChangeYourPassword": "Veuillez vous authentifier pour modifier votre mot de passe",
+  "ok": "Ok",
+  "cancel": "Annuler",
+  "yes": "Oui",
+  "no": "Non",
+  "email": "E-mail",
+  "support": "Support",
+  "settings": "Paramètres",
+  "copied": "Copié",
+  "pleaseTryAgain": "Veuillez réessayer",
+  "existingUser": "Utilisateur existant",
+  "newUser": "Nouveau sur ente",
+  "delete": "Supprimer",
+  "enterYourPasswordHint": "Saisir votre mot de passe",
+  "forgotPassword": "Mot de passe oublié",
+  "oops": "Oups",
+  "suggestFeatures": "Suggérer des fonctionnalités",
+  "faq": "FAQ",
+  "faq_q_2": "Puis-je accéder à mes codes sur mon ordinateur ?",
+  "faq_a_2": "Vous pouvez accéder à vos codes sur le web via auth.ente.io.",
+  "faq_q_3": "Comment puis-je supprimer des codes ?",
+  "faq_a_3": "Vous pouvez supprimer un code en glissant vers la gauche.",
+  "faq_q_4": "Comment puis-je soutenir le projet?",
+  "faq_a_4": "Vous pouvez soutenir le développement de ce projet en vous abonnant à notre application Photos, ente.io.",
+  "somethingWentWrongMessage": "Quelque chose s'est mal passé, veuillez recommencer",
+  "leaveFamily": "Quitter le plan familial",
+  "leaveFamilyMessage": "Êtes-vous certains de vouloir quitter le plan familial?",
+  "inFamilyPlanMessage": "Vous êtes sur un plan familial !",
+  "swipeHint": "Glisser vers la gauche pour modifier ou supprimer des codes",
+  "scan": "Analyser",
+  "scanACode": "Scanner un code",
+  "verify": "Vérifier",
+  "verifyEmail": "Vérifier l'email",
+  "enterCodeHint": "Saisir le code à 6 caractères de votre appli d'authentification",
+  "lostDeviceTitle": "Appareil perdu ?",
+  "twoFactorAuthTitle": "Authentification à deux facteurs",
+  "recoverAccount": "Récupérer un compte",
+  "enterRecoveryKeyHint": "Saisissez votre clé de récupération",
+  "recover": "Restaurer",
+  "contactSupportViaEmailMessage": "Veuillez envoyer un e-mail à {email} depuis votre adresse enregistrée",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Pas de clé de récupération ?",
+  "enterEmailHint": "Entrez votre adresse e-mail",
+  "invalidEmailTitle": "Adresse e-mail non valide",
+  "invalidEmailMessage": "Veuillez saisir une adresse e-mail valide.",
+  "deleteAccount": "Supprimer le compte",
+  "deleteAccountQuery": "Nous sommes désolés de vous voir partir. Êtes-vous confronté à un problème?",
+  "yesSendFeedbackAction": "Oui, envoyer un commentaire",
+  "noDeleteAccountAction": "Non, supprimer le compte",
+  "initiateAccountDeleteTitle": "Veuillez vous authentifier pour débuter la suppression du compte",
+  "confirmAccountDeleteTitle": "Êtes-vous sûr de vouloir supprimer votre compte ente ?",
+  "confirmAccountDeleteMessage": "Vos données téléchargées, à travers toutes les applications (Photos et Authenticator), seront planifiées pour la suppression, et votre compte sera définitivement supprimé.",
+  "sendEmail": "Envoyer un e-mail",
+  "createNewAccount": "Créer un nouveau compte",
+  "weakStrength": "Faible",
+  "strongStrength": "Fort",
+  "moderateStrength": "Modéré",
+  "confirmPassword": "Confirmer le mot de passe",
+  "close": "Fermer",
+  "oopsSomethingWentWrong": "Oops ! Une erreur s'est produite.",
+  "selectLanguage": "Sélectionnez la langue",
+  "language": "Langue",
+  "social": "Réseaux Sociaux",
+  "security": "Sécurité",
+  "lockscreen": "Ecran de vérouillage",
+  "authToChangeLockscreenSetting": "Veuillez vous authentifier pour modifier les paramètres de l'écran de verrouillage",
+  "lockScreenEnablePreSteps": "Pour activer l'écran de verrouillage, veuillez configurer le code d'accès de l'appareil ou le verrouillage de l'écran dans les paramètres de votre système.",
+  "viewActiveSessions": "Afficher les sessions actives",
+  "authToViewYourActiveSessions": "Veuillez vous authentifier pour voir vos sessions actives",
+  "searchHint": "Rechercher...",
+  "search": "Rechercher",
+  "sorryUnableToGenCode": "Désolé, impossible de générer un code pour {issuerName}",
+  "noResult": "Aucun résultat",
+  "addCode": "Ajouter un code",
+  "scanAQrCode": "Scanner un QR Code",
+  "enterDetailsManually": "Saisir les détails manuellement",
+  "edit": "Éditer",
+  "copiedToClipboard": "Copié dans le presse-papiers",
+  "error": "Erreur",
+  "recoveryKeyCopiedToClipboard": "Clé de récupération copiée dans le presse-papiers",
+  "recoveryKeyOnForgotPassword": "Si vous oubliez votre mot de passe, la seule façon de récupérer vos données sera grâce à cette clé.",
+  "recoveryKeySaveDescription": "Nous ne stockons pas cette clé, veuillez enregistrer cette clé de 24 mots dans un endroit sûr.",
+  "doThisLater": "Plus tard",
+  "saveKey": "Enregistrer la clé",
+  "back": "Retour",
+  "createAccount": "Créer un compte",
+  "passwordStrength": "Force du mot de passe : {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": "Mot de passe",
+  "signUpTerms": "J'accepte les <u-terms>conditions d'utilisation</u-terms> et la <u-policy>politique de confidentialité</u-policy>",
+  "privacyPolicyTitle": "Politique de confidentialité",
+  "termsOfServicesTitle": "Conditions",
+  "encryption": "Chiffrement",
+  "setPasswordTitle": "Définir le mot de passe",
+  "changePasswordTitle": "Modifier le mot de passe",
+  "resetPasswordTitle": "Réinitialiser le mot de passe",
+  "encryptionKeys": "Clés de chiffrement",
+  "passwordWarning": "Nous ne stockons pas ce mot de passe, donc si vous l'oubliez, <underline>nous ne pouvons pas déchiffrer vos données</underline>",
+  "enterPasswordToEncrypt": "Entrez un mot de passe que nous pouvons utiliser pour chiffrer vos données",
+  "enterNewPasswordToEncrypt": "Entrez un nouveau mot de passe que nous pouvons utiliser pour chiffrer vos données",
+  "passwordChangedSuccessfully": "Le mot de passe a été modifié avec succès",
+  "generatingEncryptionKeys": "Génération des clés de chiffrement...",
+  "continueLabel": "Continuer",
+  "insecureDevice": "Appareil non sécurisé",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Désolé, nous n'avons pas pu générer de clés sécurisées sur cet appareil.\n\nVeuillez vous inscrire depuis un autre appareil.",
+  "howItWorks": "Comment ça fonctionne",
+  "ackPasswordLostWarning": "Je comprends que si je perds mon mot de passe, je risque de perdre mes données puisque celles-ci sont <underline>chiffrées de bout en bout</underline>.",
+  "loginTerms": "En cliquant sur \"Connexion\", j'accepte les <u-terms>conditions d'utilisation</u-terms> et la <u-policy>politique de confidentialité</u-policy>",
+  "logInLabel": "Connexion",
+  "logout": "Déconnexion",
+  "areYouSureYouWantToLogout": "Voulez-vous vraiment vous déconnecter ?",
+  "yesLogout": "Oui, se déconnecter",
+  "exit": "Quitter",
+  "verifyingRecoveryKey": "Vérification de la clé de récupération...",
+  "recoveryKeyVerified": "Clé de récupération vérifiée",
+  "recoveryKeySuccessBody": "Parfait ! Votre clé de récupération est valide. Merci pour la vérification.\n\nN'oubliez pas de garder cette clé de récupération en lieu sûr.",
+  "invalidRecoveryKey": "La clé de récupération que vous avez saisie n'est pas valide. Assurez-vous qu'elle contient 24 mots et vérifiez l'orthographe de chacun.\n\nSi vous avez entré un ancien code de récupération, assurez-vous qu'il fait 64 caractères de long et vérifiez chacun d'entre eux.",
+  "recreatePasswordTitle": "Recréer le mot de passe",
+  "recreatePasswordBody": "L'appareil actuel n'est pas assez puissant pour vérifier votre mot de passe, donc nous avons besoin de le régénérer une fois d'une manière qu'il fonctionne avec tous les périphériques.\n\nVeuillez vous connecter en utilisant votre clé de récupération et régénérer votre mot de passe (vous pouvez utiliser le même si vous le souhaitez).",
+  "invalidKey": "Clé non valide",
+  "tryAgain": "Réessayer",
+  "viewRecoveryKey": "Voir la clé de récupération",
+  "confirmRecoveryKey": "Confirmer la clé de récupération",
+  "recoveryKeyVerifyReason": "Votre clé de récupération est la seule façon de récupérer vos photos si vous oubliez votre mot de passe. Vous pouvez trouver votre clé de récupération dans Paramètres > Compte.\n\nVeuillez entrer votre clé de récupération ici pour vous assurer que vous l'avez enregistrée correctement.",
+  "confirmYourRecoveryKey": "Confirmer la clé de récupération",
+  "confirm": "Confirmer",
+  "emailYourLogs": "Envoyez vos logs par e-mail",
+  "pleaseSendTheLogsTo": "Envoyez les logs à {toEmail}",
+  "copyEmailAddress": "Copier l’adresse e-mail",
+  "exportLogs": "Exporter les journaux",
+  "enterYourRecoveryKey": "Entrez votre clé de récupération",
+  "tempErrorContactSupportIfPersists": "Il semble qu'une erreur s'est produite. Veuillez réessayer après un certain temps. Si l'erreur persiste, veuillez contacter notre équipe d'assistance.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Il semble qu'une erreur s'est produite. Veuillez réessayer après un certain temps. Si l'erreur persiste, veuillez contacter notre équipe d'assistance.",
+  "about": "À propos",
+  "weAreOpenSource": "Nous sommes open source !",
+  "privacy": "Confidentialité",
+  "terms": "Conditions",
+  "checkForUpdates": "Vérifier les mises à jour",
+  "checking": "Vérification...",
+  "youAreOnTheLatestVersion": "Vous êtes sur la dernière version",
+  "warning": "Attention",
+  "exportWarningDesc": "Le fichier exporté contient des informations sensibles. Veuillez le stocker en toute sécurité.",
+  "iUnderStand": "J’ai compris",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Veuillez vous authentifier pour exporter vos codes",
+  "importSuccessTitle": "Youpi !",
+  "importSuccessDesc": "Vous avez importé {count} codes !",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Désolé",
+  "importFailureDesc": "Impossible d'analyser le fichier sélectionné.\nVeuillez écrire à support@ente.io si vous avez besoin d'aide !",
+  "pendingSyncs": "Attention",
+  "pendingSyncsWarningBody": "Certains de vos codes n'ont pas été sauvegardés.\n\nVeuillez vous assurer que vous avez une sauvegarde de ces codes avant de vous déconnecter.",
+  "checkInboxAndSpamFolder": "Veuillez consulter votre boîte de courriels (et les spam) pour compléter la vérification",
+  "tapToEnterCode": "Appuyez pour entrer un code",
+  "resendEmail": "Renvoyer le courriel",
+  "weHaveSendEmailTo": "Nous avons envoyé un mail à <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"
+      }
+    }
+  },
+  "activeSessions": "Sessions actives",
+  "somethingWentWrongPleaseTryAgain": "Quelque chose s'est mal passé, veuillez recommencer",
+  "thisWillLogYouOutOfThisDevice": "Cela vous déconnectera de cet appareil !",
+  "thisWillLogYouOutOfTheFollowingDevice": "Cela vous déconnectera de l'appareil suivant :",
+  "terminateSession": "Quitter la session ?",
+  "terminate": "Quitter",
+  "thisDevice": "Cet appareil",
+  "toResetVerifyEmail": "Pour réinitialiser votre mot de passe, veuillez d'abord vérifier votre e-mail.",
+  "thisEmailIsAlreadyInUse": "Cette adresse mail est déjà utilisé",
+  "verificationFailedPleaseTryAgain": "La vérification a échouée, veuillez réessayer",
+  "yourVerificationCodeHasExpired": "Votre code de vérification a expiré",
+  "incorrectCode": "Code non valide",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Le code que vous avez saisi est incorrect",
+  "emailChangedTo": "L'e-mail a été changé en {newEmail}",
+  "authenticationFailedPleaseTryAgain": "L'authentification a échouée, veuillez réessayer",
+  "authenticationSuccessful": "Authentification réussie!",
+  "twofactorAuthenticationSuccessfullyReset": "L'authentification à deux facteurs a été réinitialisée avec succès ",
+  "incorrectRecoveryKey": "Clé de récupération non valide",
+  "theRecoveryKeyYouEnteredIsIncorrect": "La clé de récupération que vous avez entrée est incorrecte",
+  "enterPassword": "Saisissez le mot de passe",
+  "export": "Exporter"
+}

lib/l10n/arb/app_it.arb

@@ -0,0 +1,320 @@
+{
+  "account": "Account",
+  "recoveryKey": "Chiave di recupero",
+  "counterAppBarTitle": "Contatore",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Proteggi i tuoi codici 2FA",
+  "onBoardingGetStarted": "Per iniziare",
+  "setupFirstAccount": "Configura il tuo primo account",
+  "importScanQrCode": "Scansiona un codice QR",
+  "qrCode": "Codice QR",
+  "importEnterSetupKey": "Inserisci il codice segreto",
+  "importAccountPageTitle": "Inserisci i dettagli del tuo account",
+  "secretCanNotBeEmpty": "La chiave segreta è obbligatoria",
+  "bothIssuerAndAccountCanNotBeEmpty": "Sia l'emittente che l'account sono obbligatori",
+  "incorrectDetails": "Dettagli errati",
+  "pleaseVerifyDetails": "Verifica i dettagli e riprova",
+  "codeIssuerHint": "Emittente",
+  "codeSecretKeyHint": "Codice segreto",
+  "codeAccountHint": "Account (username@dominio.it)",
+  "accountKeyType": "Tipo di chiave",
+  "sessionExpired": "Sessione scaduta",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Effettua nuovamente l'accesso",
+  "loggingOut": "Disconnessione...",
+  "timeBasedKeyType": "Basata sul tempo (TOTP)",
+  "counterBasedKeyType": "Basata su contatore (HOTP)",
+  "saveAction": "Salva",
+  "nextTotpTitle": "successivo",
+  "deleteCodeTitle": "Eliminare il codice?",
+  "deleteCodeMessage": "Sei sicuro di voler rimuovere questo codice? L'azione è irreversibile.",
+  "viewLogsAction": "Visualizza i log",
+  "sendLogsDescription": "Invierai i tuoi log per aiutarci a risolvere il tuo problema. Prendiamo precauzioni per garantire che le informazioni sensibili non siano registrate, tuttavia ti invitiamo a leggerli prima di condividerli con noi.",
+  "preparingLogsTitle": "Preparando i log...",
+  "emailLogsTitle": "Invia i log per email",
+  "emailLogsMessage": "Invia i log all'indirizzo {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Copia email",
+  "exportLogsAction": "Esporta log",
+  "reportABug": "Segnala un problema",
+  "crashAndErrorReporting": "Segnalazione degli errori e dei crash",
+  "reportBug": "Segnala un bug",
+  "emailUsMessage": "Per favore inviaci un'email a {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Contatta il supporto",
+  "rateUsOnStore": "Valutaci su {storeName}",
+  "blog": "Blog",
+  "merchandise": "Prodotti",
+  "verifyPassword": "Verifica la password",
+  "pleaseWait": "Attendere prego...",
+  "generatingEncryptionKeysTitle": "Generazione delle chiavi di crittografia...",
+  "recreatePassword": "Crea una nuova password",
+  "recreatePasswordMessage": "Il tuo dispositivo non è abbastanza potente per verificare la tua password, quindi abbiamo bisogno di rigenerarla in un modo che funziona con tutti i dispositivi. \n\nEffettua il login utilizzando la tua chiave di recupero e rigenera la tua password (puoi utilizzare nuovamente la stessa se vuoi).",
+  "useRecoveryKey": "Utilizza un codice di recupero",
+  "incorrectPasswordTitle": "Password sbagliata",
+  "welcomeBack": "Bentornato!",
+  "madeWithLoveAtPrefix": "realizzato con ❤️ a ",
+  "supportDevs": "Iscriviti a <bold-green>ente</bold-green> per supportare questo progetto.",
+  "supportDiscount": "Utilizzare il codice coupon \"AUTH\" per ottenere il 10% di sconto al primo anno",
+  "changeEmail": "modifica email",
+  "changePassword": "Cambia password",
+  "data": "Dati",
+  "importCodes": "Importa codici",
+  "importTypePlainText": "Testo in chiaro",
+  "importTypeEnteEncrypted": "ente Esportazione criptata",
+  "passwordForDecryptingExport": "Password per decriptare il file esportato",
+  "passwordEmptyError": "La password è obbligatoria",
+  "importFromApp": "Importa codici da {appName}",
+  "importGoogleAuthGuide": "Esporta i tuoi account da Google Authenticator in un codice QR utilizzando l'opzione \"Trasferisci Account\". Quindi, usando un altro dispositivo, scansiona il codice QR.\n\nSuggerimento: Puoi usare la webcam del tuo computer portatile per scattare una foto del codice QR.",
+  "importSelectJsonFile": "Seleziona file JSON",
+  "importEnteEncGuide": "Seleziona il file JSON criptato esportato da ente",
+  "importRaivoGuide": "Utilizza l'opzione \"Esporta i codici OTP in archivio Zip\" nelle impostazioni di Raivo.\n\nEstrai il file zip e importa il file JSON.",
+  "importAegisGuide": "Usa l'opzione \"Esporta la cassaforte\" nelle impostazioni di Aegis.\n\nSe la tua cassaforte è criptata, dovrai inserire la password della cassaforte per decriptarla.",
+  "exportCodes": "Esporta codici",
+  "importLabel": "Importa",
+  "importInstruction": "Per favore seleziona un file contenente una lista dei tuoi codici nel seguente formato",
+  "importCodeDelimiterInfo": "I codici possono essere separati da una virgola o da una nuova riga",
+  "selectFile": "Seleziona file",
+  "emailVerificationToggle": "Verifica Email",
+  "authToChangeEmailVerificationSetting": "Autenticati per cambiare la verifica email",
+  "authToViewYourRecoveryKey": "Autenticati per visualizzare la tua chiave di recupero",
+  "authToChangeYourEmail": "Autenticati per cambiare la tua email",
+  "authToChangeYourPassword": "Autenticati per cambiare la tua password",
+  "ok": "OK",
+  "cancel": "Annulla",
+  "yes": "Si",
+  "no": "No",
+  "email": "Email",
+  "support": "Supporto",
+  "settings": "Impostazioni",
+  "copied": "Copiato",
+  "pleaseTryAgain": "Per favore riprova",
+  "existingUser": "Accedi",
+  "newUser": "Nuovo utente",
+  "delete": "Cancella",
+  "enterYourPasswordHint": "Inserisci la tua password",
+  "forgotPassword": "Password dimenticata",
+  "oops": "Oops",
+  "suggestFeatures": "Suggerisci funzionalità",
+  "faq": "FAQ",
+  "faq_q_1": "Quanto è sicuro ente Auth?",
+  "faq_a_1": "Tutti i codici di cui fai il backup tramite ente sono memorizzati con crittografia end-to-end. Ciò significa che solo tu puoi accedere ai tuoi codici. Le nostre app sono open source e la nostra crittografia è stata verificata esternamente.",
+  "faq_q_2": "Posso accedere ai miei codici sul desktop?",
+  "faq_a_2": "Puoi accedere ai tuoi codici sul web @ auth.ente.io.",
+  "faq_q_3": "Come posso cancellare i codici?",
+  "faq_a_3": "Puoi eliminare un codice scorrendo il dito a sinistra sul codice in questione.",
+  "faq_q_4": "Come posso supportare questo progetto?",
+  "faq_a_4": "Puoi supportare lo sviluppo di questo progetto abbonandoti alla nostra app Photos @ ente.io.",
+  "faq_q_5": "Come posso abilitare il blocco FaceID in ente Auth",
+  "faq_a_5": "Puoi abilitare il blocco FaceID in Impostazioni → Sicurezza → Schermata di blocco.",
+  "somethingWentWrongMessage": "Qualcosa è andato storto, per favore riprova",
+  "leaveFamily": "Abbandona il piano famiglia",
+  "leaveFamilyMessage": "Sei sicuro di voler uscire dal piano famiglia?",
+  "inFamilyPlanMessage": "Sei un utente con piano famiglia!",
+  "swipeHint": "Scorri a sinistra per modificare o rimuovere i codici",
+  "scan": "Scansiona",
+  "scanACode": "Scansiona un codice",
+  "verify": "Verifica",
+  "verifyEmail": "Verifica email",
+  "enterCodeHint": "Inserisci il codice di 6 cifre dalla tua app di autenticazione",
+  "lostDeviceTitle": "Dispositivo perso?",
+  "twoFactorAuthTitle": "Autenticazione a due fattori",
+  "recoverAccount": "Recupera account",
+  "enterRecoveryKeyHint": "Inserisci la tua chiave di recupero",
+  "recover": "Recupera",
+  "contactSupportViaEmailMessage": "Per favore invia un'email a {email} dal tuo indirizzo email registrato",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Nessuna chiave di recupero?",
+  "enterEmailHint": "Inserisci il tuo indirizzo email",
+  "invalidEmailTitle": "Indirizzo email non valido",
+  "invalidEmailMessage": "Inserisci un indirizzo email valido.",
+  "deleteAccount": "Elimina account",
+  "deleteAccountQuery": "Ci dispiace vederti andare via. Stai avendo qualche problema?",
+  "yesSendFeedbackAction": "Sì, invia un feedback",
+  "noDeleteAccountAction": "No, elimina l'account",
+  "initiateAccountDeleteTitle": "Si prega di autenticarsi per avviare l'eliminazione dell'account",
+  "confirmAccountDeleteTitle": "Sei sicuro di voler eliminare il tuo account?",
+  "confirmAccountDeleteMessage": "I tuoi dati caricati, in tutte le app (sia foto che autenticatore), verranno pianificati per la cancellazione, e il tuo account sarà eliminato in modo permanente.",
+  "sendEmail": "Invia email",
+  "createNewAccount": "Crea un nuovo account",
+  "weakStrength": "Debole",
+  "strongStrength": "Forte",
+  "moderateStrength": "Mediocre",
+  "confirmPassword": "Conferma la password",
+  "close": "Chiudi",
+  "oopsSomethingWentWrong": "Oops, qualcosa è andato storto.",
+  "selectLanguage": "Seleziona lingua",
+  "language": "Lingua",
+  "social": "Social",
+  "security": "Sicurezza",
+  "lockscreen": "Schermata di blocco",
+  "authToChangeLockscreenSetting": "Autenticati per modificare le impostazioni della schermata di blocco",
+  "lockScreenEnablePreSteps": "Per abilitare la schermata di blocco, configura il codice di accesso del dispositivo o il blocco schermo nelle impostazioni di sistema.",
+  "viewActiveSessions": "Visualizza sessioni attive",
+  "authToViewYourActiveSessions": "Autenticati per visualizzare le sessioni attive",
+  "searchHint": "Cerca...",
+  "search": "Cerca",
+  "sorryUnableToGenCode": "Spiacente, impossibile generare un codice per {issuerName}",
+  "noResult": "Nessun risultato",
+  "addCode": "Aggiungi codice",
+  "scanAQrCode": "Scansiona un codice QR",
+  "enterDetailsManually": "Inserisci i dettagli manualmente",
+  "edit": "Modifica",
+  "copiedToClipboard": "Copiato negli appunti",
+  "error": "Errore",
+  "recoveryKeyCopiedToClipboard": "Chiave di recupero copiata negli appunti",
+  "recoveryKeyOnForgotPassword": "Se dimentichi la password, l'unico modo per recuperare i tuoi dati è con questa chiave.",
+  "recoveryKeySaveDescription": "Non memorizziamo questa chiave, per favore salva questa chiave di 24 parole in un posto sicuro.",
+  "doThisLater": "Fallo più tardi",
+  "saveKey": "Salva chiave",
+  "back": "Indietro",
+  "createAccount": "Crea account",
+  "passwordStrength": "Forza password: {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": "Password",
+  "signUpTerms": "Accetto i <u-terms>termini di servizio</u-terms> e la <u-policy>politica sulla privacy</u-policy>",
+  "privacyPolicyTitle": "Politica sulla Privacy",
+  "termsOfServicesTitle": "Termini",
+  "encryption": "Crittografia",
+  "setPasswordTitle": "Imposta password",
+  "changePasswordTitle": "Modifica password",
+  "resetPasswordTitle": "Reimposta password",
+  "encryptionKeys": "Chiavi di crittografia",
+  "passwordWarning": "Non memorizziamo questa password, quindi se te la dimentichi, <underline>non possiamo decriptare i tuoi dati</underline>",
+  "enterPasswordToEncrypt": "Inserisci una password per criptare i tuoi dati",
+  "enterNewPasswordToEncrypt": "Inserisci una nuova password per criptare i tuoi dati",
+  "passwordChangedSuccessfully": "Password modificata con successo",
+  "generatingEncryptionKeys": "Generazione delle chiavi di crittografia...",
+  "continueLabel": "Continua",
+  "insecureDevice": "Dispositivo non sicuro",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Siamo spiacenti, non possiamo generare le chiavi sicure su questo dispositivo.\n\nPer favore, accedi da un altro dispositivo.",
+  "howItWorks": "Come funziona",
+  "ackPasswordLostWarning": "Comprendo che se perdo la password, potrei perdere l'accesso ai miei dati poiché i miei dati sono <underline>criptati end-to-end</underline>.",
+  "loginTerms": "Cliccando sul pulsante Accedi, accetto i <u-terms>termini di servizio</u-terms> e la <u-policy>politica sulla privacy</u-policy>",
+  "logInLabel": "Accedi",
+  "logout": "Disconnettiti",
+  "areYouSureYouWantToLogout": "Sei sicuro di volerti disconnettere?",
+  "yesLogout": "Si, effettua la disconnessione",
+  "exit": "Esci",
+  "verifyingRecoveryKey": "Verifica della chiave di recupero...",
+  "recoveryKeyVerified": "Chiave di recupero verificata",
+  "recoveryKeySuccessBody": "Ottimo! La tua chiave di recupero è valida. Grazie per averla verificata.\n\nRicordati di effettuare il backup sicuro della tua chiave di recupero.",
+  "invalidRecoveryKey": "La chiave di recupero che hai inserito non è valida. Assicurati che contenga 24 parole e controlla l'ortografia di ciascuna parola.\n\nSe hai inserito un vecchio codice di recupero, assicurati che sia lungo 64 caratteri e controlla ciascuno di essi.",
+  "recreatePasswordTitle": "Ricrea password",
+  "recreatePasswordBody": "Il dispositivo attuale non è abbastanza potente per verificare la tua password, ma la possiamo rigenerare in un modo che funzioni su tutti i dispositivi.\n\nEffettua il login utilizzando la tua chiave di recupero e rigenera la tua password (puoi utilizzare nuovamente la stessa se vuoi).",
+  "invalidKey": "Chiave non valida",
+  "tryAgain": "Riprova",
+  "viewRecoveryKey": "Visualizza chiave di recupero",
+  "confirmRecoveryKey": "Conferma chiave di recupero",
+  "recoveryKeyVerifyReason": "La tua chiave di recupero è l'unico modo per recuperare le foto se ti dimentichi la password. Puoi trovare la tua chiave di recupero in Impostazioni > Account.\n\nInserisci qui la tua chiave di recupero per verificare di averla salvata correttamente.",
+  "confirmYourRecoveryKey": "Conferma la tua chiave di recupero",
+  "confirm": "Conferma",
+  "emailYourLogs": "Invia una mail dei tuoi log",
+  "pleaseSendTheLogsTo": "Invia i log a \n{toEmail}",
+  "copyEmailAddress": "Copia indirizzo email",
+  "exportLogs": "Esporta log",
+  "enterYourRecoveryKey": "Inserisci la tua chiave di recupero",
+  "tempErrorContactSupportIfPersists": "Sembra che qualcosa sia andato storto. Riprova tra un po'. Se l'errore persiste, contatta il nostro team di supporto.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Sembra che qualcosa sia andato storto. Riprova tra un po'. Se l'errore persiste, contatta il nostro team di supporto.",
+  "about": "Informazioni",
+  "weAreOpenSource": "Siamo open source!",
+  "privacy": "Privacy",
+  "terms": "Termini",
+  "checkForUpdates": "Controlla aggiornamenti",
+  "checking": "Controllo...",
+  "youAreOnTheLatestVersion": "Stai utilizzando l'ultima versione",
+  "warning": "Attenzione",
+  "exportWarningDesc": "Il file esportato contiene informazioni sensibili. Si prega di memorizzarlo in maniera sicura.",
+  "iUnderStand": "Ho capito",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Autenticati per esportare i tuoi codici",
+  "importSuccessTitle": "Evviva!",
+  "importSuccessDesc": "Hai importato {count} codici!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Scusa",
+  "importFailureDesc": "Impossibile analizzare il file selezionato.\nPer favore scrivi a support@ente.io se hai bisogno di aiuto!",
+  "pendingSyncs": "Attenzione",
+  "pendingSyncsWarningBody": "Non hai effettuato il backup di alcuni codici.\n\nPer favore assicurati di effettuare il backup di questi codici prima di disconnetterti.",
+  "checkInboxAndSpamFolder": "Per favore, controlla la tua casella di posta (e lo spam) per completare la verifica",
+  "tapToEnterCode": "Tocca per inserire il codice",
+  "resendEmail": "Rinvia email",
+  "weHaveSendEmailTo": "Abbiamo inviato una mail a <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"
+      }
+    }
+  },
+  "activeSessions": "Sessioni attive",
+  "somethingWentWrongPleaseTryAgain": "Qualcosa è andato storto, per favore riprova",
+  "thisWillLogYouOutOfThisDevice": "Questo ti disconnetterà da questo dispositivo!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Questo ti disconnetterà dal seguente dispositivo:",
+  "terminateSession": "Termina sessione?",
+  "terminate": "Termina",
+  "thisDevice": "Questo dispositivo",
+  "toResetVerifyEmail": "Per reimpostare la tua password, prima verifica la tua email.",
+  "thisEmailIsAlreadyInUse": "Questa email é già in uso",
+  "verificationFailedPleaseTryAgain": "Verifica fallita, per favore riprova",
+  "yourVerificationCodeHasExpired": "Il tuo codice di verifica è scaduto",
+  "incorrectCode": "Codice errato",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Spiacenti, il codice che hai inserito non è corretto",
+  "emailChangedTo": "Email modificata in {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Autenticazione non riuscita, riprova",
+  "authenticationSuccessful": "Autenticazione riuscita!",
+  "twofactorAuthenticationSuccessfullyReset": "Autenticazione a due fattori ripristinata con successo",
+  "incorrectRecoveryKey": "Chiave di recupero errata",
+  "theRecoveryKeyYouEnteredIsIncorrect": "La chiave di recupero che hai inserito non è corretta",
+  "enterPassword": "Inserisci la password",
+  "selectExportFormat": "Seleziona formato di esportazione",
+  "exportDialogDesc": "Le esportazioni criptate saranno protette da una password a tua scelta.",
+  "encrypted": "Criptato",
+  "plainText": "Testo in chiaro",
+  "passwordToEncryptExport": "Password per criptare il file esportato",
+  "export": "Esporta"
+}

lib/l10n/arb/app_ja.arb

@@ -0,0 +1,267 @@
+{
+  "account": "アカウント",
+  "recoveryKey": "回復キー",
+  "counterAppBarTitle": "カウンタ",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "2要素認証コードの保護",
+  "onBoardingGetStarted": "さあ、はじめよう",
+  "setupFirstAccount": "最初のアカウントを設定しましょう",
+  "importScanQrCode": "QRコードをスキャン",
+  "importEnterSetupKey": "セットアップキーを入力",
+  "importAccountPageTitle": "アカウントの詳細を入力",
+  "codeIssuerHint": "発行者",
+  "codeSecretKeyHint": "シークレットキー",
+  "codeAccountHint": "アカウント (you@domain.com)",
+  "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": "このコードを削除してもよろしいですか? このアクションは元に戻せません。",
+  "viewLogsAction": "ログの表示",
+  "sendLogsDescription": "問題のデバッグに役立つログが送信されます。機密情報が記録されないように予防措置を講じていますが、共有する前にこれらのログを確認することをお勧めします。",
+  "preparingLogsTitle": "ログを準備中...",
+  "emailLogsTitle": "ログをメール",
+  "emailLogsMessage": "{email} にログを送信してください",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "メールをコピー",
+  "exportLogsAction": "ログのエクスポート",
+  "reportABug": "バグを報告",
+  "crashAndErrorReporting": "クラッシュとエラーの報告",
+  "reportBug": "バグを報告",
+  "emailUsMessage": "{email} にメールでご連絡ください",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "サポートに問い合わせ",
+  "verifyPassword": "パスワードを確認",
+  "pleaseWait": "お待ちください...",
+  "generatingEncryptionKeysTitle": "暗号化キーを生成中...",
+  "recreatePassword": "パスワードを再設定",
+  "recreatePasswordMessage": "現在のデバイスは、パスワードを確認するのに十分ではありません。全てのデバイスで利用できるように再生成する必要があります。\n\nリカバリーキーを使用してログインし、パスワードを再生成してください (ご希望の場合は再度同じパスワードを使用できます)",
+  "useRecoveryKey": "回復キーを使用",
+  "incorrectPasswordTitle": "パスワードが正しくありません",
+  "welcomeBack": "おかえりなさい!",
+  "madeWithLoveAtPrefix": "made with ❤️ at ",
+  "supportDevs": "プロジェクト支援のために <bold-green>ente</bold-green> に登録",
+  "supportDiscount": "クーポンコード \"AUTH\" を使用すると、初年度が10%オフになります。",
+  "changeEmail": "メールアドレスを変更",
+  "changePassword": "パスワードを変更",
+  "data": "データ",
+  "importCodes": "コードをインポート",
+  "exportCodes": "コードをエクスポート",
+  "importInstruction": "以下のフォーマットで、コードのリストを含むファイルを選択してください",
+  "importCodeDelimiterInfo": "コードはカンマまたは改行で区切ることができます",
+  "selectFile": "ファイルを選択",
+  "authToViewYourRecoveryKey": "回復キーを表示するためには認証が必要です",
+  "authToChangeYourEmail": "メールアドレスを変更するためには認証が必要です",
+  "authToChangeYourPassword": "パスワードを変更するためには認証が必要です",
+  "ok": "OK",
+  "cancel": "キャンセル",
+  "yes": "はい",
+  "no": "いいえ",
+  "email": "Eメール",
+  "support": "サポート",
+  "settings": "設定",
+  "copied": "コピーしました",
+  "pleaseTryAgain": "再度お試しください",
+  "existingUser": "既存のユーザー",
+  "newUser": "ente 新規ユーザー",
+  "delete": "削除",
+  "enterYourPasswordHint": "パスワードを入力してください",
+  "forgotPassword": "パスワードを忘れた場合",
+  "oops": "おっと",
+  "somethingWentWrongMessage": "問題が発生しました、再試行してください",
+  "leaveFamily": "ファミリーから退会",
+  "leaveFamilyMessage": "本当にファミリープランを退会しますか?",
+  "inFamilyPlanMessage": "ファミリープランに入会しています!",
+  "swipeHint": "左にスワイプしてコードを編集、削除します",
+  "scan": "スキャン",
+  "scanACode": "コードをスキャン",
+  "verify": "認証",
+  "verifyEmail": "メールアドレス認証",
+  "enterCodeHint": "認証アプリに表示された6ケタのコードを入力してください",
+  "lostDeviceTitle": "デバイスを紛失しましたか?",
+  "twoFactorAuthTitle": "2要素認証",
+  "recoverAccount": "アカウント回復",
+  "enterRecoveryKeyHint": "回復キーを入力",
+  "recover": "回復",
+  "contactSupportViaEmailMessage": "登録したメールアドレスから {email} に問い合わせメールをお送りください",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "回復キーがありませんか?",
+  "enterEmailHint": "メールアドレスを入力してください",
+  "invalidEmailTitle": "メールアドレスが無効です",
+  "invalidEmailMessage": "有効なメール アドレスを入力して下さい",
+  "deleteAccount": "アカウント削除",
+  "deleteAccountQuery": "ご不便をおかけして申し訳ありません。なにか問題が発生していますか?",
+  "yesSendFeedbackAction": "はい、フィードバックを送信します",
+  "noDeleteAccountAction": "いいえ、アカウントを削除します",
+  "initiateAccountDeleteTitle": "アカウント削除を開始するには認証してください",
+  "confirmAccountDeleteTitle": "本当に ente アカウントを削除してよろしいですか?",
+  "confirmAccountDeleteMessage": "アップロードされたデータは、すべてのアプリ(写真と認証アプリの両方) で削除がスケジュールされます。アカウントは完全に削除されます。",
+  "sendEmail": "メール送信",
+  "createNewAccount": "新規アカウント作成",
+  "weakStrength": "脆弱",
+  "strongStrength": "強力",
+  "moderateStrength": "まあまあ",
+  "confirmPassword": "パスワードの確認",
+  "close": "閉じる",
+  "oopsSomethingWentWrong": "問題が発生しました",
+  "selectLanguage": "言語の選択",
+  "language": "言語",
+  "social": "ソーシャル",
+  "security": "セキュリティ",
+  "lockscreen": "ロックスクリーン",
+  "authToChangeLockscreenSetting": "ロックスクリーン設定を変更するためには認証が必要です",
+  "lockScreenEnablePreSteps": "ロックスクリーンを有効にするには、システム設定でデバイスのパスコードまたはスクリーンロックを設定してください。",
+  "viewActiveSessions": "アクティブなセッションを表示",
+  "authToViewYourActiveSessions": "アクティブセッションを表示するためには認証が必要です",
+  "searchHint": "検索...",
+  "search": "検索",
+  "sorryUnableToGenCode": "申し訳ありません、 {issuerName} 用のコードを生成できません",
+  "noResult": "該当結果なし",
+  "addCode": "コードを追加",
+  "scanAQrCode": "QRコードをスキャン",
+  "enterDetailsManually": "手動で詳細を入力する",
+  "edit": "編集",
+  "copiedToClipboard": "クリップボードにコピーされました",
+  "error": "エラー",
+  "recoveryKeyCopiedToClipboard": "回復キーがクリップボードにコピーされました",
+  "recoveryKeyOnForgotPassword": "パスワードを忘れた場合、データを回復できる唯一の方法がこのキーです。",
+  "recoveryKeySaveDescription": "このキーは保存されません。この24単語のキーを安全な場所に保存してください。",
+  "doThisLater": "後で行う",
+  "saveKey": "キーを保存",
+  "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": "やめる",
+  "verifyingRecoveryKey": "回復キーを確認中...",
+  "recoveryKeyVerified": "回復キーが確認されました",
+  "recoveryKeySuccessBody": "素晴らしい! 回復キーは有効です。ご確認いただきありがとうございます。\n\n回復キーを安全にバックアップしておいてください。",
+  "invalidRecoveryKey": "入力されたリカバリーキーが無効です。24単語が含まれていることを確認し、それぞれのスペルを確認してください。\n\n古い形式の回復コードを入力した場合は、64文字であることを確認して、それぞれを確認してください。",
+  "recreatePasswordTitle": "パスワードを再設定",
+  "recreatePasswordBody": "現在のデバイスは、パスワードを確認するのに十分ではありません。全てのデバイスで利用できるように再生成する必要があります。\n回復キーを使用してログインし、パスワードを再生成してください (ご希望の場合は再度同じパスワードを使用できます)",
+  "invalidKey": "キーが無効",
+  "tryAgain": "再試行",
+  "viewRecoveryKey": "回復キーを表示",
+  "confirmRecoveryKey": "回復キーを確認",
+  "recoveryKeyVerifyReason": "パスワードを忘れた場合、回復キーは写真を復元するための唯一の方法です。設定 > アカウント で回復キーを確認することができます。\n \n\n 回復キーを入力して、正しく保存したことを確認してください。",
+  "confirmYourRecoveryKey": "回復キーを確認",
+  "confirm": "確認",
+  "emailYourLogs": "ログをメールで送信",
+  "pleaseSendTheLogsTo": "ログを以下のアドレスに送信してください \n{toEmail}",
+  "copyEmailAddress": "メールアドレスをコピー",
+  "exportLogs": "ログのエクスポート",
+  "enterYourRecoveryKey": "回復キーを入力",
+  "tempErrorContactSupportIfPersists": "問題が発生したようです。しばらくしてから再試行してください。エラーが解決しない場合は、サポートチームにお問い合わせください。",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "問題が発生したようです。しばらくしてから再試行してください。エラーが解決しない場合は、サポートチームにお問い合わせください。",
+  "about": "情報",
+  "weAreOpenSource": "我々はオープンソースです!",
+  "privacy": "プライバシー",
+  "terms": "利用規約",
+  "checkForUpdates": "アップデートを確認",
+  "checking": "確認中…",
+  "youAreOnTheLatestVersion": "あなたは最新バージョンを使用しています",
+  "warning": "警告",
+  "exportWarningDesc": "エクスポートされたファイルには機密情報が含まれています。安全に保管してください。",
+  "iUnderStand": "理解しました",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "コードをエクスポートするためには認証が必要です",
+  "importSuccessTitle": "やりました!",
+  "importSuccessDesc": "{count} 個のコードをインポートしました!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "申し訳ありません",
+  "importFailureDesc": "選択したファイルを解析できませんでした。\nsupport@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"
+      }
+    }
+  },
+  "activeSessions": "アクティブセッション",
+  "somethingWentWrongPleaseTryAgain": "問題が発生しました、再試行してください",
+  "thisWillLogYouOutOfThisDevice": "このデバイスからログアウトします!",
+  "thisWillLogYouOutOfTheFollowingDevice": "以下のデバイスからログアウトします:",
+  "terminateSession": "セッションを終了しますか?",
+  "terminate": "終了",
+  "thisDevice": "このデバイス"
+}

lib/l10n/arb/app_nl.arb

@@ -0,0 +1,320 @@
+{
+  "account": "Account",
+  "recoveryKey": "Herstelsleutel",
+  "counterAppBarTitle": "Teller",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Beveilig je 2FA codes",
+  "onBoardingGetStarted": "Begin",
+  "setupFirstAccount": "Maak je account aan",
+  "importScanQrCode": "Scan een QR-code",
+  "qrCode": "QR Code",
+  "importEnterSetupKey": "Voer een toegangssleutel in",
+  "importAccountPageTitle": "Accountgegevens invoeren",
+  "secretCanNotBeEmpty": "Geheime code mag niet leeg zijn",
+  "bothIssuerAndAccountCanNotBeEmpty": "Uitgever en account kunnen niet beiden leeg zijn",
+  "incorrectDetails": "Onjuiste gegevens",
+  "pleaseVerifyDetails": "Controleer je gegevens en probeer het nog eens",
+  "codeIssuerHint": "Uitgever",
+  "codeSecretKeyHint": "Geheime sleutel",
+  "codeAccountHint": "Account (jij@domein.nl)",
+  "accountKeyType": "Type sleutel",
+  "sessionExpired": "Sessie verlopen",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Log opnieuw in",
+  "loggingOut": "Bezig met uitloggen...",
+  "timeBasedKeyType": "Tijd gebaseerd (TOTP)",
+  "counterBasedKeyType": "Teller gebaseerd (HOTP)",
+  "saveAction": "Opslaan",
+  "nextTotpTitle": "volgende",
+  "deleteCodeTitle": "Code verwijderen?",
+  "deleteCodeMessage": "Weet je zeker dat je deze code wilt verwijderen? Deze actie is onomkeerbaar.",
+  "viewLogsAction": "Bekijk logs",
+  "sendLogsDescription": "Dit zal logs verzenden om ons te helpen uw probleem op te lossen. Hoewel we voorzorgsmaatregelen nemen om ervoor te zorgen dat gevoelige informatie niet wordt gedeeld, raden we je aan deze logs te bekijken voordat je ze deelt.",
+  "preparingLogsTitle": "Klaarmaken...",
+  "emailLogsTitle": "E-mail logs",
+  "emailLogsMessage": "Verstuur de logs alsjeblieft naar {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "E-mail kopiëren",
+  "exportLogsAction": "Logs exporteren",
+  "reportABug": "Een fout melden",
+  "crashAndErrorReporting": "Crash- en foutrapportage",
+  "reportBug": "Een fout melden",
+  "emailUsMessage": "Stuur ons een e-mail op {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Klantenservice",
+  "rateUsOnStore": "Beoordeel ons op {storeName}",
+  "blog": "Blog",
+  "merchandise": "Merchandise",
+  "verifyPassword": "Bevestig wachtwoord",
+  "pleaseWait": "Een ogenblik geduld...",
+  "generatingEncryptionKeysTitle": "Encryptiesleutels genereren...",
+  "recreatePassword": "Wachtwoord opnieuw instellen",
+  "recreatePasswordMessage": "Het huidige apparaat is niet krachtig genoeg om je wachtwoord te verifiëren, dus moeten we de code een keer opnieuw genereren op een manier die met alle apparaten werkt.\n\nLog in met behulp van uw herstelcode en genereer opnieuw uw wachtwoord (je kunt dezelfde indien gewenst opnieuw gebruiken).",
+  "useRecoveryKey": "Herstelsleutel gebruiken",
+  "incorrectPasswordTitle": "Onjuist wachtwoord",
+  "welcomeBack": "Welkom terug!",
+  "madeWithLoveAtPrefix": "gemaakt met ❤️ door ",
+  "supportDevs": "Abonneer je op <bold-green>ente</bold-green> om dit project te steunen.",
+  "supportDiscount": "Gebruik couponcode \"AUTH\" om 10% korting te krijgen op het eerste jaar",
+  "changeEmail": "e-mailadres wijzigen",
+  "changePassword": "Wachtwoord wijzigen",
+  "data": "Gegevens",
+  "importCodes": "Codes importeren",
+  "importTypePlainText": "Kale tekst",
+  "importTypeEnteEncrypted": "ente versleutelde export",
+  "passwordForDecryptingExport": "Wachtwoord voor het decoderen van export",
+  "passwordEmptyError": "Wachtwoord kan niet leeg zijn",
+  "importFromApp": "Importeer codes van {appName}",
+  "importGoogleAuthGuide": "Exporteer uw accounts van Google Authenticator naar een QR-code met behulp van de optie \"Transfer Accounts\". Met een ander apparaat scan je de QR-code.\n\nTip: Je kunt de webcam van je laptop gebruiken om een foto van de QR-code te maken.",
+  "importSelectJsonFile": "Selecteer JSON bestand",
+  "importEnteEncGuide": "Selecteer het versleutelde JSON-bestand dat vanuit ente geëxporteerd is",
+  "importRaivoGuide": "Gebruik de optie \"Export OTPs to Zip archive\" in Raivo's instellingen.\n\nPak het zip-bestand uit en importeer het JSON-bestand.",
+  "importAegisGuide": "Gebruik de optie \"Exporteer de kluis\" in de instellingen van Aegis.\n\nAls uw kluis is versleuteld, moet u het wachtwoord invoeren om de kluis te ontsleutelen.",
+  "exportCodes": "Codes exporteren",
+  "importLabel": "Importeren",
+  "importInstruction": "Selecteer een bestand dat een lijst van uw codes in de volgende indeling bevat",
+  "importCodeDelimiterInfo": "De codes mogen gescheiden worden door een komma of een nieuwe regel",
+  "selectFile": "Bestand selecteren",
+  "emailVerificationToggle": "E-mailverificatie",
+  "authToChangeEmailVerificationSetting": "Gelieve te verifiëren om de e-mailverificatie te wijzigen",
+  "authToViewYourRecoveryKey": "Graag verifiëren om uw herstelsleutel te bekijken",
+  "authToChangeYourEmail": "Graag verifiëren om je e-mailadres te wijzigen",
+  "authToChangeYourPassword": "Graag verifiëren om je wachtwoord te wijzigen",
+  "ok": "Oké",
+  "cancel": "Annuleer",
+  "yes": "Ja",
+  "no": "Nee",
+  "email": "E-mail",
+  "support": "Ondersteuning",
+  "settings": "Instellingen",
+  "copied": "Gekopieerd",
+  "pleaseTryAgain": "Probeer het nog eens",
+  "existingUser": "Bestaande gebruiker",
+  "newUser": "Nieuw bij ente",
+  "delete": "Verwijderen",
+  "enterYourPasswordHint": "Voer je wachtwoord in",
+  "forgotPassword": "Wachtwoord vergeten",
+  "oops": "Oeps",
+  "suggestFeatures": "Features voorstellen",
+  "faq": "Veelgestelde vragen",
+  "faq_q_1": "Hoe veilig is ente Auth?",
+  "faq_a_1": "Alle codes in ente zijn versleuteld opgeslagen met end-to-end encryptie. Dit betekent dat alleen jij toegang hebt tot je codes. Onze apps zijn open source en onze cryptografie is extern gecontroleerd.",
+  "faq_q_2": "Kan ik toegang krijgen tot mijn codes op desktop?",
+  "faq_a_2": "U heeft toegang tot uw codes op het web @ auth.ente.io.",
+  "faq_q_3": "Hoe kan ik codes verwijderen?",
+  "faq_a_3": "Je kunt een code verwijderen door naar links te vegen op dat item.",
+  "faq_q_4": "Hoe kan ik dit project steunen?",
+  "faq_a_4": "U kunt de ontwikkeling van dit project steunen door u te abonneren op onze Photos app @ ente.io.",
+  "faq_q_5": "Hoe kan ik FaceID lock inschakelen in ente Auth",
+  "faq_a_5": "Je kunt FaceID vergrendelen onder Instellingen → Beveiliging → Lockscreen.",
+  "somethingWentWrongMessage": "Er is iets fout gegaan, probeer het opnieuw",
+  "leaveFamily": "Familie verlaten",
+  "leaveFamilyMessage": "Weet je zeker dat je het familie-plan wil verlaten?",
+  "inFamilyPlanMessage": "Je hebt een familie-plan!",
+  "swipeHint": "Veeg naar links om codes te bewerken of te verwijderen",
+  "scan": "Scannen",
+  "scanACode": "Scan een code",
+  "verify": "Verifiëren",
+  "verifyEmail": "Bevestig e-mail",
+  "enterCodeHint": "Voer de 6-cijferige code van je verificatie-app in",
+  "lostDeviceTitle": "Apparaat verloren?",
+  "twoFactorAuthTitle": "Tweestapsverificatie",
+  "recoverAccount": "Account herstellen",
+  "enterRecoveryKeyHint": "Voer je herstelsleutel in",
+  "recover": "Herstellen",
+  "contactSupportViaEmailMessage": "Verstuur a.u.b. een e-mail naar {email} van uw geregistreerde e-mailadres",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Geen herstelsleutel?",
+  "enterEmailHint": "Voer je e-mailadres in",
+  "invalidEmailTitle": "Ongeldig e-mailadres",
+  "invalidEmailMessage": "Voer een geldig e-mailadres in.",
+  "deleteAccount": "Account verwijderen",
+  "deleteAccountQuery": "We zullen het vervelend vinden om je te zien vertrekken. Zijn er problemen?",
+  "yesSendFeedbackAction": "Ja, geef feedback",
+  "noDeleteAccountAction": "Nee, verwijder account",
+  "initiateAccountDeleteTitle": "Gelieve te verifiëren om het account te verwijderen",
+  "confirmAccountDeleteTitle": "Weet je zeker dat je je ente account wil verwijderen?",
+  "confirmAccountDeleteMessage": "Uw geüploade gegevens, in alle apps (Photos en Authenticator), worden ingepland voor verwijdering en uw account zal permanent worden verwijderd.",
+  "sendEmail": "E-mail versturen",
+  "createNewAccount": "Nieuw account aanmaken",
+  "weakStrength": "Zwak",
+  "strongStrength": "Sterk",
+  "moderateStrength": "Matig",
+  "confirmPassword": "Wachtwoord bevestigen",
+  "close": "Sluiten",
+  "oopsSomethingWentWrong": "Oeps, er is iets fout gegaan.",
+  "selectLanguage": "Taal kiezen",
+  "language": "Taal",
+  "social": "Sociale media",
+  "security": "Beveiliging",
+  "lockscreen": "Vergrendelscherm",
+  "authToChangeLockscreenSetting": "Graag verifiëren om de vergrendelscherm instellingen te wijzigen",
+  "lockScreenEnablePreSteps": "Om vergrendelscherm in te schakelen, moet u een toegangscode of schermvergrendeling instellen in uw systeeminstellingen.",
+  "viewActiveSessions": "Actieve sessies bekijken",
+  "authToViewYourActiveSessions": "Graag verifiëren om uw actieve sessies te bekijken",
+  "searchHint": "Zoeken...",
+  "search": "Zoeken",
+  "sorryUnableToGenCode": "Sorry, kan geen code genereren voor {issuerName}",
+  "noResult": "Geen resultaat",
+  "addCode": "Code toevoegen",
+  "scanAQrCode": "Scan QR-code",
+  "enterDetailsManually": "Voer gegevens handmatig in",
+  "edit": "Bewerken",
+  "copiedToClipboard": "Gekopieerd naar klembord",
+  "error": "Foutmelding",
+  "recoveryKeyCopiedToClipboard": "Herstelsleutel gekopieerd naar klembord",
+  "recoveryKeyOnForgotPassword": "Als je je wachtwoord vergeet, kun je alleen met deze code je gegevens herstellen.",
+  "recoveryKeySaveDescription": "We slaan deze code niet op, bewaar deze code met 24 woorden op een veilige plaats.",
+  "doThisLater": "Doe dit later",
+  "saveKey": "Sleutel opslaan",
+  "back": "Terug",
+  "createAccount": "Account aanmaken",
+  "passwordStrength": "Wachtwoord sterkte: {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": "Wachtwoord",
+  "signUpTerms": "Ik ga akkoord met de <u-terms>gebruiksvoorwaarden</u-terms> en <u-policy>privacybeleid</u-policy>",
+  "privacyPolicyTitle": "Privacybeleid",
+  "termsOfServicesTitle": "Voorwaarden",
+  "encryption": "Encryptie",
+  "setPasswordTitle": "Wachtwoord instellen",
+  "changePasswordTitle": "Wachtwoord wijzigen",
+  "resetPasswordTitle": "Wachtwoord resetten",
+  "encryptionKeys": "Encryptiesleutels",
+  "passwordWarning": "Wij slaan dit wachtwoord niet op, dus als je het vergeet, <underline>kunnen we jouw gegevens niet ontsleutelen</underline>",
+  "enterPasswordToEncrypt": "Voer een wachtwoord in dat we kunnen gebruiken om je gegevens te versleutelen",
+  "enterNewPasswordToEncrypt": "Voer een nieuw wachtwoord in dat we kunnen gebruiken om je gegevens te versleutelen",
+  "passwordChangedSuccessfully": "Wachtwoord succesvol aangepast",
+  "generatingEncryptionKeys": "Encryptiesleutels worden gegenereerd...",
+  "continueLabel": "Doorgaan",
+  "insecureDevice": "Onveilig apparaat",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Sorry, we konden geen beveiligde sleutels genereren op dit apparaat.\n\nMeld je aan vanaf een ander apparaat.",
+  "howItWorks": "Hoe het werkt",
+  "ackPasswordLostWarning": "Ik begrijp dat als ik mijn wachtwoord verlies, ik mijn gegevens kan verliezen omdat mijn gegevens <underline>end-to-end versleuteld</underline> zijn.",
+  "loginTerms": "Door op inloggen te klikken, ga ik akkoord met de <u-terms>gebruiksvoorwaarden</u-terms> en <u-policy>privacybeleid</u-policy>",
+  "logInLabel": "Inloggen",
+  "logout": "Uitloggen",
+  "areYouSureYouWantToLogout": "Weet je zeker dat je wilt uitloggen?",
+  "yesLogout": "Ja, uitloggen",
+  "exit": "Afsluiten",
+  "verifyingRecoveryKey": "Herstelsleutel verifiëren...",
+  "recoveryKeyVerified": "Herstelsleutel geverifieerd",
+  "recoveryKeySuccessBody": "Super! Je herstelsleutel is geldig. Bedankt voor het verifiëren.\n\nVergeet niet om je herstelsleutel veilig te bewaren.",
+  "invalidRecoveryKey": "De herstelsleutel die je hebt ingevoerd is niet geldig. Zorg ervoor dat deze 24 woorden bevat en controleer de spelling van elk van deze woorden.\n\nAls je een oudere herstelsleutel hebt ingevoerd, zorg ervoor dat deze 64 tekens lang is, en controleer ze allemaal.",
+  "recreatePasswordTitle": "Wachtwoord opnieuw instellen",
+  "recreatePasswordBody": "Het huidige apparaat is niet krachtig genoeg om je wachtwoord te verifiëren, dus moeten we de code een keer opnieuw genereren op een manier die met alle apparaten werkt.\n\nLog in met behulp van uw herstelsleutel en genereer opnieuw uw wachtwoord (je kunt dezelfde indien gewenst opnieuw gebruiken).",
+  "invalidKey": "Ongeldige sleutel",
+  "tryAgain": "Probeer opnieuw",
+  "viewRecoveryKey": "Toon herstelsleutel",
+  "confirmRecoveryKey": "Bevestig herstelsleutel",
+  "recoveryKeyVerifyReason": "Je herstelsleutel is de enige manier om je foto's te herstellen als je je wachtwoord bent vergeten. Je vindt je herstelsleutel in Instellingen > Account.\n\nVoer hier je herstelsleutel in om te controleren of je hem correct hebt opgeslagen.",
+  "confirmYourRecoveryKey": "Bevestig herstelsleutel",
+  "confirm": "Bevestig",
+  "emailYourLogs": "E-mail uw logs",
+  "pleaseSendTheLogsTo": "Verstuur de logs alsjeblieft naar {toEmail}",
+  "copyEmailAddress": "E-mailadres kopiëren",
+  "exportLogs": "Logs exporteren",
+  "enterYourRecoveryKey": "Voer je herstelsleutel in",
+  "tempErrorContactSupportIfPersists": "Het lijkt erop dat er iets fout is gegaan. Probeer het later opnieuw. Als de fout zich blijft voordoen, neem dan contact op met ons supportteam.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Het lijkt erop dat er iets fout is gegaan. Probeer het later opnieuw. Als de fout zich blijft voordoen, neem dan contact op met ons supportteam.",
+  "about": "Over",
+  "weAreOpenSource": "We zijn open source!",
+  "privacy": "Privacy",
+  "terms": "Voorwaarden",
+  "checkForUpdates": "Controleer op updates",
+  "checking": "Controleren...",
+  "youAreOnTheLatestVersion": "Je hebt de meest recente versie",
+  "warning": "Waarschuwing",
+  "exportWarningDesc": "Het geëxporteerde bestand bevat gevoelige informatie. Bewaar deze veilig.",
+  "iUnderStand": "Ik begrijp het",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Graag verifiëren om je codes te exporteren",
+  "importSuccessTitle": "Joepie!",
+  "importSuccessDesc": "Je hebt {count} codes geïmporteerd!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Sorry",
+  "importFailureDesc": "Kan het geselecteerde bestand niet analyseren.\nStuur een e-mail naar support@ente.io als u hulp nodig heeft!",
+  "pendingSyncs": "Waarschuwing",
+  "pendingSyncsWarningBody": "Sommige van uw codes zijn niet geback-upt.\n\nZorg ervoor dat u een back-up voor deze codes heeft voordat u uitlogt.",
+  "checkInboxAndSpamFolder": "Controleer je inbox (en spam) om verificatie te voltooien",
+  "tapToEnterCode": "Tik om code in te voeren",
+  "resendEmail": "E-mail opnieuw versturen",
+  "weHaveSendEmailTo": "We hebben een e-mail gestuurd naar <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"
+      }
+    }
+  },
+  "activeSessions": "Actieve sessies",
+  "somethingWentWrongPleaseTryAgain": "Er is iets fout gegaan, probeer het opnieuw",
+  "thisWillLogYouOutOfThisDevice": "Dit zal je uitloggen van dit apparaat!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Dit zal je uitloggen van het volgende apparaat:",
+  "terminateSession": "Sessie beëindigen?",
+  "terminate": "Beëindigen",
+  "thisDevice": "Dit apparaat",
+  "toResetVerifyEmail": "Verifieer eerst je e-mailadres om je wachtwoord opnieuw in te stellen.",
+  "thisEmailIsAlreadyInUse": "Dit e-mailadres is al in gebruik",
+  "verificationFailedPleaseTryAgain": "Verificatie mislukt, probeer het opnieuw",
+  "yourVerificationCodeHasExpired": "Uw verificatiecode is verlopen",
+  "incorrectCode": "Onjuiste code",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Sorry, de ingevoerde code is onjuist",
+  "emailChangedTo": "E-mailadres gewijzigd naar {newEmail}",
+  "authenticationFailedPleaseTryAgain": "Verificatie mislukt, probeer het opnieuw",
+  "authenticationSuccessful": "Verificatie geslaagd!",
+  "twofactorAuthenticationSuccessfullyReset": "Tweestapsverificatie succesvol gereset",
+  "incorrectRecoveryKey": "Onjuiste herstelsleutel",
+  "theRecoveryKeyYouEnteredIsIncorrect": "De ingevoerde herstelsleutel is onjuist",
+  "enterPassword": "Voer wachtwoord in",
+  "selectExportFormat": "Selecteer export formaat",
+  "exportDialogDesc": "Versleutelde exports worden beschermd door een wachtwoord van uw keuze.",
+  "encrypted": "Versleuteld",
+  "plainText": "Kale tekst",
+  "passwordToEncryptExport": "Wachtwoord voor het versleutelen van export",
+  "export": "Exporteren"
+}

lib/l10n/arb/app_pl.arb

@@ -0,0 +1,267 @@
+{
+  "account": "Konto",
+  "recoveryKey": "Klucz odzyskiwania",
+  "counterAppBarTitle": "Licznik",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Zabezpiecz swoje kody 2FA",
+  "onBoardingGetStarted": "Wprowadzenie",
+  "setupFirstAccount": "Skonfiguruj pierwsze konto",
+  "importScanQrCode": "Zeskanuj kod QR",
+  "importEnterSetupKey": "Wprowadź klucz",
+  "importAccountPageTitle": "Wprowadź dane konta",
+  "codeIssuerHint": "Wydawca",
+  "codeSecretKeyHint": "Tajny klucz",
+  "codeAccountHint": "Konto (ty@domena.com)",
+  "accountKeyType": "Rodzaj klucza",
+  "sessionExpired": "Sesja wygasła",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Prosimy zaloguj się ponownie",
+  "loggingOut": "Wylogowywanie...",
+  "timeBasedKeyType": "Oparte na czasie (TOTP)",
+  "counterBasedKeyType": "Oparte na liczniku (HOTP)",
+  "saveAction": "Zapisz",
+  "nextTotpTitle": "dalej",
+  "deleteCodeTitle": "Usunąć kod?",
+  "deleteCodeMessage": "Czy na pewno chcesz usunąć ten kod? Ta akcja jest nieodwracalna.",
+  "viewLogsAction": "Wyświetl logi",
+  "sendLogsDescription": "Spowoduje to przesłanie logów, które pomogą nam rozwiązać Twój problem. Chociaż podejmujemy środki ostrożności, aby zapewnić, że wrażliwe informacje nie są rejestrowane, zachęcamy do obejrzenia tych dzienników przed ich udostępnieniem.",
+  "preparingLogsTitle": "Przygotowanie logów...",
+  "emailLogsTitle": "Wyślij log mailem",
+  "emailLogsMessage": "Proszę wysłać logi do {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Kopiuj adres e-mail",
+  "exportLogsAction": "Eksportuj logi",
+  "reportABug": "Zgłoś błąd",
+  "crashAndErrorReporting": "Zgłaszanie błędów i awarii",
+  "reportBug": "Zgłoś błąd",
+  "emailUsMessage": "Prosimy o kontakt mailowy pod adresem {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Skontaktuj się z pomocą techniczną",
+  "verifyPassword": "Zweryfikuj hasło",
+  "pleaseWait": "Proszę czekać...",
+  "generatingEncryptionKeysTitle": "Generowanie kluczy szyfrujących...",
+  "recreatePassword": "Zresetuj hasło",
+  "recreatePasswordMessage": "Obecne urządzenie nie jest wystarczająco wydajne, aby zweryfikować Twoje hasło, więc musimy je raz zregenerować w sposób, który działa ze wszystkimi urządzeniami. \n\nZaloguj się przy użyciu klucza odzyskiwania i zresetuj swoje hasło (możesz ponownie użyć tego samego, jeśli chcesz).",
+  "useRecoveryKey": "Użyj kodu odzyskiwania",
+  "incorrectPasswordTitle": "Nieprawidłowe hasło",
+  "welcomeBack": "Witaj ponownie!",
+  "madeWithLoveAtPrefix": "wykonane z ❤️ w ",
+  "supportDevs": "Subskrybuj <bold-green>ente</bold-green> aby wesprzeć ten projekt.",
+  "supportDiscount": "Użyj kodu rabatowego \"AUTH\", aby otrzymać 10% rabatu na pierwszy rok",
+  "changeEmail": "Zmień adres e-mail",
+  "changePassword": "Zmień hasło",
+  "data": "Dane",
+  "importCodes": "Importuj kody",
+  "exportCodes": "Eksportuj kody",
+  "importInstruction": "Wybierz plik, który zawiera listę twoich kodów w następującym formacie",
+  "importCodeDelimiterInfo": "Kody mogą być oddzielone przecinkiem lub nową linią",
+  "selectFile": "Wybierz plik",
+  "authToViewYourRecoveryKey": "Proszę uwierzytelnić, aby wyświetlić swój klucz odzyskiwania",
+  "authToChangeYourEmail": "Proszę uwierzytelnić, aby zmienić swój adres e-mail",
+  "authToChangeYourPassword": "Proszę uwierzytelnić, aby zmienić hasło",
+  "ok": "Ok",
+  "cancel": "Anuluj",
+  "yes": "Tak",
+  "no": "Nie",
+  "email": "Email",
+  "support": "Wsparcie techniczne",
+  "settings": "Ustawienia",
+  "copied": "Skopiowano",
+  "pleaseTryAgain": "Proszę spróbować ponownie",
+  "existingUser": "Istniejący użytkownik",
+  "newUser": "Nowy do ente",
+  "delete": "Usuń",
+  "enterYourPasswordHint": "Wprowadź swoje hasło",
+  "forgotPassword": "Nie pamiętam hasła",
+  "oops": "Ups",
+  "somethingWentWrongMessage": "Coś poszło nie tak. Proszę, spróbuj ponownie",
+  "leaveFamily": "Opuść rodzinę",
+  "leaveFamilyMessage": "Czy jesteś pewien/pewna, że chcesz opuścić plan rodzinny?",
+  "inFamilyPlanMessage": "Jesteś w planie rodzinnym!",
+  "swipeHint": "Przesuń palcem w lewo, aby edytować lub usunąć kody",
+  "scan": "Skanuj",
+  "scanACode": "Skanuj kod",
+  "verify": "Zweryfikuj",
+  "verifyEmail": "Zweryfikuj adres e-mail",
+  "enterCodeHint": "Wprowadź sześciocyfrowy kod z twojej aplikacji uwierzytelniającej",
+  "lostDeviceTitle": "Zagubiono urządzenie?",
+  "twoFactorAuthTitle": "Uwierzytelnianie dwuetapowe",
+  "recoverAccount": "Odzyskaj konto",
+  "enterRecoveryKeyHint": "Wprowadź swój klucz odzyskiwania",
+  "recover": "Odzyskaj",
+  "contactSupportViaEmailMessage": "Wyślij wiadomość e-mail na {email} z zarejestrowanego adresu e-mail",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Brak klucza odzyskiwania?",
+  "enterEmailHint": "Wprowadź adres e-mail",
+  "invalidEmailTitle": "Nieprawidłowy adres e-mail",
+  "invalidEmailMessage": "Proszę wpisać prawidłowy adres e-mail.",
+  "deleteAccount": "Usuń konto",
+  "deleteAccountQuery": "Będzie nam przykro, że odchodzisz. Masz jakiś problem?",
+  "yesSendFeedbackAction": "Tak, wyślij opinię",
+  "noDeleteAccountAction": "Nie, usuń moje konto",
+  "initiateAccountDeleteTitle": "Proszę uwierzytelnić, aby zainicjować usuwanie konta",
+  "confirmAccountDeleteTitle": "Na pewno chcesz usunąć swoje konto ente?",
+  "confirmAccountDeleteMessage": "Twoje przesłane dane, we wszystkich aplikacjach (zarówno Zdjęcia, jak i Authenticator), zostaną zaplanowane do usunięcia, a Twoje konto zostanie trwale usunięte.",
+  "sendEmail": "Wyślij e-mail",
+  "createNewAccount": "Utwórz nowe konto",
+  "weakStrength": "Słabe",
+  "strongStrength": "Silne",
+  "moderateStrength": "Umiarkowany",
+  "confirmPassword": "Potwierdź hasło",
+  "close": "Zamknij",
+  "oopsSomethingWentWrong": "Ups! Coś poszło nie tak.",
+  "selectLanguage": "Wybierz język",
+  "language": "Język",
+  "social": "Społeczność",
+  "security": "Bezpieczeństwo",
+  "lockscreen": "Ekran blokady",
+  "authToChangeLockscreenSetting": "Proszę uwierzytelnić, aby zmienić ustawienia ekranu blokady",
+  "lockScreenEnablePreSteps": "Aby włączyć ekran blokady, ustaw hasło urządzenia lub blokadę ekranu w ustawieniach systemu.",
+  "viewActiveSessions": "Zobacz aktualne sesje",
+  "authToViewYourActiveSessions": "Proszę uwierzytelnić, aby wyświetlić swój klucz odzyskiwania",
+  "searchHint": "Szukaj...",
+  "search": "Szukaj",
+  "sorryUnableToGenCode": "Przepraszamy, nie można wygenerować kodu dla {issuerName}",
+  "noResult": "Brak wyniku",
+  "addCode": "Dodaj kod",
+  "scanAQrCode": "Zeskanuj kod QR",
+  "enterDetailsManually": "Wprowadź dane ręcznie",
+  "edit": "Edytuj",
+  "copiedToClipboard": "Skopiowano do schowka",
+  "error": "Błąd",
+  "recoveryKeyCopiedToClipboard": "Klucz odzyskiwania został skopiowany do schowka",
+  "recoveryKeyOnForgotPassword": "Jeśli zapomnisz hasła, jedynym sposobem na odzyskanie danych jest ten klucz.",
+  "recoveryKeySaveDescription": "Nie przechowujemy tego klucza, proszę zachować ten 24 wyrazowy klucz w bezpiecznym miejscu.",
+  "doThisLater": "Zrób To Później",
+  "saveKey": "Zapisz klucz",
+  "createAccount": "Utwórz konto",
+  "passwordStrength": "Siła hasła: {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": "Hasło",
+  "signUpTerms": "Akceptuję <u-terms>warunki korzystania z usługi</u-terms> i <u-policy>politykę prywatności</u-policy>",
+  "privacyPolicyTitle": "Polityka prywatności",
+  "termsOfServicesTitle": "Regulamin",
+  "encryption": "Szyfrowanie",
+  "setPasswordTitle": "Ustaw hasło",
+  "changePasswordTitle": "Zmień hasło",
+  "resetPasswordTitle": "Zresetuj hasło",
+  "encryptionKeys": "Klucz szyfrowania",
+  "passwordWarning": "Nie przechowujemy tego hasła, więc jeśli go zapomnisz, <underline>nie będziemy w stanie odszyfrować Twoich danych</underline>",
+  "enterPasswordToEncrypt": "Wprowadź hasło, którego możemy użyć do zaszyfrowania Twoich danych",
+  "enterNewPasswordToEncrypt": "Wprowadź nowe hasło, którego możemy użyć do zaszyfrowania Twoich danych",
+  "passwordChangedSuccessfully": "Hasło zostało pomyślnie zmienione",
+  "generatingEncryptionKeys": "Generowanie kluczy szyfrujących...",
+  "continueLabel": "Kontynuuj",
+  "insecureDevice": "Niezabezpieczone urządzenie",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Przepraszamy, nie mogliśmy wygenerować kluczy bezpiecznych na tym urządzeniu.\n\nZarejestruj się z innego urządzenia.",
+  "howItWorks": "Jak to działa",
+  "ackPasswordLostWarning": "Rozumiem, że jeśli utracę hasło, mogę stracić moje dane, ponieważ moje dane są <underline>szyfrowane end-to-end</underline>.",
+  "loginTerms": "Klikając zaloguj się zgadzam się na <u-terms>Regulamin</u-terms> i <u-policy>politykę prywatności<u-policy>",
+  "logInLabel": "Zaloguj się",
+  "logout": "Wyloguj się",
+  "areYouSureYouWantToLogout": "Czy na pewno chcesz się wylogować?",
+  "yesLogout": "Tak, wyloguj",
+  "exit": "Wyjdź",
+  "verifyingRecoveryKey": "Weryfikowanie klucza odzyskiwania...",
+  "recoveryKeyVerified": "Klucz odzyskiwania zweryfikowany",
+  "recoveryKeySuccessBody": "Świetnie! Twój klucz odzyskiwania jest prawidłowy. Dziękuję za weryfikację.\n\nPamiętaj, aby przechowywać klucz odzyskiwania w bezpiecznej kopii zapasowej.",
+  "invalidRecoveryKey": "Wprowadzony klucz odzyskiwania jest nieprawidłowy. Upewnij się, że zawiera 24 słowa i sprawdź pisownię każdego z nich.\n\nJeśli wprowadziłeś starszy kod odzyskiwania, upewnij się, że ma on 64 znaki i sprawdź każdy z nich.",
+  "recreatePasswordTitle": "Zresetuj hasło",
+  "recreatePasswordBody": "Obecne urządzenie nie jest wystarczająco wydajne, aby zweryfikować Twoje hasło, więc musimy je raz zregenerować w sposób, który działa ze wszystkimi urządzeniami. \n\nZaloguj się przy użyciu klucza odzyskiwania i zresetuj swoje hasło (możesz ponownie użyć tego samego, jeśli chcesz).",
+  "invalidKey": "Nieprawidłowy klucz",
+  "tryAgain": "Spróbuj ponownie",
+  "viewRecoveryKey": "Wyświetl kod odzyskiwania",
+  "confirmRecoveryKey": "Potwierdź klucz odzyskiwania",
+  "recoveryKeyVerifyReason": "Twój klucz odzyskiwania jest jedynym sposobem na odzyskanie zdjęć, jeśli zapomnisz hasła. Klucz odzyskiwania można znaleźć w Ustawieniach > Konto.\n\nWprowadź tutaj swój klucz odzyskiwania, aby sprawdzić, czy został zapisany poprawnie.",
+  "confirmYourRecoveryKey": "Potwierdź klucz odzyskiwania",
+  "confirm": "Potwierdź",
+  "emailYourLogs": "Wyślij mailem logi",
+  "pleaseSendTheLogsTo": "Proszę wysłać logi do {toEmail}",
+  "copyEmailAddress": "Kopiuj adres e-mail",
+  "exportLogs": "Eksportuj logi",
+  "enterYourRecoveryKey": "Wprowadź swój klucz odzyskiwania",
+  "tempErrorContactSupportIfPersists": "Wygląda na to, że coś poszło nie tak. Spróbuj ponownie po pewnym czasie. Jeśli błąd będzie się powtarzał, skontaktuj się z naszym zespołem pomocy technicznej.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Wygląda na to, że coś poszło nie tak. Spróbuj ponownie po pewnym czasie. Jeśli błąd będzie się powtarzał, skontaktuj się z naszym zespołem pomocy technicznej.",
+  "about": "O nas",
+  "weAreOpenSource": "Posiadamy otwarte źródło!",
+  "privacy": "Prywatność",
+  "terms": "Warunki",
+  "checkForUpdates": "Sprawdź czy są dostępne nowe aktualizacje",
+  "checking": "Sprawdzanie...",
+  "youAreOnTheLatestVersion": "Używasz najnowszej wersji",
+  "warning": "Ostrzeżenie",
+  "exportWarningDesc": "Wyeksportowany plik zawiera poufne informacje. Przechowuj to bezpiecznie.",
+  "iUnderStand": "Rozumiem",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Proszę uwierzytelnić, aby wyeksportować swoje kody",
+  "importSuccessTitle": "Hura!",
+  "importSuccessDesc": "Zaimportowałeś {count} kodów!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Przepraszamy",
+  "importFailureDesc": "Nie można przetworzyć wybranego pliku.\nJeśli potrzebujesz pomocy, napisz do support@ente.io!",
+  "pendingSyncs": "Uwaga",
+  "pendingSyncsWarningBody": "Niektóre z Twoich kodów nie zostały skopiowane.\n\nUpewnij się, że masz kopię zapasową tych kodów przed wylogowaniem.",
+  "checkInboxAndSpamFolder": "Sprawdź swoją skrzynkę odbiorczą (i spam), aby zakończyć weryfikację",
+  "tapToEnterCode": "Dotknij, aby wprowadzić kod",
+  "resendEmail": "Wyślij e-mail ponownie",
+  "weHaveSendEmailTo": "Wysłaliśmy wiadomość do <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"
+      }
+    }
+  },
+  "activeSessions": "Aktywne sesje",
+  "somethingWentWrongPleaseTryAgain": "Coś poszło nie tak, spróbuj ponownie",
+  "thisWillLogYouOutOfThisDevice": "To wyloguje Cię z tego urządzenia!",
+  "thisWillLogYouOutOfTheFollowingDevice": "To wyloguje Cię z tego urządzenia:",
+  "terminateSession": "Zakończyć sesję?",
+  "terminate": "Zakończ",
+  "thisDevice": "To urządzenie"
+}

lib/l10n/arb/app_pt.arb

@@ -0,0 +1,227 @@
+{
+  "account": "Conta",
+  "recoveryKey": "Chave de recuperação",
+  "counterAppBarTitle": "Contador",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Proteja seus códigos 2FA",
+  "onBoardingGetStarted": "Vamos Começar",
+  "setupFirstAccount": "Configure sua primeira conta",
+  "importScanQrCode": "Escanear QR code",
+  "importEnterSetupKey": "Inserir uma chave de configuração",
+  "importAccountPageTitle": "Inserir detalhes da conta",
+  "codeIssuerHint": "Emissor",
+  "codeSecretKeyHint": "Chave secreta",
+  "codeAccountHint": "Conta (voce@dominio.com)",
+  "accountKeyType": "Tipo de chave",
+  "sessionExpired": "Sessão expirada",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Por favor, faça login novamente",
+  "loggingOut": "Desconectando...",
+  "timeBasedKeyType": "Baseado no horário (TOTP)",
+  "counterBasedKeyType": "Baseado em um contador (HOTP)",
+  "saveAction": "Salvar",
+  "nextTotpTitle": "próximo",
+  "deleteCodeTitle": "Excluir código?",
+  "deleteCodeMessage": "Tem certeza que deseja excluir este código? Esta ação é irreversível.",
+  "viewLogsAction": "Ver logs",
+  "sendLogsDescription": "Isto irá compartilhar seus logs para nos ajudar a depurar seu problema. Embora tomemos precauções para garantir que informações sensíveis não sejam enviadas, encorajamos você a ver esses longs antes de compartilhá-los.",
+  "preparingLogsTitle": "Preparando logs...",
+  "emailLogsTitle": "Logs de email",
+  "emailLogsMessage": "Por favor, envie os logs para {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Copiar e-mail",
+  "exportLogsAction": "Exportar logs",
+  "reportABug": "Reportar um bug",
+  "crashAndErrorReporting": "Reporte de erros e falhas",
+  "reportBug": "Reportar bug",
+  "emailUsMessage": "Por favor, envie um e-mail para {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Falar com o suporte",
+  "verifyPassword": "Verificar senha",
+  "pleaseWait": "Por favor, aguarde...",
+  "generatingEncryptionKeysTitle": "Gerando chaves de criptografia...",
+  "recreatePassword": "Recriar senha",
+  "useRecoveryKey": "Usar chave de recuperação",
+  "incorrectPasswordTitle": "Senha incorreta",
+  "welcomeBack": "Bem-vindo de volta!",
+  "madeWithLoveAtPrefix": "feito com ❤️ em ",
+  "supportDevs": "Inscreva-se no <bold-green>ente</bold-green> para apoiar este projeto.",
+  "supportDiscount": "Use o cupom \"AUTH\" para obter 10% de desconto no primeiro ano",
+  "changeEmail": "Alterar email",
+  "changePassword": "Alterar senha",
+  "data": "Dados",
+  "importCodes": "Importar códigos",
+  "exportCodes": "Exportar Códigos",
+  "importInstruction": "Por favor, selecione um arquivo que contenha uma lista de códigos no seguinte formato",
+  "importCodeDelimiterInfo": "Os códigos podem ser separados por uma vírgula ou uma nova linha",
+  "selectFile": "Selecionar arquivo",
+  "authToViewYourRecoveryKey": "Por favor, autentique-se para visualizar sua chave de recuperação",
+  "authToChangeYourEmail": "Por favor, autentique-se para alterar o seu e-mail",
+  "authToChangeYourPassword": "Por favor, autentique-se para alterar sua senha",
+  "ok": "Ok",
+  "cancel": "Cancelar",
+  "yes": "Sim",
+  "no": "Não",
+  "email": "E-mail",
+  "support": "Suporte",
+  "settings": "Configurações",
+  "copied": "Copiado",
+  "pleaseTryAgain": "Por favor, tente novamente",
+  "existingUser": "Usuário Existente",
+  "newUser": "Novo no ente",
+  "delete": "Deletar",
+  "enterYourPasswordHint": "Insira sua senha",
+  "forgotPassword": "Esqueceu sua senha",
+  "oops": "Oops",
+  "somethingWentWrongMessage": "Algo deu errado. Por favor, tente outra vez",
+  "leaveFamily": "Sair da família",
+  "leaveFamilyMessage": "Tem certeza que deseja sair do plano familiar?",
+  "inFamilyPlanMessage": "Você está em um plano familiar!",
+  "swipeHint": "Deslize para a esquerda para editar ou remover os códigos",
+  "scan": "Escanear",
+  "scanACode": "Escanear código",
+  "verify": "Verificar",
+  "enterCodeHint": "Digite o código de 6 dígitos de\nseu aplicativo autenticador",
+  "lostDeviceTitle": "Perdeu seu dispositivo?",
+  "twoFactorAuthTitle": "Autenticação de dois fatores",
+  "recoverAccount": "Recuperar conta",
+  "enterRecoveryKeyHint": "Digite sua chave de recuperação",
+  "recover": "Recuperar",
+  "contactSupportViaEmailMessage": "Por favor, envie um e-mail para {email} a partir do seu endereço de e-mail registrado",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Não possui a chave de recuperação?",
+  "enterEmailHint": "Insira o seu endereço de e-mail",
+  "invalidEmailTitle": "Endereço de e-mail invalido",
+  "invalidEmailMessage": "Por, favor insira um endereço de e-mail válido.",
+  "deleteAccount": "Deletar conta",
+  "deleteAccountQuery": "Sentiremos muito por vê-lo partir. Você está enfrentando algum problema?",
+  "yesSendFeedbackAction": "Sim, enviar feedback",
+  "noDeleteAccountAction": "Não, excluir conta",
+  "initiateAccountDeleteTitle": "Por favor, autentique-se para iniciar a exclusão de conta",
+  "confirmAccountDeleteTitle": "Tem certeza que deseja excluir sua conta ente?",
+  "confirmAccountDeleteMessage": "Seus dados enviados, através de todos os aplicativos (Photos e Authenticator), serão agendados para exclusão, e sua conta será permanentemente deletada.",
+  "sendEmail": "Enviar e-mail",
+  "createNewAccount": "Criar nova conta",
+  "weakStrength": "Fraca",
+  "strongStrength": "Forte",
+  "moderateStrength": "Moderada",
+  "confirmPassword": "Confirme sua senha",
+  "close": "Fechar",
+  "oopsSomethingWentWrong": "Oops, Algo deu errado.",
+  "selectLanguage": "Selecionar idioma",
+  "language": "Idioma",
+  "social": "Redes sociais",
+  "security": "Segurança",
+  "lockscreen": "Tela de bloqueio",
+  "authToChangeLockscreenSetting": "Por favor, autentique-se para alterar a configuração da tela de bloqueio",
+  "lockScreenEnablePreSteps": "Para ativar o bloqueio de tela, por favor ative um método de autenticação nas configurações do sistema do seu dispositivo.",
+  "viewActiveSessions": "Ver sessões ativas",
+  "authToViewYourActiveSessions": "Por favor, autentique-se para ver as sessões ativas",
+  "searchHint": "Pesquisar...",
+  "search": "Pesquisar",
+  "sorryUnableToGenCode": "Desculpe, não foi possível gerar um código para {issuerName}",
+  "noResult": "Nenhum resultado",
+  "addCode": "Adicionar código",
+  "scanAQrCode": "Escanear QR code",
+  "enterDetailsManually": "Insira os dados manualmente",
+  "edit": "Editar",
+  "copiedToClipboard": "Copiado para a área de transferência",
+  "error": "Erro",
+  "recoveryKeyCopiedToClipboard": "A chave de recuperação foi copiada para a área de transferência",
+  "recoveryKeyOnForgotPassword": "Caso você esqueça sua senha, a única maneira de recuperar seus dados é com essa chave.",
+  "recoveryKeySaveDescription": "Não armazenamos essa chave, por favor, salve essa chave de 24 palavras em um lugar seguro.",
+  "doThisLater": "Fazer isso mais tarde",
+  "saveKey": "Salvar chave",
+  "createAccount": "Criar uma conta",
+  "passwordStrength": "Força da senha: {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": "Senha",
+  "signUpTerms": "Eu concordo com os <u-terms>termos de serviço</u-terms> e a <u-policy>política de privacidade</u-policy>",
+  "privacyPolicyTitle": "Política de Privacidade",
+  "termsOfServicesTitle": "Termos",
+  "encryption": "Criptografia",
+  "ackPasswordLostWarning": "Eu entendo que se eu perder minha senha, posso perder meus dados, já que meus dados são <underline>criptografados de ponta a ponta</underline>.",
+  "loginTerms": "Ao clicar em login, eu concordo com os <u-terms>termos de serviço</u-terms> e a <u-policy>política de privacidade</u-policy>",
+  "logInLabel": "Login",
+  "logout": "Encerrar sessão",
+  "areYouSureYouWantToLogout": "Você tem certeza que deseja sair?",
+  "yesLogout": "Sim",
+  "exit": "Sair",
+  "verifyingRecoveryKey": "Verificando chave de recuperação...",
+  "recoveryKeyVerified": "Chave de recuperação verificada",
+  "recoveryKeySuccessBody": "Ótimo! Sua chave de recuperação é válida. Obrigado por verificar.\n\nLembre-se de manter o backup seguro de sua chave de recuperação.",
+  "invalidRecoveryKey": "A chave de recuperação que você digitou não é válida. Certifique-se de que contém 24 palavras e verifique a ortografia de cada uma.\n\nSe você inseriu um código de recuperação mais antigo, verifique se ele tem 64 caracteres e verifique cada um deles.",
+  "invalidKey": "Chave inválida",
+  "tryAgain": "Tente novamente",
+  "viewRecoveryKey": "Ver chave de recuperação",
+  "recoveryKeyVerifyReason": "Sua chave de recuperação é a única maneira de recuperar suas fotos se você esquecer sua senha. Você pode encontrar sua chave de recuperação em Configurações > Conta.\n\nDigite sua chave de recuperação aqui para verificar se você a salvou corretamente.",
+  "confirm": "Confirmar",
+  "emailYourLogs": "Enviar por email seus logs",
+  "pleaseSendTheLogsTo": "Por favor, envie os logs para \n{toEmail}",
+  "copyEmailAddress": "Copiar endereço de email",
+  "exportLogs": "Exportar logs",
+  "enterYourRecoveryKey": "Digite sua chave de recuperação",
+  "tempErrorContactSupportIfPersists": "Parece que algo deu errado. Por favor, tente novamente mais tarde. Se o erro persistir, entre em contato com nossa equipe de suporte.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Parece que algo deu errado. Por favor, tente novamente mais tarde. Se o erro persistir, entre em contato com nossa equipe de suporte.",
+  "about": "Sobre",
+  "weAreOpenSource": "Nós somos de código aberto!",
+  "privacy": "Privacidade",
+  "terms": "Termos",
+  "checkForUpdates": "Verificar por atualizações",
+  "checking": "Verificando...",
+  "youAreOnTheLatestVersion": "Você está na versão mais recente",
+  "warning": "Atenção",
+  "exportWarningDesc": "O arquivo exportado contém informações confidenciais. Por favor, armazene-o com segurança.",
+  "iUnderStand": "Eu entendo",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Por favor, autentique para exportar seus códigos",
+  "importSuccessTitle": "Yay!",
+  "importSuccessDesc": "Você importou {count} códigos!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Desculpe",
+  "importFailureDesc": "Não foi possível analisar o arquivo selecionado.\nPor favor, escreva para support@ente.io se precisar de ajuda!",
+  "pendingSyncs": "Atenção",
+  "pendingSyncsWarningBody": "Alguns de seus códigos não foram salvos.\n\nPor favor, certifique-se que você possui um backup para esses códigos antes de sair."
+}

lib/l10n/arb/app_ru.arb

@@ -0,0 +1,320 @@
+{
+  "account": "Аккаунт",
+  "recoveryKey": "Ключ восстановления",
+  "counterAppBarTitle": "Счетчик",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Защитите ваши 2FA коды",
+  "onBoardingGetStarted": "Начать",
+  "setupFirstAccount": "Настройте свой первый аккаунт",
+  "importScanQrCode": "Сканировать QR-код",
+  "qrCode": "QR-код",
+  "importEnterSetupKey": "Ввести ключ настройки",
+  "importAccountPageTitle": "Введите данные аккаунта",
+  "secretCanNotBeEmpty": "Секретный код не может быть пустым",
+  "bothIssuerAndAccountCanNotBeEmpty": "И эмитент, и аккаунт не могут быть пустыми",
+  "incorrectDetails": "Неправильные данные",
+  "pleaseVerifyDetails": "Пожалуйста, проверьте детали и попробуйте еще раз",
+  "codeIssuerHint": "Эмитент",
+  "codeSecretKeyHint": "Секретный ключ",
+  "codeAccountHint": "Аккаунт (you@domain.com)",
+  "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": "Вы уверены, что хотите удалить этот код? Это действие необратимо.",
+  "viewLogsAction": "Посмотреть журнал",
+  "sendLogsDescription": "Это отправит все журналы, чтобы помочь нам отладить вашу проблему. Хотя мы принимаем меры предосторожности, чтобы конфиденциальная информация не регистрировалась, мы рекомендуем вам просмотреть эти журналы, прежде чем делиться ими.",
+  "preparingLogsTitle": "Подготовка журналов...",
+  "emailLogsTitle": "Отправляйте журналы по электронной почте",
+  "emailLogsMessage": "Пожалуйста, отправьте журналы на {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Скопировать адрес",
+  "exportLogsAction": "Экспорт журналов",
+  "reportABug": "Сообщить об ошибке",
+  "crashAndErrorReporting": "Отчёт об ошибках",
+  "reportBug": "Сообщить об ошибке",
+  "emailUsMessage": "Пожалуйста, напишите нам на {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Связаться с поддержкой",
+  "rateUsOnStore": "Оценить нас на {storeName}",
+  "blog": "Блог",
+  "merchandise": "Товары",
+  "verifyPassword": "Подтверждение пароля",
+  "pleaseWait": "Пожалуйста, подождите...",
+  "generatingEncryptionKeysTitle": "Генерируем ключи шифрования...",
+  "recreatePassword": "Воссоздать пароль заново",
+  "recreatePasswordMessage": "Текущее устройство недостаточно мощное для проверки пароля, поэтому нам нужно регенерировать его один раз таким образом, чтобы работать со всеми устройствами. \n\nПожалуйста, войдите, используя ваш ключ восстановления и сгенерируйте ваш пароль (вы можете использовать тот же самый, если пожелаете).",
+  "useRecoveryKey": "Использовать ключ восстановления",
+  "incorrectPasswordTitle": "Неправильный пароль",
+  "welcomeBack": "С возвращением!",
+  "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-файл",
+  "importEnteEncGuide": "Выберите зашифрованный JSON-файл, экспортированный из ente",
+  "importRaivoGuide": "Используйте опцию «Export OTPs to Zip archive» в настройках Raivo.\n\nРаспакуйте zip-архив и импортируйте JSON-файл.",
+  "importAegisGuide": "Используйте опцию «Экспортировать хранилище» в настройках Aegis.\n\nЕсли ваше хранилище зашифровано, то для его расшифровки потребуется ввести пароль хранилища.",
+  "exportCodes": "Экспортировать коды",
+  "importLabel": "Импорт",
+  "importInstruction": "Пожалуйста, выберите файл, содержащий список ваших кодов в следующем формате",
+  "importCodeDelimiterInfo": "Коды могут быть разделены запятой или новой строкой",
+  "selectFile": "Выбрать файл",
+  "emailVerificationToggle": "Подтверждение электронной почты",
+  "authToChangeEmailVerificationSetting": "Авторизуйтесь, чтобы изменить подтверждение электронной почты",
+  "authToViewYourRecoveryKey": "Пожалуйста, авторизуйтесь для просмотра вашего ключа восстановления",
+  "authToChangeYourEmail": "Пожалуйста, авторизуйтесь, чтобы изменить адрес электронной почты",
+  "authToChangeYourPassword": "Пожалуйста, авторизуйтесь, чтобы изменить пароль",
+  "ok": "Ок",
+  "cancel": "Отменить",
+  "yes": "Да",
+  "no": "Нет",
+  "email": "Электронная почта",
+  "support": "Поддержка",
+  "settings": "Настройки",
+  "copied": "Скопировано",
+  "pleaseTryAgain": "Пожалуйста, попробуйте ещё раз",
+  "existingUser": "Существующий пользователь",
+  "newUser": "Новый аккаунт",
+  "delete": "Удалить",
+  "enterYourPasswordHint": "Введите пароль",
+  "forgotPassword": "Забыл пароль",
+  "oops": "Ой",
+  "suggestFeatures": "Предложить улучшения",
+  "faq": "FAQ",
+  "faq_q_1": "Насколько безопасен ente Auth?",
+  "faq_a_1": "Все коды, которые вы резервируете с помощью ente, хранятся в зашифрованном виде. Это означает, что только вы можете получить доступ к своим кодам. Наши приложения имеют открытый исходный код, а наша криптография прошла внешний аудит.",
+  "faq_q_2": "Могу ли я получить доступ к моим кодам на компьютере?",
+  "faq_a_2": "Вы можете получить доступ к своим кодам на сайте @ auth.ente.io.",
+  "faq_q_3": "Как я могу удалить коды?",
+  "faq_a_3": "Вы можете удалить код, проведя пальцем влево по этому элементу.",
+  "faq_q_4": "Как я могу поддержать этот проект?",
+  "faq_a_4": "Вы можете поддержать развитие этого проекта, подписавшись на наше приложение Photos @ ente.io.",
+  "faq_q_5": "Как мне включить блокировку FaceID в ente Auth?",
+  "faq_a_5": "Вы можете включить блокировку FaceID в Настройки → Безопасность → Экран блокировки.",
+  "somethingWentWrongMessage": "Что-то пошло не так. Попробуйте еще раз",
+  "leaveFamily": "Покинуть семью",
+  "leaveFamilyMessage": "Вы уверены, что хотите отказаться от семейного плана?",
+  "inFamilyPlanMessage": "Вы на семейном плане!",
+  "swipeHint": "Проведите пальцем влево, чтобы отредактировать или удалить коды",
+  "scan": "Сканировать",
+  "scanACode": "Сканировать QR-код",
+  "verify": "Подтвердить",
+  "verifyEmail": "Подтвердить электронную почту",
+  "enterCodeHint": "Введите 6-значный код из\nвашего приложения-аутентификатора",
+  "lostDeviceTitle": "Потеряно устройство?",
+  "twoFactorAuthTitle": "Двухфакторная аутентификация",
+  "recoverAccount": "Восстановить аккаунт",
+  "enterRecoveryKeyHint": "Введите свой ключ восстановления",
+  "recover": "Восстановить",
+  "contactSupportViaEmailMessage": "Пожалуйста, отправьте электронное письмо на адрес {email} с вашего зарегистрированного адреса электронной почты",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Нет ключа восстановления?",
+  "enterEmailHint": "Введите свою почту",
+  "invalidEmailTitle": "Неверный адрес электронной почты",
+  "invalidEmailMessage": "Пожалуйста, введите действительный адрес электронной почты.",
+  "deleteAccount": "Удалить аккаунт",
+  "deleteAccountQuery": "Нам будет жаль, если вы уйдете. Вы столкнулись с какой-то проблемой?",
+  "yesSendFeedbackAction": "Да, отправить отзыв",
+  "noDeleteAccountAction": "Нет, удалить аккаунт",
+  "initiateAccountDeleteTitle": "Пожалуйста, авторизуйтесь, чтобы начать удаление аккаунта",
+  "confirmAccountDeleteTitle": "Вы уверены, что хотите удалить ваш аккаунт ente?",
+  "confirmAccountDeleteMessage": "Ваши загруженные данные во всех приложениях (как фотографии, так и средство аутентификации) будут запланированы к удалению, а ваш аккаунт будет удален безвозвратно.",
+  "sendEmail": "Отправить электронное письмо",
+  "createNewAccount": "Создать новый аккаунт",
+  "weakStrength": "Слабый",
+  "strongStrength": "Крепкий",
+  "moderateStrength": "Средний",
+  "confirmPassword": "Подтвердить пароль",
+  "close": "Закрыть",
+  "oopsSomethingWentWrong": "Ой, что-то пошло не так.",
+  "selectLanguage": "Выберите язык",
+  "language": "Язык",
+  "social": "Соцсети",
+  "security": "Безопасность",
+  "lockscreen": "Экран блокировки",
+  "authToChangeLockscreenSetting": "Пожалуйста, авторизуйтесь, чтобы изменить настройки экрана блокировки",
+  "lockScreenEnablePreSteps": "Чтобы включить блокировку, настройте пароль устройства или блокировку экрана в настройках системы.",
+  "viewActiveSessions": "Просмотр активных сессий",
+  "authToViewYourActiveSessions": "Пожалуйста, авторизуйтесь для просмотра активных сессий",
+  "searchHint": "Поиск...",
+  "search": "Поиск",
+  "sorryUnableToGenCode": "К сожалению, не удалось сгенерировать код {issuerName}",
+  "noResult": "Ничего не найдено",
+  "addCode": "Добавить код",
+  "scanAQrCode": "Сканировать QR-код",
+  "enterDetailsManually": "Ввести детали вручную",
+  "edit": "Редактировать",
+  "copiedToClipboard": "Скопировано",
+  "error": "Ошибка",
+  "recoveryKeyCopiedToClipboard": "Ключ восстановления скопирован в буфер обмена",
+  "recoveryKeyOnForgotPassword": "Если вы забыли свой пароль, то восстановить данные можно только с помощью этого ключа.",
+  "recoveryKeySaveDescription": "Мы не храним этот ключ, пожалуйста, сохраните этот ключ в безопасном месте.",
+  "doThisLater": "Сделать позже",
+  "saveKey": "Сохранить ключ",
+  "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": "Выйти",
+  "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": "Похоже, что-то пошло не так. Пожалуйста, повторите попытку через некоторое время. Если ошибка повторится, обратитесь в нашу службу поддержки.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Похоже, что-то пошло не так. Пожалуйста, повторите попытку через некоторое время. Если ошибка повторится, обратитесь в нашу службу поддержки.",
+  "about": "О программе",
+  "weAreOpenSource": "У нас открытое программное обеспечение!",
+  "privacy": "Конфиденциальность",
+  "terms": "Условия использования",
+  "checkForUpdates": "Проверить наличие обновлений",
+  "checking": "Проверка...",
+  "youAreOnTheLatestVersion": "Вы используете последнюю версию",
+  "warning": "Предупреждение",
+  "exportWarningDesc": "Экспортированный файл содержит конфиденциальную информацию. Пожалуйста, храните его в надежном месте.",
+  "iUnderStand": "Я понимаю",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Пожалуйста, авторизуйтесь для экспорта кодов",
+  "importSuccessTitle": "Ура!",
+  "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"
+      }
+    }
+  },
+  "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": "Экспорт"
+}

lib/l10n/arb/app_tr.arb

@@ -0,0 +1,318 @@
+{
+  "account": "Hesabım",
+  "recoveryKey": "Kurtarma Anahtarı",
+  "counterAppBarTitle": "Sayaç",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "2 faktörlü kimlik doğrulama kodlarınızı koruyun",
+  "onBoardingGetStarted": "Başlayın",
+  "setupFirstAccount": "İlk hesabınızı ekleyin",
+  "importScanQrCode": "Karekodu tara",
+  "qrCode": "QR Kodu",
+  "importEnterSetupKey": "Kurulum anahtarını giriniz",
+  "importAccountPageTitle": "Hesap bilgilerinizi girin",
+  "incorrectDetails": "Bilgiler yanlış",
+  "pleaseVerifyDetails": "Lütfen bilgileri doğrulayın ve tekrar deneyin",
+  "codeIssuerHint": "Yayınlayan",
+  "codeSecretKeyHint": "Gizli Anahtar",
+  "codeAccountHint": "Hesap (örnek@domain.com)",
+  "accountKeyType": "Anahtar türü",
+  "sessionExpired": "Oturum süresi doldu",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Lütfen tekrar giriş yapın",
+  "loggingOut": "Çıkış yapılıyor...",
+  "timeBasedKeyType": "Zaman tabanlı (TOTP)",
+  "counterBasedKeyType": "Sayaç tabanlı (HOTP)",
+  "saveAction": "Kaydet",
+  "nextTotpTitle": "sonraki",
+  "deleteCodeTitle": "Kodu silmek istiyor musunuz?",
+  "deleteCodeMessage": "Bu kodu silmek istediğinize emin misiniz? Bu geri alınamaz bir işlemdir.",
+  "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": "E-postaların Günlüğü",
+  "emailLogsMessage": "Lütfen günlüğünüzü {email} adresine gönderin",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "E-postayı Kopyala",
+  "exportLogsAction": "Günlüğü dışa aktar",
+  "reportABug": "Bir hata bildir",
+  "crashAndErrorReporting": "Çökme ve hata bildirimi",
+  "reportBug": "Hata bildir",
+  "emailUsMessage": "Lütfen bize {email} adresinden ulaşın",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Destek ekibiyle iletişime geçin",
+  "rateUsOnStore": "Bizi {storeName} üzerinden değerlendirin",
+  "blog": "Blog",
+  "merchandise": "Ürünler",
+  "verifyPassword": "Şifreyi doğrulayın",
+  "pleaseWait": "Lütfen bekleyin...",
+  "generatingEncryptionKeysTitle": "Şifreleme anahtarları üretiliyor...",
+  "recreatePassword": "Şifreyi yeniden oluştur",
+  "recreatePasswordMessage": "Bu cihaz, şifrenizi doğrulayabilecek kadar güçlü değil, bu sebeple şifreyi her cihazda çalışabilecek bir yolla oluşturmamız gerekiyor.\n\nLütfen kurtarma anahtarınızla giriş yapın ve şifrenizi tekrar oluşturun (dilerseniz aynı şifreyi kullanabilirsiniz).",
+  "useRecoveryKey": "Kurtarma anahtarını kullan",
+  "incorrectPasswordTitle": "Yanlış şifre",
+  "welcomeBack": "Tekrar hoş geldiniz!",
+  "madeWithLoveAtPrefix": "❤️ ile 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-postayı değiştir",
+  "changePassword": "Şifreyi değiştir",
+  "data": "Veriler",
+  "importCodes": "Kodu içe aktar",
+  "importTypePlainText": "Düz metin",
+  "importTypeEnteEncrypted": "ente Şifreli dışa aktarma",
+  "passwordForDecryptingExport": "Dışa aktarımın şifresini çözmek için parola",
+  "passwordEmptyError": "Şifre boş olamaz",
+  "importFromApp": "Kodları {appName} uygulamasından içe aktarın",
+  "importGoogleAuthGuide": "\"Hesapları Aktar\" seçeneğini kullanarak hesaplarınızı Google Authenticator'dan bir QR koduna aktarın. Ardından başka bir cihaz kullanarak QR kodunu tarayın.\n\nİpucu: QR kodunun fotoğrafını çekmek için dizüstü bilgisayarınızın kamerasını kullanabilirsiniz.",
+  "importSelectJsonFile": "JSON dosyasını seçin",
+  "importEnteEncGuide": "Ente'den dışa aktarılan şifrelenmiş JSON dosyasını seçin",
+  "importRaivoGuide": "Raivo'nun ayarlarında \"OTP'leri Zip arşivine aktar\" seçeneğini kullanın.\n\nZip dosyasını çıkarın ve JSON dosyasını içe aktarın.",
+  "importAegisGuide": "Aegis'in Ayarlarında \"Kasayı dışa aktar\" seçeneğini kullanın.\n\nKasanız şifrelenmişse, kasanın şifresini çözmek için kasa parolasını girmeniz gerekecektir.",
+  "exportCodes": "Kodu dışa aktar",
+  "importLabel": "İçe aktar",
+  "importInstruction": "Lütfen aşağıdaki şekilde kodlarınızın listesini içeren dosyayı seçiniz",
+  "importCodeDelimiterInfo": "Kodlar, virgülle ya da yeni bir satırla ayrılabilir",
+  "selectFile": "Dosya seç",
+  "emailVerificationToggle": "E-posta doğrulama",
+  "authToChangeEmailVerificationSetting": "E-posta doğrulamasını değiştirmek için lütfen kimlik doğrulaması yapın",
+  "authToViewYourRecoveryKey": "Kurtarma anahtarınızı görmek için lütfen kimliğinizi doğrulayın",
+  "authToChangeYourEmail": "Epostanızı değiştirmek için lütfen kimliğinizi doğrulayın",
+  "authToChangeYourPassword": "Şifrenizi değiştirmek için lütfen kimliğinizi doğrulayın",
+  "ok": "Tamam",
+  "cancel": "İptal Et",
+  "yes": "Evet",
+  "no": "Hayır",
+  "email": "E-Posta",
+  "support": "Destek",
+  "settings": "Ayarlar",
+  "copied": "Kopyalandı",
+  "pleaseTryAgain": "Lütfen tekrar deneyin",
+  "existingUser": "Mevcut kullanıcı",
+  "newUser": "Yeni ente kullanıcısı",
+  "delete": "Sil",
+  "enterYourPasswordHint": "Parolanızı girin",
+  "forgotPassword": "Şifremi unuttum",
+  "oops": "Hay aksi",
+  "suggestFeatures": "Özellik önerin",
+  "faq": "SSS",
+  "faq_q_1": "Ente Auth ne kadar güvenli?",
+  "faq_a_1": "Ente aracılığıyla yedeklediğiniz tüm kodlar uçtan uca şifrelenmiş olarak saklanır. Bu, kodlarınıza yalnızca sizin erişebileceğiniz anlamına gelir. Uygulamalarımız açık kaynaklıdır ve kriptografimiz harici olarak denetlenmiştir.",
+  "faq_q_2": "Kodlarıma masaüstünden erişebilir miyim?",
+  "faq_a_2": "Kodlarınıza internet üzerinden @ auth.ente.io adresinden erişebilirsiniz.",
+  "faq_q_3": "Kodları nasıl silebilirim?",
+  "faq_a_3": "Bir kodu, o öğenin üzerinde sola kaydırarak silebilirsiniz.",
+  "faq_q_4": "Bu projeye nasıl destek olabilirim?",
+  "faq_a_4": "Fotoğraflar uygulamamıza @ ente.io abone olarak bu projenin geliştirilmesine destek olabilirsiniz.",
+  "faq_q_5": "FaceID kilidini ente Auth'ta nasıl etkinleştirebilirim",
+  "faq_a_5": "FaceID kilidini Ayarlar → Güvenlik → Kilit Ekranı altında etkinleştirebilirsiniz.",
+  "somethingWentWrongMessage": "Bir şeyler ters gitti, lütfen tekrar deneyin",
+  "leaveFamily": "Aile planından ayrıl",
+  "leaveFamilyMessage": "Aile planından ayrılmak istediğinize emin misiniz?",
+  "inFamilyPlanMessage": "Aile planı kullanıyorsunuz!",
+  "swipeHint": "Kodları düzenlemek ya da kaldırmak için sola kaydırın",
+  "scan": "Tara",
+  "scanACode": "Bir kodu tarayın",
+  "verify": "Doğrula",
+  "verifyEmail": "E-posta adresini doğrulayın",
+  "enterCodeHint": "Kimlik doğrulayıcı uygulamanızdaki 6 haneli doğrulama kodunu girin",
+  "lostDeviceTitle": "Cihazınızı mı kaybettiniz?",
+  "twoFactorAuthTitle": "İki faktörlü kimlik doğrulama",
+  "recoverAccount": "Hesap kurtarma",
+  "enterRecoveryKeyHint": "Kurtarma anahtarınızı girin",
+  "recover": "Kurtar",
+  "contactSupportViaEmailMessage": "Lütfen kayıtlı e-posta adresinizden {email} adresine e-posta gönderin",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Kurtarma anahtarınız yok mu?",
+  "enterEmailHint": "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 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",
+  "confirmAccountDeleteTitle": "ente hesabınızı silmek istediğinizden emin misiniz?",
+  "confirmAccountDeleteMessage": "Tüm uygulamalarda (Fotoğraflar ve Kimlik doğrulayıcı) kaydedilen verileriniz zamanlı silinmeye ayarlanacak ve hesabınız kalıcı olarak silinecektir.",
+  "sendEmail": "E-posta gönder",
+  "createNewAccount": "Yeni hesap oluşturun",
+  "weakStrength": "Zayıf",
+  "strongStrength": "Güçlü",
+  "moderateStrength": "Orta",
+  "confirmPassword": "Şifreyi onayla",
+  "close": "Kapat",
+  "oopsSomethingWentWrong": "Hay aksi, bir sorun oluştu.",
+  "selectLanguage": "Dil Seçin",
+  "language": "Dil",
+  "social": "Sosyal Medya",
+  "security": "Güvenlik",
+  "lockscreen": "Kilit ekranı",
+  "authToChangeLockscreenSetting": "Kilit ekranı ayarını değiştirmek için lütfen kimliğinizi doğrulayın",
+  "lockScreenEnablePreSteps": "Kilit ekranını aktif etmek için lütfen cihazın ayarlarından şifreyi ya da ekran kilidini ayarlayın.",
+  "viewActiveSessions": "Aktif oturumları görüntüle",
+  "authToViewYourActiveSessions": "Aktif oturumlarınızı görüntülemek için lütfen kimliğinizi doğrulayın",
+  "searchHint": "Ara...",
+  "search": "Ara",
+  "sorryUnableToGenCode": "Üzgünüz, {issuerName} için bir kod oluşturulamadı",
+  "noResult": "Sonuç yok",
+  "addCode": "Kod ekle",
+  "scanAQrCode": "Bir QR kod tarayın",
+  "enterDetailsManually": "Bilgileri elle girin",
+  "edit": "Düzenle",
+  "copiedToClipboard": "Panoya kopyalandı",
+  "error": "Hata",
+  "recoveryKeyCopiedToClipboard": "Kurtarma anahtarı panoya kopyalandı",
+  "recoveryKeyOnForgotPassword": "Eğer şifrenizi unutursanız, verilerinizi kurtarabileceğiniz tek yol bu anahtardır.",
+  "recoveryKeySaveDescription": "Biz bu anahtarı saklamıyoruz, lütfen. bu 24 kelimelik anahtarı güvenli bir yerde saklayın.",
+  "doThisLater": "Bunu daha sonra yap",
+  "saveKey": "Anahtarı kaydet",
+  "back": "Geri",
+  "createAccount": "Hesap oluştur",
+  "passwordStrength": "Şifre gücü: {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": "Şifre",
+  "signUpTerms": "<u-terms>Kullanım şartları</u-terms>nı ve <u-policy>gizlilik politikası</u-policy>nı kabul ediyorum",
+  "privacyPolicyTitle": "Gizlilik Politikası",
+  "termsOfServicesTitle": "Şartlar",
+  "encryption": "Şifreleme",
+  "setPasswordTitle": "Şifre belirleyin",
+  "changePasswordTitle": "Şifreyi değiştirin",
+  "resetPasswordTitle": "Şifreyi sıfırlayın",
+  "encryptionKeys": "Şifreleme anahtarları",
+  "passwordWarning": "Bu şifreyi saklamıyoruz, bu nedenle unutursanız, <underline>verilerinizin şifresini çözemeyiz</underline>",
+  "enterPasswordToEncrypt": "Verilerinizi şifrelemek için kullanabileceğimiz bir şifre girin",
+  "enterNewPasswordToEncrypt": "Verilerinizi şifrelemek için kullanabileceğimiz yeni bir şifre girin",
+  "passwordChangedSuccessfully": "Şifre başarıyla değiştirildi",
+  "generatingEncryptionKeys": "Şifreleme anahtarları oluşturuluyor...",
+  "continueLabel": "Devam et",
+  "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",
+  "logInLabel": "Giriş yapın",
+  "logout": "Çıkış yap",
+  "areYouSureYouWantToLogout": "Çıkış yapmak istediğinize emin misiniz?",
+  "yesLogout": "Evet, çıkış yap",
+  "exit": "Çıkış",
+  "verifyingRecoveryKey": "Kurtarma anahtarı doğrulanıyor...",
+  "recoveryKeyVerified": "Kurtarma anahtarı doğrulandı",
+  "recoveryKeySuccessBody": "Güzel! Kurtarma anahtarınız geçerli. Doğruladığınız için teşekkürler.\n\nLütfen kurtarma anahtarınızı güvenli bir şekilde yedeklemeyi unutmayın.",
+  "invalidRecoveryKey": "Girdiğiniz kurtarma kodu geçersiz. Lütfen 24 kelime içerdiğinden ve her birinin yazılışını kontrol ettiğinizden emin olun.\n\nEğer eski bir kurtarma kodu girdiyseniz, Lütfen 64 kelime içerdiğinden ve her birinin yazılışını kontrol ettiğinizden emin olun.",
+  "recreatePasswordTitle": "Şifreyi yeniden oluştur",
+  "recreatePasswordBody": "Mevcut cihaz şifrenizi doğrulayacak kadar güçlü değil, ancak tüm cihazlarla çalışacak şekilde yeniden oluşturabiliriz.\n\nLütfen kurtarma anahtarınızı kullanarak giriş yapın ve şifrenizi yeniden oluşturun (isterseniz aynı şifreyi tekrar kullanabilirsiniz).",
+  "invalidKey": "Geçersiz anahtar",
+  "tryAgain": "Tekrar deneyin",
+  "viewRecoveryKey": "Kurtarma anahtarını görün",
+  "confirmRecoveryKey": "Kurtarma anahtarını doğrulayın",
+  "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": "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": "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.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "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.",
+  "about": "Hakkında",
+  "weAreOpenSource": "Biz açık kaynağız!",
+  "privacy": "Gizlilik",
+  "terms": "Şartlar",
+  "checkForUpdates": "Güncellemeleri denetleyin",
+  "checking": "Denetleniyor...",
+  "youAreOnTheLatestVersion": "En son sürümdesiniz",
+  "warning": "Uyarı",
+  "exportWarningDesc": "Dışa aktarılan dosya hassas bilgiler içeriyor. Lütfen bunu güvenli bir şekilde saklayın.",
+  "iUnderStand": "Anlıyorum",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Kodlarınızı dışa aktarmak için lütfen kimlik doğrulaması yapın",
+  "importSuccessTitle": "Oley!",
+  "importSuccessDesc": "İçeri {count} kod aktardınız!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Üzgünüz",
+  "importFailureDesc": "Seçilen dosya ayrıştırılamadı.\nYardıma ihtiyacınız varsa lütfen support@ente.io adresine yazın!",
+  "pendingSyncs": "Uyarı",
+  "pendingSyncsWarningBody": "Kodlarınızdan bazıları yedeklenmemiş.\n\nLütfen oturumu kapatmadan önce bu kodların yedeğini aldığınızdan emin olun.",
+  "checkInboxAndSpamFolder": "Doğrulamayı tamamlamak için lütfen gelen kutunuzu (ve spam kutunuzu) kontrol edin",
+  "tapToEnterCode": "Kodu girmek için dokunun",
+  "resendEmail": "E-postayı yeniden gönder",
+  "weHaveSendEmailTo": "<green>{email}</green> adresine bir posta gönderdik",
+  "@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"
+      }
+    }
+  },
+  "activeSessions": "Aktif oturumlar",
+  "somethingWentWrongPleaseTryAgain": "Bir şeyler ters gitti, lütfen tekrar deneyin",
+  "thisWillLogYouOutOfThisDevice": "Bu sizin bu cihazdaki oturumunuzu kapatacaktır!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Bu, aşağıdaki cihazdan çıkış yapmanızı sağlayacaktır:",
+  "terminateSession": "Oturumu sonlandır?",
+  "terminate": "Sonlandır",
+  "thisDevice": "Bu cihaz",
+  "toResetVerifyEmail": "Şifrenizi sıfırlamak için lütfen önce e-postanızı doğrulayın.",
+  "thisEmailIsAlreadyInUse": "Bu e-posta zaten kullanılıyor",
+  "verificationFailedPleaseTryAgain": "Doğrulama başarısız oldu, lütfen tekrar deneyin",
+  "yourVerificationCodeHasExpired": "Doğrulama kodunuzun süresi doldu",
+  "incorrectCode": "Yanlış kod",
+  "sorryTheCodeYouveEnteredIsIncorrect": "Üzgünüz, girdiğiniz kod yanlış",
+  "emailChangedTo": "E-posta {newEmail} olarak değiştirildi",
+  "authenticationFailedPleaseTryAgain": "Kimlik doğrulama başarısız oldu, lütfen tekrar deneyin",
+  "authenticationSuccessful": "Kimlik doğrulama başarılı!",
+  "twofactorAuthenticationSuccessfullyReset": "İki faktörlü kimlik doğrulama başarıyla sıfırlandı",
+  "incorrectRecoveryKey": "Yanlış kurtarma kodu",
+  "theRecoveryKeyYouEnteredIsIncorrect": "Girdiğiniz kurtarma kodu yanlış",
+  "enterPassword": "Şifreyi girin",
+  "selectExportFormat": "Dışa aktarma formatını seç",
+  "exportDialogDesc": "Şifrelenmiş dışa aktarımlar seçtiğiniz bir parola ile korunacaktır.",
+  "encrypted": "Şifreli",
+  "plainText": "Düz metin",
+  "passwordToEncryptExport": "Dışa aktarımı şifrelemek için parola",
+  "export": "Dışa aktar"
+}

lib/l10n/arb/app_vi.arb

@@ -0,0 +1,271 @@
+{
+  "account": "Tài khoản",
+  "recoveryKey": "Khóa khôi phục",
+  "counterAppBarTitle": "Bộ Đếm",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "Bảo mật mã 2FA của bạn",
+  "onBoardingGetStarted": "Bắt đầu",
+  "setupFirstAccount": "Thiết lập tài khoản đầu tiên của bạn",
+  "importScanQrCode": "Quét mã QR",
+  "importEnterSetupKey": "Nhập khóa thiết lập",
+  "importAccountPageTitle": "Nhập chi tiết tài khoản",
+  "secretCanNotBeEmpty": "Khoá bí mật không được để trống",
+  "bothIssuerAndAccountCanNotBeEmpty": "Cả nhà phát hành và tài khoản không được để trống",
+  "incorrectDetails": "Thông tin chi tiết không chính xác",
+  "pleaseVerifyDetails": "Vui lòng xác minh chi tiết và thử lại",
+  "codeIssuerHint": "Nhà phát hành",
+  "codeSecretKeyHint": "Khóa bí mật",
+  "codeAccountHint": "Tài khoản (bạn@miền.com)",
+  "accountKeyType": "Loại khóa",
+  "sessionExpired": "Phiên làm việc đã hết hạn",
+  "@sessionExpired": {
+    "description": "Title of the dialog when the users current session is invalid/expired"
+  },
+  "pleaseLoginAgain": "Vui lòng đăng nhập lại",
+  "loggingOut": "Đang thoát...",
+  "timeBasedKeyType": "Dựa trên thời gian (TOTP)",
+  "counterBasedKeyType": "Dựa trên bộ đếm (HOTP)",
+  "saveAction": "Lưu",
+  "nextTotpTitle": "tiếp",
+  "deleteCodeTitle": "Xóa mã?",
+  "deleteCodeMessage": "Bạn có chắc chắn muốn xóa mã này không? Hành động này không thể đảo ngược.",
+  "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",
+  "emailLogsMessage": "Vui lòng gửi nhật ký tới {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "Sao chép email",
+  "exportLogsAction": "Xuất nhật ký",
+  "reportABug": "Báo cáo lỗi",
+  "crashAndErrorReporting": "Báo cáo sự cố và lỗi",
+  "reportBug": "Báo lỗi",
+  "emailUsMessage": "Vui lòng gửi email cho chúng tôi tại {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "Liên hệ hỗ trợ",
+  "verifyPassword": "Xác nhận mật khẩu",
+  "pleaseWait": "Vui lòng chờ...",
+  "generatingEncryptionKeysTitle": "Đang tạo khóa mã hóa...",
+  "recreatePassword": "Tạo lại mật khẩu",
+  "recreatePasswordMessage": "Thiết bị hiện tại không đủ mạnh để xác minh mật khẩu của bạn, vì vậy chúng tôi cần tạo lại mật khẩu một lần theo cách hoạt động với tất cả các thiết bị. \n\nVui lòng đăng nhập bằng khóa khôi phục và tạo lại mật khẩu của bạn (bạn có thể sử dụng lại cùng một mật khẩu nếu muốn).",
+  "useRecoveryKey": "Dùng khóa khôi phục",
+  "incorrectPasswordTitle": "Mật khẩu không đúng",
+  "welcomeBack": "Chào mừng trở lại!",
+  "madeWithLoveAtPrefix": "được làm bằng ❤️ tại ",
+  "supportDevs": "Đăng ký <bold-green>ente</bold-green> để hỗ trợ dự án này.",
+  "supportDiscount": "Sử dụng mã giảm giá \"AUTH\" để được giảm 10% trong năm đầu tiên",
+  "changeEmail": "Thay đổi email",
+  "changePassword": "Thay đổi mật khẩu",
+  "data": "Dữ liệu",
+  "importCodes": "Nhập mã",
+  "exportCodes": "Xuất mã",
+  "importInstruction": "Vui lòng chọn tệp chứa danh sách mã của bạn ở định dạng sau",
+  "importCodeDelimiterInfo": "Các mã có thể được phân tách bằng một dấu phẩy hoặc một dòng mới",
+  "selectFile": "Chọn tập tin",
+  "authToViewYourRecoveryKey": "Vui lòng xác thực để xem khóa khôi phục của bạn",
+  "authToChangeYourEmail": "Vui lòng xác thực để thay đổi email của bạn",
+  "authToChangeYourPassword": "Vui lòng xác thực để thay đổi mật khẩu của bạn",
+  "ok": "Được rồi",
+  "cancel": "Hủy",
+  "yes": "Đúng",
+  "no": "Không",
+  "email": "Thư điện tử",
+  "support": "Hỗ trợ",
+  "settings": "Cài đặt",
+  "copied": "\u001dĐã sao chép",
+  "pleaseTryAgain": "Vui lòng thử lại",
+  "existingUser": "Người dùng hiện tại",
+  "newUser": "Mới tham gia ente",
+  "delete": "Xóa",
+  "enterYourPasswordHint": "Nhập mật khẩu của bạn",
+  "forgotPassword": "Quên mật khẩu",
+  "oops": "Rất tiếc",
+  "somethingWentWrongMessage": "Phát hiện có lỗi, xin thử lại",
+  "leaveFamily": "Rời khỏi gia đình",
+  "leaveFamilyMessage": "Bạn có chắc chắn muốn thoát khỏi gói dành cho gia đình không?",
+  "inFamilyPlanMessage": "Bạn đang sử dụng gói dành cho gia đình!",
+  "swipeHint": "Vuốt sang trái để chỉnh sửa hoặc xóa mã",
+  "scan": "Quét",
+  "scanACode": "Quét mã",
+  "verify": "Xác minh",
+  "verifyEmail": "Xác nhận địa chỉ Email",
+  "enterCodeHint": "Nhập mã gồm 6 chữ số từ ứng dụng xác thực của bạn",
+  "lostDeviceTitle": "Bạn đã mất thiết bị?",
+  "twoFactorAuthTitle": "Xác thực hai yếu tố",
+  "recoverAccount": "Khôi phục tài khoản",
+  "enterRecoveryKeyHint": "Nhập khóa khôi phục của bạn",
+  "recover": "Khôi phục",
+  "contactSupportViaEmailMessage": "Vui lòng gửi email đến {email} từ địa chỉ email đã đăng ký của bạn",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "Không có khóa khôi phục?",
+  "enterEmailHint": "Nhập địa chỉ email của bạn",
+  "invalidEmailTitle": "Địa chỉ email không hợp lệ",
+  "invalidEmailMessage": "Xin vui lòng nhập một địa chỉ email hợp lệ.",
+  "deleteAccount": "Xoá tài khoản",
+  "deleteAccountQuery": "Chúng tôi sẽ rất tiếc khi thấy bạn đi. Bạn đang phải đối mặt với một số vấn đề?",
+  "yesSendFeedbackAction": "Có, gửi phản hồi",
+  "noDeleteAccountAction": "Không, xóa tài khoản",
+  "initiateAccountDeleteTitle": "Vui lòng xác thực để bắt đầu xóa tài khoản",
+  "confirmAccountDeleteTitle": "Bạn có chắc rằng bạn muốn xóa tài khoản ente của bạn không?",
+  "confirmAccountDeleteMessage": "Dữ liệu đã tải lên của bạn, trên tất cả các ứng dụng (cả Ảnh và Authenticator), sẽ được lên lịch xóa và tài khoản của bạn sẽ bị xóa vĩnh viễn.",
+  "sendEmail": "Gửi email",
+  "createNewAccount": "Tạo tài khoản mới",
+  "weakStrength": "Yếu",
+  "strongStrength": "Mạnh",
+  "moderateStrength": "Trung bình",
+  "confirmPassword": "Xác nhận mật khẩu",
+  "close": "Đóng",
+  "oopsSomethingWentWrong": "Rất tiếc, Đã xảy ra lỗi.",
+  "selectLanguage": "Chọn ngôn ngữ",
+  "language": "Ngôn ngữ",
+  "social": "Xã hội",
+  "security": "Bảo mật",
+  "lockscreen": "Màn hình khoá",
+  "authToChangeLockscreenSetting": "Vui lòng xác thực để thay đổi cài đặt màn hình khóa",
+  "lockScreenEnablePreSteps": "Để bật màn hình khóa, vui lòng thiết lập mật khẩu thiết bị hoặc khóa màn hình trong cài đặt hệ thống của bạn.",
+  "viewActiveSessions": "Xem danh sách phiên làm việc hiện tại",
+  "authToViewYourActiveSessions": "Vui lòng xác thực để xem danh sách phiên làm việc của bạn",
+  "searchHint": "Tìm kiếm...",
+  "search": "Tìm kiếm",
+  "sorryUnableToGenCode": "Rất tiếc, không thể tạo mã cho {issuerName}",
+  "noResult": "Không có kết quả",
+  "addCode": "Thêm mã",
+  "scanAQrCode": "Quét mã QR",
+  "enterDetailsManually": "Nhập chi tiết thủ công",
+  "edit": "Sửa",
+  "copiedToClipboard": "Đã sao chép vào khay nhớ tạm",
+  "error": "Lỗi",
+  "recoveryKeyCopiedToClipboard": "Đã sao chép khóa khôi phục vào bộ nhớ tạm",
+  "recoveryKeyOnForgotPassword": "Nếu bạn quên mật khẩu, cách duy nhất bạn có thể khôi phục dữ liệu của mình là sử dụng khóa này.",
+  "recoveryKeySaveDescription": "Chúng tôi không lưu trữ khóa này, vui lòng lưu khóa 24 từ này ở nơi an toàn.",
+  "doThisLater": "Để sau",
+  "saveKey": "Lưu khóa",
+  "createAccount": "Tạo tài khoản",
+  "passwordStrength": "Độ mạnh mật khẩu: {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": "Mật khẩu",
+  "signUpTerms": "Tôi đồng ý với <u-terms>điều khoản dịch vụ</u-terms> và <u-policy>chính sách quyền riêng tư</u-policy>",
+  "privacyPolicyTitle": "Chính sách bảo mật",
+  "termsOfServicesTitle": "Điều khoản",
+  "encryption": "Mã hóa",
+  "setPasswordTitle": "Đặt mật khẩu",
+  "changePasswordTitle": "Thay đổi mật khẩu",
+  "resetPasswordTitle": "Đặt lại mật khẩu",
+  "encryptionKeys": "Khóa mã hóa",
+  "passwordWarning": "Chúng tôi không lưu trữ mật khẩu này, vì vậy nếu bạn quên, <underline>chúng tôi không thể giải mã dữ liệu của bạn</underline>",
+  "enterPasswordToEncrypt": "Nhập mật khẩu mà chúng tôi có thể sử dụng để mã hóa dữ liệu của bạn",
+  "enterNewPasswordToEncrypt": "Nhập một mật khẩu mới mà chúng tôi có thể sử dụng để mã hóa dữ liệu của bạn",
+  "passwordChangedSuccessfully": "Thay đổi mật khẩu thành công",
+  "generatingEncryptionKeys": "Đang tạo khóa mã hóa...",
+  "continueLabel": "Tiếp tục",
+  "insecureDevice": "Thiết bị không an toàn",
+  "sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease": "Rất tiếc, chúng tôi không thể tạo khóa bảo mật trên thiết bị này.\n\nvui lòng đăng ký từ một thiết bị khác.",
+  "howItWorks": "Cách thức hoạt động",
+  "ackPasswordLostWarning": "Tôi hiểu rằng việc mất mật khẩu có thể đồng nghĩa với việc mất dữ liệu của tôi vì dữ liệu của tôi được <underline>mã hóa hai đầu</underline>.",
+  "loginTerms": "Bằng cách nhấp vào đăng nhập, tôi đồng ý với <u-terms>điều khoản dịch vụ</u-terms> và <u-policy>chính sách quyền riêng tư</u-policy>",
+  "logInLabel": "Đăng nhập",
+  "logout": "Đăng xuất",
+  "areYouSureYouWantToLogout": "Bạn có chắc chắn muốn đăng xuất?",
+  "yesLogout": "Có, đăng xuất",
+  "exit": "Thoát",
+  "verifyingRecoveryKey": "Đang xác minh khóa khôi phục...",
+  "recoveryKeyVerified": "Khóa khôi phục đã được xác thực",
+  "recoveryKeySuccessBody": "Tuyệt vời! Khóa khôi phục của bạn hợp lệ. Cảm ơn bạn đã xác minh.\n\nHãy nhớ sao lưu khóa khôi phục của bạn một cách an toàn.",
+  "invalidRecoveryKey": "Khóa khôi phục bạn đã nhập không hợp lệ. Vui lòng đảm bảo rằng nó chứa 24 từ và kiểm tra chính tả của từng từ.\n\nNếu bạn đã nhập mã khôi phục cũ hơn, hãy đảm bảo mã đó dài 64 ký tự và kiểm tra từng ký tự.",
+  "recreatePasswordTitle": "Tạo lại mật khẩu",
+  "recreatePasswordBody": "Thiết bị hiện tại không đủ mạnh để xác minh mật khẩu của bạn nhưng chúng tôi có thể tạo lại mật khẩu theo cách hoạt động với tất cả các thiết bị.\n\nVui lòng đăng nhập bằng khóa khôi phục và tạo lại mật khẩu của bạn (bạn có thể sử dụng lại cùng một mật khẩu nếu muốn).",
+  "invalidKey": "Khoá không hợp lệ",
+  "tryAgain": "Thử lại",
+  "viewRecoveryKey": "Hiển thị khóa khôi phục",
+  "confirmRecoveryKey": "Xác nhận khóa khôi phục",
+  "recoveryKeyVerifyReason": "Nếu bạn quên mật khẩu, khóa khôi phục là cách duy nhất để khôi phục ảnh của bạn. Bạn có thể tìm thấy khóa khôi phục của mình trong Cài đặt > Tài khoản.\n\nVui lòng nhập khóa khôi phục của bạn tại đây để xác minh rằng bạn đã lưu chính xác.",
+  "confirmYourRecoveryKey": "Xác nhận khóa khôi phục",
+  "confirm": "Xác nhận",
+  "emailYourLogs": "Gửi email nhật ký của bạn",
+  "pleaseSendTheLogsTo": "Vui lòng gửi nhật ký đến \n{toEmail}",
+  "copyEmailAddress": "Sao chép địa chỉ email",
+  "exportLogs": "Xuất nhật ký",
+  "enterYourRecoveryKey": "Nhập khóa khôi phục của bạn",
+  "tempErrorContactSupportIfPersists": "Có vẻ như đã xảy ra sự cố. Vui lòng thử lại sau một thời gian. Nếu lỗi vẫn tiếp diễn, vui lòng liên hệ với nhóm hỗ trợ của chúng tôi.",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "Có vẻ như đã xảy ra sự cố. Vui lòng thử lại sau một thời gian. Nếu lỗi vẫn tiếp diễn, vui lòng liên hệ với nhóm hỗ trợ của chúng tôi.",
+  "about": "Về chúng tôi",
+  "weAreOpenSource": "Chúng tôi có mã nguồn mở!",
+  "privacy": "Riêng tư",
+  "terms": "Điều khoản",
+  "checkForUpdates": "Kiểm tra cập nhật",
+  "checking": "Đang kiểm tra...",
+  "youAreOnTheLatestVersion": "Bạn đang sử dụng phiên bản mới nhất",
+  "warning": "Cánh báo",
+  "exportWarningDesc": "Tệp đã xuất chứa thông tin nhạy cảm. Hãy lưu trữ tệp này một cách an toàn.",
+  "iUnderStand": "Tôi hiểu",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "Vui lòng xác thực để xuất mã của bạn",
+  "importSuccessTitle": "Hoan hô!",
+  "importSuccessDesc": "Bạn đã nhập {count} mã!",
+  "@importSuccessDesc": {
+    "placeholders": {
+      "count": {
+        "description": "The number of codes imported",
+        "type": "int",
+        "example": "1"
+      }
+    }
+  },
+  "sorry": "Xin lỗi",
+  "importFailureDesc": "Không thể phân tích cú pháp tệp đã chọn.\nVui lòng viết thư cho support@ente.io nếu bạn cần trợ giúp!",
+  "pendingSyncs": "Cánh báo",
+  "pendingSyncsWarningBody": "Một số mã của bạn chưa được sao lưu.\n\nVui lòng đảm bảo rằng bạn có bản sao lưu cho các mã này trước khi đăng xuất.",
+  "checkInboxAndSpamFolder": "Vui lòng kiểm tra hộp thư đến (và thư rác) của bạn để hoàn tất xác minh",
+  "tapToEnterCode": "Chạm để nhập mã",
+  "resendEmail": "Gửi lại email",
+  "weHaveSendEmailTo": "Chúng tôi đã gửi thư đến <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"
+      }
+    }
+  },
+  "activeSessions": "Các phiên làm việc hiện tại",
+  "somethingWentWrongPleaseTryAgain": "Phát hiện có lỗi, xin thử lại",
+  "thisWillLogYouOutOfThisDevice": "Thao tác này sẽ đăng xuất bạn khỏi thiết bị này!",
+  "thisWillLogYouOutOfTheFollowingDevice": "Thao tác này sẽ đăng xuất bạn khỏi thiết bị sau:",
+  "terminateSession": "Chấm dứt phiên?",
+  "terminate": "Dừng lại",
+  "thisDevice": "Thiết bị này"
+}

lib/l10n/arb/app_zh.arb

@@ -0,0 +1,320 @@
+{
+  "account": "账户",
+  "recoveryKey": "恢复密钥",
+  "counterAppBarTitle": "计数器",
+  "@counterAppBarTitle": {
+    "description": "Text shown in the AppBar of the Counter Page"
+  },
+  "onBoardingBody": "妥善保管您的 2FA代码",
+  "onBoardingGetStarted": "开始",
+  "setupFirstAccount": "设置您的第一个账户",
+  "importScanQrCode": "扫描二维码",
+  "qrCode": "二维码",
+  "importEnterSetupKey": "输入设置密钥",
+  "importAccountPageTitle": "输入账户详细信息",
+  "secretCanNotBeEmpty": "密码不能为空",
+  "bothIssuerAndAccountCanNotBeEmpty": "发行人和账户均不能为空",
+  "incorrectDetails": "详细信息不正确",
+  "pleaseVerifyDetails": "请验证详细信息并重试",
+  "codeIssuerHint": "发行人",
+  "codeSecretKeyHint": "私钥",
+  "codeAccountHint": "账户 (you@domain.com)",
+  "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": "您确定要删除此代码吗？此操作是不可逆的。",
+  "viewLogsAction": "查看日志",
+  "sendLogsDescription": "这将跨日志发送以帮助我们调试您的问题。 虽然我们采取预防措施以确保不记录敏感信息，但我们鼓励您在共享这些日志之前先查看它们。",
+  "preparingLogsTitle": "正在准备日志...",
+  "emailLogsTitle": "电子邮件日志",
+  "emailLogsMessage": "请将日志发送至 {email}",
+  "@emailLogsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "copyEmailAction": "复制电子邮件",
+  "exportLogsAction": "导出日志",
+  "reportABug": "报告错误",
+  "crashAndErrorReporting": "崩溃和错误报告",
+  "reportBug": "报告错误",
+  "emailUsMessage": "请给我们发送电子邮件至 {email}",
+  "@emailUsMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "contactSupport": "联系支持",
+  "rateUsOnStore": "在 {storeName} 上给我们评分",
+  "blog": "博客",
+  "merchandise": "商品",
+  "verifyPassword": "验证密码",
+  "pleaseWait": "请稍候...",
+  "generatingEncryptionKeysTitle": "正在生成加密密钥...",
+  "recreatePassword": "重新创建密码",
+  "recreatePasswordMessage": "当前设备的强度不足以验证您的密码， 所以我们需要以一种能够与所有设备一起运行的方式重新生成它。 \n\n请使用您的恢复密钥登录并重新生成您的密码 (如果您愿意，您可以再次使用相同密钥)。",
+  "useRecoveryKey": "使用恢复密钥",
+  "incorrectPasswordTitle": "密码错误",
+  "welcomeBack": "欢迎回来！",
+  "madeWithLoveAtPrefix": "用❤️制成 ",
+  "supportDevs": "订阅 <bold-green>ente</bold-green> 以支持此项目。",
+  "supportDiscount": "使用优惠券号码“AUTH”获得第一年优惠10%的折扣",
+  "changeEmail": "修改邮箱",
+  "changePassword": "修改密码",
+  "data": "数据",
+  "importCodes": "导入代码",
+  "importTypePlainText": "纯文本",
+  "importTypeEnteEncrypted": "ente 加密导出",
+  "passwordForDecryptingExport": "用来解密导出的密码",
+  "passwordEmptyError": "密码不能为空",
+  "importFromApp": "从 {appName} 导入代码",
+  "importGoogleAuthGuide": "使用“转移帐户”选项将您的帐户从 Google 身份验证器导出到二维码。然后使用另一台设备扫描二维码。\n\n提示：您可以使用笔记本电脑的网络摄像头拍摄二维码的照片。",
+  "importSelectJsonFile": "选择 JSON 文件",
+  "importEnteEncGuide": "选择从ente导出的加密JSON文件",
+  "importRaivoGuide": "使用 Raivo 设置中的“将 OTP 导出到 Zip 存档”选项。\n\n解压 zip 文件并导入 JSON 文件。",
+  "importAegisGuide": "在Aegis的设置中使用\"导出密码库\"选项。\n\n如果您的密码库已加密，您需要输入密码才能解密密码库。",
+  "exportCodes": "导出代码",
+  "importLabel": "导入",
+  "importInstruction": "请以以下格式选择包含代码列表的文件",
+  "importCodeDelimiterInfo": "代码可以用逗号或新行分隔。",
+  "selectFile": "选择文件",
+  "emailVerificationToggle": "电子邮件验证",
+  "authToChangeEmailVerificationSetting": "请进行身份验证以更改电子邮件验证",
+  "authToViewYourRecoveryKey": "请验证以查看您的恢复密钥",
+  "authToChangeYourEmail": "请验证以更改您的电子邮件",
+  "authToChangeYourPassword": "请验证以更改密码",
+  "ok": "好的",
+  "cancel": "取消",
+  "yes": "是",
+  "no": "否",
+  "email": "电子邮件地址",
+  "support": "支持",
+  "settings": "设置",
+  "copied": "已复制",
+  "pleaseTryAgain": "请重试",
+  "existingUser": "已注册用户",
+  "newUser": "刚来到ente",
+  "delete": "删除",
+  "enterYourPasswordHint": "输入您的密码",
+  "forgotPassword": "忘记密码",
+  "oops": "哎呀",
+  "suggestFeatures": "建议新功能",
+  "faq": "常见问题",
+  "faq_q_1": "ente Auth的安全程度如何？",
+  "faq_a_1": "您通过 ente 备份的所有代码均以端到端加密方式存储。这意味着只有您可以访问您的代码。 我们的应用程序是开源的，我们的加密技术已经过外部审计。",
+  "faq_q_2": "我可以在桌面上访问我的代码吗？",
+  "faq_a_2": "您可以在 web @auth.ente.io 上访问您的代码。",
+  "faq_q_3": "我如何删除代码？",
+  "faq_a_3": "您可以通过向左滑动该项目来删除该代码。",
+  "faq_q_4": "我该如何支持该项目？",
+  "faq_a_4": "您可以通过订阅我们的照片应用程序@ente.io来支持该项目的开发。",
+  "faq_q_5": "如何在 ente Auth 中启用 FaceID 锁定",
+  "faq_a_5": "您可以在“设置”→“安全”→“锁屏”下启用 FaceID 锁定。",
+  "somethingWentWrongMessage": "出了点问题，请重试",
+  "leaveFamily": "离开家庭",
+  "leaveFamilyMessage": "您确定要离开家庭计划吗？",
+  "inFamilyPlanMessage": "你在一个家庭计划中！",
+  "swipeHint": "向左滑动以编辑或删除代码",
+  "scan": "扫描",
+  "scanACode": "扫描代码",
+  "verify": "验证",
+  "verifyEmail": "验证电子邮件",
+  "enterCodeHint": "从你的身份验证器应用中\n输入6位数字代码",
+  "lostDeviceTitle": "丢失了设备吗？",
+  "twoFactorAuthTitle": "双因素认证",
+  "recoverAccount": "恢复账户",
+  "enterRecoveryKeyHint": "输入您的恢复密钥",
+  "recover": "恢复",
+  "contactSupportViaEmailMessage": "请从您注册的电子邮件地址拖放一封邮件到 {email}",
+  "@contactSupportViaEmailMessage": {
+    "placeholders": {
+      "email": {
+        "type": "String"
+      }
+    }
+  },
+  "noRecoveryKeyTitle": "没有恢复密钥吗？",
+  "enterEmailHint": "请输入您的电子邮件地址",
+  "invalidEmailTitle": "无效的电子邮件地址",
+  "invalidEmailMessage": "请输入一个有效的电子邮件地址。",
+  "deleteAccount": "删除账户",
+  "deleteAccountQuery": "我们很抱歉看到您离开。您面临一些问题？",
+  "yesSendFeedbackAction": "是，发送反馈",
+  "noDeleteAccountAction": "不，删除账户",
+  "initiateAccountDeleteTitle": "请进行身份验证以启动账户删除",
+  "confirmAccountDeleteTitle": "确定要删除您的ente账户吗？",
+  "confirmAccountDeleteMessage": "您上传的数据，跨越所有应用程序(Photos 和 Authenticator 两者)，将被排定删除，您的账户将被永久删除。",
+  "sendEmail": "发送电子邮件",
+  "createNewAccount": "创建新账号",
+  "weakStrength": "弱",
+  "strongStrength": "强",
+  "moderateStrength": "中等",
+  "confirmPassword": "请确认密码",
+  "close": "关闭",
+  "oopsSomethingWentWrong": "哎呀，似乎出了点问题.",
+  "selectLanguage": "选择语言",
+  "language": "语言",
+  "social": "社交",
+  "security": "安全",
+  "lockscreen": "锁屏",
+  "authToChangeLockscreenSetting": "请验证以更改锁屏设置",
+  "lockScreenEnablePreSteps": "要启用锁屏，请在系统设置中设置设备密码或屏幕锁定。",
+  "viewActiveSessions": "查看活动会话",
+  "authToViewYourActiveSessions": "请验证以查看您的活动会话",
+  "searchHint": "搜索...",
+  "search": "搜索",
+  "sorryUnableToGenCode": "对不起，无法为 {issuerName} 生成代码",
+  "noResult": "没有结果",
+  "addCode": "添加代码",
+  "scanAQrCode": "扫描二维码",
+  "enterDetailsManually": "手动输入详细信息",
+  "edit": "编辑",
+  "copiedToClipboard": "已复制到剪贴板",
+  "error": "错误",
+  "recoveryKeyCopiedToClipboard": "恢复密钥已复制到剪贴板",
+  "recoveryKeyOnForgotPassword": "如果您忘记了密码，恢复数据的唯一方法就是使用此密钥。",
+  "recoveryKeySaveDescription": "我们不会存储此密钥，请将此24个单词密钥保存在一个安全的地方。",
+  "doThisLater": "稍后再做",
+  "saveKey": "保存密钥",
+  "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": "退出",
+  "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": "看起来出了点问题。 请稍后重试。 如果错误仍然存在，请联系我们的支持团队。",
+  "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": "看起来出了点问题。 请稍后重试。 如果错误仍然存在，请联系我们的支持团队。",
+  "about": "关于",
+  "weAreOpenSource": "我们是开源的 ！",
+  "privacy": "隐私",
+  "terms": "使用条款",
+  "checkForUpdates": "检查更新",
+  "checking": "正在检查...",
+  "youAreOnTheLatestVersion": "当前为最新版本",
+  "warning": "警告",
+  "exportWarningDesc": "导出的文件包含敏感信息。请安全存储。",
+  "iUnderStand": "我明白了",
+  "@iUnderStand": {
+    "description": "Text for the button to confirm the user understands the warning"
+  },
+  "authToExportCodes": "请验证以导出您的代码",
+  "importSuccessTitle": "耶！",
+  "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"
+      }
+    }
+  },
+  "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": "导出"
+}

lib/locale.dart

@@ -0,0 +1,75 @@
+import 'package:flutter/cupertino.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+// list of locales which are enabled for auth app.
+// Add more language to the list only when at least 90% of the strings are
+// translated in the corresponding language.
+const List<Locale> appSupportedLocales = <Locale>[
+  Locale('de'),
+  Locale('en'),
+  Locale('es', 'ES'),
+  Locale('fa'),
+  Locale('fr'),
+  Locale('it'),
+  Locale('ja'),
+  Locale('nl'),
+  Locale('pl'),
+  Locale('pt', 'BR'),
+  Locale('ru'),
+  Locale('tr'),
+  Locale("zh", "CN"),
+];
+
+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)) {
+      return locale;
+    }
+
+    if (languageCodeMatch == null &&
+        languageCodeToLocale.containsKey(locale.languageCode)) {
+      languageCodeMatch = languageCodeToLocale[locale.languageCode];
+    }
+  }
+
+  // Return the first language code match or default to 'en'
+  return languageCodeMatch ?? const Locale('en');
+}
+
+Future<Locale> getLocale() async {
+  final String? savedValue =
+      (await SharedPreferences.getInstance()).getString('locale');
+  // if savedLocale is not null and is supported by the app, return it
+  if (savedValue != null) {
+    late Locale savedLocale;
+    if (savedValue.contains('_')) {
+      final List<String> parts = savedValue.split('_');
+      savedLocale = Locale(parts[0], parts[1]);
+    } else {
+      savedLocale = Locale(savedValue);
+    }
+    if (appSupportedLocales.contains(savedLocale)) {
+      return savedLocale;
+    }
+  }
+  return const Locale('en');
+}
+
+Future<void> setLocale(Locale locale) async {
+  if (!appSupportedLocales.contains(locale)) {
+    throw Exception('Locale $locale is not supported by the app');
+  }
+  final StringBuffer out = StringBuffer(locale.languageCode);
+  if (locale.countryCode != null && locale.countryCode!.isNotEmpty) {
+    out.write('_');
+    out.write(locale.countryCode);
+  }
+  await (await SharedPreferences.getInstance())
+      .setString('locale', out.toString());
+}

lib/main.dart

@@ -1,10 +1,12 @@
-// @dart=2.9
+import 'package:adaptive_theme/adaptive_theme.dart';
+import 'package:computer/computer.dart';
 import "package:ente_auth/app/view/app.dart";
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/core/constants.dart';
 import 'package:ente_auth/core/logging/super_logging.dart';
 import 'package:ente_auth/core/network.dart';
 import 'package:ente_auth/ente_theme_data.dart';
+import 'package:ente_auth/locale.dart';
 import 'package:ente_auth/services/authenticator_service.dart';
 import 'package:ente_auth/services/billing_service.dart';
 import 'package:ente_auth/services/notification_service.dart';
@@ -15,7 +17,9 @@ import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/store/code_store.dart';
 import 'package:ente_auth/ui/tools/app_lock.dart';
 import 'package:ente_auth/ui/tools/lock_screen.dart';
+import 'package:ente_auth/ui/utils/icon_utils.dart';
 import 'package:ente_auth/utils/crypto_util.dart';
+import 'package:flutter/foundation.dart';
 import "package:flutter/material.dart";
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
@@ -24,26 +28,37 @@ final _logger = Logger("main");
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  await _runInForeground();
+  final savedThemeMode = await AdaptiveTheme.getThemeMode();
+  await _runInForeground(savedThemeMode);
 }
 
-Future<void> _runInForeground() async {
+Future<void> _runInForeground(AdaptiveThemeMode? savedThemeMode) async {
   return await _runWithLogs(() async {
     _logger.info("Starting app in foreground");
     await _init(false, via: 'mainMethod');
+    final Locale locale = await getLocale();
     UpdateService.instance.showUpdateNotification();
     runApp(
       AppLock(
-        builder: (args) => const App(),
+        builder: (args) => App(locale: locale),
         lockScreen: const LockScreen(),
         enabled: Configuration.instance.shouldShowLockScreen(),
+        locale: locale,
         lightTheme: lightThemeData,
         darkTheme: darkThemeData,
+        savedThemeMode: _themeMode(savedThemeMode),
       ),
     );
   });
 }
 
+ThemeMode _themeMode(AdaptiveThemeMode? savedThemeMode) {
+  if (savedThemeMode == null) return ThemeMode.system;
+  if (savedThemeMode.isLight) return ThemeMode.light;
+  if (savedThemeMode.isDark) return ThemeMode.dark;
+  return ThemeMode.system;
+}
+
 Future _runWithLogs(Function() function, {String prefix = ""}) async {
   await SuperLogging.main(
     LogConfig(
@@ -57,7 +72,9 @@ Future _runWithLogs(Function() function, {String prefix = ""}) async {
   );
 }
 
-Future<void> _init(bool bool, {String via}) async {
+Future<void> _init(bool bool, {String? via}) async {
+  // Start workers asynchronously. No need to wait for them to start
+  Computer.shared().turnOn(workersCount: 4, verbose: kDebugMode);
   CryptoUtil.init();
   await PreferenceService.instance.init();
   await CodeStore.instance.init();
@@ -69,4 +86,5 @@ Future<void> _init(bool bool, {String via}) async {
   await BillingService.instance.init();
   await NotificationService.instance.init();
   await UpdateService.instance.init();
+  await IconUtils.instance.init();
 }

lib/models/api/user/srp.dart

@@ -0,0 +1,135 @@
+class SetupSRPRequest {
+  final String srpUserID;
+  final String srpSalt;
+  final String srpVerifier;
+  final String srpA;
+  final bool isUpdate;
+
+  SetupSRPRequest({
+    required this.srpUserID,
+    required this.srpSalt,
+    required this.srpVerifier,
+    required this.srpA,
+    required this.isUpdate,
+  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'srpUserID': srpUserID.toString(),
+      'srpSalt': srpSalt,
+      'srpVerifier': srpVerifier,
+      'srpA': srpA,
+      'isUpdate': isUpdate,
+    };
+  }
+
+  factory SetupSRPRequest.fromJson(Map<String, dynamic> json) {
+    return SetupSRPRequest(
+      srpUserID: json['srpUserID'],
+      srpSalt: json['srpSalt'],
+      srpVerifier: json['srpVerifier'],
+      srpA: json['srpA'],
+      isUpdate: json['isUpdate'],
+    );
+  }
+}
+
+class SetupSRPResponse {
+  final String setupID;
+  final String srpB;
+
+  SetupSRPResponse({
+    required this.setupID,
+    required this.srpB,
+  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'setupID': setupID.toString(),
+      'srpB': srpB,
+    };
+  }
+
+  factory SetupSRPResponse.fromJson(Map<String, dynamic> json) {
+    return SetupSRPResponse(
+      setupID: json['setupID'],
+      srpB: json['srpB'],
+    );
+  }
+}
+
+class CompleteSRPSetupRequest {
+  final String setupID;
+  final String srpM1;
+
+  CompleteSRPSetupRequest({
+    required this.setupID,
+    required this.srpM1,
+  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'setupID': setupID.toString(),
+      'srpM1': srpM1,
+    };
+  }
+
+  factory CompleteSRPSetupRequest.fromJson(Map<String, dynamic> json) {
+    return CompleteSRPSetupRequest(
+      setupID: json['setupID'],
+      srpM1: json['srpM1'],
+    );
+  }
+}
+class SrpAttributes {
+  final String srpUserID;
+  final String srpSalt;
+  final int memLimit;
+  final int opsLimit;
+  final String kekSalt;
+  final bool isEmailMFAEnabled;
+
+  SrpAttributes({
+    required this.srpUserID,
+    required this.srpSalt,
+    required this.memLimit,
+    required this.opsLimit,
+    required this.kekSalt,
+    required this.isEmailMFAEnabled,
+  });
+
+  factory SrpAttributes.fromMap(Map<String, dynamic> map) {
+    return SrpAttributes(
+      srpUserID: map['attributes']['srpUserID'],
+      srpSalt: map['attributes']['srpSalt'],
+      memLimit: map['attributes']['memLimit'],
+      opsLimit: map['attributes']['opsLimit'],
+      kekSalt: map['attributes']['kekSalt'],
+      isEmailMFAEnabled: map['attributes']['isEmailMFAEnabled'],
+    );
+  }
+}
+
+class CompleteSRPSetupResponse {
+  final String setupID;
+  final String srpM2;
+
+  CompleteSRPSetupResponse({
+    required this.setupID,
+    required this.srpM2,
+  });
+
+  Map<String, dynamic> toMap() {
+    return {
+      'setupID': setupID,
+      'srpM2': srpM2,
+    };
+  }
+
+  factory CompleteSRPSetupResponse.fromJson(Map<String, dynamic> json) {
+    return CompleteSRPSetupResponse(
+      setupID: json['setupID'],
+      srpM2: json['srpM2'],
+    );
+  }
+}

lib/models/authenticator/local_auth_entity.dart

@@ -5,15 +5,18 @@ import 'package:flutter/material.dart';
 @immutable
 class LocalAuthEntity {
   final int generatedID;
+
   // id can be null if a code has been scanned locally but it's yet to be
   // synced with the remote server.
   final String? id;
   final String encryptedData;
   final String header;
+
   // createdAt and updateAt will be equal to local time of creation or updation
   // till remote sync is completed.
   final int createdAt;
   final int updatedAt;
+
   // shouldSync indicates that the entry was locally created or updated. The
   // app should try to sync it to the server during next sync
   final bool shouldSync;

lib/models/code.dart

@@ -13,6 +13,7 @@ class Code {
   final Algorithm algorithm;
   final Type type;
   final String rawData;
+  final int counter;
   bool? hasSynced;
 
   Code(
@@ -23,10 +24,51 @@ class Code {
     this.secret,
     this.algorithm,
     this.type,
+    this.counter,
     this.rawData, {
     this.generatedID,
   });
 
+  Code copyWith({
+    String? account,
+    String? issuer,
+    int? digits,
+    int? period,
+    String? secret,
+    Algorithm? algorithm,
+    Type? type,
+    int? counter,
+  }) {
+    final String updateAccount = account ?? this.account;
+    final String updateIssuer = issuer ?? this.issuer;
+    final int updatedDigits = digits ?? this.digits;
+    final int updatePeriod = period ?? this.period;
+    final String updatedSecret = secret ?? this.secret;
+    final Algorithm updatedAlgo = algorithm ?? this.algorithm;
+    final Type updatedType = type ?? this.type;
+    final int updatedCounter = counter ?? this.counter;
+
+    return Code(
+      updateAccount,
+      updateIssuer,
+      updatedDigits,
+      updatePeriod,
+      updatedSecret,
+      updatedAlgo,
+      updatedType,
+      updatedCounter,
+      "otpauth://${updatedType.name}/" +
+          updateIssuer +
+          ":" +
+          updateAccount +
+          "?algorithm=${updatedAlgo.name}&digits=$updatedDigits&issuer=" +
+          updateIssuer +
+          "&period=$updatePeriod&secret=" +
+          updatedSecret + (updatedType == Type.hotp ? "&counter=$updatedCounter" : ""),
+      generatedID: generatedID,
+    );
+  }
+
   static Code fromAccountAndSecret(
     String account,
     String issuer,
@@ -40,19 +82,21 @@ class Code {
       secret,
       Algorithm.sha1,
       Type.totp,
+      0,
       "otpauth://totp/" +
           issuer +
           ":" +
           account +
           "?algorithm=SHA1&digits=6&issuer=" +
           issuer +
-          "period=30&secret=" +
+          "&period=30&secret=" +
           secret,
     );
   }
 
   static Code fromRawData(String rawData) {
     Uri uri = Uri.parse(rawData);
+    try {
     return Code(
       _getAccount(uri),
       _getIssuer(uri),
@@ -61,13 +105,31 @@ class Code {
       getSanitizedSecret(uri.queryParameters['secret']!),
       _getAlgorithm(uri),
       _getType(uri),
+      _getCounter(uri),
       rawData,
     );
+    } catch(e) {
+      // if account name contains # without encoding,
+      // rest of the url are treated as url fragment
+      if(rawData.contains("#")) {
+        return Code.fromRawData(rawData.replaceAll("#", '%23'));
+      } else {
+        rethrow;
+      }
+    }
   }
 
   static String _getAccount(Uri uri) {
     try {
-      final String path = Uri.decodeComponent(uri.path);
+      String path = Uri.decodeComponent(uri.path);
+      if (path.startsWith("/")) {
+        path = path.substring(1, path.length);
+      }
+      // Parse account name from documented auth URI
+      // otpauth://totp/ACCOUNT?secret=SUPERSECRET&issuer=SERVICE
+      if (uri.queryParameters.containsKey("issuer") && !path.contains(":")) {
+        return path;
+      }
       return path.split(':')[1];
     } catch (e) {
       return "";
@@ -76,6 +138,15 @@ class Code {
 
   static String _getIssuer(Uri uri) {
     try {
+      if (uri.queryParameters.containsKey("issuer")) {
+        String issuerName = uri.queryParameters['issuer']!;
+        // Handle issuer name with period
+        // See https://github.com/ente-io/auth/pull/77
+        if (issuerName.contains("period=")) {
+          return issuerName.substring(0, issuerName.indexOf("period="));
+        }
+        return issuerName;
+      }
       final String path = Uri.decodeComponent(uri.path);
       return path.split(':')[0].substring(1);
     } catch (e) {
@@ -99,6 +170,18 @@ class Code {
     }
   }
 
+  static int _getCounter(Uri uri) {
+    try {
+      final bool hasCounterKey = uri.queryParameters.containsKey('counter');
+      if (!hasCounterKey) {
+        return 0;
+      }
+      return int.parse(uri.queryParameters['counter']!);
+    } catch (e) {
+      return defaultPeriod;
+    }
+  }
+
   static Algorithm _getAlgorithm(Uri uri) {
     try {
       final algorithm =
@@ -133,6 +216,7 @@ class Code {
         other.digits == digits &&
         other.period == period &&
         other.secret == secret &&
+        other.counter == counter &&
         other.type == type &&
         other.rawData == rawData;
   }
@@ -145,6 +229,7 @@ class Code {
         period.hashCode ^
         secret.hashCode ^
         type.hashCode ^
+        counter.hashCode ^
         rawData.hashCode;
   }
 }

lib/models/execution_states.dart

@@ -0,0 +1,6 @@
+enum ExecutionState {
+  idle,
+  inProgress,
+  error,
+  successful
+}

lib/models/export/ente.dart

@@ -0,0 +1,66 @@
+/*
+Version: 1.0
+KDF Algo: ARGON2ID
+Decrypted Data Format: It contains code.rawData [1] separated by new line.
+[1] otpauth://totp/provider.com:you@email.com?secret=YOUR_SECRET
+*/
+
+class EnteAuthExport {
+  final int version;
+  final KDFParams kdfParams;
+  final String encryptedData;
+  final String encryptionNonce;
+
+  // Named constructor which can be used to specify each field individually
+  EnteAuthExport({
+    required this.version,
+    required this.kdfParams,
+    required this.encryptedData,
+    required this.encryptionNonce,
+  });
+
+  // Convert EnteExport object to JSON
+  Map<String, dynamic> toJson() => {
+        'version': version,
+        'kdfParams': kdfParams.toJson(),
+        'encryptedData': encryptedData,
+        'encryptionNonce': encryptionNonce,
+      };
+
+  // Convert JSON to EnteExport object
+  static EnteAuthExport fromJson(Map<String, dynamic> json) => EnteAuthExport(
+        version: json['version'],
+        kdfParams: KDFParams.fromJson(json['kdfParams']),
+        encryptedData: json['encryptedData'],
+        encryptionNonce: json['encryptionNonce'],
+      );
+}
+
+// KDFParams is a class that holds the parameters for the KDF function.
+// It is used to derive a key from a password.
+class KDFParams {
+  final int memLimit;
+  final int opsLimit;
+  final String salt;
+
+  // Named constructor which can be used to specify each field individually
+  KDFParams({
+    required this.memLimit,
+    required this.opsLimit,
+    required this.salt,
+  });
+
+  // Convert KDFParams object to JSON
+  Map<String, dynamic> toJson() => {
+        'memLimit': memLimit,
+        'opsLimit': opsLimit,
+        'salt': salt,
+      };
+
+  // Convert JSON to KDFParams object
+  static KDFParams fromJson(Map<String, dynamic> json) => KDFParams(
+        memLimit: json['memLimit'],
+        opsLimit: json['opsLimit'],
+        salt: json['salt'],
+      );
+}

lib/models/key_gen_result.dart

@@ -1,9 +1,12 @@
+import 'dart:typed_data';
+
 import 'package:ente_auth/models/key_attributes.dart';
 import 'package:ente_auth/models/private_key_attributes.dart';
 
 class KeyGenResult {
   final KeyAttributes keyAttributes;
   final PrivateKeyAttributes privateKeyAttributes;
+  final Uint8List loginKey;
 
-  KeyGenResult(this.keyAttributes, this.privateKeyAttributes);
+  KeyGenResult(this.keyAttributes, this.privateKeyAttributes, this.loginKey);
 }

lib/models/protos/googleauth.pb.dart

@@ -0,0 +1,202 @@
+//
+//  Generated code. Do not modify.
+//  source: googleauth.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:core' as $core;
+
+import 'package:fixnum/fixnum.dart' as $fixnum;
+import 'package:protobuf/protobuf.dart' as $pb;
+
+// ignore: always_use_package_imports
+import 'googleauth.pbenum.dart';
+
+export 'googleauth.pbenum.dart';
+
+class MigrationPayload_OtpParameters extends $pb.GeneratedMessage {
+  factory MigrationPayload_OtpParameters() => create();
+  MigrationPayload_OtpParameters._() : super();
+  factory MigrationPayload_OtpParameters.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory MigrationPayload_OtpParameters.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MigrationPayload.OtpParameters', package: const $pb.PackageName(_omitMessageNames ? '' : 'googleauth'), createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'secret', $pb.PbFieldType.OY)
+    ..aOS(2, _omitFieldNames ? '' : 'name')
+    ..aOS(3, _omitFieldNames ? '' : 'issuer')
+    ..e<MigrationPayload_Algorithm>(4, _omitFieldNames ? '' : 'algorithm', $pb.PbFieldType.OE, defaultOrMaker: MigrationPayload_Algorithm.ALGORITHM_UNSPECIFIED, valueOf: MigrationPayload_Algorithm.valueOf, enumValues: MigrationPayload_Algorithm.values)
+    ..e<MigrationPayload_DigitCount>(5, _omitFieldNames ? '' : 'digits', $pb.PbFieldType.OE, defaultOrMaker: MigrationPayload_DigitCount.DIGIT_COUNT_UNSPECIFIED, valueOf: MigrationPayload_DigitCount.valueOf, enumValues: MigrationPayload_DigitCount.values)
+    ..e<MigrationPayload_OtpType>(6, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: MigrationPayload_OtpType.OTP_TYPE_UNSPECIFIED, valueOf: MigrationPayload_OtpType.valueOf, enumValues: MigrationPayload_OtpType.values)
+    ..aInt64(7, _omitFieldNames ? '' : 'counter')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  MigrationPayload_OtpParameters clone() => MigrationPayload_OtpParameters()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  MigrationPayload_OtpParameters copyWith(void Function(MigrationPayload_OtpParameters) updates) => super.copyWith((message) => updates(message as MigrationPayload_OtpParameters)) as MigrationPayload_OtpParameters;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static MigrationPayload_OtpParameters create() => MigrationPayload_OtpParameters._();
+  MigrationPayload_OtpParameters createEmptyInstance() => create();
+  static $pb.PbList<MigrationPayload_OtpParameters> createRepeated() => $pb.PbList<MigrationPayload_OtpParameters>();
+  @$core.pragma('dart2js:noInline')
+  static MigrationPayload_OtpParameters getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<MigrationPayload_OtpParameters>(create);
+  static MigrationPayload_OtpParameters? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<$core.int> get secret => $_getN(0);
+  @$pb.TagNumber(1)
+  set secret($core.List<$core.int> v) { $_setBytes(0, v); }
+  @$pb.TagNumber(1)
+  $core.bool hasSecret() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearSecret() => clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get name => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set name($core.String v) { $_setString(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasName() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearName() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.String get issuer => $_getSZ(2);
+  @$pb.TagNumber(3)
+  set issuer($core.String v) { $_setString(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasIssuer() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearIssuer() => clearField(3);
+
+  @$pb.TagNumber(4)
+  MigrationPayload_Algorithm get algorithm => $_getN(3);
+  @$pb.TagNumber(4)
+  set algorithm(MigrationPayload_Algorithm v) { setField(4, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasAlgorithm() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearAlgorithm() => clearField(4);
+
+  @$pb.TagNumber(5)
+  MigrationPayload_DigitCount get digits => $_getN(4);
+  @$pb.TagNumber(5)
+  set digits(MigrationPayload_DigitCount v) { setField(5, v); }
+  @$pb.TagNumber(5)
+  $core.bool hasDigits() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearDigits() => clearField(5);
+
+  @$pb.TagNumber(6)
+  MigrationPayload_OtpType get type => $_getN(5);
+  @$pb.TagNumber(6)
+  set type(MigrationPayload_OtpType v) { setField(6, v); }
+  @$pb.TagNumber(6)
+  $core.bool hasType() => $_has(5);
+  @$pb.TagNumber(6)
+  void clearType() => clearField(6);
+
+  @$pb.TagNumber(7)
+  $fixnum.Int64 get counter => $_getI64(6);
+  @$pb.TagNumber(7)
+  set counter($fixnum.Int64 v) { $_setInt64(6, v); }
+  @$pb.TagNumber(7)
+  $core.bool hasCounter() => $_has(6);
+  @$pb.TagNumber(7)
+  void clearCounter() => clearField(7);
+}
+
+class MigrationPayload extends $pb.GeneratedMessage {
+  factory MigrationPayload() => create();
+  MigrationPayload._() : super();
+  factory MigrationPayload.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
+  factory MigrationPayload.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'MigrationPayload', package: const $pb.PackageName(_omitMessageNames ? '' : 'googleauth'), createEmptyInstance: create)
+    ..pc<MigrationPayload_OtpParameters>(1, _omitFieldNames ? '' : 'otpParameters', $pb.PbFieldType.PM, subBuilder: MigrationPayload_OtpParameters.create)
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'version', $pb.PbFieldType.O3)
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'batchSize', $pb.PbFieldType.O3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'batchIndex', $pb.PbFieldType.O3)
+    ..a<$core.int>(5, _omitFieldNames ? '' : 'batchId', $pb.PbFieldType.O3)
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
+  'Will be removed in next major version')
+  MigrationPayload clone() => MigrationPayload()..mergeFromMessage(this);
+  @$core.Deprecated(
+  'Using this can add significant overhead to your binary. '
+  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
+  'Will be removed in next major version')
+  MigrationPayload copyWith(void Function(MigrationPayload) updates) => super.copyWith((message) => updates(message as MigrationPayload)) as MigrationPayload;
+
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static MigrationPayload create() => MigrationPayload._();
+  MigrationPayload createEmptyInstance() => create();
+  static $pb.PbList<MigrationPayload> createRepeated() => $pb.PbList<MigrationPayload>();
+  @$core.pragma('dart2js:noInline')
+  static MigrationPayload getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<MigrationPayload>(create);
+  static MigrationPayload? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.List<MigrationPayload_OtpParameters> get otpParameters => $_getList(0);
+
+  @$pb.TagNumber(2)
+  $core.int get version => $_getIZ(1);
+  @$pb.TagNumber(2)
+  set version($core.int v) { $_setSignedInt32(1, v); }
+  @$pb.TagNumber(2)
+  $core.bool hasVersion() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearVersion() => clearField(2);
+
+  @$pb.TagNumber(3)
+  $core.int get batchSize => $_getIZ(2);
+  @$pb.TagNumber(3)
+  set batchSize($core.int v) { $_setSignedInt32(2, v); }
+  @$pb.TagNumber(3)
+  $core.bool hasBatchSize() => $_has(2);
+  @$pb.TagNumber(3)
+  void clearBatchSize() => clearField(3);
+
+  @$pb.TagNumber(4)
+  $core.int get batchIndex => $_getIZ(3);
+  @$pb.TagNumber(4)
+  set batchIndex($core.int v) { $_setSignedInt32(3, v); }
+  @$pb.TagNumber(4)
+  $core.bool hasBatchIndex() => $_has(3);
+  @$pb.TagNumber(4)
+  void clearBatchIndex() => clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.int get batchId => $_getIZ(4);
+  @$pb.TagNumber(5)
+  set batchId($core.int v) { $_setSignedInt32(4, v); }
+  @$pb.TagNumber(5)
+  $core.bool hasBatchId() => $_has(4);
+  @$pb.TagNumber(5)
+  void clearBatchId() => clearField(5);
+}
+
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/models/protos/googleauth.pbenum.dart

@@ -0,0 +1,72 @@
+//
+//  Generated code. Do not modify.
+//  source: googleauth.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:core' as $core;
+
+import 'package:protobuf/protobuf.dart' as $pb;
+
+class MigrationPayload_Algorithm extends $pb.ProtobufEnum {
+  static const MigrationPayload_Algorithm ALGORITHM_UNSPECIFIED = MigrationPayload_Algorithm._(0, _omitEnumNames ? '' : 'ALGORITHM_UNSPECIFIED');
+  static const MigrationPayload_Algorithm ALGORITHM_SHA1 = MigrationPayload_Algorithm._(1, _omitEnumNames ? '' : 'ALGORITHM_SHA1');
+  static const MigrationPayload_Algorithm ALGORITHM_SHA256 = MigrationPayload_Algorithm._(2, _omitEnumNames ? '' : 'ALGORITHM_SHA256');
+  static const MigrationPayload_Algorithm ALGORITHM_SHA512 = MigrationPayload_Algorithm._(3, _omitEnumNames ? '' : 'ALGORITHM_SHA512');
+  static const MigrationPayload_Algorithm ALGORITHM_MD5 = MigrationPayload_Algorithm._(4, _omitEnumNames ? '' : 'ALGORITHM_MD5');
+
+  static const $core.List<MigrationPayload_Algorithm> values = <MigrationPayload_Algorithm> [
+    ALGORITHM_UNSPECIFIED,
+    ALGORITHM_SHA1,
+    ALGORITHM_SHA256,
+    ALGORITHM_SHA512,
+    ALGORITHM_MD5,
+  ];
+
+  static final $core.Map<$core.int, MigrationPayload_Algorithm> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static MigrationPayload_Algorithm? valueOf($core.int value) => _byValue[value];
+
+  const MigrationPayload_Algorithm._($core.int v, $core.String n) : super(v, n);
+}
+
+class MigrationPayload_DigitCount extends $pb.ProtobufEnum {
+  static const MigrationPayload_DigitCount DIGIT_COUNT_UNSPECIFIED = MigrationPayload_DigitCount._(0, _omitEnumNames ? '' : 'DIGIT_COUNT_UNSPECIFIED');
+  static const MigrationPayload_DigitCount DIGIT_COUNT_SIX = MigrationPayload_DigitCount._(1, _omitEnumNames ? '' : 'DIGIT_COUNT_SIX');
+  static const MigrationPayload_DigitCount DIGIT_COUNT_EIGHT = MigrationPayload_DigitCount._(2, _omitEnumNames ? '' : 'DIGIT_COUNT_EIGHT');
+
+  static const $core.List<MigrationPayload_DigitCount> values = <MigrationPayload_DigitCount> [
+    DIGIT_COUNT_UNSPECIFIED,
+    DIGIT_COUNT_SIX,
+    DIGIT_COUNT_EIGHT,
+  ];
+
+  static final $core.Map<$core.int, MigrationPayload_DigitCount> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static MigrationPayload_DigitCount? valueOf($core.int value) => _byValue[value];
+
+  const MigrationPayload_DigitCount._($core.int v, $core.String n) : super(v, n);
+}
+
+class MigrationPayload_OtpType extends $pb.ProtobufEnum {
+  static const MigrationPayload_OtpType OTP_TYPE_UNSPECIFIED = MigrationPayload_OtpType._(0, _omitEnumNames ? '' : 'OTP_TYPE_UNSPECIFIED');
+  static const MigrationPayload_OtpType OTP_TYPE_HOTP = MigrationPayload_OtpType._(1, _omitEnumNames ? '' : 'OTP_TYPE_HOTP');
+  static const MigrationPayload_OtpType OTP_TYPE_TOTP = MigrationPayload_OtpType._(2, _omitEnumNames ? '' : 'OTP_TYPE_TOTP');
+
+  static const $core.List<MigrationPayload_OtpType> values = <MigrationPayload_OtpType> [
+    OTP_TYPE_UNSPECIFIED,
+    OTP_TYPE_HOTP,
+    OTP_TYPE_TOTP,
+  ];
+
+  static final $core.Map<$core.int, MigrationPayload_OtpType> _byValue = $pb.ProtobufEnum.initByValue(values);
+  static MigrationPayload_OtpType? valueOf($core.int value) => _byValue[value];
+
+  const MigrationPayload_OtpType._($core.int v, $core.String n) : super(v, n);
+}
+
+
+const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/models/protos/googleauth.pbjson.dart

@@ -0,0 +1,93 @@
+//
+//  Generated code. Do not modify.
+//  source: googleauth.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+import 'dart:convert' as $convert;
+import 'dart:core' as $core;
+import 'dart:typed_data' as $typed_data;
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload$json = {
+  '1': 'MigrationPayload',
+  '2': [
+    {'1': 'otp_parameters', '3': 1, '4': 3, '5': 11, '6': '.googleauth.MigrationPayload.OtpParameters', '10': 'otpParameters'},
+    {'1': 'version', '3': 2, '4': 1, '5': 5, '10': 'version'},
+    {'1': 'batch_size', '3': 3, '4': 1, '5': 5, '10': 'batchSize'},
+    {'1': 'batch_index', '3': 4, '4': 1, '5': 5, '10': 'batchIndex'},
+    {'1': 'batch_id', '3': 5, '4': 1, '5': 5, '10': 'batchId'},
+  ],
+  '3': [MigrationPayload_OtpParameters$json],
+  '4': [MigrationPayload_Algorithm$json, MigrationPayload_DigitCount$json, MigrationPayload_OtpType$json],
+};
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload_OtpParameters$json = {
+  '1': 'OtpParameters',
+  '2': [
+    {'1': 'secret', '3': 1, '4': 1, '5': 12, '10': 'secret'},
+    {'1': 'name', '3': 2, '4': 1, '5': 9, '10': 'name'},
+    {'1': 'issuer', '3': 3, '4': 1, '5': 9, '10': 'issuer'},
+    {'1': 'algorithm', '3': 4, '4': 1, '5': 14, '6': '.googleauth.MigrationPayload.Algorithm', '10': 'algorithm'},
+    {'1': 'digits', '3': 5, '4': 1, '5': 14, '6': '.googleauth.MigrationPayload.DigitCount', '10': 'digits'},
+    {'1': 'type', '3': 6, '4': 1, '5': 14, '6': '.googleauth.MigrationPayload.OtpType', '10': 'type'},
+    {'1': 'counter', '3': 7, '4': 1, '5': 3, '10': 'counter'},
+  ],
+};
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload_Algorithm$json = {
+  '1': 'Algorithm',
+  '2': [
+    {'1': 'ALGORITHM_UNSPECIFIED', '2': 0},
+    {'1': 'ALGORITHM_SHA1', '2': 1},
+    {'1': 'ALGORITHM_SHA256', '2': 2},
+    {'1': 'ALGORITHM_SHA512', '2': 3},
+    {'1': 'ALGORITHM_MD5', '2': 4},
+  ],
+};
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload_DigitCount$json = {
+  '1': 'DigitCount',
+  '2': [
+    {'1': 'DIGIT_COUNT_UNSPECIFIED', '2': 0},
+    {'1': 'DIGIT_COUNT_SIX', '2': 1},
+    {'1': 'DIGIT_COUNT_EIGHT', '2': 2},
+  ],
+};
+
+@$core.Deprecated('Use migrationPayloadDescriptor instead')
+const MigrationPayload_OtpType$json = {
+  '1': 'OtpType',
+  '2': [
+    {'1': 'OTP_TYPE_UNSPECIFIED', '2': 0},
+    {'1': 'OTP_TYPE_HOTP', '2': 1},
+    {'1': 'OTP_TYPE_TOTP', '2': 2},
+  ],
+};
+
+/// Descriptor for `MigrationPayload`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List migrationPayloadDescriptor = $convert.base64Decode(
+    'ChBNaWdyYXRpb25QYXlsb2FkElEKDm90cF9wYXJhbWV0ZXJzGAEgAygLMiouZ29vZ2xlYXV0aC'
+    '5NaWdyYXRpb25QYXlsb2FkLk90cFBhcmFtZXRlcnNSDW90cFBhcmFtZXRlcnMSGAoHdmVyc2lv'
+    'bhgCIAEoBVIHdmVyc2lvbhIdCgpiYXRjaF9zaXplGAMgASgFUgliYXRjaFNpemUSHwoLYmF0Y2'
+    'hfaW5kZXgYBCABKAVSCmJhdGNoSW5kZXgSGQoIYmF0Y2hfaWQYBSABKAVSB2JhdGNoSWQargIK'
+    'DU90cFBhcmFtZXRlcnMSFgoGc2VjcmV0GAEgASgMUgZzZWNyZXQSEgoEbmFtZRgCIAEoCVIEbm'
+    'FtZRIWCgZpc3N1ZXIYAyABKAlSBmlzc3VlchJECglhbGdvcml0aG0YBCABKA4yJi5nb29nbGVh'
+    'dXRoLk1pZ3JhdGlvblBheWxvYWQuQWxnb3JpdGhtUglhbGdvcml0aG0SPwoGZGlnaXRzGAUgAS'
+    'gOMicuZ29vZ2xlYXV0aC5NaWdyYXRpb25QYXlsb2FkLkRpZ2l0Q291bnRSBmRpZ2l0cxI4CgR0'
+    'eXBlGAYgASgOMiQuZ29vZ2xlYXV0aC5NaWdyYXRpb25QYXlsb2FkLk90cFR5cGVSBHR5cGUSGA'
+    'oHY291bnRlchgHIAEoA1IHY291bnRlciJ5CglBbGdvcml0aG0SGQoVQUxHT1JJVEhNX1VOU1BF'
+    'Q0lGSUVEEAASEgoOQUxHT1JJVEhNX1NIQTEQARIUChBBTEdPUklUSE1fU0hBMjU2EAISFAoQQU'
+    'xHT1JJVEhNX1NIQTUxMhADEhEKDUFMR09SSVRITV9NRDUQBCJVCgpEaWdpdENvdW50EhsKF0RJ'
+    'R0lUX0NPVU5UX1VOU1BFQ0lGSUVEEAASEwoPRElHSVRfQ09VTlRfU0lYEAESFQoRRElHSVRfQ0'
+    '9VTlRfRUlHSFQQAiJJCgdPdHBUeXBlEhgKFE9UUF9UWVBFX1VOU1BFQ0lGSUVEEAASEQoNT1RQ'
+    'X1RZUEVfSE9UUBABEhEKDU9UUF9UWVBFX1RPVFAQAg==');
+

lib/models/protos/googleauth.pbserver.dart

@@ -0,0 +1,14 @@
+//
+//  Generated code. Do not modify.
+//  source: googleauth.proto
+//
+// @dart = 2.12
+
+// ignore_for_file: annotate_overrides, camel_case_types
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
+export 'googleauth.pb.dart';
+

lib/models/typedefs.dart

@@ -0,0 +1,7 @@
+import 'dart:async';
+
+typedef FutureVoidCallback = Future<void> Function();
+typedef BoolCallBack = bool Function();
+typedef FutureVoidCallbackParamStr = Future<void> Function(String);
+typedef VoidCallbackParamStr = void Function(String);
+typedef FutureOrVoidCallback = FutureOr<void> Function();

lib/models/user_details.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:math';
 
 import 'package:collection/collection.dart';
@@ -10,6 +11,7 @@ class UserDetails {
   final int sharedCollectionsCount;
   final Subscription subscription;
   final FamilyData? familyData;
+  final ProfileData? profileData;
 
   UserDetails(
     this.email,
@@ -18,6 +20,7 @@ class UserDetails {
     this.sharedCollectionsCount,
     this.subscription,
     this.familyData,
+      this.profileData,
   );
 
   bool isPartOfFamily() {
@@ -59,8 +62,10 @@ class UserDetails {
       (map['sharedCollectionsCount'] ?? 0) as int,
       Subscription.fromMap(map['subscription']),
       FamilyData.fromMap(map['familyData']),
+      ProfileData.fromJson(map['profileData']),
     );
   }
+
 }
 
 class FamilyMember {
@@ -80,7 +85,39 @@ class FamilyMember {
     );
   }
 }
+class ProfileData {
+  bool canDisableEmailMFA;
+  bool isEmailMFAEnabled;
+  bool isTwoFactorEnabled;
 
+  // Constructor with default values
+  ProfileData({
+    this.canDisableEmailMFA = false,
+    this.isEmailMFAEnabled = false,
+    this.isTwoFactorEnabled = false,
+  });
+
+  // Factory method to create ProfileData instance from JSON
+  factory ProfileData.fromJson(Map<String, dynamic>? json) {
+    if (json == null) null;
+
+    return ProfileData(
+      canDisableEmailMFA: json!['canDisableEmailMFA'] ?? false,
+      isEmailMFAEnabled: json['isEmailMFAEnabled'] ?? false,
+      isTwoFactorEnabled: json['isTwoFactorEnabled'] ?? false,
+    );
+  }
+
+  // Method to convert ProfileData instance to JSON
+  Map<String, dynamic> toJson() {
+    return {
+      'canDisableEmailMFA': canDisableEmailMFA,
+      'isEmailMFAEnabled': isEmailMFAEnabled,
+      'isTwoFactorEnabled': isTwoFactorEnabled,
+    };
+  }
+  String toJsonString() => json.encode(toJson());
+}
 class FamilyData {
   final List<FamilyMember>? members;
 

lib/onboarding/view/onboarding_page.dart

@@ -1,15 +1,29 @@
-// ignore_for_file: import_of_legacy_library_into_null_safe
+import 'dart:async';
 
+import 'package:ente_auth/app/view/app.dart';
 import 'package:ente_auth/core/configuration.dart';
+import 'package:ente_auth/core/event_bus.dart';
 import 'package:ente_auth/ente_theme_data.dart';
+import 'package:ente_auth/events/trigger_logout_event.dart';
 import "package:ente_auth/l10n/l10n.dart";
+import 'package:ente_auth/locale.dart';
+import 'package:ente_auth/theme/text_style.dart';
 import 'package:ente_auth/ui/account/email_entry_page.dart';
 import 'package:ente_auth/ui/account/login_page.dart';
+import 'package:ente_auth/ui/account/logout_dialog.dart';
 import 'package:ente_auth/ui/account/password_entry_page.dart';
 import 'package:ente_auth/ui/account/password_reentry_page.dart';
 import 'package:ente_auth/ui/common/gradient_button.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
+import 'package:ente_auth/ui/components/models/button_result.dart';
 import 'package:ente_auth/ui/home_page.dart';
+import 'package:ente_auth/ui/settings/language_picker.dart';
+import 'package:ente_auth/utils/dialog_util.dart';
+import 'package:ente_auth/utils/navigation_util.dart';
+import 'package:ente_auth/utils/toast_util.dart';
+import 'package:flutter/foundation.dart';
 import "package:flutter/material.dart";
+import 'package:local_auth/local_auth.dart';
 
 class OnboardingPage extends StatefulWidget {
   const OnboardingPage({Key? key}) : super(key: key);
@@ -19,6 +33,23 @@ class OnboardingPage extends StatefulWidget {
 }
 
 class _OnboardingPageState extends State<OnboardingPage> {
+  late StreamSubscription<TriggerLogoutEvent> _triggerLogoutEvent;
+
+  @override
+  void initState() {
+    _triggerLogoutEvent =
+        Bus.instance.on<TriggerLogoutEvent>().listen((event) async {
+      await autoLogoutAlert(context);
+    });
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _triggerLogoutEvent.cancel();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     debugPrint("Building OnboardingPage");
@@ -37,6 +68,30 @@ class _OnboardingPageState extends State<OnboardingPage> {
                   children: [
                     Column(
                       children: [
+                        kDebugMode
+                            ? GestureDetector(
+                                child: const Align(
+                                  alignment: Alignment.topRight,
+                                  child: Text("Lang"),
+                                ),
+                                onTap: () async {
+                                  final locale = await getLocale();
+                                  routeToPage(
+                                    context,
+                                    LanguageSelectorPage(
+                                      appSupportedLocales,
+                                      (locale) async {
+                                        await setLocale(locale);
+                                        App.setLocale(context, locale);
+                                      },
+                                      locale,
+                                    ),
+                                  ).then((value) {
+                                    setState(() {});
+                                  });
+                                },
+                              )
+                            : const SizedBox(),
                         Image.asset(
                           "assets/sheild-front-gradient.png",
                           width: 200,
@@ -54,15 +109,18 @@ class _OnboardingPageState extends State<OnboardingPage> {
                         const SizedBox(height: 4),
                         Text(
                           "Authenticator",
-                          style: Theme.of(context).textTheme.headline4,
+                          style: Theme.of(context).textTheme.headlineMedium,
                         ),
                         const SizedBox(height: 32),
                         Text(
                           l10n.onBoardingBody,
                           textAlign: TextAlign.center,
                           style:
-                              Theme.of(context).textTheme.headline6!.copyWith(
+                              Theme.of(context).textTheme.titleLarge!.copyWith(
                                     color: Colors.white38,
+                                    // color: Theme.of(context)
+                                    //                            .colorScheme
+                                    //                            .mutedTextColor,
                                   ),
                         ),
                       ],
@@ -79,7 +137,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
                     const SizedBox(height: 4),
                     Container(
                       width: double.infinity,
-                      padding: const EdgeInsets.fromLTRB(20, 12, 20, 28),
+                      padding: const EdgeInsets.fromLTRB(20, 12, 20, 0),
                       child: Hero(
                         tag: "log_in",
                         child: ElevatedButton(
@@ -96,6 +154,23 @@ class _OnboardingPageState extends State<OnboardingPage> {
                         ),
                       ),
                     ),
+                    const SizedBox(height: 4),
+                    Container(
+                      width: double.infinity,
+                      padding: const EdgeInsets.only(top: 20, bottom: 20),
+                      child: GestureDetector(
+                        onTap: _optForOfflineMode,
+                        child: Center(
+                          child: Text(
+                            l10n.useOffline,
+                            style: body.copyWith(
+                              color:
+                                  Theme.of(context).colorScheme.mutedTextColor,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
                   ],
                 ),
               ),
@@ -106,6 +181,36 @@ class _OnboardingPageState extends State<OnboardingPage> {
     );
   }
 
+  Future<void> _optForOfflineMode() async {
+    bool canCheckBio = await LocalAuthentication().canCheckBiometrics;
+    if(!canCheckBio) {
+      showToast(context, "Sorry, biometric authentication is not supported on this device.");
+      return;
+    }
+    final bool hasOptedBefore = Configuration.instance.hasOptedForOfflineMode();
+    ButtonResult? result;
+    if(!hasOptedBefore) {
+      result = await showChoiceActionSheet(
+        context,
+        title: context.l10n.warning,
+        body: context.l10n.offlineModeWarning,
+        secondButtonLabel: context.l10n.cancel,
+        firstButtonLabel: context.l10n.ok,
+      );
+    }
+    if (hasOptedBefore || result?.action == ButtonAction.first) {
+      await Configuration.instance.optForOfflineMode();
+      Navigator.of(context).push(
+        MaterialPageRoute(
+          builder: (BuildContext context) {
+            return const HomePage();
+          },
+        ),
+      );
+    }
+
+  }
+
   void _navigateToSignUpPage() {
     Widget page;
     if (Configuration.instance.getEncryptedToken() == null) {
@@ -114,7 +219,9 @@ class _OnboardingPageState extends State<OnboardingPage> {
       // No key
       if (Configuration.instance.getKeyAttributes() == null) {
         // Never had a key
-        page = const PasswordEntryPage();
+        page = const PasswordEntryPage(
+          mode: PasswordEntryMode.set,
+        );
       } else if (Configuration.instance.getKey() == null) {
         // Yet to decrypt the key
         page = const PasswordReentryPage();
@@ -140,7 +247,9 @@ class _OnboardingPageState extends State<OnboardingPage> {
       // No key
       if (Configuration.instance.getKeyAttributes() == null) {
         // Never had a key
-        page = const PasswordEntryPage();
+        page = const PasswordEntryPage(
+          mode: PasswordEntryMode.set,
+        );
       } else if (Configuration.instance.getKey() == null) {
         // Yet to decrypt the key
         page = const PasswordReentryPage();

lib/onboarding/view/setup_enter_secret_key_page.dart

@@ -1,6 +1,5 @@
 import "package:ente_auth/l10n/l10n.dart";
 import 'package:ente_auth/models/code.dart';
-// ignore: import_of_legacy_library_into_null_safe
 import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:ente_auth/utils/totp_util.dart';
 import "package:flutter/material.dart";
@@ -11,30 +10,27 @@ class SetupEnterSecretKeyPage extends StatefulWidget {
   SetupEnterSecretKeyPage({this.code, Key? key}) : super(key: key);
 
   @override
-  State<SetupEnterSecretKeyPage> createState() =>
-      _SetupEnterSecretKeyPageState();
+  State<SetupEnterSecretKeyPage> createState() => _SetupEnterSecretKeyPageState();
 }
 
 class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
   late TextEditingController _issuerController;
   late TextEditingController _accountController;
   late TextEditingController _secretController;
+  late bool _secretKeyObscured;
 
   @override
   void initState() {
     _issuerController = TextEditingController(
-      text: widget.code != null
-          ? Uri.decodeFull(widget.code!.issuer).trim()
-          : null,
+      text: widget.code != null ? safeDecode(widget.code!.issuer).trim() : null,
     );
     _accountController = TextEditingController(
-      text: widget.code != null
-          ? Uri.decodeFull(widget.code!.account).trim()
-          : null,
+      text: widget.code != null ? safeDecode(widget.code!.account).trim() : null,
     );
     _secretController = TextEditingController(
       text: widget.code != null ? widget.code!.secret : null,
     );
+    _secretKeyObscured = widget.code != null;
     super.initState();
   }
 
@@ -78,7 +74,18 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                   },
                   decoration: InputDecoration(
                     hintText: l10n.codeSecretKeyHint,
+                    suffixIcon: IconButton(
+                      onPressed: () {
+                        setState(() {
+                          _secretKeyObscured = !_secretKeyObscured;
+                        });
+                      },
+                      icon: _secretKeyObscured
+                          ? const Icon(Icons.visibility_off_rounded)
+                          : const Icon(Icons.visibility_rounded),
+                    ),
                   ),
+                  obscureText: _secretKeyObscured,
                   controller: _secretController,
                 ),
                 const SizedBox(
@@ -109,25 +116,31 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                           _secretController.text.trim().isEmpty) {
                         String message;
                         if (_secretController.text.trim().isEmpty) {
-                          message = "Secret can not be empty";
+                          message = context.l10n.secretCanNotBeEmpty;
                         } else {
-                          message = "Both account and issuer can not be empty";
+                          message = context.l10n.bothIssuerAndAccountCanNotBeEmpty;
                         }
                         _showIncorrectDetailsDialog(context, message: message);
                         return;
                       }
                       try {
-                        final code = Code.fromAccountAndSecret(
-                          _accountController.text.trim(),
-                          _issuerController.text.trim(),
-                          _secretController.text.trim().replaceAll(' ', ''),
-                        );
+                        final account = _accountController.text.trim();
+                        final issuer = _issuerController.text.trim();
+                        final secret = _secretController.text.trim().replaceAll(' ', '');
+                        final Code newCode = widget.code == null
+                            ? Code.fromAccountAndSecret(
+                                account,
+                                issuer,
+                                secret,
+                              )
+                            : widget.code!.copyWith(
+                                account: account,
+                                issuer: issuer,
+                                secret: secret,
+                              );
                         // Verify the validity of the code
-                        getTotp(code);
-                        if (widget.code != null) {
-                          code.generatedID = widget.code!.generatedID;
-                        }
-                        Navigator.of(context).pop(code);
+                        getOTP(newCode);
+                        Navigator.of(context).pop(newCode);
                       } catch (e) {
                         _showIncorrectDetailsDialog(context);
                       }
@@ -151,12 +164,12 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
 
   void _showIncorrectDetailsDialog(
     BuildContext context, {
-    String message = "Please verify the entered details",
+    String? message,
   }) {
     showErrorDialog(
       context,
-      "Incorrect details",
-      message,
+      context.l10n.incorrectDetails,
+      message ?? context.l10n.pleaseVerifyDetails,
     );
   }
 }

lib/onboarding/view/view_qr_page.dart

@@ -0,0 +1,100 @@
+
+import 'dart:math';
+
+import "package:ente_auth/l10n/l10n.dart";
+import 'package:ente_auth/models/code.dart';
+import 'package:ente_auth/theme/ente_theme.dart';
+import "package:flutter/material.dart";
+import 'package:qr_flutter/qr_flutter.dart';
+
+class ViewQrPage extends StatelessWidget {
+  final Code? code;
+
+  ViewQrPage({this.code, Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    final screenWidth = MediaQuery.of(context).size.width;
+    final double qrSize = min(screenWidth - 80, 300.0);
+    final enteTextTheme = getEnteTextTheme(context);
+    final l10n = context.l10n;
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(l10n.qrCode),
+      ),
+      body: SafeArea(
+        child: Center(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(vertical: 40.0, horizontal: 40),
+            child: Column(
+              children: [
+                QrImage(
+                  data: code!.rawData,
+                  foregroundColor: Theme.of(context).colorScheme.onBackground,
+                  version: QrVersions.auto,
+                  size: qrSize,
+                ),
+                const SizedBox(
+                  height: 20,
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      l10n.account,
+                      style: enteTextTheme.largeMuted,
+                    ),
+                    const SizedBox(
+                      width: 10,
+                    ),
+                    Text(
+                      code?.account ?? '',
+                      style: enteTextTheme.largeBold,
+                    ),
+                  ],
+                ),
+                const SizedBox(
+                  height: 4,
+                ),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      l10n.codeIssuerHint,
+                      style: enteTextTheme.largeMuted,
+                    ),
+                    const SizedBox(
+                      width: 10,
+                    ),
+                    Text(
+                      code?.issuer ?? '',
+                      style: enteTextTheme.largeBold,
+                    ),
+                  ],
+                ),
+                const SizedBox(
+                  height: 80,
+                ),
+                SizedBox(
+                  width: 400,
+                  child: OutlinedButton(
+                    onPressed: () {
+                      Navigator.of(context).pop();
+                    },
+                    child: Padding(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 16.0,
+                        vertical: 4,
+                      ),
+                      child: Text(l10n.back),
+                    ),
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/services/authenticator_service.dart

@@ -8,24 +8,36 @@ import 'package:ente_auth/core/event_bus.dart';
 import 'package:ente_auth/core/network.dart';
 import 'package:ente_auth/events/codes_updated_event.dart';
 import 'package:ente_auth/events/signed_in_event.dart';
+import 'package:ente_auth/events/trigger_logout_event.dart';
 import 'package:ente_auth/gateway/authenticator.dart';
 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/store/authenticator_db.dart';
+import 'package:ente_auth/store/offline_authenticator_db.dart';
 import 'package:ente_auth/utils/crypto_util.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_sodium/flutter_sodium.dart';
 import 'package:logging/logging.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
+enum AccountMode {
+  online,
+  offline,
+}
+extension on AccountMode {
+  bool get isOnline => this == AccountMode.online;
+  bool get isOffline => this == AccountMode.offline;
+}
+
 class AuthenticatorService {
   final _logger = Logger((AuthenticatorService).toString());
   final _config = Configuration.instance;
   late SharedPreferences _prefs;
   late AuthenticatorGateway _gateway;
   late AuthenticatorDB _db;
+  late OfflineAuthenticatorDB _offlineDb;
   final String _lastEntitySyncTime = "lastEntitySyncTime";
 
   AuthenticatorService._privateConstructor();
@@ -33,25 +45,34 @@ class AuthenticatorService {
   static final AuthenticatorService instance =
       AuthenticatorService._privateConstructor();
 
+  AccountMode getAccountMode() {
+    return Configuration.instance.hasOptedForOfflineMode() &&
+            !Configuration.instance.hasConfiguredAccount()
+        ? AccountMode.offline
+        : AccountMode.online;
+  }
+
   Future<void> init() async {
     _prefs = await SharedPreferences.getInstance();
     _db = AuthenticatorDB.instance;
+    _offlineDb = OfflineAuthenticatorDB.instance;
     _gateway = AuthenticatorGateway(Network.instance.getDio(), _config);
     if (Configuration.instance.hasConfiguredAccount()) {
-      unawaited(sync());
+      unawaited(onlineSync());
     }
     Bus.instance.on<SignedInEvent>().listen((event) {
-      unawaited(sync());
+      unawaited(onlineSync());
     });
   }
 
-  Future<List<EntityResult>> getEntities() async {
-    final List<LocalAuthEntity> result = await _db.getAll();
+  Future<List<EntityResult>> getEntities(AccountMode mode) async {
+    final List<LocalAuthEntity> result =
+        mode.isOnline ? await _db.getAll() : await _offlineDb.getAll();
     final List<EntityResult> entities = [];
     if (result.isEmpty) {
       return entities;
     }
-    final key = await getOrCreateAuthDataKey();
+    final key = await getOrCreateAuthDataKey(mode);
     for (LocalAuthEntity e in result) {
       try {
         final decryptedValue = await CryptoUtil.decryptChaCha(
@@ -74,17 +95,23 @@ class AuthenticatorService {
     return entities;
   }
 
-  Future<int> addEntry(String plainText, bool shouldSync) async {
-    var key = await getOrCreateAuthDataKey();
+  Future<int> addEntry(
+    String plainText,
+    bool shouldSync,
+    AccountMode accountMode,
+  ) async {
+    var key = await getOrCreateAuthDataKey(accountMode);
     final encryptedKeyData = await CryptoUtil.encryptChaCha(
       utf8.encode(plainText) as Uint8List,
       key,
     );
     String encryptedData = Sodium.bin2base64(encryptedKeyData.encryptedData!);
     String header = Sodium.bin2base64(encryptedKeyData.header!);
-    final insertedID = await _db.insert(encryptedData, header);
+    final insertedID = accountMode.isOnline
+        ? await _db.insert(encryptedData, header)
+        : await _offlineDb.insert(encryptedData, header);
     if (shouldSync) {
-      unawaited(sync());
+      unawaited(onlineSync());
     }
     return insertedID;
   }
@@ -93,54 +120,78 @@ class AuthenticatorService {
     int generatedID,
     String plainText,
     bool shouldSync,
+    AccountMode accountMode,
   ) async {
-    var key = await getOrCreateAuthDataKey();
+    var key = await getOrCreateAuthDataKey(accountMode);
     final encryptedKeyData = await CryptoUtil.encryptChaCha(
       utf8.encode(plainText) as Uint8List,
       key,
     );
     String encryptedData = Sodium.bin2base64(encryptedKeyData.encryptedData!);
     String header = Sodium.bin2base64(encryptedKeyData.header!);
-    final int affectedRows =
-        await _db.updateEntry(generatedID, encryptedData, header);
+    final int affectedRows = accountMode.isOnline
+        ? await _db.updateEntry(generatedID, encryptedData, header)
+        : await _offlineDb.updateEntry(generatedID, encryptedData, header);
     assert(
       affectedRows == 1,
       "updateEntry should have updated exactly one row",
     );
     if (shouldSync) {
-      unawaited(sync());
+      unawaited(onlineSync());
     }
   }
 
-  Future<void> deleteEntry(int genID) async {
-    LocalAuthEntity? result = await _db.getEntryByID(genID);
+  Future<void> deleteEntry(int genID, AccountMode accountMode) async {
+    LocalAuthEntity? result = accountMode.isOnline
+        ? await _db.getEntryByID(genID)
+        : await _offlineDb.getEntryByID(genID);
     if (result == null) {
       _logger.info("No entry found for given id");
       return;
     }
-    if (result.id != null) {
+    if (result.id != null && accountMode.isOnline) {
       await _gateway.deleteEntity(result.id!);
+    } else {
+      debugPrint("Skipping delete since account mode is offline");
+    }
+    if(accountMode.isOnline) {
+      await _db.deleteByIDs(generatedIDs: [genID]);
+    } else {
+      await _offlineDb.deleteByIDs(generatedIDs: [genID]);
     }
-    await _db.deleteByIDs(generatedIDs: [genID]);
   }
 
-  Future<void> sync() async {
+  Future<bool> onlineSync() async {
     try {
+      if(getAccountMode().isOffline) {
+        debugPrint("Skipping sync since account mode is offline");
+        return false;
+      }
       _logger.info("Sync");
       await _remoteToLocalSync();
       _logger.info("remote fetch completed");
       await _localToRemoteSync();
       _logger.info("local push completed");
       Bus.instance.fire(CodesUpdatedEvent());
+      return true;
+    } on UnauthorizedError {
+      if ((await _db.removeSyncedData()) > 0) {
+        Bus.instance.fire(CodesUpdatedEvent());
+      }
+      debugPrint("Firing logout event");
+
+      Bus.instance.fire(TriggerLogoutEvent());
+      return false;
     } catch (e) {
       _logger.severe("Failed to sync with remote", e);
+      return false;
     }
   }
 
   Future<void> _remoteToLocalSync() async {
     _logger.info('Initiating remote to local sync');
     final int lastSyncTime = _prefs.getInt(_lastEntitySyncTime) ?? 0;
-    _logger.info("Current synctime is " + lastSyncTime.toString());
+    _logger.info("Current sync is " + lastSyncTime.toString());
     const int fetchLimit = 500;
     final List<AuthEntity> result =
         await _gateway.getDiff(lastSyncTime, limit: fetchLimit);
@@ -201,7 +252,10 @@ class AuthenticatorService {
     }
   }
 
-  Future<Uint8List> getOrCreateAuthDataKey() async {
+  Future<Uint8List> getOrCreateAuthDataKey(AccountMode mode) async {
+    if(mode.isOffline) {
+      return _config.getOfflineSecretKey()!;
+    }
     if (_config.getAuthSecretKey() != null) {
       return _config.getAuthSecretKey()!;
     }
@@ -209,7 +263,7 @@ class AuthenticatorService {
       final AuthKey response = await _gateway.getKey();
       final authKey = CryptoUtil.decryptSync(
         Sodium.base642bin(response.encryptedKey),
-        _config.getKey(),
+        _config.getKey()!,
         Sodium.base642bin(response.header),
       );
       await _config.setAuthSecretKey(Sodium.bin2base64(authKey));

lib/services/billing_service.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'dart:io';
 
 import 'package:dio/dio.dart';
@@ -32,10 +30,11 @@ class BillingService {
 
   bool _isOnSubscriptionPage = false;
 
-  Future<BillingPlans> _future;
+  Subscription? _cachedSubscription;
 
-  Future<void> init() async {
-  }
+  Future<BillingPlans>? _future;
+
+  Future<void> init() async {}
 
   void clearCache() {
     _future = null;
@@ -48,7 +47,7 @@ class BillingService {
         .then((response) {
       return BillingPlans.fromMap(response.data);
     });
-    return _future;
+    return _future!;
   }
 
   Future<Response<dynamic>> _fetchPrivateBillingPlans() {
@@ -88,7 +87,7 @@ class BillingService {
       );
       return Subscription.fromMap(response.data["subscription"]);
     } on DioError catch (e) {
-      if (e.response != null && e.response.statusCode == 409) {
+      if (e.response != null && e.response!.statusCode == 409) {
         throw SubscriptionAlreadyClaimedError();
       } else {
         rethrow;
@@ -99,22 +98,25 @@ class BillingService {
     }
   }
 
-  Future<Subscription> fetchSubscription() async {
-    try {
-      final response = await _dio.get(
-        _config.getHttpEndpoint() + "/billing/subscription",
-        options: Options(
-          headers: {
-            "X-Auth-Token": _config.getToken(),
-          },
-        ),
-      );
-      final subscription = Subscription.fromMap(response.data["subscription"]);
-      return subscription;
-    } on DioError catch (e, s) {
-      _logger.severe(e, s);
-      rethrow;
+  Future<Subscription> getSubscription() async {
+    if (_cachedSubscription == null) {
+      try {
+        final response = await _dio.get(
+          _config.getHttpEndpoint() + "/billing/subscription",
+          options: Options(
+            headers: {
+              "X-Auth-Token": _config.getToken(),
+            },
+          ),
+        );
+        _cachedSubscription =
+            Subscription.fromMap(response.data["subscription"]);
+      } on DioError catch (e, s) {
+        _logger.severe(e, s);
+        rethrow;
+      }
     }
+    return _cachedSubscription!;
   }
 
   Future<Subscription> cancelStripeSubscription() async {

lib/services/local_authentication_service.dart

@@ -1,4 +1,4 @@
-// @dart=2.9
+
 
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/ui/tools/app_lock.dart';
@@ -18,9 +18,9 @@ class LocalAuthenticationService {
     String infoMessage,
   ) async {
     if (await _isLocalAuthSupportedOnDevice()) {
-      AppLock.of(context).setEnabled(false);
+      AppLock.of(context)!.setEnabled(false);
       final result = await requestAuthentication(infoMessage);
-      AppLock.of(context).setEnabled(
+      AppLock.of(context)!.setEnabled(
         Configuration.instance.shouldShowLockScreen(),
       );
       if (!result) {
@@ -41,17 +41,17 @@ class LocalAuthenticationService {
     String errorDialogTitle = "",
   ]) async {
     if (await LocalAuthentication().isDeviceSupported()) {
-      AppLock.of(context).disable();
+      AppLock.of(context)!.disable();
       final result = await requestAuthentication(
         infoMessage,
       );
       if (result) {
-        AppLock.of(context).setEnabled(shouldEnableLockScreen);
+        AppLock.of(context)!.setEnabled(shouldEnableLockScreen);
         await Configuration.instance
             .setShouldShowLockScreen(shouldEnableLockScreen);
         return true;
       } else {
-        AppLock.of(context)
+        AppLock.of(context)!
             .setEnabled(Configuration.instance.shouldShowLockScreen());
       }
     } else {

lib/services/preference_service.dart

@@ -1,3 +1,5 @@
+import 'package:ente_auth/core/event_bus.dart';
+import 'package:ente_auth/events/icons_changed_event.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class PreferenceService {
@@ -8,6 +10,8 @@ class PreferenceService {
   late final SharedPreferences _prefs;
 
   static const kHasShownCoachMarkKey = "has_shown_coach_mark";
+  static const kShouldShowLargeIconsKey = "should_show_large_icons";
+  static const kShouldAutoFocusOnSearchBar = "should_auto_focus_on_search_bar";
 
   Future<void> init() async {
     _prefs = await SharedPreferences.getInstance();
@@ -24,4 +28,30 @@ class PreferenceService {
   Future<void> setHasShownCoachMark(bool value) {
     return _prefs.setBool(kHasShownCoachMarkKey, value);
   }
+
+  bool shouldShowLargeIcons() {
+    if (_prefs.containsKey(kShouldShowLargeIconsKey)) {
+      return _prefs.getBool(kShouldShowLargeIconsKey)!;
+    } else {
+      return false;
+    }
+  }
+
+  Future<void> setShowLargeIcons(bool value) async {
+    await _prefs.setBool(kShouldShowLargeIconsKey, value);
+    Bus.instance.fire(IconsChangedEvent());
+  }
+
+  bool shouldAutoFocusOnSearchBar() {
+    if (_prefs.containsKey(kShouldAutoFocusOnSearchBar)) {
+      return _prefs.getBool(kShouldAutoFocusOnSearchBar)!;
+    } else {
+      return false;
+    }
+  }
+
+  Future<void> setAutoFocusOnSearchBar(bool value) async {
+    await _prefs.setBool(kShouldAutoFocusOnSearchBar, value);
+    Bus.instance.fire(IconsChangedEvent());
+  }
 }

lib/services/update_service.dart

@@ -1,25 +1,27 @@
-// @dart=2.9
+
 
 import 'dart:io';
 
 import 'package:ente_auth/core/constants.dart';
 import 'package:ente_auth/core/network.dart';
 import 'package:ente_auth/services/notification_service.dart';
-import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:tuple/tuple.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class UpdateService {
   UpdateService._privateConstructor();
 
   static final UpdateService instance = UpdateService._privateConstructor();
   static const kUpdateAvailableShownTimeKey = "update_available_shown_time_key";
+  static const String flavor = String.fromEnvironment('app.flavor');
 
-  LatestVersionInfo _latestVersion;
+  LatestVersionInfo? _latestVersion;
   final _logger = Logger("UpdateService");
-  PackageInfo _packageInfo;
-  SharedPreferences _prefs;
+  late PackageInfo _packageInfo;
+  late SharedPreferences _prefs;
 
   Future<void> init() async {
     _packageInfo = await PackageInfo.fromPlatform();
@@ -33,27 +35,27 @@ class UpdateService {
     try {
       _latestVersion = await _getLatestVersionInfo();
       final currentVersionCode = int.parse(_packageInfo.buildNumber);
-      return currentVersionCode < _latestVersion.code;
+      return currentVersionCode < _latestVersion!.code!;
     } catch (e) {
       _logger.severe(e);
       return false;
     }
   }
 
-  bool shouldForceUpdate(LatestVersionInfo info) {
+  bool shouldForceUpdate(LatestVersionInfo? info) {
     if (!isIndependent()) {
       return false;
     }
     try {
       final currentVersionCode = int.parse(_packageInfo.buildNumber);
-      return currentVersionCode < info.lastSupportedVersionCode;
+      return currentVersionCode < info!.lastSupportedVersionCode;
     } catch (e) {
       _logger.severe(e);
       return false;
     }
   }
 
-  LatestVersionInfo getLatestVersionInfo() {
+  LatestVersionInfo? getLatestVersionInfo() {
     return _latestVersion;
   }
 
@@ -69,7 +71,7 @@ class UpdateService {
         (now - lastNotificationShownTime) > (3 * microSecondsInDay);
     if (shouldUpdate &&
         hasBeen3DaysSinceLastNotification &&
-        _latestVersion.shouldNotify) {
+        _latestVersion!.shouldNotify!) {
       NotificationService.instance.showNotification(
         "Update available",
         "Click to install our best version yet",
@@ -87,23 +89,59 @@ class UpdateService {
     return LatestVersionInfo.fromMap(response.data["latestVersion"]);
   }
 
-  bool isIndependent() {
-    if (Platform.isIOS) {
-      return false;
+  // getRateDetails returns details about the place
+  Tuple2<String, String> getRateDetails() {
+    // Note: in auth, currently we don't have a way to identify if the
+    // app was installed from play store, f-droid or github based on pkg name
+    if (Platform.isAndroid) {
+      if(flavor == "playstore") {
+        return const Tuple2(
+          "Play Store",
+          "market://details??id=io.ente.auth",
+        );
+      }
+      return const Tuple2(
+        "AlternativeTo",
+        "https://alternativeto.net/software/ente-authenticator/about/",
+      );
     }
-    return kDebugMode || _packageInfo.packageName.endsWith("independent");
+    return const Tuple2(
+      "App Store",
+      "https://apps.apple.com/in/app/ente-photos/id6444121398",
+    );
+  }
+
+  Future<void> launchReviewUrl() async {
+    final String url = getRateDetails().item2;
+    try {
+      await launchUrlString(url, mode: LaunchMode.externalApplication);
+    } catch (e) {
+      _logger.severe("Failed top open launch url $url", e);
+      // Fall back if we fail to open play-store market app on android
+      if (Platform.isAndroid && url.startsWith("market://")) {
+        launchUrlString(
+          "https://play.google.com/store/apps/details?id=io"
+              ".ente.auth",
+          mode: LaunchMode.externalApplication,
+        ).ignore();
+      }
+    }
+  }
+
+  bool isIndependent() {
+    return flavor == "independent" || _packageInfo.packageName.endsWith("independent");
   }
 }
 
 class LatestVersionInfo {
-  final String name;
-  final int code;
+  final String? name;
+  final int? code;
   final List<String> changelog;
-  final bool shouldForceUpdate;
+  final bool? shouldForceUpdate;
   final int lastSupportedVersionCode;
-  final String url;
-  final int size;
-  final bool shouldNotify;
+  final String? url;
+  final int? size;
+  final bool? shouldNotify;
 
   LatestVersionInfo(
     this.name,

lib/store/authenticator_db.dart

@@ -135,6 +135,21 @@ class AuthenticatorDB {
     return _convertRows(rows);
   }
 
+  // removeSyncedData will remove all the data which is synced with the server
+  Future<int> removeSyncedData() async {
+    final db = await instance.database;
+    return await db
+        .delete(entityTable, where: 'shouldSync = ?', whereArgs: [0]);
+  }
+
+  // getCount of entries which are not synced with the server
+  Future<int> getNeedSyncCount() async {
+    final db = await instance.database;
+    final rows = await db
+        .rawQuery("SELECT COUNT(*) from $entityTable WHERE shouldSync = 1");
+    return Sqflite.firstIntValue(rows)!;
+  }
+
 // deleteByID will prefer generated id if both ids are passed during deletion
   Future<void> deleteByIDs({List<int>? generatedIDs, List<String>? ids}) async {
     final db = await instance.database;

lib/store/code_store.dart

@@ -1,10 +1,13 @@
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
+import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/core/event_bus.dart';
 import 'package:ente_auth/events/codes_updated_event.dart';
 import 'package:ente_auth/models/authenticator/entity_result.dart';
 import 'package:ente_auth/models/code.dart';
 import 'package:ente_auth/services/authenticator_service.dart';
+import 'package:ente_auth/store/offline_authenticator_db.dart';
 import 'package:logging/logging.dart';
 
 class CodeStore {
@@ -19,9 +22,10 @@ class CodeStore {
     _authenticatorService = AuthenticatorService.instance;
   }
 
-  Future<List<Code>> getAllCodes() async {
+  Future<List<Code>> getAllCodes({AccountMode? accountMode}) async {
+    final mode = accountMode ?? _authenticatorService.getAccountMode();
     final List<EntityResult> entities =
-        await _authenticatorService.getEntities();
+        await _authenticatorService.getEntities(mode);
     final List<Code> codes = [];
     for (final entity in entities) {
       final decodeJson = jsonDecode(entity.rawData);
@@ -30,44 +34,132 @@ class CodeStore {
       code.hasSynced = entity.hasSynced;
       codes.add(code);
     }
-    codes.sort((c1, c2) {
-      return c1.issuer.toLowerCase().compareTo(c2.issuer.toLowerCase());
+
+    // sort codes by issuer,account
+    codes.sort((a, b) {
+      final issuerComparison = compareAsciiLowerCaseNatural(a.issuer, b.issuer);
+      if (issuerComparison != 0) {
+        return issuerComparison;
+      }
+      return compareAsciiLowerCaseNatural(a.account, b.account);
     });
     return codes;
   }
 
-  Future<void> addCode(
+  Future<AddResult> addCode(
     Code code, {
     bool shouldSync = true,
+    AccountMode? accountMode,
   }) async {
-    final codes = await getAllCodes();
+    final mode = accountMode ?? _authenticatorService.getAccountMode();
+    final codes = await getAllCodes(accountMode: mode);
     bool isExistingCode = false;
     for (final existingCode in codes) {
       if (existingCode == code) {
         _logger.info("Found duplicate code, skipping add");
-        return;
+        return AddResult.duplicate;
       } else if (existingCode.generatedID == code.generatedID) {
         isExistingCode = true;
         break;
       }
     }
+    late AddResult result;
     if (isExistingCode) {
+      result = AddResult.updateCode;
       await _authenticatorService.updateEntry(
         code.generatedID!,
         jsonEncode(code.rawData),
         shouldSync,
+        mode,
       );
     } else {
+      result = AddResult.newCode;
       code.generatedID = await _authenticatorService.addEntry(
         jsonEncode(code.rawData),
         shouldSync,
+        mode,
       );
     }
     Bus.instance.fire(CodesUpdatedEvent());
+    return result;
   }
 
-  Future<void> removeCode(Code code) async {
-    await _authenticatorService.deleteEntry(code.generatedID!);
+  Future<void> removeCode(Code code, {AccountMode? accountMode}) async {
+    final mode = accountMode ?? _authenticatorService.getAccountMode();
+    await _authenticatorService.deleteEntry(code.generatedID!, mode);
     Bus.instance.fire(CodesUpdatedEvent());
   }
+
+  bool _isOfflineImportRunning = false;
+
+  Future<void> importOfflineCodes() async {
+    if(_isOfflineImportRunning) {
+      return;
+    }
+    _isOfflineImportRunning = true;
+    Logger logger = Logger('importOfflineCodes');
+    try {
+      Configuration config = Configuration.instance;
+      if (!config.hasConfiguredAccount() ||
+          !config.hasOptedForOfflineMode() ||
+          config.getOfflineSecretKey() == null) {
+        return;
+      }
+      logger.info('start import');
+
+      List<Code> offlineCodes = await CodeStore.instance
+          .getAllCodes(accountMode: AccountMode.offline);
+      if (offlineCodes.isEmpty) {
+        return;
+      }
+      bool isOnlineSyncDone = await AuthenticatorService.instance.onlineSync();
+      if (!isOnlineSyncDone) {
+        logger.info("skip as online sync is not done");
+        return;
+      }
+      final List<Code> onlineCodes =
+          await CodeStore.instance.getAllCodes(accountMode: AccountMode.online);
+      logger.info(
+        'importing ${offlineCodes.length} offline codes with ${onlineCodes.length} online codes',
+      );
+      for (Code eachCode in offlineCodes) {
+        bool alreadyPresent = onlineCodes.any(
+          (oc) =>
+              oc.issuer == eachCode.issuer &&
+              oc.account == eachCode.account &&
+              oc.secret == eachCode.secret,
+        );
+        int? generatedID = eachCode.generatedID!;
+        logger.info(
+          'importingCode: genID ${eachCode.generatedID} & isAlreadyPresent $alreadyPresent',
+        );
+        if (!alreadyPresent) {
+          // Avoid conflict with generatedID of online codes
+          eachCode.generatedID = null;
+          final AddResult result = await CodeStore.instance.addCode(
+            eachCode,
+            accountMode: AccountMode.online,
+            shouldSync: false,
+          );
+          logger.info(
+            'importedCode: genID ${eachCode.generatedID} result: ${result.name}',
+          );
+        }
+        await OfflineAuthenticatorDB.instance.deleteByIDs(
+          generatedIDs: [generatedID],
+        );
+      }
+      AuthenticatorService.instance.onlineSync().ignore();
+    } catch (e, s) {
+      _logger.severe("error while importing offline codes", e, s);
+    } finally {
+      _isOfflineImportRunning = false;
+    }
+  }
+}
+
+enum AddResult {
+  newCode,
+  duplicate,
+  updateCode,
 }

lib/store/offline_authenticator_db.dart

@@ -0,0 +1,170 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:ente_auth/models/authenticator/auth_entity.dart';
+import 'package:ente_auth/models/authenticator/local_auth_entity.dart';
+import 'package:flutter/foundation.dart';
+import 'package:path/path.dart';
+import 'package:path_provider/path_provider.dart';
+import 'package:sqflite/sqflite.dart';
+
+class OfflineAuthenticatorDB {
+  static const _databaseName = "ente.offline_authenticator.db";
+  static const _databaseVersion = 1;
+
+  static const entityTable = 'entities';
+
+  OfflineAuthenticatorDB._privateConstructor();
+  static final OfflineAuthenticatorDB instance = OfflineAuthenticatorDB._privateConstructor();
+
+  static Future<Database>? _dbFuture;
+
+  Future<Database> get database async {
+    _dbFuture ??= _initDatabase();
+    return _dbFuture!;
+  }
+
+  Future<Database> _initDatabase() async {
+    final Directory documentsDirectory =
+    await getApplicationDocumentsDirectory();
+    final String path = join(documentsDirectory.path, _databaseName);
+    debugPrint(path);
+    return await openDatabase(
+      path,
+      version: _databaseVersion,
+      onCreate: _onCreate,
+    );
+  }
+
+  Future _onCreate(Database db, int version) async {
+    await db.execute(
+      '''
+                CREATE TABLE $entityTable (
+                  _generatedID INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                  id TEXT,
+                  encryptedData TEXT NOT NULL,
+                  header TEXT NOT NULL,
+                  createdAt INTEGER NOT NULL,
+                  updatedAt INTEGER NOT NULL,
+                  shouldSync INTEGER DEFAULT 0,
+                  UNIQUE(id)
+                );
+      ''',
+    );
+  }
+
+  Future<int> insert(String encData, String header) async {
+    final db = await instance.database;
+    final int timeInMicroSeconds = DateTime.now().microsecondsSinceEpoch;
+    final insertedID = await db.insert(
+      entityTable,
+      {
+        "encryptedData": encData,
+        "header": header,
+        "shouldSync": 1,
+        "createdAt": timeInMicroSeconds,
+        "updatedAt": timeInMicroSeconds,
+      },
+    );
+    return insertedID;
+  }
+
+  Future<int> updateEntry(
+      int generatedID,
+      String encData,
+      String header,
+      ) async {
+    final db = await instance.database;
+    final int timeInMicroSeconds = DateTime.now().microsecondsSinceEpoch;
+    int affectedRows = await db.update(
+      entityTable,
+      {
+        "encryptedData": encData,
+        "header": header,
+        "shouldSync": 1,
+        "updatedAt": timeInMicroSeconds,
+      },
+      where: '_generatedID = ?',
+      whereArgs: [generatedID],
+    );
+    return affectedRows;
+  }
+
+  Future<void> insertOrReplace(List<AuthEntity> authEntities) async {
+    final db = await instance.database;
+    final batch = db.batch();
+    for (AuthEntity authEntity in authEntities) {
+      final insertRow = authEntity.toMap();
+      insertRow.remove('isDeleted');
+      insertRow.putIfAbsent('shouldSync', () => 0);
+      batch.insert(
+        entityTable,
+        insertRow,
+        conflictAlgorithm: ConflictAlgorithm.replace,
+      );
+    }
+    await batch.commit(noResult: true);
+  }
+
+  Future<void> updateLocalEntity(LocalAuthEntity localAuthEntity) async {
+    final db = await instance.database;
+    await db.update(
+      entityTable,
+      localAuthEntity.toMap(),
+      where: '_generatedID = ?',
+      whereArgs: [localAuthEntity.generatedID],
+      conflictAlgorithm: ConflictAlgorithm.replace,
+    );
+  }
+
+  Future<LocalAuthEntity?> getEntryByID(int genID) async {
+    final db = await instance.database;
+    final rows = await db
+        .query(entityTable, where: '_generatedID = ?', whereArgs: [genID]);
+    final listOfAuthEntities = _convertRows(rows);
+    if (listOfAuthEntities.isEmpty) {
+      return null;
+    } else {
+      return listOfAuthEntities.first;
+    }
+  }
+
+  Future<List<LocalAuthEntity>> getAll() async {
+    final db = await instance.database;
+    final rows = await db.rawQuery("SELECT * from $entityTable");
+    return _convertRows(rows);
+  }
+
+// deleteByID will prefer generated id if both ids are passed during deletion
+  Future<void> deleteByIDs({List<int>? generatedIDs, List<String>? ids}) async {
+    final db = await instance.database;
+    final batch = db.batch();
+    const whereGenID = '_generatedID = ?';
+    const whereID = 'id = ?';
+    if (generatedIDs != null) {
+      for (int genId in generatedIDs) {
+        batch.delete(entityTable, where: whereGenID, whereArgs: [genId]);
+      }
+    }
+    if (ids != null) {
+      for (String id in ids) {
+        batch.delete(entityTable, where: whereID, whereArgs: [id]);
+      }
+    }
+    final result = await batch.commit();
+    debugPrint("Done");
+  }
+
+  Future<void> clearTable() async {
+    final db = await instance.database;
+    await db.delete(entityTable);
+  }
+
+  List<LocalAuthEntity> _convertRows(List<Map<String, dynamic>> rows) {
+    final keys = <LocalAuthEntity>[];
+    for (final row in rows) {
+      keys.add(LocalAuthEntity.fromMap(row));
+    }
+    return keys;
+  }
+}

lib/theme/colors.dart

@@ -11,6 +11,7 @@ class EnteColorScheme {
   // Backdrop Colors
   final Color backdropBase;
   final Color backdropBaseMute;
+  final Color backdropFaint;
 
   // Text Colors
   final Color textBase;
@@ -19,15 +20,22 @@ class EnteColorScheme {
 
   // Fill Colors
   final Color fillBase;
+  final Color fillBasePressed;
   final Color fillMuted;
   final Color fillFaint;
+  final Color fillFaintPressed;
 
   // Stroke Colors
   final Color strokeBase;
   final Color strokeMuted;
   final Color strokeFaint;
+  final Color strokeFainter;
+  final Color blurStrokeBase;
+  final Color blurStrokeFaint;
+  final Color blurStrokePressed;
 
   // Fixed Colors
+  final Color primaryGreen;
   final Color primary700;
   final Color primary500;
   final Color primary400;
@@ -36,6 +44,8 @@ class EnteColorScheme {
   final Color warning700;
   final Color warning500;
   final Color warning400;
+  final Color warning800;
+
   final Color caution500;
 
   const EnteColorScheme(
@@ -44,20 +54,29 @@ class EnteColorScheme {
     this.backgroundElevated2,
     this.backdropBase,
     this.backdropBaseMute,
+    this.backdropFaint,
     this.textBase,
     this.textMuted,
     this.textFaint,
     this.fillBase,
+    this.fillBasePressed,
     this.fillMuted,
     this.fillFaint,
+    this.fillFaintPressed,
     this.strokeBase,
     this.strokeMuted,
-    this.strokeFaint, {
+    this.strokeFaint,
+    this.strokeFainter,
+    this.blurStrokeBase,
+    this.blurStrokeFaint,
+    this.blurStrokePressed, {
+    this.primaryGreen = _primaryGreen,
     this.primary700 = _primary700,
     this.primary500 = _primary500,
     this.primary400 = _primary400,
     this.primary300 = _primary300,
     this.warning700 = _warning700,
+    this.warning800 = _warning800,
     this.warning500 = _warning500,
     this.warning400 = _warning700,
     this.caution500 = _caution500,
@@ -69,16 +88,23 @@ const EnteColorScheme lightScheme = EnteColorScheme(
   backgroundElevatedLight,
   backgroundElevated2Light,
   backdropBaseLight,
-  backdropBaseMuteLight,
+  backdropMutedLight,
+  backdropFaintLight,
   textBaseLight,
   textMutedLight,
   textFaintLight,
   fillBaseLight,
+  fillBasePressedLight,
   fillMutedLight,
   fillFaintLight,
+  fillFaintPressedLight,
   strokeBaseLight,
   strokeMutedLight,
   strokeFaintLight,
+  strokeFainterLight,
+  blurStrokeBaseLight,
+  blurStrokeFaintLight,
+  blurStrokePressedLight,
 );
 
 const EnteColorScheme darkScheme = EnteColorScheme(
@@ -86,16 +112,23 @@ const EnteColorScheme darkScheme = EnteColorScheme(
   backgroundElevatedDark,
   backgroundElevated2Dark,
   backdropBaseDark,
-  backdropBaseMuteDark,
+  backdropMutedDark,
+  backdropFaintDark,
   textBaseDark,
   textMutedDark,
   textFaintDark,
   fillBaseDark,
+  fillBasePressedDark,
   fillMutedDark,
   fillFaintDark,
+  fillFaintPressedDark,
   strokeBaseDark,
   strokeMutedDark,
   strokeFaintDark,
+  strokeFainterDark,
+  blurStrokeBaseDark,
+  blurStrokeFaintDark,
+  blurStrokePressedDark,
 );
 
 // Background Colors
@@ -108,11 +141,13 @@ const Color backgroundElevatedDark = Color.fromRGBO(27, 27, 27, 1);
 const Color backgroundElevated2Dark = Color.fromRGBO(37, 37, 37, 1);
 
 // Backdrop Colors
-const Color backdropBaseLight = Color.fromRGBO(255, 255, 255, 0.75);
-const Color backdropBaseMuteLight = Color.fromRGBO(255, 255, 255, 0.30);
+const Color backdropBaseLight = Color.fromRGBO(255, 255, 255, 0.92);
+const Color backdropMutedLight = Color.fromRGBO(255, 255, 255, 0.75);
+const Color backdropFaintLight = Color.fromRGBO(255, 255, 255, 0.30);
 
-const Color backdropBaseDark = Color.fromRGBO(0, 0, 0, 0.65);
-const Color backdropBaseMuteDark = Color.fromRGBO(0, 0, 0, 0.20);
+const Color backdropBaseDark = Color.fromRGBO(0, 0, 0, 0.90);
+const Color backdropMutedDark = Color.fromRGBO(0, 0, 0, 0.65);
+const Color backdropFaintDark = Color.fromRGBO(0, 0, 0, 0.20);
 
 // Text Colors
 const Color textBaseLight = Color.fromRGBO(0, 0, 0, 1);
@@ -125,24 +160,38 @@ const Color textFaintDark = Color.fromRGBO(255, 255, 255, 0.5);
 
 // Fill Colors
 const Color fillBaseLight = Color.fromRGBO(0, 0, 0, 1);
+const Color fillBasePressedLight = Color.fromRGBO(0, 0, 0, 0.87);
 const Color fillMutedLight = Color.fromRGBO(0, 0, 0, 0.12);
 const Color fillFaintLight = Color.fromRGBO(0, 0, 0, 0.04);
+const Color fillFaintPressedLight = Color.fromRGBO(0, 0, 0, 0.08);
 
 const Color fillBaseDark = Color.fromRGBO(255, 255, 255, 1);
+const Color fillBasePressedDark = Color.fromRGBO(255, 255, 255, 0.9);
 const Color fillMutedDark = Color.fromRGBO(255, 255, 255, 0.16);
 const Color fillFaintDark = Color.fromRGBO(255, 255, 255, 0.12);
+const Color fillFaintPressedDark = Color.fromRGBO(255, 255, 255, 0.06);
 
 // Stroke Colors
 const Color strokeBaseLight = Color.fromRGBO(0, 0, 0, 1);
 const Color strokeMutedLight = Color.fromRGBO(0, 0, 0, 0.24);
 const Color strokeFaintLight = Color.fromRGBO(0, 0, 0, 0.04);
+const Color strokeFainterLight = Color.fromRGBO(0, 0, 0, 0.06);
+const Color blurStrokeBaseLight = Color.fromRGBO(0, 0, 0, 0.65);
+const Color blurStrokeFaintLight = Color.fromRGBO(0, 0, 0, 0.08);
+const Color blurStrokePressedLight = Color.fromRGBO(0, 0, 0, 0.50);
 
 const Color strokeBaseDark = Color.fromRGBO(255, 255, 255, 1);
 const Color strokeMutedDark = Color.fromRGBO(255, 255, 255, 0.24);
 const Color strokeFaintDark = Color.fromRGBO(255, 255, 255, 0.16);
+const Color strokeFainterDark = Color.fromRGBO(255, 255, 255, 0.08);
+const Color blurStrokeBaseDark = Color.fromRGBO(255, 255, 255, 0.90);
+const Color blurStrokeFaintDark = Color.fromRGBO(255, 255, 255, 0.06);
+const Color blurStrokePressedDark = Color.fromRGBO(255, 255, 255, 0.50);
 
 // Fixed Colors
 
+const Color _primaryGreen = Color.fromRGBO(29, 185, 84, 1);
+
 const Color _primary700 = Color.fromARGB(255, 164, 0, 182);
 const Color _primary500 = Color.fromARGB(255, 204, 10, 101);
 const Color _primary400 = Color.fromARGB(255, 122, 41, 193);
@@ -150,6 +199,7 @@ const Color _primary300 = Color.fromARGB(255, 152, 77, 244);
 
 const Color _warning700 = Color.fromRGBO(234, 63, 63, 1);
 const Color _warning500 = Color.fromRGBO(255, 101, 101, 1);
+const Color _warning800 = Color(0xFFF53434);
 const Color warning500 = Color.fromRGBO(255, 101, 101, 1);
 const Color _warning400 = Color.fromRGBO(255, 111, 111, 1);
 

lib/theme/effects.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 
-const blurBase = 96;
-const blurMuted = 48;
-const blurFaint = 24;
+const blurBase = 96.0;
+const blurMuted = 48.0;
+const blurFaint = 24.0;
 
 List<BoxShadow> shadowFloatLight = const [
   BoxShadow(blurRadius: 10, color: Color.fromRGBO(0, 0, 0, 0.25)),

lib/theme/ente_theme.dart

@@ -36,10 +36,20 @@ EnteTheme darkTheme = EnteTheme(
   shadowButton: shadowButtonDark,
 );
 
-EnteColorScheme getEnteColorScheme(BuildContext context) {
-  return Theme.of(context).colorScheme.enteTheme.colorScheme;
+EnteColorScheme getEnteColorScheme(
+  BuildContext context, {
+  bool inverse = false,
+}) {
+  return inverse
+      ? Theme.of(context).colorScheme.inverseEnteTheme.colorScheme
+      : Theme.of(context).colorScheme.enteTheme.colorScheme;
 }
 
-EnteTextTheme getEnteTextTheme(BuildContext context) {
-  return Theme.of(context).colorScheme.enteTheme.textTheme;
+EnteTextTheme getEnteTextTheme(
+  BuildContext context, {
+  bool inverse = false,
+}) {
+  return inverse
+      ? Theme.of(context).colorScheme.inverseEnteTheme.textTheme
+      : Theme.of(context).colorScheme.enteTheme.textTheme;
 }

lib/theme/text_style.dart

@@ -5,6 +5,18 @@ const FontWeight _regularWeight = FontWeight.w500;
 const FontWeight _boldWeight = FontWeight.w600;
 const String _fontFamily = 'Inter';
 
+const TextStyle brandStyleSmall = TextStyle(
+  fontWeight: FontWeight.bold,
+  fontFamily: 'Montserrat',
+  fontSize: 21,
+);
+
+const TextStyle brandStyleMedium = TextStyle(
+  fontWeight: FontWeight.bold,
+  fontFamily: 'Montserrat',
+  fontSize: 24,
+);
+
 const TextStyle h1 = TextStyle(
   fontSize: 48,
   height: 48 / 28,
@@ -31,7 +43,7 @@ const TextStyle large = TextStyle(
 );
 const TextStyle body = TextStyle(
   fontSize: 16,
-  height: 19.4 / 16.0,
+  height: 20 / 16.0,
   fontWeight: _regularWeight,
   fontFamily: _fontFamily,
 );
@@ -71,6 +83,29 @@ class EnteTextTheme {
   final TextStyle miniBold;
   final TextStyle tiny;
   final TextStyle tinyBold;
+  final TextStyle brandSmall;
+  final TextStyle brandMedium;
+
+  // textMuted variants
+  final TextStyle h1Muted;
+  final TextStyle h2Muted;
+  final TextStyle h3Muted;
+  final TextStyle largeMuted;
+  final TextStyle bodyMuted;
+  final TextStyle smallMuted;
+  final TextStyle miniMuted;
+  final TextStyle miniBoldMuted;
+  final TextStyle tinyMuted;
+
+  // textFaint variants
+  final TextStyle h1Faint;
+  final TextStyle h2Faint;
+  final TextStyle h3Faint;
+  final TextStyle largeFaint;
+  final TextStyle bodyFaint;
+  final TextStyle smallFaint;
+  final TextStyle miniFaint;
+  final TextStyle tinyFaint;
 
   const EnteTextTheme({
     required this.h1,
@@ -89,13 +124,45 @@ class EnteTextTheme {
     required this.miniBold,
     required this.tiny,
     required this.tinyBold,
+    required this.brandSmall,
+    required this.brandMedium,
+    required this.h1Muted,
+    required this.h2Muted,
+    required this.h3Muted,
+    required this.largeMuted,
+    required this.bodyMuted,
+    required this.smallMuted,
+    required this.miniMuted,
+    required this.miniBoldMuted,
+    required this.tinyMuted,
+    required this.h1Faint,
+    required this.h2Faint,
+    required this.h3Faint,
+    required this.largeFaint,
+    required this.bodyFaint,
+    required this.smallFaint,
+    required this.miniFaint,
+    required this.tinyFaint,
   });
 }
 
-EnteTextTheme lightTextTheme = _buildEnteTextStyle(textBaseLight);
-EnteTextTheme darkTextTheme = _buildEnteTextStyle(textBaseDark);
+EnteTextTheme lightTextTheme = _buildEnteTextStyle(
+  textBaseLight,
+  textMutedLight,
+  textFaintLight,
+);
 
-EnteTextTheme _buildEnteTextStyle(Color color) {
+EnteTextTheme darkTextTheme = _buildEnteTextStyle(
+  textBaseDark,
+  textMutedDark,
+  textFaintDark,
+);
+
+EnteTextTheme _buildEnteTextStyle(
+    Color color,
+    Color textMuted,
+    Color textFaint,
+    ) {
   return EnteTextTheme(
     h1: h1.copyWith(color: color),
     h1Bold: h1.copyWith(color: color, fontWeight: _boldWeight),
@@ -113,5 +180,24 @@ EnteTextTheme _buildEnteTextStyle(Color color) {
     miniBold: mini.copyWith(color: color, fontWeight: _boldWeight),
     tiny: tiny.copyWith(color: color),
     tinyBold: tiny.copyWith(color: color, fontWeight: _boldWeight),
+    brandSmall: brandStyleSmall.copyWith(color: color),
+    brandMedium: brandStyleMedium.copyWith(color: color),
+    h1Muted: h1.copyWith(color: textMuted),
+    h2Muted: h2.copyWith(color: textMuted),
+    h3Muted: h3.copyWith(color: textMuted),
+    largeMuted: large.copyWith(color: textMuted),
+    bodyMuted: body.copyWith(color: textMuted),
+    smallMuted: small.copyWith(color: textMuted),
+    miniMuted: mini.copyWith(color: textMuted),
+    miniBoldMuted: mini.copyWith(color: textMuted, fontWeight: _boldWeight),
+    tinyMuted: tiny.copyWith(color: textMuted),
+    h1Faint: h1.copyWith(color: textFaint),
+    h2Faint: h2.copyWith(color: textFaint),
+    h3Faint: h3.copyWith(color: textFaint),
+    largeFaint: large.copyWith(color: textFaint),
+    bodyFaint: body.copyWith(color: textFaint),
+    smallFaint: small.copyWith(color: textFaint),
+    miniFaint: mini.copyWith(color: textFaint),
+    tinyFaint: tiny.copyWith(color: textFaint),
   );
 }

lib/ui/account/change_email_dialog.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/utils/dialog_util.dart';
@@ -7,14 +5,14 @@ import 'package:ente_auth/utils/email_util.dart';
 import 'package:flutter/material.dart';
 
 class ChangeEmailDialog extends StatefulWidget {
-  const ChangeEmailDialog({Key key}) : super(key: key);
+  const ChangeEmailDialog({Key? key}) : super(key: key);
 
   @override
   State<ChangeEmailDialog> createState() => _ChangeEmailDialogState();
 }
 
 class _ChangeEmailDialogState extends State<ChangeEmailDialog> {
-  String _email;
+  String _email = "";
 
   @override
   Widget build(BuildContext context) {

lib/ui/account/delete_account_page.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'dart:convert';
 
 import 'package:ente_auth/core/configuration.dart';
@@ -16,7 +14,7 @@ import 'package:flutter_sodium/flutter_sodium.dart';
 
 class DeleteAccountPage extends StatelessWidget {
   const DeleteAccountPage({
-    Key key,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -50,7 +48,7 @@ class DeleteAccountPage extends StatelessWidget {
               Center(
                 child: Text(
                   l10n.deleteAccountQuery,
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
               ),
               const SizedBox(
@@ -69,7 +67,7 @@ class DeleteAccountPage extends StatelessWidget {
                       text: ", maybe there is a way we can help.",
                     ),
                   ],
-                  style: Theme.of(context).textTheme.subtitle1,
+                  style: Theme.of(context).textTheme.titleMedium,
                 ),
               ),
               const SizedBox(
@@ -153,7 +151,7 @@ class DeleteAccountPage extends StatelessWidget {
     );
 
     if (hasAuthenticated) {
-      final choice = await showChoiceDialog(
+      final choice = await showChoiceDialogOld(
         context,
         l10n.confirmAccountDeleteTitle,
         l10n.confirmAccountDeleteMessage,
@@ -167,8 +165,8 @@ class DeleteAccountPage extends StatelessWidget {
       }
       final decryptChallenge = CryptoUtil.openSealSync(
         Sodium.base642bin(response.encryptedChallenge),
-        Sodium.base642bin(Configuration.instance.getKeyAttributes().publicKey),
-        Configuration.instance.getSecretKey(),
+        Sodium.base642bin(Configuration.instance.getKeyAttributes()!.publicKey),
+        Configuration.instance.getSecretKey()!,
       );
       final challengeResponseStr = utf8.decode(decryptChallenge);
       await UserService.instance.deleteAccount(context, challengeResponseStr);

lib/ui/account/email_entry_page.dart

@@ -1,26 +1,18 @@
-// @dart=2.9
-
-import 'dart:io';
-
 import 'package:email_validator/email_validator.dart';
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/models/billing_plan.dart';
-import 'package:ente_auth/services/billing_service.dart';
 import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/ui/common/dynamic_fab.dart';
-import 'package:ente_auth/ui/common/loading_widget.dart';
 import 'package:ente_auth/ui/common/web_page.dart';
-import 'package:ente_auth/utils/data_util.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:password_strength/password_strength.dart';
 import 'package:step_progress_indicator/step_progress_indicator.dart';
+import "package:styled_text/styled_text.dart";
 
 class EmailEntryPage extends StatefulWidget {
-  const EmailEntryPage({Key key}) : super(key: key);
+  const EmailEntryPage({Key? key}) : super(key: key);
 
   @override
   State<EmailEntryPage> createState() => _EmailEntryPageState();
@@ -35,8 +27,8 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
   final _passwordController2 = TextEditingController();
   final Color _validFieldValueColor = const Color.fromARGB(51, 157, 45, 194);
 
-  String _email;
-  String _password;
+  String? _email;
+  String? _password;
   String _cnfPassword = '';
   double _passwordStrength = 0.0;
   bool _emailIsValid = false;
@@ -72,7 +64,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
   Widget build(BuildContext context) {
     final isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100;
 
-    FloatingActionButtonLocation fabLocation() {
+    FloatingActionButtonLocation? fabLocation() {
       if (isKeypadOpen) {
         return null;
       } else {
@@ -108,12 +100,12 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
       floatingActionButton: DynamicFAB(
         isKeypadOpen: isKeypadOpen,
         isFormValid: _isFormValid(),
-        buttonText: 'Create account',
+        buttonText: context.l10n.createAccount,
         onPressedFunction: () {
           _config.setVolatilePassword(_passwordController1.text);
-          UserService.instance.setEmail(_email);
+          UserService.instance.setEmail(_email!);
           UserService.instance
-              .sendOtt(context, _email, isCreateAccountScreen: true);
+              .sendOtt(context, _email!, isCreateAccountScreen: true);
           FocusScope.of(context).unfocus();
         },
       ),
@@ -123,14 +115,13 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
   }
 
   Widget _getBody() {
-    final l10n = context.l10n;
-    var passwordStrengthText = l10n.passwordStrengthWeak;
+    var passwordStrengthText = context.l10n.weakStrength;
     var passwordStrengthColor = Colors.redAccent;
     if (_passwordStrength > kStrongPasswordStrengthThreshold) {
-      passwordStrengthText = l10n.passwordStrengthStrong;
+      passwordStrengthText = context.l10n.strongStrength;
       passwordStrengthColor = Colors.greenAccent;
     } else if (_passwordStrength > kMildPasswordStrengthThreshold) {
-      passwordStrengthText = l10n.passwordStrengthModerate;
+      passwordStrengthText = context.l10n.moderateStrength;
       passwordStrengthColor = Colors.orangeAccent;
     }
     return Column(
@@ -143,19 +134,19 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                   padding:
                       const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
                   child: Text(
-                    l10n.createNewAccount,
-                    style: Theme.of(context).textTheme.headline4,
+                    context.l10n.createNewAccount,
+                    style: Theme.of(context).textTheme.headlineMedium,
                   ),
                 ),
                 Padding(
                   padding: const EdgeInsets.fromLTRB(20, 0, 20, 0),
                   child: TextFormField(
-                    style: Theme.of(context).textTheme.subtitle1,
+                    style: Theme.of(context).textTheme.titleMedium,
                     autofillHints: const [AutofillHints.email],
                     decoration: InputDecoration(
                       fillColor: _emailIsValid ? _validFieldValueColor : null,
                       filled: true,
-                      hintText: l10n.email,
+                      hintText: context.l10n.email,
                       contentPadding: const EdgeInsets.symmetric(
                         horizontal: 16,
                         vertical: 14,
@@ -170,7 +161,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                               size: 20,
                               color: Theme.of(context)
                                   .inputDecorationTheme
-                                  .focusedBorder
+                                  .focusedBorder!
                                   .borderSide
                                   .color,
                             )
@@ -178,9 +169,9 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                     ),
                     onChanged: (value) {
                       _email = value.trim();
-                      if (_emailIsValid != EmailValidator.validate(_email)) {
+                      if (_emailIsValid != EmailValidator.validate(_email!)) {
                         setState(() {
-                          _emailIsValid = EmailValidator.validate(_email);
+                          _emailIsValid = EmailValidator.validate(_email!);
                         });
                       }
                     },
@@ -203,7 +194,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                       fillColor:
                           _passwordIsValid ? _validFieldValueColor : null,
                       filled: true,
-                      hintText: "Password",
+                      hintText: context.l10n.password,
                       contentPadding: const EdgeInsets.symmetric(
                         horizontal: 16,
                         vertical: 14,
@@ -228,7 +219,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                                   Icons.check,
                                   color: Theme.of(context)
                                       .inputDecorationTheme
-                                      .focusedBorder
+                                      .focusedBorder!
                                       .borderSide
                                       .color,
                                 )
@@ -268,9 +259,11 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                     autofillHints: const [AutofillHints.newPassword],
                     onEditingComplete: () => TextInput.finishAutofillContext(),
                     decoration: InputDecoration(
-                      fillColor: _passwordsMatch ? _validFieldValueColor : null,
+                      fillColor: _passwordsMatch && _passwordIsValid
+                          ? _validFieldValueColor
+                          : null,
                       filled: true,
-                      hintText: l10n.confirmPassword,
+                      hintText: context.l10n.confirmPassword,
                       contentPadding: const EdgeInsets.symmetric(
                         horizontal: 16,
                         vertical: 14,
@@ -295,7 +288,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                                   Icons.check,
                                   color: Theme.of(context)
                                       .inputDecorationTheme
-                                      .focusedBorder
+                                      .focusedBorder!
                                       .borderSide
                                       .color,
                                 )
@@ -322,7 +315,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
                     padding:
                         const EdgeInsets.symmetric(horizontal: 24, vertical: 8),
                     child: Text(
-                      'Password strength: $passwordStrengthText',
+                      context.l10n.passwordStrength(passwordStrengthText),
                       style: TextStyle(
                         color: passwordStrengthColor,
                         fontWeight: FontWeight.w500,
@@ -371,63 +364,47 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
             side: CheckboxTheme.of(context).side,
             onChanged: (value) {
               setState(() {
-                _hasAgreedToTOS = value;
+                _hasAgreedToTOS = value!;
               });
             },
           ),
           Expanded(
-            child: RichText(
-              text: TextSpan(
-                children: [
-                  const TextSpan(
-                    text: "I agree to the ",
-                  ),
-                  TextSpan(
-                    text: "terms of service",
-                    style: const TextStyle(
-                      decoration: TextDecoration.underline,
+            child: StyledText(
+              text: context.l10n.signUpTerms,
+              style:
+                  Theme.of(context).textTheme.titleMedium!.copyWith(fontSize: 12),
+              tags: {
+                'u-terms': StyledTextActionTag(
+                  (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
+                      MaterialPageRoute(
+                        builder: (BuildContext context) {
+                          return WebPage(
+                            context.l10n.termsOfServicesTitle,
+                            "https://ente.io/terms",
+                          );
+                        },
+                      ),
                     ),
-                    recognizer: TapGestureRecognizer()
-                      ..onTap = () {
-                        Navigator.of(context).push(
-                          MaterialPageRoute(
-                            builder: (BuildContext context) {
-                              return const WebPage(
-                                "Terms",
-                                "https://ente.io/terms",
-                              );
-                            },
-                          ),
-                        );
-                      },
+                  style: const TextStyle(
+                    decoration: TextDecoration.underline,
                   ),
-                  const TextSpan(text: " and "),
-                  TextSpan(
-                    text: "privacy policy",
-                    style: const TextStyle(
-                      decoration: TextDecoration.underline,
+                ),
+                'u-policy': StyledTextActionTag(
+                  (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
+                      MaterialPageRoute(
+                        builder: (BuildContext context) {
+                          return WebPage(
+                            context.l10n.privacyPolicyTitle,
+                            "https://ente.io/privacy",
+                          );
+                        },
+                      ),
                     ),
-                    recognizer: TapGestureRecognizer()
-                      ..onTap = () {
-                        Navigator.of(context).push(
-                          MaterialPageRoute(
-                            builder: (BuildContext context) {
-                              return const WebPage(
-                                "Privacy",
-                                "https://ente.io/privacy",
-                              );
-                            },
-                          ),
-                        );
-                      },
+                  style: const TextStyle(
+                    decoration: TextDecoration.underline,
                   ),
-                ],
-                style: Theme.of(context)
-                    .textTheme
-                    .subtitle1
-                    .copyWith(fontSize: 12),
-              ),
-              textAlign: TextAlign.left,
+                )
+              },
             ),
           ),
         ],
@@ -450,45 +427,32 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
             side: CheckboxTheme.of(context).side,
             onChanged: (value) {
               setState(() {
-                _hasAgreedToE2E = value;
+                _hasAgreedToE2E = value!;
               });
             },
           ),
           Expanded(
-            child: RichText(
-              text: TextSpan(
-                children: [
-                  const TextSpan(
-                    text:
-                        "I understand that if I lose my password, I may lose my data since my data is ",
-                  ),
-                  TextSpan(
-                    text: "end-to-end encrypted",
-                    style: const TextStyle(
-                      decoration: TextDecoration.underline,
+            child: StyledText(
+              text: context.l10n.ackPasswordLostWarning,
+              style:
+                  Theme.of(context).textTheme.titleMedium!.copyWith(fontSize: 12),
+              tags: {
+                'underline': StyledTextActionTag(
+                  (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
+                      MaterialPageRoute(
+                        builder: (BuildContext context) {
+                          return WebPage(
+                            context.l10n.encryption,
+                            "https://ente.io/architecture",
+                          );
+                        },
+                      ),
                     ),
-                    recognizer: TapGestureRecognizer()
-                      ..onTap = () {
-                        Navigator.of(context).push(
-                          MaterialPageRoute(
-                            builder: (BuildContext context) {
-                              return const WebPage(
-                                "Encryption",
-                                "https://ente.io/architecture",
-                              );
-                            },
-                          ),
-                        );
-                      },
+                  style: const TextStyle(
+                    decoration: TextDecoration.underline,
                   ),
-                  const TextSpan(text: " with ente"),
-                ],
-                style: Theme.of(context)
-                    .textTheme
-                    .subtitle1
-                    .copyWith(fontSize: 12),
-              ),
-              textAlign: TextAlign.left,
+                ),
+              },
             ),
           ),
         ],
@@ -504,136 +468,3 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
         _passwordIsValid;
   }
 }
-
-class PricingWidget extends StatelessWidget {
-  const PricingWidget({
-    Key key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final l10n = context.l10n;
-    return FutureBuilder<BillingPlans>(
-      future: BillingService.instance.getBillingPlans(),
-      builder: (BuildContext context, AsyncSnapshot snapshot) {
-        if (snapshot.hasData) {
-          return _buildPlans(context, snapshot.data);
-        } else if (snapshot.hasError) {
-          return Text(l10n.oopsSomethingWentWrong);
-        }
-        return const EnteLoadingWidget();
-      },
-    );
-  }
-
-  Container _buildPlans(BuildContext context, BillingPlans plans) {
-    final l10n = context.l10n;
-    final planWidgets = <BillingPlanWidget>[];
-    for (final plan in plans.plans) {
-      final productID = Platform.isAndroid ? plan.androidID : plan.iosID;
-      if (productID != null && productID.isNotEmpty) {
-        planWidgets.add(BillingPlanWidget(plan));
-      }
-    }
-    final freePlan = plans.freePlan;
-    return Container(
-      height: 280,
-      color: Theme.of(context).cardColor,
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-        children: <Widget>[
-          const Text(
-            "Pricing",
-            style: TextStyle(
-              fontWeight: FontWeight.bold,
-              fontSize: 18,
-            ),
-          ),
-          SingleChildScrollView(
-            scrollDirection: Axis.horizontal,
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: planWidgets,
-            ),
-          ),
-          Text(
-            "We offer a free trial of " +
-                convertBytesToReadableFormat(freePlan.storage) +
-                " for " +
-                freePlan.duration.toString() +
-                " " +
-                freePlan.period,
-          ),
-          GestureDetector(
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                const Icon(
-                  Icons.close,
-                  size: 12,
-                  color: Colors.white38,
-                ),
-                const Padding(padding: EdgeInsets.all(1)),
-                Text(
-                  l10n.close,
-                  style: const TextStyle(
-                    color: Colors.white38,
-                  ),
-                ),
-              ],
-            ),
-            onTap: () => Navigator.pop(context),
-          )
-        ],
-      ),
-    );
-  }
-}
-
-class BillingPlanWidget extends StatelessWidget {
-  final BillingPlan plan;
-
-  const BillingPlanWidget(
-    this.plan, {
-    Key key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(2.0),
-      child: Card(
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(12.0),
-        ),
-        color: Colors.black.withOpacity(0.2),
-        child: Container(
-          padding: const EdgeInsets.fromLTRB(12, 20, 12, 20),
-          child: Column(
-            children: [
-              Text(
-                convertBytesToGBs(plan.storage, precision: 0).toString() +
-                    " GB",
-                style: const TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 16,
-                ),
-              ),
-              const Padding(
-                padding: EdgeInsets.all(4),
-              ),
-              Text(
-                plan.price + " / " + plan.period,
-                style: const TextStyle(
-                  fontSize: 12,
-                  color: Colors.white70,
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/ui/account/login_page.dart

@@ -1,15 +1,18 @@
-// @dart=2.9
-
 import 'package:email_validator/email_validator.dart';
 import 'package:ente_auth/core/configuration.dart';
+import 'package:ente_auth/core/errors.dart';
+import "package:ente_auth/l10n/l10n.dart";
+import 'package:ente_auth/models/api/user/srp.dart';
 import 'package:ente_auth/services/user_service.dart';
+import 'package:ente_auth/ui/account/login_pwd_verification_page.dart';
 import 'package:ente_auth/ui/common/dynamic_fab.dart';
 import 'package:ente_auth/ui/common/web_page.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:logging/logging.dart';
+import "package:styled_text/styled_text.dart";
 
 class LoginPage extends StatefulWidget {
-  const LoginPage({Key key}) : super(key: key);
+  const LoginPage({Key? key}) : super(key: key);
 
   @override
   State<LoginPage> createState() => _LoginPageState();
@@ -18,8 +21,9 @@ class LoginPage extends StatefulWidget {
 class _LoginPageState extends State<LoginPage> {
   final _config = Configuration.instance;
   bool _emailIsValid = false;
-  String _email;
-  Color _emailInputFieldColor;
+  String? _email;
+  Color? _emailInputFieldColor;
+  final Logger _logger = Logger('_LoginPageState');
 
   @override
   void initState() {
@@ -31,7 +35,7 @@ class _LoginPageState extends State<LoginPage> {
   Widget build(BuildContext context) {
     final isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100;
 
-    FloatingActionButtonLocation fabLocation() {
+    FloatingActionButtonLocation? fabLocation() {
       if (isKeypadOpen) {
         return null;
       } else {
@@ -55,11 +59,33 @@ class _LoginPageState extends State<LoginPage> {
       floatingActionButton: DynamicFAB(
         isKeypadOpen: isKeypadOpen,
         isFormValid: _emailIsValid,
-        buttonText: 'Log in',
-        onPressedFunction: () {
-          UserService.instance.setEmail(_email);
-          UserService.instance
-              .sendOtt(context, _email, isCreateAccountScreen: false);
+        buttonText: context.l10n.logInLabel,
+        onPressedFunction: () async {
+          UserService.instance.setEmail(_email!);
+          SrpAttributes? attr;
+          bool isEmailVerificationEnabled = true;
+          try {
+            attr = await UserService.instance.getSrpAttributes(_email!);
+            isEmailVerificationEnabled = attr.isEmailMFAEnabled;
+          } catch (e) {
+            if (e is! SrpSetupNotCompleteError) {
+              _logger.severe('Error getting SRP attributes', e);
+            }
+          }
+          if (attr != null && !isEmailVerificationEnabled) {
+            Navigator.of(context).push(
+              MaterialPageRoute(
+                builder: (BuildContext context) {
+                  return LoginPasswordVerificationPage(
+                    srpAttributes: attr!,
+                  );
+                },
+              ),
+            );
+          } else {
+            await UserService.instance
+                .sendOtt(context, _email!, isCreateAccountScreen: false);
+          }
           FocusScope.of(context).unfocus();
         },
       ),
@@ -69,6 +95,7 @@ class _LoginPageState extends State<LoginPage> {
   }
 
   Widget _getBody() {
+    final l10n = context.l10n;
     return Column(
       children: [
         Expanded(
@@ -79,8 +106,8 @@ class _LoginPageState extends State<LoginPage> {
                   padding:
                       const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
                   child: Text(
-                    'Welcome back!',
-                    style: Theme.of(context).textTheme.headline4,
+                    l10n.welcomeBack,
+                    style: Theme.of(context).textTheme.headlineMedium,
                   ),
                 ),
                 Padding(
@@ -90,7 +117,7 @@ class _LoginPageState extends State<LoginPage> {
                     decoration: InputDecoration(
                       fillColor: _emailInputFieldColor,
                       filled: true,
-                      hintText: 'Email',
+                      hintText: l10n.email,
                       contentPadding: const EdgeInsets.symmetric(
                         horizontal: 15,
                         vertical: 15,
@@ -105,7 +132,7 @@ class _LoginPageState extends State<LoginPage> {
                               size: 20,
                               color: Theme.of(context)
                                   .inputDecorationTheme
-                                  .focusedBorder
+                                  .focusedBorder!
                                   .borderSide
                                   .color,
                             )
@@ -114,7 +141,7 @@ class _LoginPageState extends State<LoginPage> {
                     onChanged: (value) {
                       setState(() {
                         _email = value.trim();
-                        _emailIsValid = EmailValidator.validate(_email);
+                        _emailIsValid = EmailValidator.validate(_email!);
                         if (_emailIsValid) {
                           _emailInputFieldColor =
                               const Color.fromARGB(51, 157, 45, 194);
@@ -141,58 +168,44 @@ class _LoginPageState extends State<LoginPage> {
                     children: [
                       Expanded(
                         flex: 5,
-                        child: RichText(
-                          text: TextSpan(
-                            style: Theme.of(context)
-                                .textTheme
-                                .subtitle1
-                                .copyWith(fontSize: 12),
-                            children: [
-                              const TextSpan(
-                                text: "By clicking log in, I agree to the ",
-                              ),
-                              TextSpan(
-                                text: "terms of service",
-                                style: const TextStyle(
-                                  decoration: TextDecoration.underline,
+                        child: StyledText(
+                          text: context.l10n.loginTerms,
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium!
+                              .copyWith(fontSize: 12),
+                          tags: {
+                            'u-terms': StyledTextActionTag(
+                              (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
+                                  MaterialPageRoute(
+                                    builder: (BuildContext context) {
+                                      return WebPage(
+                                        context.l10n.termsOfServicesTitle,
+                                        "https://ente.io/terms",
+                                      );
+                                    },
+                                  ),
                                 ),
-                                recognizer: TapGestureRecognizer()
-                                  ..onTap = () {
-                                    Navigator.of(context).push(
-                                      MaterialPageRoute(
-                                        builder: (BuildContext context) {
-                                          return const WebPage(
-                                            "terms",
-                                            "https://ente.io/terms",
-                                          );
-                                        },
-                                      ),
-                                    );
-                                  },
+                              style: const TextStyle(
+                                decoration: TextDecoration.underline,
                               ),
-                              const TextSpan(text: " and "),
-                              TextSpan(
-                                text: "privacy policy",
-                                style: const TextStyle(
-                                  decoration: TextDecoration.underline,
+                            ),
+                            'u-policy': StyledTextActionTag(
+                              (String? text, Map<String?, String?> attrs) => Navigator.of(context).push(
+                                  MaterialPageRoute(
+                                    builder: (BuildContext context) {
+                                      return WebPage(
+                                        context.l10n.privacyPolicyTitle,
+                                        "https://ente.io/privacy",
+                                      );
+                                    },
+                                  ),
                                 ),
-                                recognizer: TapGestureRecognizer()
-                                  ..onTap = () {
-                                    Navigator.of(context).push(
-                                      MaterialPageRoute(
-                                        builder: (BuildContext context) {
-                                          return const WebPage(
-                                            "privacy",
-                                            "https://ente.io/privacy",
-                                          );
-                                        },
-                                      ),
-                                    );
-                                  },
+                              style: const TextStyle(
+                                decoration: TextDecoration.underline,
                               ),
-                            ],
-                          ),
-                          textAlign: TextAlign.left,
+                            )
+                          },
                         ),
                       ),
                       Expanded(

lib/ui/account/login_pwd_verification_page.dart

@@ -0,0 +1,232 @@
+
+import 'package:ente_auth/core/configuration.dart';
+import "package:ente_auth/l10n/l10n.dart";
+import "package:ente_auth/models/api/user/srp.dart";
+import "package:ente_auth/services/user_service.dart";
+import "package:ente_auth/theme/ente_theme.dart";
+import 'package:ente_auth/ui/common/dynamic_fab.dart';
+import "package:ente_auth/utils/dialog_util.dart";
+import 'package:flutter/material.dart';
+import "package:logging/logging.dart";
+
+// LoginPasswordVerificationPage is a page that allows the user to enter their password to verify their identity.
+// If the password is correct, then the user is either directed to
+// PasswordReentryPage (if the user has not yet set up 2FA) or TwoFactorAuthenticationPage (if the user has set up 2FA).
+// In the PasswordReentryPage, the password is auto-filled based on the
+// volatile password.
+class LoginPasswordVerificationPage extends StatefulWidget {
+  final SrpAttributes srpAttributes;
+  const LoginPasswordVerificationPage({Key? key, required this.srpAttributes}) : super(key: key);
+
+  @override
+  State<LoginPasswordVerificationPage> createState() => _LoginPasswordVerificationPageState();
+}
+
+class _LoginPasswordVerificationPageState extends
+State<LoginPasswordVerificationPage> {
+  final _logger = Logger((_LoginPasswordVerificationPageState).toString());
+  final _passwordController = TextEditingController();
+  final FocusNode _passwordFocusNode = FocusNode();
+  String? email;
+  bool _passwordInFocus = false;
+  bool _passwordVisible = false;
+
+  @override
+  void initState() {
+    super.initState();
+    email = Configuration.instance.getEmail();
+    _passwordFocusNode.addListener(() {
+      setState(() {
+        _passwordInFocus = _passwordFocusNode.hasFocus;
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100;
+
+    FloatingActionButtonLocation? fabLocation() {
+      if (isKeypadOpen) {
+        return null;
+      } else {
+        return FloatingActionButtonLocation.centerFloat;
+      }
+    }
+
+    return Scaffold(
+      resizeToAvoidBottomInset: isKeypadOpen,
+      appBar: AppBar(
+        elevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          color: Theme.of(context).iconTheme.color,
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+        ),
+      ),
+      body: _getBody(),
+      floatingActionButton: DynamicFAB(
+        key: const ValueKey("verifyPasswordButton"),
+        isKeypadOpen: isKeypadOpen,
+        isFormValid: _passwordController.text.isNotEmpty,
+        buttonText: context.l10n.logInLabel,
+        onPressedFunction: () async {
+          FocusScope.of(context).unfocus();
+          await UserService.instance.verifyEmailViaPassword(context, widget
+              .srpAttributes,
+              _passwordController.text,);
+        },
+      ),
+      floatingActionButtonLocation: fabLocation(),
+      floatingActionButtonAnimator: NoScalingAnimation(),
+    );
+  }
+
+  Widget _getBody() {
+    return Column(
+      children: [
+        Expanded(
+          child: AutofillGroup(
+            child: ListView(
+              children: [
+                Padding(
+                  padding:
+                  const EdgeInsets.only(top: 30, left: 20, right: 20),
+                  child: Text(
+                    context.l10n.enterPassword,
+                    style: Theme.of(context).textTheme.headlineMedium,
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.only(bottom: 30, left: 22, right:
+                  20,),
+                  child: Text(email ?? '', style: getEnteTextTheme(context).smallMuted,),
+                ),
+                Visibility(
+                  // hidden textForm for suggesting auto-fill service for saving
+                  // password
+                  visible: false,
+                  child: TextFormField(
+                    autofillHints: const [
+                      AutofillHints.email,
+                    ],
+                    autocorrect: false,
+                    keyboardType: TextInputType.emailAddress,
+                    initialValue: email,
+                    textInputAction: TextInputAction.next,
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(20, 24, 20, 0),
+                  child: TextFormField(
+                    key: const ValueKey("passwordInputField"),
+                    autofillHints: const [AutofillHints.password],
+                    decoration: InputDecoration(
+                      hintText: context.l10n.enterYourPasswordHint,
+                      filled: true,
+                      contentPadding: const EdgeInsets.all(20),
+                      border: UnderlineInputBorder(
+                        borderSide: BorderSide.none,
+                        borderRadius: BorderRadius.circular(6),
+                      ),
+                      suffixIcon: _passwordInFocus
+                          ? IconButton(
+                        icon: Icon(
+                          _passwordVisible
+                              ? Icons.visibility
+                              : Icons.visibility_off,
+                          color: Theme.of(context).iconTheme.color,
+                          size: 20,
+                        ),
+                        onPressed: () {
+                          setState(() {
+                            _passwordVisible = !_passwordVisible;
+                          });
+                        },
+                      )
+                          : null,
+                    ),
+                    style: const TextStyle(
+                      fontSize: 14,
+                    ),
+                    controller: _passwordController,
+                    autofocus: true,
+                    autocorrect: false,
+                    obscureText: !_passwordVisible,
+                    keyboardType: TextInputType.visiblePassword,
+                    focusNode: _passwordFocusNode,
+                    onChanged: (_) {
+                      setState(() {});
+                    },
+                  ),
+                ),
+                const Padding(
+                  padding: EdgeInsets.symmetric(vertical: 18),
+                  child: Divider(
+                    thickness: 1,
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 20),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      GestureDetector(
+                        behavior: HitTestBehavior.opaque,
+                        onTap: () async {
+                          await UserService.instance
+                              .sendOtt(context, email!,
+                              isResetPasswordScreen: true,);
+                        },
+                        child: Center(
+                          child: Text(
+                            context.l10n.forgotPassword,
+                            style: Theme.of(context)
+                                .textTheme
+                                .titleMedium!
+                                .copyWith(
+                              fontSize: 14,
+                              decoration: TextDecoration.underline,
+                            ),
+                          ),
+                        ),
+                      ),
+                      GestureDetector(
+                        behavior: HitTestBehavior.opaque,
+                        onTap: () async {
+                          final dialog = createProgressDialog(
+                            context,
+                            context.l10n.pleaseWait,
+                          );
+                          await dialog.show();
+                          await Configuration.instance.logout();
+                          await dialog.hide();
+                          Navigator.of(context)
+                              .popUntil((route) => route.isFirst);
+                        },
+                        child: Center(
+                          child: Text(
+                            context.l10n.changeEmail,
+                            style: Theme.of(context)
+                                .textTheme
+                                .titleMedium!
+                                .copyWith(
+                              fontSize: 14,
+                              decoration: TextDecoration.underline,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                )
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/ui/account/logout_dialog.dart

@@ -0,0 +1,57 @@
+import 'package:ente_auth/core/configuration.dart';
+import 'package:ente_auth/l10n/l10n.dart';
+import 'package:ente_auth/store/authenticator_db.dart';
+import 'package:ente_auth/utils/dialog_util.dart';
+import 'package:flutter/material.dart';
+
+Future<void> autoLogoutAlert(BuildContext context) async {
+  final l10n = context.l10n;
+  final AlertDialog alert = AlertDialog(
+    title: Text(l10n.sessionExpired),
+    content: Text(l10n.pleaseLoginAgain),
+    actions: [
+      TextButton(
+        child: Text(
+          l10n.ok,
+          style: TextStyle(
+            color: Theme.of(context).colorScheme.primary,
+          ),
+        ),
+        onPressed: () async {
+          Navigator.of(context, rootNavigator: true).pop('dialog');
+          Navigator.of(context).popUntil((route) => route.isFirst);
+          int pendingSyncCount =
+              await AuthenticatorDB.instance.getNeedSyncCount();
+          if (pendingSyncCount > 0) {
+            showChoiceActionSheet(
+              context,
+              title: l10n.pendingSyncs,
+              body: l10n.pendingSyncsWarningBody,
+              firstButtonLabel: context.l10n.yesLogout,
+              isCritical: true,
+              firstButtonOnTap: () async {
+                await _logout(context, l10n);
+              },
+            );
+          } else {
+            await _logout(context, l10n);
+          }
+        },
+      ),
+    ],
+  );
+  await showDialog(
+    context: context,
+    barrierDismissible: false,
+    builder: (BuildContext context) {
+      return alert;
+    },
+  );
+}
+
+Future<void> _logout(BuildContext context, AppLocalizations l10n) async {
+  final dialog = createProgressDialog(context, l10n.loggingOut);
+  await dialog.show();
+  await Configuration.instance.logout();
+  await dialog.hide();
+}

lib/ui/account/ott_verification_page.dart

@@ -1,21 +1,23 @@
-// @dart=2.9
-
 import 'package:ente_auth/ente_theme_data.dart';
+import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/ui/common/dynamic_fab.dart';
 import 'package:flutter/material.dart';
 import 'package:step_progress_indicator/step_progress_indicator.dart';
+import 'package:styled_text/styled_text.dart';
 
 class OTTVerificationPage extends StatefulWidget {
   final String email;
   final bool isChangeEmail;
   final bool isCreateAccountScreen;
+  final bool isResetPasswordScreen;
 
   const OTTVerificationPage(
     this.email, {
     this.isChangeEmail = false,
     this.isCreateAccountScreen = false,
-    Key key,
+    this.isResetPasswordScreen = false,
+    Key? key,
   }) : super(key: key);
 
   @override
@@ -27,9 +29,10 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
 
   @override
   Widget build(BuildContext context) {
+    final l10n = context.l10n;
     final isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100;
 
-    FloatingActionButtonLocation fabLocation() {
+    FloatingActionButtonLocation? fabLocation() {
       if (isKeypadOpen) {
         return null;
       } else {
@@ -65,9 +68,8 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
       body: _getBody(),
       floatingActionButton: DynamicFAB(
         isKeypadOpen: isKeypadOpen,
-        isFormValid: !(_verificationCodeController.text == null ||
-            _verificationCodeController.text.isEmpty),
-        buttonText: 'Verify',
+        isFormValid: !(_verificationCodeController.text.isEmpty),
+        buttonText: l10n.verify,
         onPressedFunction: () {
           if (widget.isChangeEmail) {
             UserService.instance.changeEmail(
@@ -77,7 +79,8 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
             );
           } else {
             UserService.instance
-                .verifyEmail(context, _verificationCodeController.text);
+                .verifyEmail(context, _verificationCodeController.text,
+              isResettingPasswordScreen: widget.isResetPasswordScreen,);
           }
           FocusScope.of(context).unfocus();
         },
@@ -88,6 +91,7 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
   }
 
   Widget _getBody() {
+    final l10n = context.l10n;
     return ListView(
       children: [
         Column(
@@ -96,8 +100,8 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
             Padding(
               padding: const EdgeInsets.fromLTRB(20, 30, 20, 15),
               child: Text(
-                'Verify email',
-                style: Theme.of(context).textTheme.headline4,
+                l10n.verifyEmail,
+                style: Theme.of(context).textTheme.headlineMedium,
               ),
             ),
             Padding(
@@ -110,33 +114,38 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
                       children: [
                         Padding(
                           padding: const EdgeInsets.fromLTRB(0, 0, 0, 12),
-                          child: RichText(
-                            text: TextSpan(
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .subtitle1
-                                  .copyWith(fontSize: 14),
-                              children: [
-                                const TextSpan(text: "We've sent a mail to "),
-                                TextSpan(
-                                  text: widget.email,
-                                  style: TextStyle(
-                                    color: Theme.of(context)
-                                        .colorScheme
-                                        .alternativeColor,
-                                  ),
-                                )
-                              ],
-                            ),
+                          child: StyledText(
+                            text: l10n.weHaveSendEmailTo(widget.email),
+                            style: Theme.of(context)
+                                .textTheme
+                                .titleMedium!
+                                .copyWith(fontSize: 14),
+                            tags: {
+                              'green': StyledTextTag(
+                                style: TextStyle(
+                                  color: Theme.of(context)
+                                      .colorScheme
+                                      .alternativeColor,
+                                ),
+                              ),
+                            },
                           ),
                         ),
-                        Text(
-                          'Please check your inbox (and spam) to complete verification',
-                          style: Theme.of(context)
-                              .textTheme
-                              .subtitle1
-                              .copyWith(fontSize: 14),
-                        ),
+                        widget.isResetPasswordScreen
+                            ? Text(
+                                l10n.toResetVerifyEmail,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleMedium!
+                                    .copyWith(fontSize: 14),
+                              )
+                            : Text(
+                                l10n.checkInboxAndSpamFolder,
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleMedium!
+                                    .copyWith(fontSize: 14),
+                              ),
                       ],
                     ),
                   ),
@@ -150,10 +159,10 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
             Padding(
               padding: const EdgeInsets.fromLTRB(20, 16, 20, 16),
               child: TextFormField(
-                style: Theme.of(context).textTheme.subtitle1,
+                style: Theme.of(context).textTheme.titleMedium,
                 decoration: InputDecoration(
                   filled: true,
-                  hintText: 'Tap to enter code',
+                  hintText: l10n.tapToEnterCode,
                   contentPadding: const EdgeInsets.all(15),
                   border: UnderlineInputBorder(
                     borderSide: BorderSide.none,
@@ -183,11 +192,13 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
                         context,
                         widget.email,
                         isCreateAccountScreen: widget.isCreateAccountScreen,
+                        isChangeEmail: widget.isChangeEmail,
+                        isResetPasswordScreen: widget.isResetPasswordScreen,
                       );
                     },
                     child: Text(
-                      "Resend email",
-                      style: Theme.of(context).textTheme.subtitle1.copyWith(
+                      l10n.resendEmail,
+                      style: Theme.of(context).textTheme.titleMedium!.copyWith(
                             fontSize: 14,
                             decoration: TextDecoration.underline,
                           ),

lib/ui/account/password_entry_page.dart

@@ -1,7 +1,6 @@
-// @dart=2.9
-
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/l10n/l10n.dart';
+import 'package:ente_auth/models/key_gen_result.dart';
 import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/ui/account/recovery_key_page.dart';
 import 'package:ente_auth/ui/common/dynamic_fab.dart';
@@ -14,6 +13,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:logging/logging.dart';
 import 'package:password_strength/password_strength.dart';
+import 'package:styled_text/styled_text.dart';
 
 enum PasswordEntryMode {
   set,
@@ -24,7 +24,7 @@ enum PasswordEntryMode {
 class PasswordEntryPage extends StatefulWidget {
   final PasswordEntryMode mode;
 
-  const PasswordEntryPage({this.mode = PasswordEntryMode.set, Key key})
+  const PasswordEntryPage({required this.mode, Key? key})
       : super(key: key);
 
   @override
@@ -39,7 +39,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
   final _passwordController1 = TextEditingController(),
       _passwordController2 = TextEditingController();
   final Color _validFieldValueColor = const Color.fromRGBO(45, 194, 98, 0.2);
-  String _volatilePassword;
+  String? _volatilePassword;
   String _passwordInInputBox = '';
   String _passwordInInputConfirmationBox = '';
   double _passwordStrength = 0.0;
@@ -60,7 +60,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
     if (_volatilePassword != null) {
       Future.delayed(
         Duration.zero,
-        () => _showRecoveryCodeDialog(_volatilePassword),
+        () => _showRecoveryCodeDialog(_volatilePassword!),
       );
     }
     _password1FocusNode.addListener(() {
@@ -79,7 +79,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
   Widget build(BuildContext context) {
     final isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100;
 
-    FloatingActionButtonLocation fabLocation() {
+    FloatingActionButtonLocation? fabLocation() {
       if (isKeypadOpen) {
         return null;
       } else {
@@ -87,13 +87,13 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
       }
     }
 
-    String title = "Set password";
+    String title = context.l10n.setPasswordTitle;
     if (widget.mode == PasswordEntryMode.update) {
-      title = "Change password";
+      title = context.l10n.changePasswordTitle;
     } else if (widget.mode == PasswordEntryMode.reset) {
-      title = "Reset password";
+      title = context.l10n.resetPasswordTitle;
     } else if (_volatilePassword != null) {
-      title = "Encryption keys";
+      title = context.l10n.encryptionKeys;
     }
     return Scaffold(
       resizeToAvoidBottomInset: isKeypadOpen,
@@ -130,13 +130,13 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
 
   Widget _getBody(String buttonTextAndHeading) {
     final email = Configuration.instance.getEmail();
-    var passwordStrengthText = 'Weak';
+    var passwordStrengthText = context.l10n.weakStrength;
     var passwordStrengthColor = Colors.redAccent;
     if (_passwordStrength > kStrongPasswordStrengthThreshold) {
-      passwordStrengthText = 'Strong';
+      passwordStrengthText = context.l10n.strongStrength;
       passwordStrengthColor = Colors.greenAccent;
     } else if (_passwordStrength > kMildPasswordStrengthThreshold) {
-      passwordStrengthText = 'Moderate';
+      passwordStrengthText = context.l10n.moderateStrength;
       passwordStrengthColor = Colors.orangeAccent;
     }
     if (_volatilePassword != null) {
@@ -153,45 +153,39 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                       const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
                   child: Text(
                     buttonTextAndHeading,
-                    style: Theme.of(context).textTheme.headline4,
+                    style: Theme.of(context).textTheme.headlineMedium,
                   ),
                 ),
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 20),
                   child: Text(
-                    "Enter a" +
-                        (widget.mode != PasswordEntryMode.set ? " new " : " ") +
-                        "password we can use to encrypt your data",
+                    widget.mode == PasswordEntryMode.set
+                        ? context.l10n.enterPasswordToEncrypt
+                        : context.l10n.enterNewPasswordToEncrypt,
                     textAlign: TextAlign.start,
                     style: Theme.of(context)
                         .textTheme
-                        .subtitle1
+                        .titleMedium!
                         .copyWith(fontSize: 14),
                   ),
                 ),
                 const Padding(padding: EdgeInsets.all(8)),
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 20),
-                  child: RichText(
-                    text: TextSpan(
-                      style: Theme.of(context)
-                          .textTheme
-                          .subtitle1
-                          .copyWith(fontSize: 14),
-                      children: [
-                        const TextSpan(
-                          text:
-                              "We don't store this password, so if you forget, ",
-                        ),
-                        TextSpan(
-                          text: "we cannot decrypt your data",
-                          style: Theme.of(context).textTheme.subtitle1.copyWith(
-                                fontSize: 14,
-                                decoration: TextDecoration.underline,
-                              ),
-                        ),
-                      ],
-                    ),
+                  child: StyledText(
+                    text: context.l10n.passwordWarning,
+                    style: Theme.of(context)
+                        .textTheme
+                        .titleMedium!
+                        .copyWith(fontSize: 14),
+                    tags: {
+                      'underline': StyledTextTag(
+                        style: Theme.of(context).textTheme.titleMedium!.copyWith(
+                              fontSize: 14,
+                              decoration: TextDecoration.underline,
+                            ),
+                      ),
+                    },
                   ),
                 ),
                 const Padding(padding: EdgeInsets.all(12)),
@@ -217,7 +211,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                       fillColor:
                           _isPasswordValid ? _validFieldValueColor : null,
                       filled: true,
-                      hintText: "Password",
+                      hintText: context.l10n.password,
                       contentPadding: const EdgeInsets.all(20),
                       border: UnderlineInputBorder(
                         borderSide: BorderSide.none,
@@ -243,7 +237,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                                   Icons.check,
                                   color: Theme.of(context)
                                       .inputDecorationTheme
-                                      .focusedBorder
+                                      .focusedBorder!
                                       .borderSide
                                       .color,
                                 )
@@ -280,7 +274,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                     decoration: InputDecoration(
                       fillColor: _passwordsMatch ? _validFieldValueColor : null,
                       filled: true,
-                      hintText: "Confirm password",
+                      hintText: context.l10n.confirmPassword,
                       contentPadding: const EdgeInsets.symmetric(
                         horizontal: 20,
                         vertical: 20,
@@ -305,7 +299,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                                   Icons.check,
                                   color: Theme.of(context)
                                       .inputDecorationTheme
-                                      .focusedBorder
+                                      .focusedBorder!
                                       .borderSide
                                       .color,
                                 )
@@ -335,7 +329,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                     padding:
                         const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
                     child: Text(
-                      'Password Strength: $passwordStrengthText',
+                      context.l10n.passwordStrength(passwordStrengthText),
                       style: TextStyle(
                         color: passwordStrengthColor,
                       ),
@@ -349,8 +343,8 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                     Navigator.of(context).push(
                       MaterialPageRoute(
                         builder: (BuildContext context) {
-                          return const WebPage(
-                            "How it works",
+                          return WebPage(
+                            context.l10n.howItWorks,
                             "https://ente.io/architecture",
                           );
                         },
@@ -361,8 +355,8 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                     padding: const EdgeInsets.symmetric(horizontal: 20),
                     child: RichText(
                       text: TextSpan(
-                        text: "How it works",
-                        style: Theme.of(context).textTheme.subtitle1.copyWith(
+                        text: context.l10n.howItWorks,
+                        style: Theme.of(context).textTheme.titleMedium!.copyWith(
                               fontSize: 14,
                               decoration: TextDecoration.underline,
                             ),
@@ -381,14 +375,14 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
 
   void _updatePassword() async {
     final dialog =
-        createProgressDialog(context, "Generating encryption keys...");
+        createProgressDialog(context, context.l10n.generatingEncryptionKeys);
     await dialog.show();
     try {
-      final keyAttributes = await Configuration.instance
-          .updatePassword(_passwordController1.text);
-      await UserService.instance.updateKeyAttributes(keyAttributes);
+      final result = await Configuration.instance
+          .getAttributesForNewPassword(_passwordController1.text);
+      await UserService.instance.updateKeyAttributes(result.item1, result.item2);
       await dialog.hide();
-      showShortToast(context, "Password changed successfully");
+      showShortToast(context, context.l10n.passwordChangedSuccessfully);
       Navigator.of(context).pop();
       if (widget.mode == PasswordEntryMode.reset) {
         Navigator.of(context).popUntil((route) => route.isFirst);
@@ -396,7 +390,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
     } catch (e, s) {
       _logger.severe(e, s);
       await dialog.hide();
-      showGenericErrorDialog(context);
+      showGenericErrorDialog(context: context);
     }
   }
 
@@ -406,15 +400,16 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
         createProgressDialog(context, l10n.generatingEncryptionKeysTitle);
     await dialog.show();
     try {
-      final result = await Configuration.instance.generateKey(password);
+      final KeyGenResult result = await Configuration.instance.generateKey(password);
       Configuration.instance.setVolatilePassword(null);
       await dialog.hide();
       onDone() async {
-        final dialog = createProgressDialog(context, l10n.pleaseWaitTitle);
+        final dialog = createProgressDialog(context, l10n.pleaseWait);
         await dialog.show();
         try {
           await UserService.instance.setAttributes(result);
           await dialog.hide();
+          Configuration.instance.setVolatilePassword(null);
           Navigator.of(context).pushAndRemoveUntil(
             MaterialPageRoute(
               builder: (BuildContext context) {
@@ -426,7 +421,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
         } catch (e, s) {
           _logger.severe(e, s);
           await dialog.hide();
-          showGenericErrorDialog(context);
+          showGenericErrorDialog(context: context);
         }
       }
 
@@ -434,7 +429,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
         context,
         RecoveryKeyPage(
           result.privateKeyAttributes.recoveryKey,
-          "Continue",
+          context.l10n.continueLabel,
           showAppBar: false,
           isDismissible: false,
           onDone: onDone,
@@ -447,11 +442,11 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
       if (e is UnsupportedError) {
         showErrorDialog(
           context,
-          "Insecure device",
-          "Sorry, we could not generate secure keys on this device.\n\nplease sign up from a different device.",
+          context.l10n.insecureDevice,
+          context.l10n.sorryWeCouldNotGenerateSecureKeysOnThisDevicennplease,
         );
       } else {
-        showGenericErrorDialog(context);
+        showGenericErrorDialog(context: context);
       }
     }
   }

lib/ui/account/password_reentry_page.dart

@@ -1,20 +1,22 @@
-// @dart=2.9
+import 'dart:async';
+import 'dart:typed_data';
 
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/core/errors.dart';
 import 'package:ente_auth/l10n/l10n.dart';
-import 'package:ente_auth/models/key_attributes.dart';
+import 'package:ente_auth/services/user_service.dart';
 import 'package:ente_auth/ui/account/recovery_page.dart';
-import 'package:ente_auth/ui/common/dialogs.dart';
 import 'package:ente_auth/ui/common/dynamic_fab.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
 import 'package:ente_auth/ui/home_page.dart';
+import 'package:ente_auth/utils/crypto_util.dart';
 import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:ente_auth/utils/email_util.dart';
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 
 class PasswordReentryPage extends StatefulWidget {
-  const PasswordReentryPage({Key key}) : super(key: key);
+  const PasswordReentryPage({Key? key}) : super(key: key);
 
   @override
   State<PasswordReentryPage> createState() => _PasswordReentryPageState();
@@ -24,14 +26,23 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
   final _logger = Logger((_PasswordReentryPageState).toString());
   final _passwordController = TextEditingController();
   final FocusNode _passwordFocusNode = FocusNode();
-  String email;
+  String? email;
   bool _passwordInFocus = false;
   bool _passwordVisible = false;
+  String? _volatilePassword;
 
   @override
   void initState() {
     super.initState();
     email = Configuration.instance.getEmail();
+    _volatilePassword = Configuration.instance.getVolatilePassword();
+    if (_volatilePassword != null) {
+      _passwordController.text = _volatilePassword!;
+      Future.delayed(
+        Duration.zero,
+            () => verifyPassword(_volatilePassword!),
+      );
+    }
     _passwordFocusNode.addListener(() {
       setState(() {
         _passwordInFocus = _passwordFocusNode.hasFocus;
@@ -41,10 +52,9 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
 
   @override
   Widget build(BuildContext context) {
-    final l10n = context.l10n;
     final isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100;
 
-    FloatingActionButtonLocation fabLocation() {
+    FloatingActionButtonLocation? fabLocation() {
       if (isKeypadOpen) {
         return null;
       } else {
@@ -66,72 +76,13 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
       ),
       body: _getBody(),
       floatingActionButton: DynamicFAB(
+        key: const ValueKey("verifyPasswordButton"),
         isKeypadOpen: isKeypadOpen,
         isFormValid: _passwordController.text.isNotEmpty,
-        buttonText: l10n.verifyPassword,
+        buttonText: context.l10n.verifyPassword,
         onPressedFunction: () async {
           FocusScope.of(context).unfocus();
-          final dialog = createProgressDialog(context, l10n.pleaseWaitTitle);
-          await dialog.show();
-          try {
-            await Configuration.instance.decryptAndSaveSecrets(
-              _passwordController.text,
-              Configuration.instance.getKeyAttributes(),
-            );
-          } on KeyDerivationError catch (e, s) {
-            _logger.severe("Password verification failed", e, s);
-            await dialog.hide();
-            final dialogUserChoice = await showChoiceDialog(
-              context,
-              l10n.recreatePassword,
-              l10n.recreatePasswordMessage,
-              firstAction: l10n.cancel,
-              firstActionColor: Theme.of(context).colorScheme.primary,
-              secondAction: l10n.useRecoveryKeyAction,
-              secondActionColor: Theme.of(context).colorScheme.primary,
-            );
-            if (dialogUserChoice == DialogUserChoice.secondChoice) {
-              Navigator.of(context).push(
-                MaterialPageRoute(
-                  builder: (BuildContext context) {
-                    return const RecoveryPage();
-                  },
-                ),
-              );
-            }
-            return;
-          } catch (e, s) {
-            _logger.severe("Password verification failed", e, s);
-            await dialog.hide();
-
-            final dialogUserChoice = await showChoiceDialog(
-              context,
-              l10n.incorrectPassword,
-              l10n.tryAgainMessage,
-              firstAction: l10n.contactSupport,
-              firstActionColor: Theme.of(context).colorScheme.primary,
-              secondAction: l10n.ok,
-              secondActionColor: Theme.of(context).colorScheme.primary,
-            );
-            if (dialogUserChoice == DialogUserChoice.firstChoice) {
-              await sendLogs(
-                context,
-                l10n.contactSupport,
-                "support@ente.io",
-                postShare: () {},
-              );
-            }
-            return;
-          }
-          await dialog.hide();
-          Navigator.of(context).pushAndRemoveUntil(
-            MaterialPageRoute(
-              builder: (BuildContext context) {
-                return const HomePage();
-              },
-            ),
-            (route) => false,
-          );
+          await verifyPassword(_passwordController.text);
         },
       ),
       floatingActionButtonLocation: fabLocation(),
@@ -139,8 +90,91 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
     );
   }
 
+  Future<void> verifyPassword(String password) async {
+    FocusScope.of(context).unfocus();
+    final dialog =
+    createProgressDialog(context, context.l10n.pleaseWait);
+    await dialog.show();
+    try {
+      final kek = await Configuration.instance.decryptSecretsAndGetKeyEncKey(
+        password,
+        Configuration.instance.getKeyAttributes()!,
+      );
+      _registerSRPForExistingUsers(kek).ignore();
+    } on KeyDerivationError catch (e, s) {
+      _logger.severe("Password verification failed", e, s);
+      await dialog.hide();
+      final dialogChoice = await showChoiceDialog(
+        context,
+        title: context.l10n.recreatePasswordTitle,
+        body: context.l10n.recreatePasswordBody,
+        firstButtonLabel: context.l10n.useRecoveryKey,
+      );
+      if (dialogChoice!.action == ButtonAction.first) {
+        Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (BuildContext context) {
+              return const RecoveryPage();
+            },
+          ),
+        );
+      }
+      return;
+    } catch (e, s) {
+      _logger.severe("Password verification failed", e, s);
+      await dialog.hide();
+      final dialogChoice = await showChoiceDialog(
+        context,
+        title: context.l10n.incorrectPasswordTitle,
+        body: context.l10n.pleaseTryAgain,
+        firstButtonLabel: context.l10n.contactSupport,
+        secondButtonLabel: context.l10n.ok,
+      );
+      if (dialogChoice!.action == ButtonAction.first) {
+        await sendLogs(
+          context,
+          context.l10n.contactSupport,
+          "support@ente.io",
+          postShare: () {},
+        );
+      }
+      return;
+    }
+    await dialog.hide();
+    Configuration.instance.setVolatilePassword(null);
+    unawaited(
+      Navigator.of(context).pushAndRemoveUntil(
+        MaterialPageRoute(
+          builder: (BuildContext context) {
+            return const HomePage();
+          },
+        ),
+            (route) => false,
+      ),
+    );
+  }
+
+  Future<void> _registerSRPForExistingUsers(Uint8List key) async {
+    bool shouldSetupSRP = false;
+    try {
+      // ignore: unused_local_variable
+      final attr = await UserService.instance.getSrpAttributes(email!);
+    } on SrpSetupNotCompleteError {
+      shouldSetupSRP = true;
+    } catch (e, s) {
+      _logger.severe("error while fetching attr", e, s);
+    }
+    if (shouldSetupSRP) {
+      try {
+        final Uint8List loginKey = await CryptoUtil.deriveLoginKey(key);
+        await UserService.instance.registerOrUpdateSrp(loginKey);
+      } catch (e, s) {
+        _logger.severe("error while setting up srp for existing users", e, s);
+      }
+    }
+  }
+
   Widget _getBody() {
-    final l10n = context.l10n;
     return Column(
       children: [
         Expanded(
@@ -149,10 +183,10 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
               children: [
                 Padding(
                   padding:
-                      const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
+                  const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
                   child: Text(
-                    l10n.welcomeBackTitle,
-                    style: Theme.of(context).textTheme.headline4,
+                    context.l10n.welcomeBack,
+                    style: Theme.of(context).textTheme.headlineMedium,
                   ),
                 ),
                 Visibility(
@@ -172,9 +206,10 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                 Padding(
                   padding: const EdgeInsets.fromLTRB(20, 24, 20, 0),
                   child: TextFormField(
+                    key: const ValueKey("passwordInputField"),
                     autofillHints: const [AutofillHints.password],
                     decoration: InputDecoration(
-                      hintText: l10n.enterYourPasswordHint,
+                      hintText: context.l10n.enterYourPasswordHint,
                       filled: true,
                       contentPadding: const EdgeInsets.all(20),
                       border: UnderlineInputBorder(
@@ -183,19 +218,19 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                       ),
                       suffixIcon: _passwordInFocus
                           ? IconButton(
-                              icon: Icon(
-                                _passwordVisible
-                                    ? Icons.visibility
-                                    : Icons.visibility_off,
-                                color: Theme.of(context).iconTheme.color,
-                                size: 20,
-                              ),
-                              onPressed: () {
-                                setState(() {
-                                  _passwordVisible = !_passwordVisible;
-                                });
-                              },
-                            )
+                        icon: Icon(
+                          _passwordVisible
+                              ? Icons.visibility
+                              : Icons.visibility_off,
+                          color: Theme.of(context).iconTheme.color,
+                          size: 20,
+                        ),
+                        onPressed: () {
+                          setState(() {
+                            _passwordVisible = !_passwordVisible;
+                          });
+                        },
+                      )
                           : null,
                     ),
                     style: const TextStyle(
@@ -236,12 +271,14 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                         },
                         child: Center(
                           child: Text(
-                            l10n.forgotPassword,
-                            style:
-                                Theme.of(context).textTheme.subtitle1.copyWith(
-                                      fontSize: 14,
-                                      decoration: TextDecoration.underline,
-                                    ),
+                            context.l10n.forgotPassword,
+                            style: Theme.of(context)
+                                .textTheme
+                                .titleMedium!
+                                .copyWith(
+                              fontSize: 14,
+                              decoration: TextDecoration.underline,
+                            ),
                           ),
                         ),
                       ),
@@ -250,7 +287,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                         onTap: () async {
                           final dialog = createProgressDialog(
                             context,
-                            l10n.pleaseWaitTitle,
+                            context.l10n.pleaseWait,
                           );
                           await dialog.show();
                           await Configuration.instance.logout();
@@ -260,12 +297,14 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
                         },
                         child: Center(
                           child: Text(
-                            l10n.changeEmail,
-                            style:
-                                Theme.of(context).textTheme.subtitle1.copyWith(
-                                      fontSize: 14,
-                                      decoration: TextDecoration.underline,
-                                    ),
+                            context.l10n.changeEmail,
+                            style: Theme.of(context)
+                                .textTheme
+                                .titleMedium!
+                                .copyWith(
+                              fontSize: 14,
+                              decoration: TextDecoration.underline,
+                            ),
                           ),
                         ),
                       ),
@@ -279,10 +318,4 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
       ],
     );
   }
-
-  void validatePreVerificationState(KeyAttributes keyAttributes) {
-    if (keyAttributes == null) {
-      throw Exception("Key Attributes can not be null");
-    }
-  }
 }

lib/ui/account/recovery_key_page.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'dart:io' as io;
 
 import 'package:bip39/bip39.dart' as bip39;
@@ -7,6 +5,7 @@ import 'package:dotted_border/dotted_border.dart';
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/core/constants.dart';
 import 'package:ente_auth/ente_theme_data.dart';
+import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/ui/common/gradient_button.dart';
 import 'package:ente_auth/utils/toast_util.dart';
 import 'package:flutter/material.dart';
@@ -15,20 +14,20 @@ import 'package:share_plus/share_plus.dart';
 import 'package:step_progress_indicator/step_progress_indicator.dart';
 
 class RecoveryKeyPage extends StatefulWidget {
-  final bool showAppBar;
+  final bool? showAppBar;
   final String recoveryKey;
   final String doneText;
-  final Function() onDone;
-  final bool isDismissible;
-  final String title;
-  final String text;
-  final String subText;
+  final Function()? onDone;
+  final bool? isDismissible;
+  final String? title;
+  final String? text;
+  final String? subText;
   final bool showProgressBar;
 
   const RecoveryKeyPage(
     this.recoveryKey,
     this.doneText, {
-    Key key,
+    Key? key,
     this.showAppBar,
     this.onDone,
     this.isDismissible,
@@ -56,7 +55,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
         'recovery code should have $mnemonicKeyWordCount words',
       );
     }
-    final double topPadding = widget.showAppBar
+    final double topPadding = widget.showAppBar!
         ? 40
         : widget.showProgressBar
             ? 32
@@ -65,6 +64,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
     return Scaffold(
       appBar: widget.showProgressBar
           ? AppBar(
+              automaticallyImplyLeading: false,
               elevation: 0,
               title: Hero(
                 tag: "recovery_key",
@@ -78,10 +78,10 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
                 ),
               ),
             )
-          : widget.showAppBar
+          : widget.showAppBar!
               ? AppBar(
                   elevation: 0,
-                  title: Text(widget.title ?? "Recovery key"),
+                  title: Text(widget.title ?? context.l10n.recoveryKey),
                 )
               : null,
       body: Padding(
@@ -97,20 +97,20 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
                 child: IntrinsicHeight(
                   child: Column(
                     mainAxisSize: MainAxisSize.max,
+                    crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
-                      widget.showAppBar
+                      widget.showAppBar!
                           ? const SizedBox.shrink()
                           : Text(
-                              widget.title ?? "Recovery key",
-                              style: Theme.of(context).textTheme.headline4,
+                              widget.title ?? context.l10n.recoveryKey,
+                              style: Theme.of(context).textTheme.headlineMedium,
                             ),
                       Padding(
-                        padding: EdgeInsets.all(widget.showAppBar ? 0 : 12),
+                        padding: EdgeInsets.all(widget.showAppBar! ? 0 : 12),
                       ),
                       Text(
-                        widget.text ??
-                            "If you forget your password, the only way you can recover your data is with this key.",
-                        style: Theme.of(context).textTheme.subtitle1,
+                        widget.text ?? context.l10n.recoveryKeyOnForgotPassword,
+                        style: Theme.of(context).textTheme.titleMedium,
                       ),
                       const Padding(padding: EdgeInsets.only(top: 24)),
                       DottedBorder(
@@ -134,9 +134,9 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
                                   await Clipboard.setData(
                                     ClipboardData(text: recoveryKey),
                                   );
-                                  showToast(
+                                  showShortToast(
                                     context,
-                                    "Recovery key copied to clipboard",
+                                    context.l10n.recoveryKeyCopiedToClipboard,
                                   );
                                   setState(() {
                                     _hasTriedToSave = true;
@@ -145,11 +145,11 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
                                 child: Container(
                                   decoration: BoxDecoration(
                                     border: Border.all(
-                                      color: const Color.fromARGB(
-                                        51,
-                                        147,
-                                        43,
-                                        200,
+                                      color: const Color.fromRGBO(
+                                        49,
+                                        155,
+                                        86,
+                                        .2,
                                       ),
                                     ),
                                     borderRadius: const BorderRadius.all(
@@ -164,7 +164,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
                                   child: Text(
                                     recoveryKey,
                                     style:
-                                        Theme.of(context).textTheme.bodyText1,
+                                        Theme.of(context).textTheme.bodyLarge,
                                   ),
                                 ),
                               ),
@@ -172,16 +172,12 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
                           ),
                         ),
                       ),
-                      SizedBox(
-                        height: 80,
-                        width: double.infinity,
-                        child: Padding(
-                          padding: const EdgeInsets.symmetric(vertical: 20),
-                          child: Text(
-                            widget.subText ??
-                                "We don’t store this key, please save this in a safe place.",
-                            style: Theme.of(context).textTheme.bodyText1,
-                          ),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(vertical: 20),
+                        child: Text(
+                          widget.subText ??
+                              context.l10n.recoveryKeySaveDescription,
+                          style: Theme.of(context).textTheme.bodyLarge,
                         ),
                       ),
                       Expanded(
@@ -216,7 +212,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
           onPressed: () async {
             await _saveKeys();
           },
-          child: const Text('Do this later'),
+          child: Text(context.l10n.doThisLater),
         ),
       );
       childrens.add(const SizedBox(height: 10));
@@ -227,7 +223,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
         onTap: () async {
           await _shareRecoveryKey(recoveryKey);
         },
-        text: 'Save key',
+        text: context.l10n.saveKey,
       ),
     );
     if (_hasTriedToSave) {
@@ -265,6 +261,6 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
     if (_recoveryKeyFile.existsSync()) {
       await _recoveryKeyFile.delete();
     }
-    widget.onDone();
+    widget.onDone!();
   }
 }

lib/ui/account/recovery_page.dart

@@ -1,4 +1,4 @@
-// @dart=2.9
+
 
 import 'dart:ui';
 
@@ -10,7 +10,7 @@ import 'package:ente_auth/utils/toast_util.dart';
 import 'package:flutter/material.dart';
 
 class RecoveryPage extends StatefulWidget {
-  const RecoveryPage({Key key}) : super(key: key);
+  const RecoveryPage({Key? key}) : super(key: key);
 
   @override
   State<RecoveryPage> createState() => _RecoveryPageState();
@@ -22,7 +22,7 @@ class _RecoveryPageState extends State<RecoveryPage> {
   @override
   Widget build(BuildContext context) {
     final isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100;
-    FloatingActionButtonLocation fabLocation() {
+    FloatingActionButtonLocation? fabLocation() {
       if (isKeypadOpen) {
         return null;
       } else {
@@ -88,7 +88,7 @@ class _RecoveryPageState extends State<RecoveryPage> {
                       const EdgeInsets.symmetric(vertical: 30, horizontal: 20),
                   child: Text(
                     'Forgot password',
-                    style: Theme.of(context).textTheme.headline4,
+                    style: Theme.of(context).textTheme.headlineMedium,
                   ),
                 ),
                 Padding(
@@ -140,7 +140,7 @@ class _RecoveryPageState extends State<RecoveryPage> {
                           child: Text(
                             "No recovery key?",
                             style:
-                                Theme.of(context).textTheme.subtitle1.copyWith(
+                                Theme.of(context).textTheme.titleMedium!.copyWith(
                                       fontSize: 14,
                                       decoration: TextDecoration.underline,
                                     ),

lib/ui/account/request_pwd_verification_page.dart

@@ -0,0 +1,216 @@
+import "dart:convert";
+import "dart:typed_data";
+
+import 'package:ente_auth/core/configuration.dart';
+import "package:ente_auth/l10n/l10n.dart";
+import "package:ente_auth/theme/ente_theme.dart";
+import 'package:ente_auth/ui/common/dynamic_fab.dart';
+import "package:ente_auth/utils/crypto_util.dart";
+import "package:ente_auth/utils/dialog_util.dart";
+import 'package:flutter/material.dart';
+import "package:flutter_sodium/flutter_sodium.dart";
+import "package:logging/logging.dart";
+
+typedef OnPasswordVerifiedFn = Future<void> Function(Uint8List bytes);
+
+class RequestPasswordVerificationPage extends StatefulWidget {
+  final OnPasswordVerifiedFn onPasswordVerified;
+  final Function? onPasswordError;
+
+  const RequestPasswordVerificationPage(
+      {super.key, required this.onPasswordVerified, this.onPasswordError,});
+
+  @override
+  State<RequestPasswordVerificationPage> createState() =>
+      _RequestPasswordVerificationPageState();
+}
+
+class _RequestPasswordVerificationPageState
+    extends State<RequestPasswordVerificationPage> {
+  final _logger = Logger((_RequestPasswordVerificationPageState).toString());
+  final _passwordController = TextEditingController();
+  final FocusNode _passwordFocusNode = FocusNode();
+  String? email;
+  bool _passwordInFocus = false;
+  bool _passwordVisible = false;
+
+  @override
+  void initState() {
+    super.initState();
+    email = Configuration.instance.getEmail();
+    _passwordFocusNode.addListener(() {
+      setState(() {
+        _passwordInFocus = _passwordFocusNode.hasFocus;
+      });
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100;
+
+    FloatingActionButtonLocation? fabLocation() {
+      if (isKeypadOpen) {
+        return null;
+      } else {
+        return FloatingActionButtonLocation.centerFloat;
+      }
+    }
+
+    return Scaffold(
+      resizeToAvoidBottomInset: isKeypadOpen,
+      appBar: AppBar(
+        elevation: 0,
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back),
+          color: Theme.of(context).iconTheme.color,
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+        ),
+      ),
+      body: _getBody(),
+      floatingActionButton: DynamicFAB(
+        key: const ValueKey("verifyPasswordButton"),
+        isKeypadOpen: isKeypadOpen,
+        isFormValid: _passwordController.text.isNotEmpty,
+        buttonText: context.l10n.verifyPassword,
+        onPressedFunction: () async {
+          FocusScope.of(context).unfocus();
+          final dialog = createProgressDialog(context, context.l10n.pleaseWait);
+          dialog.show();
+          try {
+            final attributes = Configuration.instance.getKeyAttributes()!;
+            final Uint8List keyEncryptionKey = await CryptoUtil.deriveKey(
+              utf8.encode(_passwordController.text) as Uint8List,
+              Sodium.base642bin(attributes.kekSalt),
+              attributes.memLimit,
+              attributes.opsLimit,
+            );
+            CryptoUtil.decryptSync(
+              Sodium.base642bin(attributes.encryptedKey),
+              keyEncryptionKey,
+              Sodium.base642bin(attributes.keyDecryptionNonce),
+            );
+            dialog.show();
+            // pop
+            await widget.onPasswordVerified(keyEncryptionKey);
+            dialog.hide();
+            Navigator.of(context).pop(true);
+          } catch (e, s) {
+            _logger.severe("Error while verifying password", e, s);
+            dialog.hide();
+            if (widget.onPasswordError != null) {
+              widget.onPasswordError!();
+            } else {
+              showErrorDialog(
+                context,
+                context.l10n.incorrectPasswordTitle,
+                context.l10n.pleaseTryAgain,
+              );
+            }
+          }
+        },
+      ),
+      floatingActionButtonLocation: fabLocation(),
+      floatingActionButtonAnimator: NoScalingAnimation(),
+    );
+  }
+
+  Widget _getBody() {
+    return Column(
+      children: [
+        Expanded(
+          child: AutofillGroup(
+            child: ListView(
+              children: [
+                Padding(
+                  padding: const EdgeInsets.only(top: 30, left: 20, right: 20),
+                  child: Text(
+                    context.l10n.enterPassword,
+                    style: Theme.of(context).textTheme.headlineMedium,
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.only(
+                    bottom: 30,
+                    left: 22,
+                    right: 20,
+                  ),
+                  child: Text(
+                    email ?? '',
+                    style: getEnteTextTheme(context).smallMuted,
+                  ),
+                ),
+                Visibility(
+                  // hidden textForm for suggesting auto-fill service for saving
+                  // password
+                  visible: false,
+                  child: TextFormField(
+                    autofillHints: const [
+                      AutofillHints.email,
+                    ],
+                    autocorrect: false,
+                    keyboardType: TextInputType.emailAddress,
+                    initialValue: email,
+                    textInputAction: TextInputAction.next,
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(20, 24, 20, 0),
+                  child: TextFormField(
+                    key: const ValueKey("passwordInputField"),
+                    autofillHints: const [AutofillHints.password],
+                    decoration: InputDecoration(
+                      hintText: context.l10n.enterYourPasswordHint,
+                      filled: true,
+                      contentPadding: const EdgeInsets.all(20),
+                      border: UnderlineInputBorder(
+                        borderSide: BorderSide.none,
+                        borderRadius: BorderRadius.circular(6),
+                      ),
+                      suffixIcon: _passwordInFocus
+                          ? IconButton(
+                              icon: Icon(
+                                _passwordVisible
+                                    ? Icons.visibility
+                                    : Icons.visibility_off,
+                                color: Theme.of(context).iconTheme.color,
+                                size: 20,
+                              ),
+                              onPressed: () {
+                                setState(() {
+                                  _passwordVisible = !_passwordVisible;
+                                });
+                              },
+                            )
+                          : null,
+                    ),
+                    style: const TextStyle(
+                      fontSize: 14,
+                    ),
+                    controller: _passwordController,
+                    autofocus: true,
+                    autocorrect: false,
+                    obscureText: !_passwordVisible,
+                    keyboardType: TextInputType.visiblePassword,
+                    focusNode: _passwordFocusNode,
+                    onChanged: (_) {
+                      setState(() {});
+                    },
+                  ),
+                ),
+                const Padding(
+                  padding: EdgeInsets.symmetric(vertical: 18),
+                  child: Divider(
+                    thickness: 1,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/ui/account/sessions_page.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/l10n/l10n.dart';
@@ -13,19 +11,21 @@ import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
 
 class SessionsPage extends StatefulWidget {
-  const SessionsPage({Key key}) : super(key: key);
+  const SessionsPage({Key? key}) : super(key: key);
 
   @override
   State<SessionsPage> createState() => _SessionsPageState();
 }
 
 class _SessionsPageState extends State<SessionsPage> {
-  Sessions _sessions;
+  Sessions? _sessions;
   final Logger _logger = Logger("SessionsPageState");
 
   @override
   void initState() {
-    _fetchActiveSessions();
+    _fetchActiveSessions().onError((error, stackTrace) {
+      showToast(context, "Failed to fetch active sessions");
+    });
     super.initState();
   }
 
@@ -34,7 +34,7 @@ class _SessionsPageState extends State<SessionsPage> {
     return Scaffold(
       appBar: AppBar(
         elevation: 0,
-        title: const Text("Active sessions"),
+        title: Text(context.l10n.activeSessions),
       ),
       body: _getBody(),
     );
@@ -46,7 +46,7 @@ class _SessionsPageState extends State<SessionsPage> {
     }
     final List<Widget> rows = [];
     rows.add(const Padding(padding: EdgeInsets.all(4)));
-    for (final session in _sessions.sessions) {
+    for (final session in _sessions!.sessions) {
       rows.add(_getSessionWidget(session));
     }
     return SingleChildScrollView(
@@ -112,35 +112,36 @@ class _SessionsPageState extends State<SessionsPage> {
   }
 
   Future<void> _terminateSession(Session session) async {
-    final l10n = context.l10n;
-    final dialog = createProgressDialog(context, l10n.pleaseWaitTitle);
+    final dialog = createProgressDialog(context, context.l10n.pleaseWait);
     await dialog.show();
     try {
       await UserService.instance.terminateSession(session.token);
       await _fetchActiveSessions();
       await dialog.hide();
-    } catch (e, s) {
+    } catch (e) {
       await dialog.hide();
-      _logger.severe('failed to terminate', e, s);
+      _logger.severe('failed to terminate');
       showErrorDialog(
         context,
-        l10n.oops,
-        l10n.somethingWentWrongMessage,
+        context.l10n.oops,
+        context.l10n.somethingWentWrongPleaseTryAgain,
       );
     }
   }
 
   Future<void> _fetchActiveSessions() async {
-    _sessions = await UserService.instance
-        .getActiveSessions()
-        .onError((error, stackTrace) {
-      showToast(context, "Failed to fetch active sessions");
-      throw error;
+    _sessions = await UserService.instance.getActiveSessions().onError((e, s) {
+      _logger.severe("failed to fetch active sessions", e, s);
+      throw e!;
     });
-    _sessions.sessions.sort((first, second) {
-      return second.lastUsedTime.compareTo(first.lastUsedTime);
-    });
-    setState(() {});
+    if (_sessions != null) {
+      _sessions!.sessions.sort((first, second) {
+        return second.lastUsedTime.compareTo(first.lastUsedTime);
+      });
+      if (mounted) {
+        setState(() {});
+      }
+    }
   }
 
   void _showSessionTerminationDialog(Session session) {
@@ -148,33 +149,33 @@ class _SessionsPageState extends State<SessionsPage> {
         session.token == Configuration.instance.getToken();
     Widget text;
     if (isLoggingOutFromThisDevice) {
-      text = const Text(
-        "This will log you out of this device!",
+      text = Text(
+        context.l10n.thisWillLogYouOutOfThisDevice,
       );
     } else {
       text = SingleChildScrollView(
         child: Column(
           children: [
-            const Text(
-              "This will log you out of the following device:",
+            Text(
+              context.l10n.thisWillLogYouOutOfTheFollowingDevice,
             ),
             const Padding(padding: EdgeInsets.all(8)),
             Text(
               session.ua,
-              style: Theme.of(context).textTheme.caption,
+              style: Theme.of(context).textTheme.bodySmall,
             ),
           ],
         ),
       );
     }
     final AlertDialog alert = AlertDialog(
-      title: const Text("Terminate session?"),
+      title: Text(context.l10n.terminateSession),
       content: text,
       actions: [
         TextButton(
-          child: const Text(
-            "Terminate",
-            style: TextStyle(
+          child: Text(
+            context.l10n.terminate,
+            style: const TextStyle(
               color: Colors.red,
             ),
           ),
@@ -189,7 +190,7 @@ class _SessionsPageState extends State<SessionsPage> {
         ),
         TextButton(
           child: Text(
-            "Cancel",
+            context.l10n.cancel,
             style: TextStyle(
               color: isLoggingOutFromThisDevice
                   ? Theme.of(context).colorScheme.alternativeColor
@@ -214,7 +215,7 @@ class _SessionsPageState extends State<SessionsPage> {
   Widget _getUAWidget(Session session) {
     if (session.token == Configuration.instance.getToken()) {
       return Text(
-        "This device",
+        context.l10n.thisDevice,
         style: TextStyle(
           fontWeight: FontWeight.bold,
           color: Theme.of(context).colorScheme.alternativeColor,

lib/ui/account/verify_recovery_page.dart

@@ -1,18 +1,15 @@
-// ignore_for_file: import_of_legacy_library_into_null_safe
-
 import 'dart:ui';
 
 import 'package:bip39/bip39.dart' as bip39;
 import 'package:dio/dio.dart';
 import 'package:ente_auth/core/configuration.dart';
-import 'package:ente_auth/core/event_bus.dart';
 import 'package:ente_auth/ente_theme_data.dart';
-import 'package:ente_auth/events/notification_event.dart';
+import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/services/local_authentication_service.dart';
 import 'package:ente_auth/services/user_remote_flag_service.dart';
 import 'package:ente_auth/ui/account/recovery_key_page.dart';
-import 'package:ente_auth/ui/common/dialogs.dart';
 import 'package:ente_auth/ui/common/gradient_button.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
 import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:ente_auth/utils/navigation_util.dart';
 import 'package:flutter/material.dart';
@@ -31,7 +28,8 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
   final Logger _logger = Logger((_VerifyRecoveryPageState).toString());
 
   void _verifyRecoveryKey() async {
-    final dialog = createProgressDialog(context, "Verifying recovery key...");
+    final dialog =
+        createProgressDialog(context, context.l10n.verifyingRecoveryKey);
     await dialog.show();
     try {
       final String inputKey = _recoveryKey.text.trim();
@@ -50,19 +48,17 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
               "Please check your internet connection and try again.",
             );
           } else {
-            await showGenericErrorDialog(context);
+            await showGenericErrorDialog(context: context);
           }
           return;
         }
-        Bus.instance.fire(NotificationEvent());
+
         await dialog.hide();
         // todo: change this as per figma once the component is ready
         await showErrorDialog(
           context,
-          "Recovery key verified",
-          "Great! Your recovery key is valid. Thank you for verifying.\n"
-              "\nPlease"
-              " remember to keep your recovery key safely backed up.",
+          context.l10n.recoveryKeyVerified,
+          context.l10n.recoveryKeySuccessBody,
         );
         Navigator.of(context).pop();
       } else {
@@ -71,18 +67,16 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
     } catch (e, s) {
       _logger.severe("failed to verify recovery key", e, s);
       await dialog.hide();
-      const String errMessage =
-          "The recovery key you entered is not valid. Please make sure it "
-          "contains 24 words, and check the spelling of each.\n\nIf you "
-          "entered an older recovery code, make sure it is 64 characters long, and check each of them.";
+      final String errMessage = context.l10n.invalidRecoveryKey;
       final result = await showChoiceDialog(
         context,
-        "Invalid key",
-        errMessage,
-        firstAction: "Try again",
-        secondAction: "View recovery key",
+        title: context.l10n.invalidKey,
+        body: errMessage,
+        firstButtonLabel: context.l10n.tryAgain,
+        secondButtonLabel: context.l10n.viewRecoveryKey,
+        secondButtonAction: ButtonAction.second,
       );
-      if (result == DialogUserChoice.secondChoice) {
+      if (result!.action == ButtonAction.second) {
         await _onViewRecoveryKeyClick();
       }
     }
@@ -102,7 +96,7 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
           context,
           RecoveryKeyPage(
             recoveryKey,
-            "OK",
+            context.l10n.ok,
             showAppBar: true,
             onDone: () {
               Navigator.of(context).pop();
@@ -110,7 +104,7 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
           ),
         );
       } catch (e) {
-        showGenericErrorDialog(context);
+        showGenericErrorDialog(context: context);
         return;
       }
     }
@@ -147,16 +141,14 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
                       SizedBox(
                         width: double.infinity,
                         child: Text(
-                          'Verify recovery key',
+                          context.l10n.confirmRecoveryKey,
                           style: enteTheme.textTheme.h3Bold,
                           textAlign: TextAlign.left,
                         ),
                       ),
                       const SizedBox(height: 18),
                       Text(
-                        "If you forget your password, your recovery key is the "
-                        "only way to recover your photos.\n\nPlease verify that "
-                        "you have safely backed up your 24 word recovery key by re-entering it.",
+                        context.l10n.recoveryKeyVerifyReason,
                         style: enteTheme.textTheme.small
                             .copyWith(color: enteTheme.colorScheme.textMuted),
                       ),
@@ -164,7 +156,7 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
                       TextFormField(
                         decoration: InputDecoration(
                           filled: true,
-                          hintText: "Enter your recovery key",
+                          hintText: context.l10n.enterYourRecoveryKey,
                           contentPadding: const EdgeInsets.all(20),
                           border: UnderlineInputBorder(
                             borderSide: BorderSide.none,
@@ -186,12 +178,6 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
                         },
                       ),
                       const SizedBox(height: 12),
-                      Text(
-                        "If you saved the recovery key from older app versions, you might have a 64 character recovery code instead of 24 words. You can enter that too.",
-                        style: enteTheme.textTheme.mini
-                            .copyWith(color: enteTheme.colorScheme.textMuted),
-                      ),
-                      const SizedBox(height: 8),
                       Expanded(
                         child: Container(
                           alignment: Alignment.bottomCenter,
@@ -203,8 +189,7 @@ class _VerifyRecoveryPageState extends State<VerifyRecoveryPage> {
                             children: [
                               GradientButton(
                                 onTap: _verifyRecoveryKey,
-                                text: "Verify",
-                                iconData: Icons.shield_outlined,
+                                text: context.l10n.confirm,
                               ),
                               const SizedBox(height: 8),
                             ],

lib/ui/code_timer_progress.dart

@@ -0,0 +1,55 @@
+import 'package:ente_auth/ui/linear_progress_widget.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/scheduler.dart';
+
+class CodeTimerProgress extends StatefulWidget {
+  final int period;
+
+  CodeTimerProgress({
+    Key? key,
+    required this.period,
+  }) : super(key: key);
+
+  @override
+  _CodeTimerProgressState createState() => _CodeTimerProgressState();
+}
+
+class _CodeTimerProgressState extends State<CodeTimerProgress>
+    with SingleTickerProviderStateMixin {
+  late final Ticker _ticker;
+  double _progress = 0.0;
+  late final int _microSecondsInPeriod;
+
+  @override
+  void initState() {
+    super.initState();
+    _microSecondsInPeriod = widget.period * 1000000;
+    _ticker = createTicker((elapsed) {
+      _updateTimeRemaining();
+    });
+    _ticker.start();
+    _updateTimeRemaining();
+  }
+
+  void _updateTimeRemaining() {
+    int timeRemaining = (_microSecondsInPeriod) -
+        (DateTime.now().microsecondsSinceEpoch % _microSecondsInPeriod);
+    setState(() {
+      _progress = (timeRemaining / _microSecondsInPeriod);
+    });
+  }
+
+  @override
+  void dispose() {
+    _ticker.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return LinearProgressWidget(
+      color: _progress > 0.4 ? Colors.green : Colors.orange,
+      fractionOfStorage: _progress,
+    );
+  }
+}

lib/ui/code_widget.dart

@@ -1,16 +1,22 @@
 import 'dart:async';
 
 import 'package:clipboard/clipboard.dart';
+import 'package:ente_auth/core/configuration.dart';
 import 'package:ente_auth/ente_theme_data.dart';
 import 'package:ente_auth/l10n/l10n.dart';
 import 'package:ente_auth/models/code.dart';
 import 'package:ente_auth/onboarding/view/setup_enter_secret_key_page.dart';
+import 'package:ente_auth/onboarding/view/view_qr_page.dart';
+import 'package:ente_auth/services/preference_service.dart';
 import 'package:ente_auth/store/code_store.dart';
+import 'package:ente_auth/ui/code_timer_progress.dart';
+import 'package:ente_auth/ui/utils/icon_utils.dart';
+import 'package:ente_auth/utils/dialog_util.dart';
 import 'package:ente_auth/utils/toast_util.dart';
 import 'package:ente_auth/utils/totp_util.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_animation_progress_bar/flutter_animation_progress_bar.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
+import 'package:logging/logging.dart';
 
 class CodeWidget extends StatefulWidget {
   final Code code;
@@ -23,41 +29,74 @@ class CodeWidget extends StatefulWidget {
 
 class _CodeWidgetState extends State<CodeWidget> {
   Timer? _everySecondTimer;
-  int _timeRemaining = 30;
+  final ValueNotifier<String> _currentCode = ValueNotifier<String>("");
+  final ValueNotifier<String> _nextCode = ValueNotifier<String>("");
+  final Logger logger = Logger("_CodeWidgetState");
+  bool _isInitialized = false;
+  late bool hasConfiguredAccount;
+  late bool _shouldShowLargeIcon;
 
   @override
   void initState() {
     super.initState();
-    _updateTimeRemaining();
-    _everySecondTimer =
-        Timer.periodic(const Duration(milliseconds: 200), (Timer t) {
-      setState(() {
-        _updateTimeRemaining();
-      });
-    });
-  }
 
-  void _updateTimeRemaining() {
-    _timeRemaining =
-        widget.code.period - (DateTime.now().second % widget.code.period);
+    _everySecondTimer =
+        Timer.periodic(const Duration(milliseconds: 500), (Timer t) {
+      String newCode = _getCurrentOTP();
+      if (newCode != _currentCode.value) {
+        _currentCode.value = newCode;
+        if (widget.code.type == Type.totp) {
+          _nextCode.value = _getNextTotp();
+        }
+      }
+    });
+    hasConfiguredAccount = Configuration.instance.hasConfiguredAccount();
   }
 
   @override
   void dispose() {
     _everySecondTimer?.cancel();
+    _currentCode.dispose();
+    _nextCode.dispose();
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
+    _shouldShowLargeIcon = PreferenceService.instance.shouldShowLargeIcons();
+    if (!_isInitialized) {
+      _currentCode.value = _getCurrentOTP();
+      if (widget.code.type == Type.totp) {
+        _nextCode.value = _getNextTotp();
+      }
+      _isInitialized = true;
+    }
     final l10n = context.l10n;
     return Container(
       margin: const EdgeInsets.only(left: 16, right: 16, bottom: 8, top: 8),
       child: Slidable(
         key: ValueKey(widget.code.hashCode),
         endActionPane: ActionPane(
+          extentRatio: 0.60,
           motion: const ScrollMotion(),
           children: [
+            const SizedBox(
+              width: 4,
+            ),
+            SlidableAction(
+              onPressed: _onShowQrPressed,
+              backgroundColor: Colors.grey.withOpacity(0.1),
+              borderRadius: const BorderRadius.all(Radius.circular(12.0)),
+              foregroundColor:
+                  Theme.of(context).colorScheme.inverseBackgroundColor,
+              icon: Icons.qr_code_2_outlined,
+              label: "QR",
+              padding: const EdgeInsets.only(left: 4, right: 0),
+              spacing: 8,
+            ),
+            const SizedBox(
+              width: 4,
+            ),
             SlidableAction(
               onPressed: _onEditPressed,
               backgroundColor: Colors.grey.withOpacity(0.1),
@@ -65,7 +104,7 @@ class _CodeWidgetState extends State<CodeWidget> {
               foregroundColor:
                   Theme.of(context).colorScheme.inverseBackgroundColor,
               icon: Icons.edit_outlined,
-              label: 'Edit',
+              label: l10n.edit,
               padding: const EdgeInsets.only(left: 4, right: 0),
               spacing: 8,
             ),
@@ -78,126 +117,29 @@ class _CodeWidgetState extends State<CodeWidget> {
               borderRadius: const BorderRadius.all(Radius.circular(12.0)),
               foregroundColor: const Color(0xFFFE4A49),
               icon: Icons.delete,
-              label: 'Delete',
+              label: l10n.delete,
               padding: const EdgeInsets.only(left: 0, right: 0),
               spacing: 8,
             ),
           ],
         ),
-        child: Container(
-          margin: const EdgeInsets.only(right: 10),
-          child: ClipRRect(
-            borderRadius: BorderRadius.circular(8),
-            child: Container(
-              color: Theme.of(context).colorScheme.codeCardBackgroundColor,
-              child: Material(
-                color: Colors.transparent,
-                child: InkWell(
-                  customBorder: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(10),
-                  ),
-                  onTap: () {
-                    _copyToClipboard();
-                  },
-                  onLongPress: () {
-                    _copyToClipboard();
-                  },
-                  child: SizedBox(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        FAProgressBar(
-                          currentValue:
-                              _timeRemaining / widget.code.period * 100,
-                          size: 4,
-                          animatedDuration: const Duration(milliseconds: 200),
-                          progressColor: Colors.orange,
-                          changeColorValue: 40,
-                          changeProgressColor: Colors.green,
-                        ),
-                        const SizedBox(
-                          height: 16,
-                        ),
-                        Padding(
-                          padding: const EdgeInsets.only(left: 16, right: 16),
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Column(
-                                crossAxisAlignment: CrossAxisAlignment.start,
-                                children: [
-                                  Text(
-                                    Uri.decodeFull(widget.code.issuer).trim(),
-                                    style:
-                                        Theme.of(context).textTheme.headline6,
-                                  ),
-                                  const SizedBox(height: 2),
-                                  Text(
-                                    Uri.decodeFull(
-                                      widget.code.account,
-                                    ).trim(),
-                                    style: Theme.of(context)
-                                        .textTheme
-                                        .caption
-                                        ?.copyWith(
-                                          fontSize: 12,
-                                          color: Colors.grey,
-                                        ),
-                                  ),
-                                ],
-                              ),
-                              widget.code.hasSynced != null &&
-                                      widget.code.hasSynced!
-                                  ? Container()
-                                  : const Icon(
-                                      Icons.sync_disabled,
-                                      size: 20,
-                                      color: Colors.amber,
-                                    ),
-                            ],
-                          ),
-                        ),
-                        const SizedBox(height: 4),
-                        Container(
-                          padding: const EdgeInsets.only(left: 16, right: 16),
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.start,
-                            crossAxisAlignment: CrossAxisAlignment.end,
-                            children: [
-                              Expanded(
-                                child: Text(
-                                  _getTotp(),
-                                  style: const TextStyle(fontSize: 24),
-                                ),
-                              ),
-                              Column(
-                                crossAxisAlignment: CrossAxisAlignment.end,
-                                children: [
-                                  Text(
-                                    l10n.nextTotpTitle,
-                                    style: Theme.of(context).textTheme.caption,
-                                  ),
-                                  Text(
-                                    _getNextTotp(),
-                                    style: const TextStyle(
-                                      fontSize: 18,
-                                      color: Colors.grey,
-                                    ),
-                                  ),
-                                ],
-                              ),
-                            ],
-                          ),
-                        ),
-                        const SizedBox(
-                          height: 20,
-                        ),
-                      ],
-                    ),
-                  ),
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(8),
+          child: Container(
+            color: Theme.of(context).colorScheme.codeCardBackgroundColor,
+            child: Material(
+              color: Colors.transparent,
+              child: InkWell(
+                customBorder: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(10),
                 ),
+                onTap: () {
+                  _copyToClipboard();
+                },
+                onLongPress: () {
+                  _copyToClipboard();
+                },
+                child: _getCardContents(l10n),
               ),
             ),
           ),
@@ -206,12 +148,192 @@ class _CodeWidgetState extends State<CodeWidget> {
     );
   }
 
-  void _copyToClipboard() {
-    FlutterClipboard.copy(_getTotp()).then(
-      (value) => showToast(context, "Copied to clipboard"),
+  Widget _getCardContents(AppLocalizations l10n) {
+    return SizedBox(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          if (widget.code.type == Type.totp)
+            CodeTimerProgress(
+              period: widget.code.period,
+            ),
+          const SizedBox(
+            height: 16,
+          ),
+          Row(
+            children: [
+              _shouldShowLargeIcon ? _getIcon() : const SizedBox.shrink(),
+              Expanded(
+                child: Column(
+                  children: [
+                    _getTopRow(),
+                    const SizedBox(height: 4),
+                    _getBottomRow(l10n),
+                  ],
+                ),
+              ),
+            ],
+          ),
+          const SizedBox(
+            height: 20,
+          ),
+        ],
+      ),
     );
   }
 
+  Widget _getBottomRow(AppLocalizations l10n) {
+    return Container(
+      padding: const EdgeInsets.only(left: 16, right: 16),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.end,
+        children: [
+          Expanded(
+            child: ValueListenableBuilder<String>(
+              valueListenable: _currentCode,
+              builder: (context, value, child) {
+                return Material(
+                  type: MaterialType.transparency,
+                  child: Text(
+                    _getFormattedCode(value),
+                    style: const TextStyle(fontSize: 24),
+                  ),
+                );
+              },
+            ),
+          ),
+          widget.code.type == Type.totp
+              ? GestureDetector(
+                  onTap: () {
+                    _copyNextToClipboard();
+                  },
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Text(
+                        l10n.nextTotpTitle,
+                        style: Theme.of(context).textTheme.bodySmall,
+                      ),
+                      ValueListenableBuilder<String>(
+                        valueListenable: _nextCode,
+                        builder: (context, value, child) {
+                          return Material(
+                            type: MaterialType.transparency,
+                            child: Text(
+                              _getFormattedCode(value),
+                              style: const TextStyle(
+                                fontSize: 18,
+                                color: Colors.grey,
+                              ),
+                            ),
+                          );
+                        },
+                      ),
+                    ],
+                  ),
+                )
+              : Column(
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: [
+                    Text(
+                      l10n.nextTotpTitle,
+                      style: Theme.of(context).textTheme.bodySmall,
+                    ),
+                    InkWell(
+                      onTap: _onNextHotpTapped,
+                      child: const Icon(
+                        Icons.forward_outlined,
+                        size: 32,
+                        color: Colors.grey,
+                      ),
+                    ),
+                  ],
+                ),
+        ],
+      ),
+    );
+  }
+
+  Widget _getTopRow() {
+    return Padding(
+      padding: const EdgeInsets.only(left: 16, right: 16),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Text(
+                safeDecode(widget.code.issuer).trim(),
+                style: Theme.of(context).textTheme.titleLarge,
+              ),
+              const SizedBox(height: 2),
+              Text(
+                safeDecode(widget.code.account).trim(),
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                      fontSize: 12,
+                      color: Colors.grey,
+                    ),
+              ),
+            ],
+          ),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              (widget.code.hasSynced != null && widget.code.hasSynced!) ||
+                      !hasConfiguredAccount
+                  ? const SizedBox.shrink()
+                  : const Icon(
+                      Icons.sync_disabled,
+                      size: 20,
+                      color: Colors.amber,
+                    ),
+              const SizedBox(width: 12),
+              _shouldShowLargeIcon ? const SizedBox.shrink() : _getIcon(),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _getIcon() {
+    return Padding(
+      padding: _shouldShowLargeIcon
+          ? const EdgeInsets.only(left: 16)
+          : const EdgeInsets.all(0),
+      child: IconUtils.instance.getIcon(
+        safeDecode(widget.code.issuer).trim(),
+        width: _shouldShowLargeIcon ? 42 : 24,
+      ),
+    );
+  }
+
+  void _copyToClipboard() {
+    FlutterClipboard.copy(_getCurrentOTP())
+        .then((value) => showToast(context, context.l10n.copiedToClipboard));
+  }
+
+  void _copyNextToClipboard() {
+    FlutterClipboard.copy(_getNextTotp()).then(
+      (value) => showToast(context, context.l10n.copiedNextToClipboard),
+    );
+  }
+
+  void _onNextHotpTapped() {
+    if (widget.code.type == Type.hotp) {
+      CodeStore.instance
+          .addCode(
+            widget.code.copyWith(counter: widget.code.counter + 1),
+            shouldSync: true,
+          )
+          .ignore();
+    }
+  }
+
   Future<void> _onEditPressed(_) async {
     final Code? code = await Navigator.of(context).push(
       MaterialPageRoute(
@@ -225,66 +347,52 @@ class _CodeWidgetState extends State<CodeWidget> {
     }
   }
 
-  void _onDeletePressed(_) {
-    final l10n = context.l10n;
-    final AlertDialog alert = AlertDialog(
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
-      title: Text(
-        l10n.deleteCodeTitle,
-        style: Theme.of(context).textTheme.headline6,
+  Future<void> _onShowQrPressed(_) async {
+    // ignore: unused_local_variable
+    final Code? code = await Navigator.of(context).push(
+      MaterialPageRoute(
+        builder: (BuildContext context) {
+          return ViewQrPage(code: widget.code);
+        },
       ),
-      content: Text(
-        l10n.deleteCodeMessage,
-      ),
-      actions: [
-        TextButton(
-          child: Text(
-            l10n.delete,
-            style: const TextStyle(
-              color: Colors.red,
-            ),
-          ),
-          onPressed: () {
-            CodeStore.instance.removeCode(widget.code);
-            Navigator.of(context, rootNavigator: true).pop('dialog');
-          },
-        ),
-        TextButton(
-          child: Text(
-            "Cancel",
-            style: TextStyle(
-              color: Theme.of(context).colorScheme.onSurface,
-            ),
-          ),
-          onPressed: () {
-            Navigator.of(context, rootNavigator: true).pop('dialog');
-          },
-        ),
-      ],
-    );
-
-    showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return alert;
-      },
-      barrierColor: Colors.black12,
     );
   }
 
-  String _getTotp() {
+  void _onDeletePressed(_) async {
+    final l10n = context.l10n;
+    await showChoiceActionSheet(
+      context,
+      title: l10n.deleteCodeTitle,
+      body: l10n.deleteCodeMessage,
+      firstButtonLabel: l10n.delete,
+      isCritical: true,
+      firstButtonOnTap: () async {
+        await CodeStore.instance.removeCode(widget.code);
+      },
+    );
+  }
+
+  String _getCurrentOTP() {
     try {
-      return getTotp(widget.code);
+      return getOTP(widget.code);
     } catch (e) {
-      return "Error";
+      return context.l10n.error;
     }
   }
 
   String _getNextTotp() {
     try {
+      assert(widget.code.type == Type.totp);
       return getNextTotp(widget.code);
     } catch (e) {
-      return "Error";
+      return context.l10n.error;
     }
   }
+
+  String _getFormattedCode(String code) {
+    if (code.length == 6) {
+      return code.substring(0, 3) + " " + code.substring(3, 6);
+    }
+    return code;
+  }
 }

lib/ui/common/DividerWithPadding.dart

@@ -1,11 +1,11 @@
-// @dart=2.9
+
 
 import 'package:flutter/material.dart';
 
 class DividerWithPadding extends StatelessWidget {
   final double left, top, right, bottom, thinckness;
   const DividerWithPadding({
-    Key key,
+    Key? key,
     this.left = 0,
     this.top = 0,
     this.right = 0,

lib/ui/common/bottom_shadow.dart

@@ -1,11 +1,11 @@
-// @dart=2.9
+
 
 import 'package:flutter/material.dart';
 
 class BottomShadowWidget extends StatelessWidget {
   final double offsetDy;
-  final Color shadowColor;
-  const BottomShadowWidget({this.offsetDy = 28, this.shadowColor, Key key})
+  final Color? shadowColor;
+  const BottomShadowWidget({this.offsetDy = 28, this.shadowColor, Key? key})
       : super(key: key);
 
   @override
@@ -16,7 +16,7 @@ class BottomShadowWidget extends StatelessWidget {
         color: Colors.transparent,
         boxShadow: [
           BoxShadow(
-            color: shadowColor ?? Theme.of(context).backgroundColor,
+            color: shadowColor ?? Theme.of(context).colorScheme.background,
             spreadRadius: 42,
             blurRadius: 42,
             offset: Offset(0, offsetDy), // changes position of shadow

lib/ui/common/dialogs.dart

@@ -1,8 +1,10 @@
-// @dart=2.9
-
 import 'package:ente_auth/ente_theme_data.dart';
+import 'package:ente_auth/models/typedefs.dart';
+import 'package:ente_auth/ui/components/buttons/button_widget.dart';
+import 'package:ente_auth/ui/components/dialog_widget.dart';
+import 'package:ente_auth/ui/components/models/button_result.dart';
+import 'package:ente_auth/ui/components/models/button_type.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 
 enum DialogUserChoice { firstChoice, secondChoice }
 
@@ -12,14 +14,14 @@ enum ActionType {
 }
 
 // if dialog is dismissed by tapping outside, this will return null
-Future<DialogUserChoice> showChoiceDialog<T>(
+Future<DialogUserChoice?> showChoiceDialogOld<T>(
   BuildContext context,
   String title,
   String content, {
   String firstAction = 'Ok',
-  Color firstActionColor,
+  Color? firstActionColor,
   String secondAction = 'Cancel',
-  Color secondActionColor,
+  Color? secondActionColor,
   ActionType actionType = ActionType.confirm,
 }) {
   final AlertDialog alert = AlertDialog(
@@ -69,7 +71,7 @@ Future<DialogUserChoice> showChoiceDialog<T>(
     ],
   );
 
-  return showDialog(
+  return showDialog<DialogUserChoice>(
     context: context,
     builder: (BuildContext context) {
       return alert;
@@ -77,3 +79,46 @@ Future<DialogUserChoice> showChoiceDialog<T>(
     barrierColor: Colors.black87,
   );
 }
+
+///Will return null if dismissed by tapping outside
+Future<ButtonResult?> showChoiceDialog(
+  BuildContext context, {
+  required String title,
+  String? body,
+  required String firstButtonLabel,
+  String secondButtonLabel = "Cancel",
+  ButtonType firstButtonType = ButtonType.neutral,
+  ButtonType secondButtonType = ButtonType.secondary,
+  ButtonAction firstButtonAction = ButtonAction.first,
+  ButtonAction secondButtonAction = ButtonAction.cancel,
+  FutureVoidCallback? firstButtonOnTap,
+  FutureVoidCallback? secondButtonOnTap,
+  bool isCritical = false,
+  IconData? icon,
+  bool isDismissible = true,
+}) async {
+  final buttons = [
+    ButtonWidget(
+      buttonType: isCritical ? ButtonType.critical : firstButtonType,
+      labelText: firstButtonLabel,
+      isInAlert: true,
+      onTap: firstButtonOnTap,
+      buttonAction: firstButtonAction,
+    ),
+    ButtonWidget(
+      buttonType: secondButtonType,
+      labelText: secondButtonLabel,
+      isInAlert: true,
+      onTap: secondButtonOnTap,
+      buttonAction: secondButtonAction,
+    ),
+  ];
+  return showDialogWidget(
+    context: context,
+    title: title,
+    body: body,
+    buttons: buttons,
+    icon: icon,
+    isDismissible: isDismissible,
+  );
+}