diff --git a/.github/workflows/auth-crowdin.yml b/.github/workflows/auth-crowdin.yml index d472cf594..f269a8c8d 100644 --- a/.github/workflows/auth-crowdin.yml +++ b/.github/workflows/auth-crowdin.yml @@ -9,8 +9,8 @@ on: - ".github/workflows/auth-crowdin.yml" branches: [main] schedule: - # See: [Note: Run every 24 hours] - - cron: "50 1 * * *" + # See: [Note: Run workflow on specific days of the week] + - cron: "50 1 * * 2,5" # Also allow manually running the workflow workflow_dispatch: diff --git a/.github/workflows/copycat-db-release.yaml b/.github/workflows/copycat-db-release.yaml new file mode 100644 index 000000000..5ec942879 --- /dev/null +++ b/.github/workflows/copycat-db-release.yaml @@ -0,0 +1,24 @@ +name: "Release (copycat-db)" + +on: + workflow_dispatch: # Run manually + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + name: Check out code + + - uses: mr-smithers-excellent/docker-build-push@v6 + name: Build & Push + with: + dockerfile: infra/copycat-db/Dockerfile + directory: infra/copycat-db + image: ente/copycat-db + registry: rg.fr-par.scw.cloud + enableBuildKit: true + buildArgs: GIT_COMMIT=${GITHUB_SHA} + tags: ${GITHUB_SHA}, latest + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/mobile-crowdin.yml b/.github/workflows/mobile-crowdin.yml index e12ab9aac..35b4c3876 100644 --- a/.github/workflows/mobile-crowdin.yml +++ b/.github/workflows/mobile-crowdin.yml @@ -9,8 +9,8 @@ on: - ".github/workflows/mobile-crowdin.yml" branches: [main] schedule: - # See: [Note: Run every 24 hours] - - cron: "40 1 * * *" + # See: [Note: Run workflow on specific days of the week] + - cron: "40 1 * * 2,5" # Also allow manually running the workflow workflow_dispatch: diff --git a/.github/workflows/web-crowdin.yml b/.github/workflows/web-crowdin.yml index c8acb2322..8733167d6 100644 --- a/.github/workflows/web-crowdin.yml +++ b/.github/workflows/web-crowdin.yml @@ -9,8 +9,14 @@ on: - ".github/workflows/web-crowdin.yml" branches: [main] schedule: - # See: [Note: Run every 24 hours] - - cron: "20 1 * * *" + # [Note: Run workflow on specific days of the week] + # + # The last (5th) component of the cron syntax denotes the day of the + # week, with 0 == SUN and 6 == SAT. So, for example, to run on every TUE + # and FRI, this can be set to `2,5`. + # + # See also: [Note: Run workflow every 24 hours] + - cron: "20 1 * * 2,5" # Also allow manually running the workflow workflow_dispatch: diff --git a/.github/workflows/web-nightly.yml b/.github/workflows/web-nightly.yml index 3672b8b48..a800a4b73 100644 --- a/.github/workflows/web-nightly.yml +++ b/.github/workflows/web-nightly.yml @@ -2,7 +2,7 @@ name: "Nightly (web)" on: schedule: - # [Note: Run every 24 hours] + # [Note: Run workflow every 24 hours] # # Run every 24 hours - First field is minute, second is hour of the day # This runs 23:15 UTC everyday - 1 and 15 are just arbitrary offset to diff --git a/auth/.gitignore b/auth/.gitignore index b909f8341..3d6f77b84 100644 --- a/auth/.gitignore +++ b/auth/.gitignore @@ -9,6 +9,9 @@ .history .svn/ +# Editors +.vscode/ + # IntelliJ related *.iml *.ipr diff --git a/auth/assets/custom-icons/_data/custom-icons.json b/auth/assets/custom-icons/_data/custom-icons.json index b248ad8cb..489b2a7ec 100644 --- a/auth/assets/custom-icons/_data/custom-icons.json +++ b/auth/assets/custom-icons/_data/custom-icons.json @@ -267,6 +267,10 @@ "title": "Revolt", "hex": "858585" }, + { + "title": "Rockstar Games", + "slug": "rockstar_games" + }, { "title": "Rust Language Forum", "slug": "rust_language_forum", diff --git a/auth/assets/custom-icons/icons/rockstar_games.svg b/auth/assets/custom-icons/icons/rockstar_games.svg new file mode 100644 index 000000000..bf2061c2b --- /dev/null +++ b/auth/assets/custom-icons/icons/rockstar_games.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/auth/docs/release.md b/auth/docs/release.md index afc80076a..4b31c72f0 100644 --- a/auth/docs/release.md +++ b/auth/docs/release.md @@ -1,7 +1,14 @@ # Releases -Create a PR to bump up the version in `pubspec.yaml`. Once that is merged, tag -main, and push the tag. +Create a PR to bump up the version in `pubspec.yaml`. + +> [!NOTE] +> +> Use [semver](https://semver.org/) for the tags, with `auth-` as a prefix. +> Multiple beta releases for the same upcoming version can be done by adding +> build metadata at the end, e.g. `auth-v1.2.3-beta+3`. + +Once that is merged, tag main, and push the tag. ```sh git tag auth-v1.2.3 @@ -16,6 +23,11 @@ This'll trigger a GitHub workflow that: * Creates a new release in the internal track on Play Store. Once the workflow completes, go to the draft GitHub release that was created. + +> [!NOTE] +> +> Keep the title of the release same as the tag. + Set "Previous tag" to the last release of auth and press "Generate release notes". The generated release note will contain all PRs and new contributors from all the releases in the monorepo, so you'll need to filter them to keep diff --git a/auth/flutter b/auth/flutter index 41456452f..367f9ea16 160000 --- a/auth/flutter +++ b/auth/flutter @@ -1 +1 @@ -Subproject commit 41456452f29d64e8deb623a3c927524bcf9f111b +Subproject commit 367f9ea16bfae1ca451b9cc27c1366870b187ae2 diff --git a/auth/lib/l10n/arb/app_de.arb b/auth/lib/l10n/arb/app_de.arb index a05c7ca0d..32507899c 100644 --- a/auth/lib/l10n/arb/app_de.arb +++ b/auth/lib/l10n/arb/app_de.arb @@ -407,7 +407,6 @@ "hearUsWhereTitle": "Wie hast du von Ente erfahren? (optional)", "hearUsExplanation": "Wir tracken keine App-Installationen. Es würde uns jedoch helfen, wenn du uns mitteilst, wie du von uns erfahren hast!", "waitingForBrowserRequest": "Warten auf Browseranfrage...", - "launchPasskeyUrlAgain": "Passwort-URL erneut starten", "passkey": "Passkey", "developerSettingsWarning": "Sind Sie sicher, dass Sie die Entwicklereinstellungen ändern möchten?", "developerSettings": "Entwicklereinstellungen", diff --git a/auth/lib/l10n/arb/app_ja.arb b/auth/lib/l10n/arb/app_ja.arb index ed1786f71..5b281747f 100644 --- a/auth/lib/l10n/arb/app_ja.arb +++ b/auth/lib/l10n/arb/app_ja.arb @@ -145,6 +145,7 @@ "lostDeviceTitle": "デバイスを紛失しましたか？", "twoFactorAuthTitle": "2 要素認証", "passkeyAuthTitle": "パスキー認証", + "verifyPasskey": "パスキーの認証", "recoverAccount": "アカウントを回復", "enterRecoveryKeyHint": "回復キーを入力", "recover": "回復", @@ -407,7 +408,7 @@ "hearUsWhereTitle": "Ente についてどのようにお聞きになりましたか？（任意）", "hearUsExplanation": "私たちはアプリのインストールを追跡していません。私たちをお知りになった場所を教えてください！", "waitingForBrowserRequest": "ブラウザのリクエストを待っています...", - "launchPasskeyUrlAgain": "パスキーのURLを再度起動する", + "waitingForVerification": "認証を待っています...", "passkey": "パスキー", "developerSettingsWarning": "開発者向け設定を変更してもよろしいですか？", "developerSettings": "開発者向け設定", diff --git a/auth/lib/l10n/arb/app_pt.arb b/auth/lib/l10n/arb/app_pt.arb index 10c34ab29..bc43e8422 100644 --- a/auth/lib/l10n/arb/app_pt.arb +++ b/auth/lib/l10n/arb/app_pt.arb @@ -145,6 +145,7 @@ "lostDeviceTitle": "Perdeu seu dispositivo?", "twoFactorAuthTitle": "Autenticação de dois fatores", "passkeyAuthTitle": "Autenticação via Chave de acesso", + "verifyPasskey": "Verificar chave de acesso", "recoverAccount": "Recuperar conta", "enterRecoveryKeyHint": "Digite sua chave de recuperação", "recover": "Recuperar", @@ -407,7 +408,7 @@ "hearUsWhereTitle": "Como você ouviu sobre o Ente? (opcional)", "hearUsExplanation": "Não rastreamos instalações do aplicativo. Seria útil se você nos contasse onde nos encontrou!", "waitingForBrowserRequest": "Aguardando solicitação do navegador...", - "launchPasskeyUrlAgain": "Iniciar a URL de chave de acesso novamente", + "waitingForVerification": "Esperando por verificação...", "passkey": "Chave de acesso", "developerSettingsWarning": "Tem certeza de que deseja modificar as configurações de Desenvolvedor?", "developerSettings": "Configurações de desenvolvedor", diff --git a/auth/lib/l10n/arb/app_zh.arb b/auth/lib/l10n/arb/app_zh.arb index b6d4ed244..5328a14b9 100644 --- a/auth/lib/l10n/arb/app_zh.arb +++ b/auth/lib/l10n/arb/app_zh.arb @@ -145,6 +145,7 @@ "lostDeviceTitle": "丢失了设备吗？", "twoFactorAuthTitle": "双因素认证", "passkeyAuthTitle": "通行密钥认证", + "verifyPasskey": "验证通行密钥", "recoverAccount": "恢复账户", "enterRecoveryKeyHint": "输入您的恢复密钥", "recover": "恢复", @@ -407,7 +408,7 @@ "hearUsWhereTitle": "您是如何知道Ente的？ （可选的）", "hearUsExplanation": "我们不跟踪应用程序安装情况。如果您告诉我们您是在哪里找到我们的，将会有所帮助！", "waitingForBrowserRequest": "正在等待浏览器请求...", - "launchPasskeyUrlAgain": "再次启动 通行密钥 URL", + "waitingForVerification": "等待验证...", "passkey": "通行密钥", "developerSettingsWarning": "您确定要修改开发者设置吗？", "developerSettings": "开发者设置", diff --git a/auth/migration-guides/README.md b/auth/migration-guides/README.md new file mode 100644 index 000000000..56d8983d0 --- /dev/null +++ b/auth/migration-guides/README.md @@ -0,0 +1,4 @@ +Migration guides have moved to the [help +docs](https://help.ente.io/auth/migration-guides/). This folder just contains +redirects for old links. + diff --git a/auth/migration-guides/authy.md b/auth/migration-guides/authy.md index 4fbc7377f..630bc83c7 100644 --- a/auth/migration-guides/authy.md +++ b/auth/migration-guides/authy.md @@ -1,62 +1,2 @@ -# Migrating from Authy -A guide written by Green, an ente.io lover - ---- - -Migrating from Authy can be tiring, as you cannot export your 2FA codes through the app, meaning that you would have to reconfigure 2FA for all of your accounts for your new 2FA authenticator. But do not fear, as there is a much simpler way to migrate from Authy to ente! - -A user on GitHub has written a guide to export our data from Authy (morpheus on Discord found this and showed it to us), so we are going to be using that for the migration. - -## Exporting from Authy -To export your data, please follow [this guide](https://gist.github.com/gboudreau/94bb0c11a6209c82418d01a59d958c93). This will create a new JSON file with all your Authy TOTP data in it. **Do not share this file with anyone!** - -Or, you can [use this tool by Neeraj](https://github.com/ua741/authy-export/releases/tag/v0.0.4) to simplify things and skip directly to importing to ente Authenticator. -### *Do note that these tools may not export ALL of your codes. Make sure that all your accounts have been imported successfully before deleting any codes from your Authy account!* - -## Converting the export for ente Authenticator -### Update: You can now directly import from Bitwarden JSON export, meaning you can skip this step! If it doesn't work for some reason, though, then continue with this step. -So now that you have the JSON file, does that mean it can be imported into ente Authenticator? Yes, but if it doesn't work for some reason, then nope. (If you have a TXT file in the format ente Authenticator asked you for instead, then you probably used Neeraj's tool, so you can skip this step.) - -This is because the code in the guide exports your Authy data for Bitwarden, not ente Authenticator. If you have opened the JSON file, you might have noticed that the file created is not in a format that ente Authenticator asks for: - -ente Authenticator Screenshot - -So, this means that even if you try to import this file, nothing will happen. But don't worry, I've written a program in Python that converts the JSON file into a TXT file that ente Authenticator can use! (It's definitely not written **professionaly**, but hey it gets the job done so I'm happy with that.) - -You can download my program [here](https://github.com/gweeeen/ducky/blob/main/duckys_other_stuff/authy_to_ente.py). Or if you **really like making life hard**, then you can make a new Python file and copy this code to it: - -```py -import json -import os - -totp = [] - -accounts = json.load(open('authy-to-bitwarden-export.json','r',encoding='utf-8')) - -for account in accounts['items']: - totp.append(account['login']['totp']+'\n') - -writer = open('auth_codes.txt','w+',encoding='utf-8') -writer.writelines(totp) -writer.close() - -print('Saved to ' + os.getcwd() + '/auth_codes.txt') -``` - -To convert the file with this program, you will need to install [Python](https://www.python.org/downloads/) on your computer. - -Before you run the program, make sure that both the Python program and the JSON file are in the same directory, otherwise this will not work! - -To run the Python program, open it in IDLE and press F5, or open your terminal and type `python3 authy_to_ente.py` or `py -3 authy_to_ente.py`, depending on which OS you have. Once you run it, a new TXT file called `auth_codes.txt` will be generated. You can now import your data to ente Authenticator! - -## Importing to ente Authenticator -Now that we have the TXT file, let's import it. This should be the easiest part of the entire migration process. - -1. Copy the TXT file to one of your devices with ente Authenticator. -2. Log in to your account (if you haven't already). -3. Open the navigation menu (hamburger button on the top left), then press "Data", then press "Import codes". -4. Select the TXT file that was made earlier. - -And that's it! You have now successfully migrated from Authy to ente Authenticator. - -Just one more thing: Now that your secrets are safely stored, I recommend you delete the unencrypted JSON and TXT files that were made during the migration process for security. +Moved to +[help.ente.io/auth/migration-guides/authy](https://help.ente.io/auth/migration-guides/authy/) diff --git a/auth/migration-guides/encrypted_export.md b/auth/migration-guides/encrypted_export.md index b4e64134e..80a844c85 100644 --- a/auth/migration-guides/encrypted_export.md +++ b/auth/migration-guides/encrypted_export.md @@ -1,63 +1,2 @@ -# Auth Encrypted Export format - -## Overview - -When we export the auth codes, the data is encrypted using a key derived from the user's password. -This document describes the JSON structure used to organize exported data, including versioning and key derivation -parameters. - -## Export JSON Sample - -```json -{ - "version": 1, - "kdfParams": { - "memLimit": 4096, - "opsLimit": 3, - "salt": "example_salt" - }, - "encryptedData": "encrypted_data_here", - "encryptionNonce": "nonce_here" -} -``` - -The main object used to represent the export data. It contains the following key-value pairs: - -- `version`: The version of the export format. -- `kdfParams`: Key derivation function parameters. -- `encryptedData"`: The encrypted authentication data. -- `encryptionNonce`: The nonce used for encryption. - -### Version - -Export version is used to identify the format of the export data. - -#### Ver: 1 - -* KDF Algorithm: `ARGON2ID` -* Decrypted data format: `otpauth://totp/...`, separated by a new line. -* Encryption Algo: `XChaCha20-Poly1305` - -#### Key Derivation Function Params (KDF) - -This section contains the parameters that were using during KDF operation: - -- `memLimit`: Memory limit for the algorithm. -- `opsLimit`: Operations limit for the algorithm. -- `salt`: The salt used in the derivation process. - -#### Encrypted Data - -As mentioned above, the auth data is encrypted using a key that's derived by using user provided password & kdf params. -For encryption, we are using `XChaCha20-Poly1305` algorithm. - -## How to use the exported data - -* **Ente Authenticator app**: You can directly import the codes in the Ente Authenticator app. - > Settings -> Data -> Import Codes -> ente Encrypted export. - -* **Decrypt using Ente CLI** : Download the latest version of [Ente CLI](https://github.com/ente-io/ente/releases?q=CLI&expanded=false), and run the following command - -``` - ./ente auth decrypt -``` +Moved to +[help.ente.io/auth/migration-guides/export](https://help.ente.io/auth/migration-guides/export/) diff --git a/cli/.gitattributes b/cli/.gitattributes new file mode 100644 index 000000000..71965b858 --- /dev/null +++ b/cli/.gitattributes @@ -0,0 +1 @@ +docs/generated/*.md linguist-generated=true diff --git a/cli/README.md b/cli/README.md index 5a4097a46..8fc9aa694 100644 --- a/cli/README.md +++ b/cli/README.md @@ -7,7 +7,7 @@ use it to decrypting the export from Ente Auth. ## Install The easiest way is to download a pre-built binary from the [GitHub -releases](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0&expanded=true). +releases](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0). You can also build these binaries yourself diff --git a/cli/cmd/admin.go b/cli/cmd/admin.go index 0e41bbfe2..8a2d7f006 100644 --- a/cli/cmd/admin.go +++ b/cli/cmd/admin.go @@ -29,6 +29,9 @@ var _userDetailsCmd = &cobra.Command{ flags.UserEmail = f.Value.String() } }) + if flags.UserEmail == "" { + return fmt.Errorf("user email is required") + } return ctrl.GetUserId(context.Background(), *flags) }, } @@ -47,14 +50,55 @@ var _disable2faCmd = &cobra.Command{ flags.UserEmail = f.Value.String() } }) - fmt.Println("Not supported yet") - return nil + if flags.UserEmail == "" { + return fmt.Errorf("user email is required") + } + return ctrl.Disable2FA(context.Background(), *flags) + + }, +} + +var _deleteUser = &cobra.Command{ + Use: "delete-user", + Short: "Delete a user", + RunE: func(cmd *cobra.Command, args []string) error { + recoverWithLog() + var flags = &model.AdminActionForUser{} + cmd.Flags().VisitAll(func(f *pflag.Flag) { + if f.Name == "admin-user" { + flags.AdminEmail = f.Value.String() + } + if f.Name == "user" { + flags.UserEmail = f.Value.String() + } + }) + if flags.UserEmail == "" { + return fmt.Errorf("user email is required") + } + return ctrl.DeleteUser(context.Background(), *flags) + + }, +} + +var _listUsers = &cobra.Command{ + Use: "list-users", + Short: "List all users", + RunE: func(cmd *cobra.Command, args []string) error { + recoverWithLog() + var flags = &model.AdminActionForUser{} + cmd.Flags().VisitAll(func(f *pflag.Flag) { + if f.Name == "admin-user" { + flags.AdminEmail = f.Value.String() + } + }) + return ctrl.ListUsers(context.Background(), *flags) }, } var _updateFreeUserStorage = &cobra.Command{ Use: "update-subscription", - Short: "Update subscription for the free user", + Short: "Update subscription for user", + Long: "Update subscription for the free user. If you want to apply specific limits, use the `--no-limit False` flag", RunE: func(cmd *cobra.Command, args []string) error { recoverWithLog() var flags = &model.AdminActionForUser{} @@ -70,6 +114,9 @@ var _updateFreeUserStorage = &cobra.Command{ noLimit = strings.ToLower(f.Value.String()) == "true" } }) + if flags.UserEmail == "" { + return fmt.Errorf("user email is required") + } return ctrl.UpdateFreeStorage(context.Background(), *flags, noLimit) }, } @@ -78,13 +125,16 @@ func init() { rootCmd.AddCommand(_adminCmd) _ = _userDetailsCmd.MarkFlagRequired("admin-user") _ = _userDetailsCmd.MarkFlagRequired("user") - _userDetailsCmd.Flags().StringP("admin-user", "a", "", "The email of the admin user. (required)") + _userDetailsCmd.Flags().StringP("admin-user", "a", "", "The email of the admin user. ") _userDetailsCmd.Flags().StringP("user", "u", "", "The email of the user to fetch details for. (required)") - _disable2faCmd.Flags().StringP("admin-user", "a", "", "The email of the admin user. (required)") + _listUsers.Flags().StringP("admin-user", "a", "", "The email of the admin user. ") + _disable2faCmd.Flags().StringP("admin-user", "a", "", "The email of the admin user. ") _disable2faCmd.Flags().StringP("user", "u", "", "The email of the user to disable 2FA for. (required)") - _updateFreeUserStorage.Flags().StringP("admin-user", "a", "", "The email of the admin user. (required)") + _deleteUser.Flags().StringP("admin-user", "a", "", "The email of the admin user. ") + _deleteUser.Flags().StringP("user", "u", "", "The email of the user to delete. (required)") + _updateFreeUserStorage.Flags().StringP("admin-user", "a", "", "The email of the admin user.") _updateFreeUserStorage.Flags().StringP("user", "u", "", "The email of the user to update subscription for. (required)") // add a flag with no value --no-limit _updateFreeUserStorage.Flags().String("no-limit", "True", "When true, sets 100TB as storage limit, and expiry to current date + 100 years") - _adminCmd.AddCommand(_userDetailsCmd, _disable2faCmd, _updateFreeUserStorage) + _adminCmd.AddCommand(_userDetailsCmd, _disable2faCmd, _updateFreeUserStorage, _listUsers, _deleteUser) } diff --git a/cli/docs/generated/ente.md b/cli/docs/generated/ente.md index 6d0263ce4..b9d3cde17 100644 --- a/cli/docs/generated/ente.md +++ b/cli/docs/generated/ente.md @@ -25,4 +25,4 @@ ente [flags] * [ente export](ente_export.md) - Starts the export process * [ente version](ente_version.md) - Prints the current version -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_account.md b/cli/docs/generated/ente_account.md index ec26f9557..c48a65336 100644 --- a/cli/docs/generated/ente_account.md +++ b/cli/docs/generated/ente_account.md @@ -16,4 +16,4 @@ Manage account settings * [ente account list](ente_account_list.md) - list configured accounts * [ente account update](ente_account_update.md) - Update an existing account's export directory -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_account_add.md b/cli/docs/generated/ente_account_add.md index 74b2c23f9..1904ca370 100644 --- a/cli/docs/generated/ente_account_add.md +++ b/cli/docs/generated/ente_account_add.md @@ -16,4 +16,4 @@ ente account add [flags] * [ente account](ente_account.md) - Manage account settings -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_account_get-token.md b/cli/docs/generated/ente_account_get-token.md index 58ef3e7cd..d7ee77255 100644 --- a/cli/docs/generated/ente_account_get-token.md +++ b/cli/docs/generated/ente_account_get-token.md @@ -18,4 +18,4 @@ ente account get-token [flags] * [ente account](ente_account.md) - Manage account settings -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_account_list.md b/cli/docs/generated/ente_account_list.md index 3fc6fbc2e..cfc59bb8d 100644 --- a/cli/docs/generated/ente_account_list.md +++ b/cli/docs/generated/ente_account_list.md @@ -16,4 +16,4 @@ ente account list [flags] * [ente account](ente_account.md) - Manage account settings -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_account_update.md b/cli/docs/generated/ente_account_update.md index 04c4418e7..acb65412a 100644 --- a/cli/docs/generated/ente_account_update.md +++ b/cli/docs/generated/ente_account_update.md @@ -19,4 +19,4 @@ ente account update [flags] * [ente account](ente_account.md) - Manage account settings -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_admin.md b/cli/docs/generated/ente_admin.md index 91e70324d..aafe51b39 100644 --- a/cli/docs/generated/ente_admin.md +++ b/cli/docs/generated/ente_admin.md @@ -15,8 +15,10 @@ Commands for admin actions like disable or enabling 2fa, bumping up the storage ### SEE ALSO * [ente](ente.md) - CLI tool for exporting your photos from ente.io +* [ente admin delete-user](ente_admin_delete-user.md) - Delete a user * [ente admin disable-2fa](ente_admin_disable-2fa.md) - Disable 2fa for a user * [ente admin get-user-id](ente_admin_get-user-id.md) - Get user id -* [ente admin update-subscription](ente_admin_update-subscription.md) - Update subscription for the free user +* [ente admin list-users](ente_admin_list-users.md) - List all users +* [ente admin update-subscription](ente_admin_update-subscription.md) - Update subscription for user -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_admin_delete-user.md b/cli/docs/generated/ente_admin_delete-user.md new file mode 100644 index 000000000..56c96841e --- /dev/null +++ b/cli/docs/generated/ente_admin_delete-user.md @@ -0,0 +1,21 @@ +## ente admin delete-user + +Delete a user + +``` +ente admin delete-user [flags] +``` + +### Options + +``` + -a, --admin-user string The email of the admin user. + -h, --help help for delete-user + -u, --user string The email of the user to delete. (required) +``` + +### SEE ALSO + +* [ente admin](ente_admin.md) - Commands for admin actions + +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_admin_disable-2fa.md b/cli/docs/generated/ente_admin_disable-2fa.md index 19183fdfe..333f0912e 100644 --- a/cli/docs/generated/ente_admin_disable-2fa.md +++ b/cli/docs/generated/ente_admin_disable-2fa.md @@ -9,7 +9,7 @@ ente admin disable-2fa [flags] ### Options ``` - -a, --admin-user string The email of the admin user. (required) + -a, --admin-user string The email of the admin user. -h, --help help for disable-2fa -u, --user string The email of the user to disable 2FA for. (required) ``` @@ -18,4 +18,4 @@ ente admin disable-2fa [flags] * [ente admin](ente_admin.md) - Commands for admin actions -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_admin_get-user-id.md b/cli/docs/generated/ente_admin_get-user-id.md index 0151a3ec8..3d26f624a 100644 --- a/cli/docs/generated/ente_admin_get-user-id.md +++ b/cli/docs/generated/ente_admin_get-user-id.md @@ -9,7 +9,7 @@ ente admin get-user-id [flags] ### Options ``` - -a, --admin-user string The email of the admin user. (required) + -a, --admin-user string The email of the admin user. -h, --help help for get-user-id -u, --user string The email of the user to fetch details for. (required) ``` @@ -18,4 +18,4 @@ ente admin get-user-id [flags] * [ente admin](ente_admin.md) - Commands for admin actions -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_admin_list-users.md b/cli/docs/generated/ente_admin_list-users.md new file mode 100644 index 000000000..8841df57b --- /dev/null +++ b/cli/docs/generated/ente_admin_list-users.md @@ -0,0 +1,20 @@ +## ente admin list-users + +List all users + +``` +ente admin list-users [flags] +``` + +### Options + +``` + -a, --admin-user string The email of the admin user. + -h, --help help for list-users +``` + +### SEE ALSO + +* [ente admin](ente_admin.md) - Commands for admin actions + +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_admin_update-subscription.md b/cli/docs/generated/ente_admin_update-subscription.md index 30339acf2..cc1fa9623 100644 --- a/cli/docs/generated/ente_admin_update-subscription.md +++ b/cli/docs/generated/ente_admin_update-subscription.md @@ -1,6 +1,10 @@ ## ente admin update-subscription -Update subscription for the free user +Update subscription for user + +### Synopsis + +Update subscription for the free user. If you want to apply specific limits, use the `--no-limit False` flag ``` ente admin update-subscription [flags] @@ -9,7 +13,7 @@ ente admin update-subscription [flags] ### Options ``` - -a, --admin-user string The email of the admin user. (required) + -a, --admin-user string The email of the admin user. -h, --help help for update-subscription --no-limit string When true, sets 100TB as storage limit, and expiry to current date + 100 years (default "True") -u, --user string The email of the user to update subscription for. (required) @@ -19,4 +23,4 @@ ente admin update-subscription [flags] * [ente admin](ente_admin.md) - Commands for admin actions -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_auth.md b/cli/docs/generated/ente_auth.md index 4a64a944d..5770f36f3 100644 --- a/cli/docs/generated/ente_auth.md +++ b/cli/docs/generated/ente_auth.md @@ -13,4 +13,4 @@ Authenticator commands * [ente](ente.md) - CLI tool for exporting your photos from ente.io * [ente auth decrypt](ente_auth_decrypt.md) - Decrypt authenticator export -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_auth_decrypt.md b/cli/docs/generated/ente_auth_decrypt.md index 1203319e9..e573db2a3 100644 --- a/cli/docs/generated/ente_auth_decrypt.md +++ b/cli/docs/generated/ente_auth_decrypt.md @@ -16,4 +16,4 @@ ente auth decrypt [input] [output] [flags] * [ente auth](ente_auth.md) - Authenticator commands -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_export.md b/cli/docs/generated/ente_export.md index fb4cc6541..c5783236c 100644 --- a/cli/docs/generated/ente_export.md +++ b/cli/docs/generated/ente_export.md @@ -16,4 +16,4 @@ ente export [flags] * [ente](ente.md) - CLI tool for exporting your photos from ente.io -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/generated/ente_version.md b/cli/docs/generated/ente_version.md index 0254e2ebd..b51055697 100644 --- a/cli/docs/generated/ente_version.md +++ b/cli/docs/generated/ente_version.md @@ -16,4 +16,4 @@ ente version [flags] * [ente](ente.md) - CLI tool for exporting your photos from ente.io -###### Auto generated by spf13/cobra on 13-Mar-2024 +###### Auto generated by spf13/cobra on 14-Mar-2024 diff --git a/cli/docs/release.md b/cli/docs/release.md index a539e7e5d..dce097eaf 100644 --- a/cli/docs/release.md +++ b/cli/docs/release.md @@ -2,6 +2,11 @@ Tag main, and push the tag. +> [!NOTE] +> +> See [auth/docs/release](../../auth/docs/release.md) for more details about the +> tag format. The prefix for cli releases should be `cli-`. + ```sh git tag cli-v1.2.3 git push origin cli-v1.2.3 diff --git a/cli/internal/api/admin.go b/cli/internal/api/admin.go index 1c0b2c50a..9e0bcb90a 100644 --- a/cli/internal/api/admin.go +++ b/cli/internal/api/admin.go @@ -25,6 +25,69 @@ func (c *Client) GetUserIdFromEmail(ctx context.Context, email string) (*models. } return &res, nil } + +func (c *Client) ListUsers(ctx context.Context) ([]models.User, error) { + var res struct { + Users []models.User `json:"users"` + } + r, err := c.restClient.R(). + SetContext(ctx). + SetQueryParam("sinceTime", "0"). + SetResult(&res). + Get("/admin/users/") + if err != nil { + return nil, err + } + if r.IsError() { + return nil, &ApiError{ + StatusCode: r.StatusCode(), + Message: r.String(), + } + } + return res.Users, nil +} + +func (c *Client) DeleteUser(ctx context.Context, email string) error { + + r, err := c.restClient.R(). + SetContext(ctx). + SetQueryParam("email", email). + Delete("/admin/user/delete") + if err != nil { + return err + } + if r.IsError() { + return &ApiError{ + StatusCode: r.StatusCode(), + Message: r.String(), + } + } + return nil +} + +func (c *Client) Disable2Fa(ctx context.Context, userID int64) error { + var res interface{} + + payload := map[string]interface{}{ + "userID": userID, + } + r, err := c.restClient.R(). + SetContext(ctx). + SetResult(&res). + SetBody(payload). + Post("/admin/user/disable-2fa") + if err != nil { + return err + } + if r.IsError() { + return &ApiError{ + StatusCode: r.StatusCode(), + Message: r.String(), + } + } + return nil +} + func (c *Client) UpdateFreePlanSub(ctx context.Context, userDetails *models.UserDetails, storageInBytes int64, expiryTimeInMicro int64) error { var res interface{} if userDetails.Subscription.ProductID != "free" { diff --git a/cli/internal/api/models/user_details.go b/cli/internal/api/models/user_details.go index 259ff972b..6a5310d7d 100644 --- a/cli/internal/api/models/user_details.go +++ b/cli/internal/api/models/user_details.go @@ -1,9 +1,7 @@ package models type UserDetails struct { - User struct { - ID int64 `json:"id"` - } `json:"user"` + User User `json:"user"` Usage int64 `json:"usage"` Email string `json:"email"` @@ -14,3 +12,10 @@ type UserDetails struct { PaymentProvider string `json:"paymentProvider"` } `json:"subscription"` } + +type User struct { + ID int64 + Email string `json:"email"` + Hash string `json:"hash"` + CreationTime int64 `json:"creationTime"` +} diff --git a/cli/pkg/admin_actions.go b/cli/pkg/admin_actions.go index c9ec00667..0105cdc19 100644 --- a/cli/pkg/admin_actions.go +++ b/cli/pkg/admin_actions.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "github.com/ente-io/cli/internal" + "github.com/ente-io/cli/internal/api" "github.com/ente-io/cli/pkg/model" "github.com/ente-io/cli/utils" "log" @@ -24,6 +25,63 @@ func (c *ClICtrl) GetUserId(ctx context.Context, params model.AdminActionForUser return nil } +func (c *ClICtrl) ListUsers(ctx context.Context, params model.AdminActionForUser) error { + accountCtx, err := c.buildAdminContext(ctx, params.AdminEmail) + if err != nil { + return err + } + users, err := c.Client.ListUsers(accountCtx) + if err != nil { + if apiErr, ok := err.(*api.ApiError); ok && apiErr.StatusCode == 400 && strings.Contains(apiErr.Message, "Token is too old") { + fmt.Printf("Error: old admin token, please re-authenticate using `ente account add` \n") + return nil + } + return err + } + for _, user := range users { + fmt.Printf("Email: %s, ID: %d, Created: %s\n", user.Email, user.ID, time.UnixMicro(user.CreationTime).Format("2006-01-02")) + } + return nil +} + +func (c *ClICtrl) DeleteUser(ctx context.Context, params model.AdminActionForUser) error { + accountCtx, err := c.buildAdminContext(ctx, params.AdminEmail) + if err != nil { + return err + } + err = c.Client.DeleteUser(accountCtx, params.UserEmail) + if err != nil { + if apiErr, ok := err.(*api.ApiError); ok && apiErr.StatusCode == 400 && strings.Contains(apiErr.Message, "Token is too old") { + fmt.Printf("Error: old admin token, please re-authenticate using `ente account add` \n") + return nil + } + return err + } + fmt.Println("Successfully deleted user") + return nil +} + +func (c *ClICtrl) Disable2FA(ctx context.Context, params model.AdminActionForUser) error { + accountCtx, err := c.buildAdminContext(ctx, params.AdminEmail) + if err != nil { + return err + } + userDetails, err := c.Client.GetUserIdFromEmail(accountCtx, params.UserEmail) + if err != nil { + return err + } + err = c.Client.Disable2Fa(accountCtx, userDetails.User.ID) + if err != nil { + if apiErr, ok := err.(*api.ApiError); ok && apiErr.StatusCode == 400 && strings.Contains(apiErr.Message, "Token is too old") { + fmt.Printf("Error: Old admin token, please re-authenticate using `ente account add` \n") + return nil + } + return err + } + fmt.Println("Successfully disabled 2FA for user") + return nil +} + func (c *ClICtrl) UpdateFreeStorage(ctx context.Context, params model.AdminActionForUser, noLimit bool) error { accountCtx, err := c.buildAdminContext(ctx, params.AdminEmail) if err != nil { @@ -82,6 +140,9 @@ func (c *ClICtrl) buildAdminContext(ctx context.Context, adminEmail string) (con if err != nil { return nil, err } + if len(accounts) == 0 { + return nil, fmt.Errorf("no accounts found, use `account add` to add an account") + } var acc *model.Account for _, a := range accounts { if a.Email == adminEmail { @@ -89,6 +150,14 @@ func (c *ClICtrl) buildAdminContext(ctx context.Context, adminEmail string) (con break } } + if (len(accounts) > 1) && (acc == nil) { + return nil, fmt.Errorf("multiple accounts found, specify the admin email using --admin-user") + } + if acc == nil && len(accounts) == 1 { + acc = &accounts[0] + fmt.Printf("Assuming %s as the Admin \n------------\n", acc.Email) + } + if acc == nil { return nil, fmt.Errorf("account not found for %s, use `account list` to list accounts", adminEmail) } diff --git a/desktop/docs/release.md b/desktop/docs/release.md new file mode 100644 index 000000000..bdda428e1 --- /dev/null +++ b/desktop/docs/release.md @@ -0,0 +1,92 @@ +## Releases + +> [!NOTE] +> +> TODO(MR): This document needs to be audited and changed as we do the first +> release from this new monorepo. + +The Github Action that builds the desktop binaries is triggered by pushing a tag +matching the pattern `photos-desktop-v1.2.3`. This value should match the +version in `package.json`. + +So the process for doing a release would be. + +1. Create a new branch (can be named anything). On this branch, include your + changes. + +2. Mention the changes in `CHANGELOG.md`. + +3. Changing the `version` in `package.json` to `1.x.x`. + +4. Commit and push to remote + + ```sh + git add package.json && git commit -m 'Release v1.x.x' + git tag v1.x.x + git push && git push --tags + ``` + +This by itself will already trigger a new release. The GitHub action will create +a new draft release that can then be used as descibed below. + +To wrap up, we also need to merge back these changes into main. So for that, + +5. Open a PR for the branch that we're working on (where the above tag was + pushed from) to get it merged into main. + +6. In this PR, also increase the version number for the next release train. That + is, supposed we just released `v4.0.1`. Then we'll change the version number + in main to `v4.0.2-next.0`. Each pre-release will modify the `next.0` part. + Finally, at the time of the next release, this'll become `v4.0.2`. + +The GitHub Action runs on Windows, Linux and macOS. It produces the artifacts +defined in the `build` value in `package.json`. + +* Windows - An NSIS installer. +* Linux - An AppImage, and 3 other packages (`.rpm`, `.deb`, `.pacman`) +* macOS - A universal DMG + +Additionally, the GitHub action notarizes the macOS DMG. For this it needs +credentials provided via GitHub secrets. + +During the build the Sentry webpack plugin checks to see if SENTRY_AUTH_TOKEN is +defined. If so, it uploads the sourcemaps for the renderer process to Sentry +(For our GitHub action, the SENTRY_AUTH_TOKEN is defined as a GitHub secret). + +The sourcemaps for the main (node) process are currently not sent to Sentry +(this works fine in practice since the node process files are not minified, we +only run `tsc`). + +Once the build is done, a draft release with all these artifacts attached is +created. The build is idempotent, so if something goes wrong and we need to +re-run the GitHub action, just delete the draft release (if it got created) and +start a new run by pushing a new tag (if some code changes are required). + +If no code changes are required, say the build failed for some transient network +or sentry issue, we can even be re-run by the build by going to Github Action +age and rerun from there. This will re-trigger for the same tag. + +If everything goes well, we'll have a release on GitHub, and the corresponding +source maps for the renderer process uploaded to Sentry. There isn't anything +else to do: + +* The website automatically redirects to the latest release on GitHub when + people try to download. + +* The file formats with support auto update (Windows `exe`, the Linux AppImage + and the macOS DMG) also check the latest GitHub release automatically to + download and apply the update (the rest of the formats don't support auto + updates). + +* We're not putting the desktop app in other stores currently. It is available + as a `brew cask`, but we only had to open a PR to add the initial formula, now + their maintainers automatically bump the SHA, version number and the (derived + from the version) URL in the formula when their tools notice a new release on + our GitHub. + +We can also publish the draft releases by checking the "pre-release" option. +Such releases don't cause any of the channels (our website, or the desktop app +auto updater, or brew) to be notified, instead these are useful for giving links +to pre-release builds to customers. Generally, in the version number for these +we'll add a label to the version, e.g. the "beta.x" in `1.x.x-beta.x`. This +should be done both in `package.json`, and what we tag the commit with. diff --git a/docs/docs/.vitepress/sidebar.ts b/docs/docs/.vitepress/sidebar.ts index 78a6733f4..ca531716b 100644 --- a/docs/docs/.vitepress/sidebar.ts +++ b/docs/docs/.vitepress/sidebar.ts @@ -69,9 +69,17 @@ export const sidebar = [ { text: "FAQ", link: "/auth/faq/" }, { text: "Migration guides", - collapsed: true, + collapsed: false, items: [ { text: "Introduction", link: "/auth/migration-guides/" }, + { + text: "From Authy", + link: "/auth/migration-guides/authy/", + }, + { + text: "Exporting your data", + link: "/auth/migration-guides/export", + }, ], }, ], @@ -86,9 +94,14 @@ export const sidebar = [ items: [ { text: "Introduction", link: "/self-hosting/guides/" }, { - text: "Configure custom server", + text: "Connect to custom server", link: "/self-hosting/guides/custom-server/", }, + { + text: "Administering your server", + link: "/self-hosting/guides/admin", + }, + { text: "Mobile build", link: "/self-hosting/guides/mobile-build", @@ -110,6 +123,10 @@ export const sidebar = [ text: "Verification code", link: "/self-hosting/faq/otp", }, + { + text: "Increase storage space", + link: "/self-hosting/faq/storage-space", + }, ], }, { diff --git a/docs/docs/auth/faq/index.md b/docs/docs/auth/faq/index.md index e40d18431..23564e2e3 100644 --- a/docs/docs/auth/faq/index.md +++ b/docs/docs/auth/faq/index.md @@ -1,21 +1,33 @@ - +--- +title: FAQ - Auth +description: Frequently asked questions about Ente Auth +--- # Frequently Asked Questions -### How secure is ente Auth? -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. +### How secure is Ente Auth? + +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. ### Can I access my codes on desktop? -You can access your codes on the web @ [auth.ente.io](https://auth.ente.io). + +You can access your codes on the web at [auth.ente.io](https://auth.ente.io). ### How can I delete or edit codes? + You can delete or edit a code by swiping left on that item. ### How can I support this project? -You can support the development of this project by subscribing to our Photos app @ [ente.io](https://ente.io). + +You can support the development of this project by subscribing to our Photos app +at [ente.io](https://ente.io). ### How can I enable FaceID lock in Ente Auth? + You can enable FaceID lock under Settings → Security → Lockscreen. ### Why does the desktop and mobile app displays different code? + Please verify that the time on both your mobile and desktop is same. diff --git a/docs/docs/auth/index.md b/docs/docs/auth/index.md index 11fb333af..8800c5422 100644 --- a/docs/docs/auth/index.md +++ b/docs/docs/auth/index.md @@ -7,8 +7,3 @@ description: User guide for Ente Auth Ente Auth is a free, cross-platform, end-to-end encrypted authenticator app. You can use it to safely store your 2FA codes (second-factor authentication codes). - -> [!CAUTION] -> -> These docs are still incomplete. If you feel like documenting an issue you ran -> into and then found a solution to, help us [fill them in](/about/contribute). diff --git a/docs/docs/auth/migration-guides/authy/index.md b/docs/docs/auth/migration-guides/authy/index.md new file mode 100644 index 000000000..d215a610b --- /dev/null +++ b/docs/docs/auth/migration-guides/authy/index.md @@ -0,0 +1,179 @@ +--- +title: Migrating from Authy +description: Guide for importing your existing Authy 2FA tokens into Ente Auth +--- + +# Migrating from Authy + +A guide written by Green, an ente.io lover + +> [!WARNING] +> +> Authy will soon be dropping support for its desktop apps in the near future. +> If you are looking to switch to ente Authenticator from Authy, I heavily +> recommend you export your codes as soon as you can. + +--- + +Migrating from Authy can be tiring, as you cannot export your 2FA codes through +the app, meaning that you would have to reconfigure 2FA for all of your accounts +for your new 2FA authenticator. However, easier ways exist to export your codes +out of Authy. This guide will cover two of the most used methods for mograting +from Authy to ente Authenticator. + +> [!CAUTION] +> +> Under any circumstances, do **NOT** share any JSON and TXT files generated +> using this guide, as they contain your **unencrypted** TOTP secrets! +> +> Also, there is **NO GUARANTEE** that these methods will export ALL of your +> codes. Make sure that all your accounts have been imported successfully before +> deleting any codes from your Authy account! + +--- + +## Method 1: Use Neeraj's export tool + +**Who should use this?** General users who want to save time by skipping the +hard (and rather technical) parts of the process.

+ +One way to export is to +[use this tool by Neeraj](https://github.com/ua741/authy-export/releases/tag/v0.0.4) +to simplify the process and skip directly to importing to ente Authenticator. + +To export from Authy, download the tool for your specific OS, then type the +following in your terminal: + +``` +./ +``` + +Assuming the filename of the binary remains unmodified and the working directory +of the terminal is the location of the binary, you should type this for MacOS: + +> [!NOTE] +> +> On Apple Silicon devices, Rosetta 2 may be required to run the binary. + +``` +./authy-export-darwin-amd64 authy_codes.txt +``` + +For Linux: + +``` +./authy-export-linux-amd64 authy_codes.txt +``` + +For Windows: + +``` +./authy-export-windows-amd64.exe authy_codes.txt +``` + +This will generate a text file called `authy_codes.txt`, which contains your +Authy codes in ente's plaintext export format. You can now import this to ente +Authenticator! + +## Method 2: Use gboudreau's GitHub guide + +**Who should use this?** Power users who have spare time on their hands and +prefer a more "known and established" solution to exporting Authy codes.

+ +A user on GitHub (gboudreau) wrote a guide to export codes from Authy (morpheus +on Discord found this and showed it to us), so we are going to be using that for +the migration. + +To export your data, please follow +[this guide](https://gist.github.com/gboudreau/94bb0c11a6209c82418d01a59d958c93). + +This will create a JSON file called `authy-to-bitwarden-export.json`, which +contains your Authy codes in Bitwarden's export format. You can now import this +to ente Authenticator! + +### Method 2.1: If the export worked, but the import didn't + +> [!NOTE] +> +> This is intended only for users who successfully exported their codes using the +> guide in method 2, but could not import it to ente Authenticator for whatever +> reason. If the import was successful, or you haven't tried to import the codes +> yet, ignore this section. +> +> If the export itself failed, try using +> [**method 1**](#method-1-use-neerajs-export-tool) instead. + +Usually, you should be able to import Bitwarden exports directly into ente +Authenticator. In case this didn't work for whatever reason, I've written a +program in Python that converts the JSON file into a TXT file that ente +Authenticator can use, so you can try importing using plain text import instead. + +You can download my program +[here](https://github.com/gweeeen/ducky/blob/main/duckys_other_stuff/authy_to_ente.py), +or you can copy the program below: + +```py +import json +import os + +totp = [] + +accounts = json.load(open('authy-to-bitwarden-export.json','r',encoding='utf-8')) + +for account in accounts['items']: + totp.append(account['login']['totp']+'\n') + +writer = open('auth_codes.txt','w+',encoding='utf-8') +writer.writelines(totp) +writer.close() + +print('Saved to ' + os.getcwd() + '/auth_codes.txt') +``` + +To convert the file with this program, you will need to install +[Python](https://www.python.org/downloads/) on your computer. + +Before you run the program, make sure that both the Python program and the JSON +file are in the same directory, otherwise this will not work! + +To run the Python program, open it in your IDE and run the program, or open your +terminal and type `python3 authy_to_ente.py` (MacOS/Linux, or any other OS that +uses bash) or `py -3 authy_to_ente.py` (Windows). Once you run it, a new TXT +file called `auth_codes.txt` will be generated. You can now import your data to +ente Authenticator! + +--- + +You should now have a TXT file (method 1, method 2.1) or a JSON file (method 2) +that countains your TOTP secrets, which can now be imported into ente +Authenticator. To import your codes, please follow one of the steps below, +depending on which method you used to export your codes. + +## Importing to ente Authenticator (Method 1, method 2.1) + +1. Copy the TXT file to one of your devices with ente Authenticator. +2. Log in to your account (if you haven't already), or press "Use without + backups". +3. Open the navigation menu (hamburger button on the top left), then press + "Data", then press "Import codes". +4. Select the "Plain text" option. +5. Select the TXT file that was made earlier. + +## Importing to ente Authenticator (Method 2) + +1. Copy the JSON file to one of your devices with ente Authenticator. +2. Log in to your account (if you haven't already), or press "Use without + backups". +3. Open the navigation menu (hamburger button on the top left), then press + "Data", then press "Import codes". +4. Select the "Bitwarden" option. +5. Select the JSON file that was made earlier. + +If this didn't work, refer to +[**method 2.1**](#method-21-if-the-export-worked-but-the-import-didnt).

+ +And that's it! You have now successfully migrated from Authy to ente +Authenticator. + +Now that your secrets are safely stored, I recommend you delete the unencrypted +JSON and TXT files that were made during the migration process for security. diff --git a/docs/docs/auth/migration-guides/export.md b/docs/docs/auth/migration-guides/export.md new file mode 100644 index 000000000..a66bea7b6 --- /dev/null +++ b/docs/docs/auth/migration-guides/export.md @@ -0,0 +1,76 @@ +--- +title: Exporting your data from Ente Auth +description: Guide for exporting your 2FA codes out from Ente Auth +--- + +# Exporting your data out of Ente Auth + +## Auth Encrypted Export format + +### Overview + +When we export the auth codes, the data is encrypted using a key derived from +the user's password. This document describes the JSON structure used to organize +exported data, including versioning and key derivation parameters. + +### Export JSON Sample + +```json +{ + "version": 1, + "kdfParams": { + "memLimit": 4096, + "opsLimit": 3, + "salt": "example_salt" + }, + "encryptedData": "encrypted_data_here", + "encryptionNonce": "nonce_here" +} +``` + +The main object used to represent the export data. It contains the following +key-value pairs: + +- `version`: The version of the export format. +- `kdfParams`: Key derivation function parameters. +- `encryptedData"`: The encrypted authentication data. +- `encryptionNonce`: The nonce used for encryption. + +#### Version + +Export version is used to identify the format of the export data. + +##### Ver: 1 + +- KDF Algorithm: `ARGON2ID` +- Decrypted data format: `otpauth://totp/...`, separated by a new line. +- Encryption Algo: `XChaCha20-Poly1305` + +##### Key Derivation Function Params (KDF) + +This section contains the parameters that were using during KDF operation: + +- `memLimit`: Memory limit for the algorithm. +- `opsLimit`: Operations limit for the algorithm. +- `salt`: The salt used in the derivation process. + +##### Encrypted Data + +As mentioned above, the auth data is encrypted using a key that's derived by +using user provided password & kdf params. For encryption, we are using +`XChaCha20-Poly1305` algorithm. + +## How to use the exported data + +- **Ente Authenticator app**: You can directly import the codes in the Ente + Authenticator app. + + > Settings -> Data -> Import Codes -> ente Encrypted export. + +- **Decrypt using Ente CLI** : Download the latest version of + [Ente CLI](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0), and run + the following command + +``` + ./ente auth decrypt +``` diff --git a/docs/docs/auth/migration-guides/index.md b/docs/docs/auth/migration-guides/index.md index 603c87011..f10d9db41 100644 --- a/docs/docs/auth/migration-guides/index.md +++ b/docs/docs/auth/migration-guides/index.md @@ -1,11 +1,10 @@ --- title: Migrating to Ente Auth description: - Guides for migrating your existing 2FA tokens from other products into Ente - Auth + Guides for migrating your existing 2FA tokens into or out of Ente Auth --- -# Migrating to Ente Auth +# Migrating to/from Ente Auth -_Coming soon_. This section will contain guides for migrating your existing 2FA -tokens from other products into Ente Auth. +- [Migrating from Authy](authy/) +- [Exporting your data out of Ente Auth](export) diff --git a/docs/docs/photos/faq/index.md b/docs/docs/photos/faq/index.md index 93eebcb56..c5a4e2cf9 100644 --- a/docs/docs/photos/faq/index.md +++ b/docs/docs/photos/faq/index.md @@ -3,9 +3,7 @@ title: FAQ description: Frequently asked questions about Ente Photos --- - # FAQ - -_Coming soon_. On this page we'll document some help items in a question and answer format. - +_Coming soon_. On this page we'll document some help items in a question and +answer format. diff --git a/docs/docs/photos/features/family-plans.md b/docs/docs/photos/features/family-plans.md index 8405c7dcf..bb4cb3a70 100644 --- a/docs/docs/photos/features/family-plans.md +++ b/docs/docs/photos/features/family-plans.md @@ -22,3 +22,10 @@ In brief, - You can invite 5 family members. So including yourself, it will be 6 people who can share a single subscription, paying only once. + + +## FAQ + +* **Can you assign a storage quota for each individual member in the family plan?** + Unfortunately, at this moment, assigning a storage quota for each individual member in the family plan is not supported. For updates on this feature request, please follow [this thread](https://github.com/ente-io/ente/discussions/857). + diff --git a/docs/docs/self-hosting/faq/otp.md b/docs/docs/self-hosting/faq/otp.md index c3356b7bc..a224d1f66 100644 --- a/docs/docs/self-hosting/faq/otp.md +++ b/docs/docs/self-hosting/faq/otp.md @@ -17,3 +17,11 @@ locally by creating a `museum.yaml` and adding the `internal.hardcoded-ott` configuration setting to it. See [local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml) in the server source code for details about how to define this. + +> [!NOTE] +> +> If you're not able to get the OTP with the above methods, make sure that you +> are actually connecting to your self hosted instance and not to Ente's +> production servers. e.g. you can use the network requests tab in the browser +> console to verify that the API requests are going to your server instead of +> `api.ente.io`. diff --git a/docs/docs/self-hosting/faq/storage-space.md b/docs/docs/self-hosting/faq/storage-space.md new file mode 100644 index 000000000..f1ad78c71 --- /dev/null +++ b/docs/docs/self-hosting/faq/storage-space.md @@ -0,0 +1,12 @@ +--- +title: Increase storage space +description: Increasing the storage quota for users on your self hosted instance +--- + +# Increase storage space + +See the [guide for administering your server](/self-hosting/guides/admin). In +particular, you can use the `ente admin update-subscription` CLI command to +increase the +[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md) +of accounts on your instance. diff --git a/docs/docs/self-hosting/guides/admin.md b/docs/docs/self-hosting/guides/admin.md new file mode 100644 index 000000000..91ea4d0f8 --- /dev/null +++ b/docs/docs/self-hosting/guides/admin.md @@ -0,0 +1,43 @@ +--- +title: Server admin +description: Administering your custom self-hosted Ente instance using the CLI +--- + +# Administering your custom server + +You can use +[Ente's CLI](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0) to +administer your self hosted server. + +First we need to get your CLI to connect to your custom server. Define a +config.yaml and put it either in the same directory as CLI or path defined in +env variable `ENTE_CLI_CONFIG_PATH` + +```yaml +endpoint: + api: "http://localhost:8080" +``` + +Now you should be able to +[add an account](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_add.md), +and subsequently increase the +[storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md) +using the CLI. + +For the admin actions, you can create `server/museum.yaml`, and whitelist add +the admin userID `internal.admins`. See +[local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml#L211C1-L232C1) +in the server source code for details about how to define this. + +```yaml +.... +internal: + admins: + # - 1580559962386440 + +.... +``` + +You can use +[account list](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_list.md) +command to find the user id of any account. diff --git a/docs/docs/self-hosting/guides/custom-server/index.md b/docs/docs/self-hosting/guides/custom-server/index.md index 51a9b6c2f..7f7ba50fa 100644 --- a/docs/docs/self-hosting/guides/custom-server/index.md +++ b/docs/docs/self-hosting/guides/custom-server/index.md @@ -1,9 +1,14 @@ --- title: Custom server -description: Using a custom self-hosted server with frontend apps +description: Using a custom self-hosted server with Ente client apps and CLI --- -# Custom server for mobile apps +# Connecting to a custom server + +You can modify various Ente client apps and CLI to connect to a self hosted +custom server endpoint. + +## Mobile apps The pre-built Ente apps from GitHub / App Store / Play Store / F-Droid can be easily configured to use a custom server. @@ -18,32 +23,17 @@ configure the endpoint the app should be connecting to. > This is only supported by the Ente Auth app currently. We'll add this same > functionality to the Ente Photos app soon. ---- +## CLI -# CLI +> [!NOTE] +> +> You can download the CLI from +> [here](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0) -> [!WARNING] -> The new version of CLI that supports connecting to custom server is still in beta. -> You can download the beta version from [here](https://github.com/ente-io/ente/releases?q=tag%3Acli-v0&expanded=true) - -Define a config.yaml and put it either in the same directory as CLI or path defined in env variable `ENTE_CLI_CONFIG_PATH` +Define a config.yaml and put it either in the same directory as CLI or path +defined in env variable `ENTE_CLI_CONFIG_PATH` ```yaml endpoint: - api: "http://localhost:8080" + api: "http://localhost:8080" ``` - -You should be able to [add an account](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_add.md), and subsequently increase the [storage and account validity](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_admin_update-subscription.md) using the CLI. - -For the admin actions, you can create `server/museum.yaml`, and whitelist add the admin userID `internal.admins`. See [local.yaml](https://github.com/ente-io/ente/blob/main/server/configurations/local.yaml#L211C1-L232C1) in the server source code for details about how to define this. - -You can use [account list](https://github.com/ente-io/ente/blob/main/cli/docs/generated/ente_account_list.md) command to find the user id of any account. - -```yaml -.... -internal: - admins: - # - 1580559962386440 - -.... -``` \ No newline at end of file diff --git a/docs/docs/self-hosting/guides/external-s3.md b/docs/docs/self-hosting/guides/external-s3.md index 40b401724..505ae6fe9 100644 --- a/docs/docs/self-hosting/guides/external-s3.md +++ b/docs/docs/self-hosting/guides/external-s3.md @@ -17,6 +17,14 @@ have the keys and secrets for the S3 bucket. The plan is as follows: 4. Create an account and increase storage quota 5. Fix potential CORS issue with your bucket +> [!NOTE] +> +> This is a community contributed guide, and some of these steps might be out of +> sync with the upstream documentation. If something is not working correctly, +> please also see the latest +> [READMEs](https://github.com/ente-io/ente/blob/main/server/README.md) in the +> repository and/or other guides in [self-hosting](/self-hosting/). + ## 1. Create a `compose.yaml` file After cloning the main repository with @@ -25,6 +33,7 @@ After cloning the main repository with git clone https://github.com/ente-io/ente.git # Or git clone git@github.com:ente-io/ente.git cd ente +git submodule update --init --recursive ``` Create a `compose.yaml` file at the root of the project with the following diff --git a/docs/docs/self-hosting/guides/index.md b/docs/docs/self-hosting/guides/index.md index 2f7582e31..a8a64d960 100644 --- a/docs/docs/self-hosting/guides/index.md +++ b/docs/docs/self-hosting/guides/index.md @@ -10,9 +10,11 @@ walkthroughs, tutorials and other FAQ pages in this directory. See the sidebar for existing guides. In particular: -* If you're just looking to get started, see [configure custom - server](custom-server/). +- If you're just looking to get started, see + [configure custom server](custom-server/). -* For self hosting both the server and web app using external S3 buckets for - object storage, see [using external S3](external-s3). +- For various admin related tasks, e.g. increasing the storage quota on your + self hosted instance, see [administering your custom server](admin). +- For self hosting both the server and web app using external S3 buckets for + object storage, see [using external S3](external-s3). diff --git a/docs/docs/self-hosting/guides/mobile-build.md b/docs/docs/self-hosting/guides/mobile-build.md index 32bba3aa7..c36903a20 100644 --- a/docs/docs/self-hosting/guides/mobile-build.md +++ b/docs/docs/self-hosting/guides/mobile-build.md @@ -30,8 +30,6 @@ flutter run --dart-define=endpoint=http://localhost:8080 --flavor independent -- flutter run --dart-define=endpoint=http://localhost:8080 ``` - - Or for the auth app: ```sh @@ -46,9 +44,11 @@ flutter run --dart-define=endpoint=http://localhost:8080 ``` ## How to build non-debug builds -For building APK, [setup your - keystore](https://docs.flutter.dev/deployment/android#create-an-upload-keystore) - and run -```sh + +For building APK, +[setup your keystore](https://docs.flutter.dev/deployment/android#create-an-upload-keystore) +and run + +```sh flutter build apk --release --flavor independent -t lib/main.dart - ``` +``` diff --git a/infra/.gitignore b/infra/.gitignore new file mode 100644 index 000000000..a0090b46d --- /dev/null +++ b/infra/.gitignore @@ -0,0 +1,2 @@ +# macOS +.DS_Store diff --git a/infra/README.md b/infra/README.md new file mode 100644 index 000000000..e1ad6de6e --- /dev/null +++ b/infra/README.md @@ -0,0 +1,8 @@ +# Infra + +Various knick-knacks that we use when hosting our servers. + +These are not needed for running Ente's server or for self-hosting, these are +just additional services we run to make our infrastructure more robust. As such, +it's unlikely that you'll find the pieces here directly useful for your needs, +but feel free to have a look around if you're curious! diff --git a/infra/copycat-db/.gitignore b/infra/copycat-db/.gitignore new file mode 100644 index 000000000..75236ad1c --- /dev/null +++ b/infra/copycat-db/.gitignore @@ -0,0 +1,2 @@ +.DS_Store +copycat-db.env diff --git a/infra/copycat-db/Dockerfile b/infra/copycat-db/Dockerfile new file mode 100644 index 000000000..4328ef17f --- /dev/null +++ b/infra/copycat-db/Dockerfile @@ -0,0 +1,34 @@ +FROM ubuntu:latest + +RUN apt-get update && apt-get install -y curl gnupg +RUN apt-get install -y tini + +# Install pg_dump (via Postgres client) +# https://www.postgresql.org/download/linux/ubuntu/ +# +# We don't need it for production backups, but this is useful for local testing. +RUN \ + apt-get install -y lsb-release && \ + sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \ + curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ + apt-get update && \ + apt-get -y install postgresql-client-12 + +# Install SCW CLI +# Latest release: https://github.com/scaleway/scaleway-cli/releases/latest +RUN \ + export VERSION="2.26.0" && \ + curl -o /usr/local/bin/scw -L "https://github.com/scaleway/scaleway-cli/releases/download/v${VERSION}/scaleway-cli_${VERSION}_linux_amd64" && \ + chmod +x /usr/local/bin/scw + +RUN apt-get install -y jq + +# Install rclone +RUN apt-get install -y unzip +RUN curl https://rclone.org/install.sh | bash + +COPY src / + +ENTRYPOINT ["tini", "--"] + +CMD [ "/backup.sh" ] diff --git a/infra/copycat-db/README.md b/infra/copycat-db/README.md new file mode 100644 index 000000000..266bd4e6e --- /dev/null +++ b/infra/copycat-db/README.md @@ -0,0 +1,172 @@ +# Copycat DB + +Copycat DB is a [service](../services/README.md) to take a backup of our +database. It uses the Scaleway CLI to take backups of the database, and uploads +them to an offsite bucket. + +This bucket has an object lock configured, so backups cannot be deleted before +expiry. Conversely, the service also deletes backups older than some threshold +when it creates a new one to avoid indefinite retention. + +In production the service runs as a cron job, scheduled using a systemd timer. + +> These backups are in addition to the regular snapshots that we take, and are +> meant as a second layer of replication. For more details, see our +> [Reliability and Replication Specification](https://ente.io/reliability). + +## Quick help + +View service status (it gets invoked as a timer automatically, doesn't need to +be started/stopped manually): + +```sh +sudo systemctl status copycat-db +``` + +View logs locally (they'll also be available on Grafana): + +```sh +sudo tail /root/var/logs/copycat-db.log +``` + +## Name + +The name copycat-db is a riff on "copycat", which is what we call our museum +instance that does the object replication. This one replicates the DB, so, +copycat-db. + +## Required environment variables + +##### SCW_CONFIG_PATH + +Path to the `config.yaml` used by Scaleway CLI. + +This contains the credentials and the default region to use when trying to +create and download the database dump. + +If needed, this config file can be generated by running the following commands +on a shell prompt in the container (using `./test.sh sh`) + + scw init + scw config dump + +##### SCW_RDB_INSTANCE_ID + +The UUID of the Scalway RDB instance that we wish to backup. If this is missing, +then the Docker image falls back to using `pg_dump` (as outlined next). + +##### PGUSER, PGPASSWORD, PGHOST + +Not needed in production when taking a backup (since we use the Scaleway CLI to +take backups in production). + +These are used when testing a backup using `pg_dump`, and when restoring +backups. + +##### RCLONE_CONFIG + +Location of the config file, that contains the destination bucket where you want +to use to save the backups, and the credentials to to access it. + +Specifically, the config file contains two remotes: + +- The bucket itself, where data will be stored. + +- A "crypt" remote that wraps the bucket by applying client side encryption. + +The configuration file will contain (lightly) obfuscated versions of the +password, and as long as we have the configuration file we can continue using +rclone to download and decrypt the plaintext. Still, it is helpful to retain the +original password too separately so that the file can be recreated if needed. + +A config file can be generated using `./test.sh sh` + + rclone config + rclone config show + +When generating the config, we keep file (and directory) name encryption off. + +Note that rclone creates a backup of the config file, so Docker needs to have +write access to the directory where it is mounted. + +##### RCLONE_DESTINATION + +Name of the (crypt) remote to which the dump should be saved. Example: +`db-backup-crypt:`. + +Note that this will not include the bucket - the bucket name will be part of the +remote that the crypt remote wraps. + +##### Logging + +The service logs to its standard out/error. The systemd unit is configured to +route these to `/var/logs/copycat-db.log`. + +## Local testing + +The provided `test.sh` script can be used to do a smoke test for building and +running the image. For example, + + ./test.sh bin/bash + +gives us a shell prompt inside the built and running container. + +For more thorough testing, run this service as part of a local test-cluster. + +## Restoring + +The service also knows how to restore the latest backup into a Postgres +instance. This functionality by a separate service (Phoenix) to periodically +verify that the backups are restorable. + +To invoke this, use "./restore.sh" as the command when running the container +(e.g. `./test.sh ./restore.sh`). This will restore the latest backup into the +Postgres instance whose credentials are provided via the various `PG*` +environment variables. + +## Preparing the bucket + +The database dumps are stored in a bucket that has object lock enabled +(compliance mode), and has a default bucket level retention time of 30 days. + +## Deploying + +Ensure that promtail is running, and is configured to scrape +`/root/var/logs/copycat-db.log`. + +Create that the config and log destination directories + + sudo mkdir -p /root/var/config/scw + sudo mkdir -p /root/var/config/rclone + sudo mkdir -p /root/var/logs + +Create the env, scw and rclone configuration files + + sudo tee /root/copycat-db.env + sudo tee /root/var/config/scw/copycat-db-config.yaml + sudo tee /root/var/config/rclone/copycat-db-rclone.conf + +Add the service definition, and start the service + + scp copycat-db.{service,timer} instance: + + sudo mv copycat-db.{service,timer} /etc/systemd/system + sudo systemctl daemon-reload + +To start the cron job + + sudo systemctl start copycat-db.timer + +The timer will trigger the service on the specified schedule. In addition, if +you wish to force the job to service immediately + + sudo systemctl start copycat-db.service + +## Updating + +To update, run the +[GitHub workflow](../../.github/workflows/copycat-db-release.yaml) to build and +push the latest image to our Docker Registry, then restart the systemd service +on the instance + + sudo systemctl restart copycat-db diff --git a/infra/copycat-db/copycat-db.sample.env b/infra/copycat-db/copycat-db.sample.env new file mode 100644 index 000000000..ba557714e --- /dev/null +++ b/infra/copycat-db/copycat-db.sample.env @@ -0,0 +1,8 @@ +SCW_CONFIG_PATH=/var/config/scw/copycat-db-config.yaml +SCW_RDB_INSTANCE_ID= +RCLONE_CONFIG=/var/config/rclone/copycat-db-rclone.conf +RCLONE_DESTINATION=db-backup-crypt: +PGUSER= +PGPASSWORD= +PGHOST=host.docker.internal +PGPORT= diff --git a/infra/copycat-db/copycat-db.service b/infra/copycat-db/copycat-db.service new file mode 100644 index 000000000..d3ec6c485 --- /dev/null +++ b/infra/copycat-db/copycat-db.service @@ -0,0 +1,20 @@ +[Unit] +Documentation=https://github.com/ente-io/ente/blob/main/infra/copycat-db +Requires=docker.service +After=docker.service + +[Service] +Restart=always +RestartSec=3600s +# Don't automatically restart if it fails more than 6 times in 24 hours. +StartLimitInterval=86400 +StartLimitBurst=6 +ExecStartPre=docker pull rg.fr-par.scw.cloud/ente/copycat-db +ExecStartPre=-docker stop copycat-db +ExecStartPre=-docker rm copycat-db +ExecStart=docker run --name copycat-db \ + --env-file /root/copycat-db.env \ + -v /root/var:/var \ + rg.fr-par.scw.cloud/ente/copycat-db +StandardOutput=append:/root/var/logs/copycat-db.log +StandardError=inherit diff --git a/infra/copycat-db/copycat-db.timer b/infra/copycat-db/copycat-db.timer new file mode 100644 index 000000000..c3f6e2e86 --- /dev/null +++ b/infra/copycat-db/copycat-db.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Schedule copycat-db + +[Timer] +OnCalendar=Daily + +[Install] +WantedBy=timers.target diff --git a/infra/copycat-db/src/backup.sh b/infra/copycat-db/src/backup.sh new file mode 100755 index 000000000..f197f4b0f --- /dev/null +++ b/infra/copycat-db/src/backup.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +set -o errexit +set -o xtrace + +NOWS="$(date +%s)" +BACKUP_FILE="db-$NOWS.custom" + +# Scaleway backup names cannot contain dots +BACKUP_NAME="db-$NOWS-custom" + +# Calculate an expiry time 1 month from now +EXPIRYS="$(( 30 * 24 * 60 * 60 + $NOWS ))" + +# Convert it to the ISO 8601 format that SCW CLI understands +# Note that GNU date uses "-d" and an "@" to pass an epoch (macOS uses "-r"). +EXPIRY="$(date -Iseconds --utc --date "@$EXPIRYS")" + +if test -z "$SCW_RDB_INSTANCE_ID" +then + # A required SCW related environment variable hasn't been specified. This is + # expected when running the script locally for testing. Fallback to using + # pg_dump for creating the backup. + pg_dump -Fc ente_db > $BACKUP_FILE +else + # We need to export a backup first after creating it, before it can be + # downloaded. + # + # Further, our backups currently take longer than the default 20 minute + # timeout for the export set by Scaleway, and end up failing: + # + # {"error":"scaleway-sdk-go: waiting for database backup failed: timeout after 20m0s"} + # + # To avoid this we need to add a custom wait here ourselves instead of using + # the convenience `--wait` flag for the export command provided by Scaleway. + BACKUP_ID=$(scw rdb backup create instance-id=$SCW_RDB_INSTANCE_ID \ + name=$BACKUP_NAME expires-at=$EXPIRY \ + database-name=ente_db -o json | jq -r '.id') + scw rdb backup wait $BACKUP_ID timeout=5h + scw rdb backup download output=$BACKUP_FILE \ + $(scw rdb backup export $BACKUP_ID --wait -o json | jq -r '.id') +fi + +rclone copy --log-level INFO $BACKUP_FILE $RCLONE_DESTINATION + +# Delete older backups +rclone delete --log-level INFO --min-age 30d $RCLONE_DESTINATION + +set +o xtrace +echo "copycat-db: backup complete: $BACKUP_FILE" diff --git a/infra/copycat-db/src/restore.sh b/infra/copycat-db/src/restore.sh new file mode 100755 index 000000000..8df19c62b --- /dev/null +++ b/infra/copycat-db/src/restore.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +set -o errexit +set -o xtrace + +# Find the name of the latest backup +# The backup file name contains the epoch, so we can just sort. +BACKUP_FILE=$(rclone lsf --include 'db-*.custom' --files-only $RCLONE_DESTINATION | sort | tail -1) + +# Download it +rclone copy --log-level INFO "${RCLONE_DESTINATION}${BACKUP_FILE}" . + +# Restore from it +# +# This create a database named rdb on Postgres - this is only used for the +# initial connection, the actual ente_db database will be created once the +# restore starts. +# +# Flags: +# +# * no-owner: recreates the schema using the current user, not the one that was +# used for the export. +# +# * no-privileges: skip the assignment of roles (this way we do not have to +# recreate all the users from the original database before proceeding with the +# restore) + +createdb rdb || true +pg_restore -d rdb --create --no-privileges --no-owner --exit-on-error "$BACKUP_FILE" + +# Delete any tokens that were in the backup +psql -d ente_db -c 'delete from tokens' + +# Delete any push tokens that were in the backup +psql -d ente_db -c 'delete from push_tokens' + +# Delete some more temporary data that might've come up in the backup +psql -d ente_db -c 'delete from queue' +psql -d ente_db -c 'delete from temp_objects' + +set +o xtrace +echo "copycat-db: restore complete: $BACKUP_FILE" diff --git a/infra/copycat-db/test.sh b/infra/copycat-db/test.sh new file mode 100755 index 000000000..d4ac1b35f --- /dev/null +++ b/infra/copycat-db/test.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -o xtrace +set -o errexit + +PROJECT=copycat-db + +docker rmi "ente/$PROJECT" || true +docker build --tag "ente/$PROJECT" . + +# Interactively run the container. +# +# By passing "$@", we allow any arguments passed to test.sh to be forwarded to +# the image (useful for testing out things, e.g. `./test.sh sh`). +docker run \ + --interactive --tty --rm \ + --env-file copycat-db.env \ + --name "$PROJECT" \ + "ente/$PROJECT" \ + "$@" diff --git a/infra/services/README.md b/infra/services/README.md new file mode 100644 index 000000000..8c3a3d569 --- /dev/null +++ b/infra/services/README.md @@ -0,0 +1,104 @@ +# Services + +"Services" are Docker images we run on our instances and manage using systemd. + +All our services (including museum itself) follow the same pattern: + +- They're run on vanilla Ubuntu instances. The only expectation they have is + for Docker to be installed. + +- They log to fixed, known, locations - `/root/var/log/foo.log` - so that + these logs can get ingested by Promtail if needed. + +- Each service should consist of a Docker image (or a Docker compose file), + and a systemd unit file. + +- To start / stop / schedule the service, we use systemd. + +- Each time the service runs it should pull the latest Docker image, so there + is no separate installation/upgrade step needed. We can just restart the + service, and it'll use the latest code. + +- Any credentials and/or configuration should be read by mounting the + appropriate file from `/root/service-name` into the running Docker + container. + +## Systemd cheatsheet + +```sh +sudo systemctl status my-service +sudo systemctl start my-service +sudo systemctl stop my-service +sudo systemctl restart my-service +sudo journalctl --unit my-service +``` + +## Adding a service + +Create a systemd unit file (See the various `*.service` files in this repository +for examples). + +If we want the service to start on boot, add an `[Install]` section to its +service file (_note_: starting on boot requires one more step later): + +``` +[Install] +WantedBy=multi-user.target +``` + +Copy the service file to the instance where we want to run the service. Services +might also have some additional configuration or env files, also copy those to +the instance. + +```sh +scp services/example.service example.env : +``` + +SSH into the instance. + +```sh +ssh +``` + +Move the service `/etc/systemd/service`, and any config files to their expected +place. env and other config files that contain credentials are kept in `/root`. + +```sh +sudo mv example.service /etc/systemd/system +sudo mv example.env /root +``` + +If you want to start the service on boot (as spoken of in the `[Install]` +section above), then enable it (this only needs to be done once): + +```sh +sudo systemctl enable service +``` + +Restarts systemd so that it gets to know of the service. + +```sh +sudo systemctl daemon-reload +``` + +Now you can manage the service using standard systemd commands. + +```sh +sudo systemctl start example +``` + +To view stdout/err, use: + +```sh +sudo journalctl --follow --unit example +``` + +## Logging + +Services should log to files in `/var/logs` within the container. This should be +mounted to `/root/var/logs` on the instance (using the `-v` flag in the service +file which launches the Docker container or the Docker compose cluster). + +If these logs need to be sent to Grafana, then ensure that there is an entry for +this log file in the `promtail/promtail.yaml` on that instance. The logs will +then get scraped by Promtail and sent over to Grafana. diff --git a/infra/services/nginx/README.md b/infra/services/nginx/README.md new file mode 100644 index 000000000..43e570946 --- /dev/null +++ b/infra/services/nginx/README.md @@ -0,0 +1,21 @@ +# Nginx + +This is a base nginx service that terminates TLS, and can be used as a reverse +proxy for arbitrary services by adding new entries in `/root/nginx/conf.d` and +`sudo systemctl restart nginx`. + +## Installation + +Create a directory to house service specific configuration + + sudo mkdir -p /root/nginx/conf.d + +Add the SSL certificate provided by Cloudflare + + sudo tee /root/nginx/cert.pem + sudo tee /root/nginx/key.pem + +## Adding a service + +When adding new services that sit behind nginx, add their nginx conf file to +`/root/nginx/conf.d` and and restart the nginx service. diff --git a/infra/services/nginx/nginx.service b/infra/services/nginx/nginx.service new file mode 100644 index 000000000..4f772d38d --- /dev/null +++ b/infra/services/nginx/nginx.service @@ -0,0 +1,19 @@ +[Unit] +Documentation=https://www.docker.com/blog/how-to-use-the-official-nginx-docker-image/ +Requires=docker.service +After=docker.service + +[Install] +WantedBy=multi-user.target + +[Service] +ExecStartPre=docker pull nginx +ExecStartPre=-docker stop nginx +ExecStartPre=-docker rm nginx +ExecStart=docker run --name nginx \ + --add-host=host.docker.internal:host-gateway \ + -p 443:443 \ + -v /root/nginx/cert.pem:/etc/ssl/certs/cert.pem:ro \ + -v /root/nginx/key.pem:/etc/ssl/private/key.pem:ro \ + -v /root/nginx/conf.d:/etc/nginx/conf.d:ro \ + nginx diff --git a/infra/services/prometheus/README.md b/infra/services/prometheus/README.md new file mode 100644 index 000000000..79bee13d5 --- /dev/null +++ b/infra/services/prometheus/README.md @@ -0,0 +1,32 @@ +# Prometheus + +Install `prometheus.service` on an instance if it is running something that +exports custom Prometheus metrics. In particular, museum does. + +Also install `node-exporter.service` (after installing +[node-exporter](https://prometheus.io/docs/guides/node-exporter/) itself) if it +is a production instance whose metrics (CPU, disk, RAM etc) we want to monitor. + +## Installing + +Prometheus doesn't currently support environment variables in config file, so +remember to change the hardcoded `XX-HOSTNAME` too in addition to adding the +`remote_write` configuration. + +```sh +scp -P 7426 services/prometheus/* : + +nano prometheus.yml +sudo mv prometheus.yml /root/prometheus.yml +sudo mv prometheus.service /etc/systemd/system/prometheus.service +sudo mv node-exporter.service /etc/systemd/system/node-exporter.service +``` + +Tell systemd to pick up new service definitions, enable the units (so that they +automatically start on boot going forward), and start them. + +```sh +sudo systemctl daemon-reload +sudo systemctl enable --now node-exporter +sudo systemctl enable --now prometheus +``` diff --git a/infra/services/prometheus/node-exporter.service b/infra/services/prometheus/node-exporter.service new file mode 100644 index 000000000..b28e348ae --- /dev/null +++ b/infra/services/prometheus/node-exporter.service @@ -0,0 +1,12 @@ +[Unit] +Documentation=https://prometheus.io/docs/guides/node-exporter/ +Wants=network-online.target +After=network-online.target + +[Install] +WantedBy=multi-user.target + +[Service] +User=node_exporter +Group=node_exporter +ExecStart=/usr/local/bin/node_exporter diff --git a/infra/services/prometheus/prometheus.service b/infra/services/prometheus/prometheus.service new file mode 100644 index 000000000..a8f6c48f0 --- /dev/null +++ b/infra/services/prometheus/prometheus.service @@ -0,0 +1,16 @@ +[Unit] +Documentation=https://prometheus.io/docs/prometheus/ +Requires=docker.service +After=docker.service + +[Install] +WantedBy=multi-user.target + +[Service] +ExecStartPre=docker pull prom/prometheus +ExecStartPre=-docker stop prometheus +ExecStartPre=-docker rm prometheus +ExecStart=docker run --name prometheus \ + --add-host=host.docker.internal:host-gateway \ + -v /root/prometheus.yml:/etc/prometheus/prometheus.yml:ro \ + prom/prometheus diff --git a/infra/services/prometheus/prometheus.yml b/infra/services/prometheus/prometheus.yml new file mode 100644 index 000000000..81d1e3d84 --- /dev/null +++ b/infra/services/prometheus/prometheus.yml @@ -0,0 +1,39 @@ +# https://prometheus.io/docs/prometheus/latest/configuration/ + +global: + scrape_interval: 30s # Default is 1m + +scrape_configs: + - job_name: museum + static_configs: + - targets: ["host.docker.internal:2112"] + relabel_configs: + - source_labels: [__address__] + regex: ".*" + target_label: instance + replacement: XX-HOSTNAME + + - job_name: "prometheus" + static_configs: + - targets: ["localhost:9090"] + relabel_configs: + - source_labels: [__address__] + regex: ".*" + target_label: instance + replacement: XX-HOSTNAME + + - job_name: "node" + static_configs: + - targets: ["host.docker.internal:9100"] + relabel_configs: + - source_labels: [__address__] + regex: ".*" + target_label: instance + replacement: XX-HOSTNAME + +# Grafana Cloud +remote_write: + - url: https://g/api/prom/push + basic_auth: + username: foo + password: bar diff --git a/infra/services/promtail/README.md b/infra/services/promtail/README.md new file mode 100644 index 000000000..1bcf44833 --- /dev/null +++ b/infra/services/promtail/README.md @@ -0,0 +1,26 @@ +# Promtail + +Install `promtail.service` on an instance if it is running something whose logs +we want in Grafana. + +## Installing + +Replace `client.url` in the config file with the Loki URL that Promtail should +connect to, and move the files to their expected place. + +```sh +scp -P 7426 services/promtail/* : + +nano promtail.yaml +sudo mv promtail.yaml /root/promtail.yaml +sudo mv promtail.service /etc/systemd/system/promtail.service +``` + +Tell systemd to pick up new service definitions, enable the unit (so that it +automatically starts on boot), and start it this time around. + +```sh +sudo systemctl daemon-reload +sudo systemctl enable promtail +sudo systemctl start promtail +``` diff --git a/infra/services/promtail/promtail.service b/infra/services/promtail/promtail.service new file mode 100644 index 000000000..b98ec762f --- /dev/null +++ b/infra/services/promtail/promtail.service @@ -0,0 +1,19 @@ +[Unit] +Documentation=https://grafana.com/docs/loki/latest/clients/promtail/ +Requires=docker.service +After=docker.service + +[Install] +WantedBy=multi-user.target + +[Service] +ExecStartPre=docker pull grafana/promtail +ExecStartPre=-docker stop promtail +ExecStartPre=-docker rm promtail +ExecStart=docker run --name promtail \ + --hostname "%H" \ + -v /root/promtail.yaml:/config.yaml:ro \ + -v /var/log:/var/log \ + -v /root/var/logs:/var/logs:ro \ + -v /var/lib/docker/containers:/var/lib/docker/containers:ro \ + grafana/promtail -config.file=/config.yaml -config.expand-env=true diff --git a/infra/services/promtail/promtail.yaml b/infra/services/promtail/promtail.yaml new file mode 100644 index 000000000..99a2578ff --- /dev/null +++ b/infra/services/promtail/promtail.yaml @@ -0,0 +1,45 @@ +# https://grafana.com/docs/loki/latest/clients/promtail/configuration/ + +# We don't want Promtail's HTTP / GRPC server. +server: + disable: true + +# Loki URL +# For Grafana Cloud, it can be found in the integrations section. +clients: + - url: http://loki:3100/loki/api/v1/push + +# Manually add entries for all our services. This is a bit cumbersome, but +# - Retains flexibility in file names. +# - Makes adding job labels easy. +# - Does not get in the way of logrotation. +# +# In addition, also scrape logs from all docker containers. +scrape_configs: + - job_name: museum + static_configs: + - labels: + job: museum + host: ${HOSTNAME} + __path__: /var/logs/museum.log + + - job_name: copycat-db + static_configs: + - labels: + job: copycat-db + host: ${HOSTNAME} + __path__: /var/logs/copycat-db.log + + - job_name: phoenix + static_configs: + - labels: + job: phoenix + host: ${HOSTNAME} + __path__: /var/logs/phoenix.log + + - job_name: docker + static_configs: + - labels: + job: docker + host: ${HOSTNAME} + __path__: /var/lib/docker/containers/*/*-json.log diff --git a/mobile/.gitignore b/mobile/.gitignore index 47e6ea41b..b6ee5c616 100644 --- a/mobile/.gitignore +++ b/mobile/.gitignore @@ -9,6 +9,9 @@ .history .svn/ +# Editors +.vscode/ + # IntelliJ related *.iml *.ipr @@ -25,7 +28,6 @@ .pub/ /build/ - # Web related lib/generated_plugin_registrant.dart @@ -37,6 +39,5 @@ android/app/.settings/* android/.settings/ .env - fastlane/report.xml TensorFlowLiteC.framework diff --git a/mobile/README.md b/mobile/README.md index 114a3ab38..005d303b6 100644 --- a/mobile/README.md +++ b/mobile/README.md @@ -23,7 +23,8 @@ If you're looking for Ente Auth instead, see [../auth](../auth/README.md). ### Android -The [GitHub releases](https://github.com/ente-io/photos-app/releases) contain +The [GitHub +releases](https://github.com/ente-io/ente/releases?q=tag%3Aphotos-v0) contain APKs, built straight from source. The latest build is available at [ente.io/apk](https://ente.io/apk). These builds keep themselves updated, without relying on third party stores. diff --git a/mobile/docs/release.md b/mobile/docs/release.md new file mode 100644 index 000000000..c7b4f5081 --- /dev/null +++ b/mobile/docs/release.md @@ -0,0 +1,32 @@ +# Releases + +Create a PR to bump up the version in `pubspec.yaml`. + +> [!NOTE] +> +> Use [semver](https://semver.org/) for the tags, with `photos-` as a prefix. +> Multiple beta releases for the same upcoming version can be done by adding +> build metadata at the end, e.g. `photos-v1.2.3-beta+3`. + +Once that is merged, tag main, and push the tag. + +```sh +git tag photos-v1.2.3 +git push origin photos-v1.2.3 +``` + +This'll trigger a GitHub workflow that: + +* Creates a new draft GitHub release and attaches the build artifacts to it + (mobile APKs), + +Once the workflow completes, go to the draft GitHub release that was created. + +> [!NOTE] +> +> Keep the title of the release same as the tag. + +Set "Previous tag" to the last release of auth and press "Generate release +notes". The generated release note will contain all PRs and new contributors +from all the releases in the monorepo, so you'll need to filter them to keep +only the things that relate to the Photos mobile app. diff --git a/mobile/fastlane/metadata/android/de/full_description.txt b/mobile/fastlane/metadata/android/de/full_description.txt index 2d953ade9..4d963c1d7 100644 --- a/mobile/fastlane/metadata/android/de/full_description.txt +++ b/mobile/fastlane/metadata/android/de/full_description.txt @@ -27,7 +27,7 @@ FEATURES - und noch VIELES mehr! BERECHTIGUNGEN -Diese können unter folgendem Link überprüft werden: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +Diese können unter folgendem Link überprüft werden: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md PREIS Wir bieten keine lebenslang kostenlosen Abonnements an, da es für uns wichtig ist, einen nachhaltigen Service anzubieten. Wir bieten jedoch bezahlbare Abonemments an, welche auch mit der Familie geteilt werden können. Mehr Informationen sind auf ente.io zu finden. diff --git a/mobile/fastlane/metadata/android/en-US/full_description.txt b/mobile/fastlane/metadata/android/en-US/full_description.txt index 53cab6c96..9ba4fe314 100644 --- a/mobile/fastlane/metadata/android/en-US/full_description.txt +++ b/mobile/fastlane/metadata/android/en-US/full_description.txt @@ -27,7 +27,7 @@ FEATURES - and a LOT more! PERMISSIONS -ente requests for certain permissions to serve the purpose of a photo storage provider, which can be reviewed here: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente requests for certain permissions to serve the purpose of a photo storage provider, which can be reviewed here: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md PRICING We don't offer forever free plans, because it is important to us that we remain sustainable and withstand the test of time. Instead we offer affordable plans that you can freely share with your family. You can find more information at ente.io. diff --git a/mobile/fastlane/metadata/android/es/full_description.txt b/mobile/fastlane/metadata/android/es/full_description.txt index dfba04a96..8c0667934 100644 --- a/mobile/fastlane/metadata/android/es/full_description.txt +++ b/mobile/fastlane/metadata/android/es/full_description.txt @@ -27,7 +27,7 @@ CARACTERÍSTICAS - ¡Y mucho más! PERMISOS -ente solicita ciertos permisos para servir al propósito de un proveedor de almacenamiento de fotos, que puede ser revisado aquí: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente solicita ciertos permisos para servir al propósito de un proveedor de almacenamiento de fotos, que puede ser revisado aquí: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md PRECIOS No ofrecemos planes gratis para siempre, porque es importante para nosotros seguir siendo sostenibles y resistir a la prueba del tiempo. En su lugar, ofrecemos planes asequibles que puedes compartir libremente con tu familia. Puedes encontrar más información en ente.io. diff --git a/mobile/fastlane/metadata/android/fr/full_description.txt b/mobile/fastlane/metadata/android/fr/full_description.txt index ee93cf62b..f94e467af 100644 --- a/mobile/fastlane/metadata/android/fr/full_description.txt +++ b/mobile/fastlane/metadata/android/fr/full_description.txt @@ -27,7 +27,7 @@ CARACTÉRISTIQUES - et beaucoup de choses encore ! PERMISSIONS -ente sollicite diverses autorisations dans le but de fonctionner en tant que service de stockage de photos, et ces autorisations sont détaillées ici : https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente sollicite diverses autorisations dans le but de fonctionner en tant que service de stockage de photos, et ces autorisations sont détaillées ici : https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md PRIX Nous ne proposons pas d'abonnement gratuits pour toujours, car il est important pour nous de rester durables et de résister à l'épreuve du temps. Au lieu de cela, nous vous proposons des abonnements abordables que vous pouvez partager librement avec votre famille. Vous pouvez trouver plus d'informations sur ente.io. diff --git a/mobile/fastlane/metadata/android/he/full_description.txt b/mobile/fastlane/metadata/android/he/full_description.txt index 094285850..21719b771 100644 --- a/mobile/fastlane/metadata/android/he/full_description.txt +++ b/mobile/fastlane/metadata/android/he/full_description.txt @@ -27,7 +27,7 @@ ente גם מקל על שיתוף האלבומים שלך עם קרובך, גם - ועוד הרבה יותר! הרשאות -ente מבקש הרשאות מסוימות כדי לספק שירותי אחסון תמונות, וניתן לסקור אותן כאן: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente מבקש הרשאות מסוימות כדי לספק שירותי אחסון תמונות, וניתן לסקור אותן כאן: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md מחיר אנחנו לא מציעים תוכניות בחינם לתמיד, משום שזה חשוב לנו להיות עמידים ולעמוד במבחן הזמן. במקום זאת אנחנו מציעים תוכניות במחיר סביר כדי שתוכל לשתף באופן חופשי עם המשפחה שלך. ניתן למצוא עוד מידע ב-ente.io. diff --git a/mobile/fastlane/metadata/android/it/full_description.txt b/mobile/fastlane/metadata/android/it/full_description.txt index 2437688c5..9da92c97a 100644 --- a/mobile/fastlane/metadata/android/it/full_description.txt +++ b/mobile/fastlane/metadata/android/it/full_description.txt @@ -27,7 +27,7 @@ CARATTERISTICHE - e molto altro ancora! PERMESSI -ente richiede alcune autorizzazioni per servire lo scopo di un provider di storage fotografico, che può essere esaminato qui: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente richiede alcune autorizzazioni per servire lo scopo di un provider di storage fotografico, che può essere esaminato qui: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md PREZZO Non offriamo piani gratuiti per sempre, perché per noi è importante rimanere sostenibili e resistere alla prova del tempo. Offriamo invece piani accessibili che si possono condividere liberamente con la propria famiglia. Puoi trovare maggiori informazioni su ente.io. diff --git a/mobile/fastlane/metadata/android/nl/full_description.txt b/mobile/fastlane/metadata/android/nl/full_description.txt index da0877f72..80c925263 100644 --- a/mobile/fastlane/metadata/android/nl/full_description.txt +++ b/mobile/fastlane/metadata/android/nl/full_description.txt @@ -27,7 +27,7 @@ FUNCTIES - en nog veel meer! TOESTEMMINGEN -ente heeft bepaalde machtigingen nodig om uw foto's op te slaan, die hier bekeken kunnen worden: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente heeft bepaalde machtigingen nodig om uw foto's op te slaan, die hier bekeken kunnen worden: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md PRIJZEN We bieden geen oneindig gratis plannen aan, omdat het voor ons belangrijk is dat we duurzaam blijven en de tand des tijds weerstaan. In plaats daarvan bieden we betaalbare plannen aan die je vrij kunt delen met je familie. Je kunt meer informatie vinden op ente.io. diff --git a/mobile/fastlane/metadata/android/pt/full_description.txt b/mobile/fastlane/metadata/android/pt/full_description.txt index 2bd26df1e..8e6bc4833 100644 --- a/mobile/fastlane/metadata/android/pt/full_description.txt +++ b/mobile/fastlane/metadata/android/pt/full_description.txt @@ -27,7 +27,7 @@ RECURSOS - e MUITO MAIS! PERMISSÕES -ente solicita certas permissões para servir o propósito de um provedor de armazenamento de fotos, que pode ser revisado aqui: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente solicita certas permissões para servir o propósito de um provedor de armazenamento de fotos, que pode ser revisado aqui: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md PREÇO Não oferecemos planos gratuitos para sempre, porque é importante para nós que permaneçamos sustentáveis e resistamos à prova do tempo. Em vez disso, oferecemos planos acessíveis que você pode compartilhar livremente com sua família. Você pode encontrar mais informações em ente.io. diff --git a/mobile/fastlane/metadata/android/ru/full_description.txt b/mobile/fastlane/metadata/android/ru/full_description.txt index f374837e0..567f5a947 100644 --- a/mobile/fastlane/metadata/android/ru/full_description.txt +++ b/mobile/fastlane/metadata/android/ru/full_description.txt @@ -27,7 +27,7 @@ ente также делает так, что делится альбомами с - и ещё МНОГОЕ другое! РАЗРЕШЕНИЯ -ente просит разрешения на использование хранилища фотографий, которые можно рассмотреть здесь: https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente просит разрешения на использование хранилища фотографий, которые можно рассмотреть здесь: https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md ЦЕНА Мы не предлагаем бесконечные бесплатные планы, потому что для нас важно оставаться устойчивыми и выдерживать испытание временем. Вместо этого мы предлагаем доступные по цене планы, которыми вы можете свободно делиться с вашей семьей. Дополнительную информацию можно найти на сайте ente.io. diff --git a/mobile/fastlane/metadata/android/zh/full_description.txt b/mobile/fastlane/metadata/android/zh/full_description.txt index 301c5bd35..3660c6259 100644 --- a/mobile/fastlane/metadata/android/zh/full_description.txt +++ b/mobile/fastlane/metadata/android/zh/full_description.txt @@ -4,7 +4,7 @@ ente 是一个简单的应用程序来备份和分享您的照片和视频。 我们在Android、iOS、web 和桌面上有开源应用， 和您的照片将以端到端加密方式 (e2ee) 无缝同步。 -ente也使分享相册给自己的爱人、亲人变得轻而易举，即使他们可能并不使用ente。 您可以分享可公开查看的链接，使他们可以查看您的相册，并通过添加照片来协作而不需要注册账户或下载app。 权限 +ente也使分享相册给自己的爱人、亲人变得轻而易举，即使他们可能并不使用ente。 您可以分享可公开查看的链接，使他们可以查看您的相册，并通过添加照片来协作而不需要注册账户或下载app。 ente也使分享相册给自己的爱人、亲人变得轻而易举，即使他们可能并不使用ente。 您可以分享可公开查看的链接，使他们可以查看您的相册，并通过添加照片来协作而不需要注册账户或下载app。 权限 您的加密数据已复制到三个不同的地点，包括巴黎的一个安全屋。 我们认真对待子孙后代，并确保您的回忆比您长寿。 我们认真对待子孙后代，并确保您的回忆比您长寿。 @@ -27,10 +27,10 @@ ente也使分享相册给自己的爱人、亲人变得轻而易举，即使他 - 还有更多特色待你发现！ 权限 -ente需要特定权限以执行作为图像存储提供商的职责，相关内容可以在此链接查阅：https://github.com/ente-io/photos-app/blob/f-droid/android/permissions.md +ente需要特定权限以执行作为图像存储提供商的职责，相关内容可以在此链接查阅：https://github.com/ente-io/ente/blob/f-droid/mobile/android/permissions.md 价格 -我们不会提供永久免费计划，因为我们必须保持可持续性，经受住时间的考验。 相反，我们向您提供了价格实惠、可自由分享的订阅计划。 您可以在 ente.io 找到更多信息。 相反，我们向您提供了价格实惠、可自由分享的订阅计划。 您可以在 ente.io 找到更多信息。 +我们不会提供永久免费计划，因为我们必须保持可持续性，经受住时间的考验。 相反，我们向您提供了价格实惠、可自由分享的订阅计划。 您可以在 ente.io 找到更多信息。 相反，我们向您提供了价格实惠、可自由分享的订阅计划。 您可以在 ente.io 找到更多信息。 相反，我们向您提供了价格实惠、可自由分享的订阅计划。 您可以在 ente.io 找到更多信息。 支持 我们对提供真人支持感到自豪。 我们对提供真人支持感到自豪。 如果您是我们的付费客户，您可以联系 team@ente.io 并在24小时内收到来自我们团队的回复。 diff --git a/mobile/lib/generated/intl/messages_cs.dart b/mobile/lib/generated/intl/messages_cs.dart index 71aa6589d..5035838f4 100644 --- a/mobile/lib/generated/intl/messages_cs.dart +++ b/mobile/lib/generated/intl/messages_cs.dart @@ -20,10 +20,18 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'cs'; + static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; + final messages = _notInlinedMessages(_notInlinedMessages); static Map _notInlinedMessages(_) => { + "addCollaborators": m0, "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Add to hidden album"), + "addViewers": m1, "changeLocationOfSelectedItems": MessageLookupByLibrary.simpleMessage( "Change location of selected items?"), "contacts": MessageLookupByLibrary.simpleMessage("Contacts"), @@ -37,6 +45,9 @@ class MessageLookup extends MessageLookupByLibrary { "fileTypes": MessageLookupByLibrary.simpleMessage("File types"), "joinDiscord": MessageLookupByLibrary.simpleMessage("Join Discord"), "locations": MessageLookupByLibrary.simpleMessage("Locations"), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "modifyYourQueryOrTrySearchingFor": MessageLookupByLibrary.simpleMessage( "Modify your query, or try searching for"), diff --git a/mobile/lib/generated/intl/messages_de.dart b/mobile/lib/generated/intl/messages_de.dart index 5127b0ca1..ca3be9e41 100644 --- a/mobile/lib/generated/intl/messages_de.dart +++ b/mobile/lib/generated/intl/messages_de.dart @@ -21,27 +21,33 @@ class MessageLookup extends MessageLookupByLibrary { String get localeName => 'de'; static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m2(count) => "${Intl.plural(count, one: 'Element hinzufügen', other: 'Elemente hinzufügen')}"; - static String m1(storageAmount, endDate) => + static String m3(storageAmount, endDate) => "Dein ${storageAmount} Add-on ist gültig bis ${endDate}"; - static String m2(emailOrName) => "Von ${emailOrName} hinzugefügt"; + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; - static String m3(albumName) => "Erfolgreich zu ${albumName} hinzugefügt"; + static String m4(emailOrName) => "Von ${emailOrName} hinzugefügt"; - static String m4(count) => + static String m5(albumName) => "Erfolgreich zu ${albumName} hinzugefügt"; + + static String m6(count) => "${Intl.plural(count, zero: 'Keine Teilnehmer', one: '1 Teilnehmer', other: '${count} Teilnehmer')}"; - static String m5(versionValue) => "Version: ${versionValue}"; + static String m7(versionValue) => "Version: ${versionValue}"; - static String m6(paymentProvider) => + static String m8(paymentProvider) => "Bitte kündigen Sie Ihr aktuelles Abo über ${paymentProvider} zuerst"; - static String m7(user) => + static String m9(user) => "Der Nutzer \"${user}\" wird keine weiteren Fotos zum Album hinzufügen können.\n\nJedoch kann er weiterhin vorhandene Bilder, welche durch ihn hinzugefügt worden sind, wieder entfernen"; - static String m8(isFamilyMember, storageAmountInGb) => + static String m10(isFamilyMember, storageAmountInGb) => "${Intl.select(isFamilyMember, { 'true': 'Deine Familiengruppe hat bereits ${storageAmountInGb} GB erhalten', @@ -49,166 +55,166 @@ class MessageLookup extends MessageLookupByLibrary { 'other': 'Du hast bereits ${storageAmountInGb} GB erhalten!', })}"; - static String m9(albumName) => + static String m11(albumName) => "Kollaborativer Link für ${albumName} erstellt"; - static String m10(familyAdminEmail) => + static String m12(familyAdminEmail) => "Bitte kontaktiere ${familyAdminEmail} um dein Abo zu verwalten"; - static String m11(provider) => + static String m13(provider) => "Bitte kontaktieren Sie uns über support@ente.io, um Ihr ${provider} Abo zu verwalten."; - static String m12(count) => + static String m14(count) => "${Intl.plural(count, one: 'Lösche ${count} Element', other: 'Lösche ${count} Elemente')}"; - static String m13(currentlyDeleting, totalCount) => + static String m15(currentlyDeleting, totalCount) => "Lösche ${currentlyDeleting} / ${totalCount}"; - static String m14(albumName) => + static String m16(albumName) => "Der öffentliche Link zum Zugriff auf \"${albumName}\" wird entfernt."; - static String m15(supportEmail) => + static String m17(supportEmail) => "Bitte sende eine E-Mail an ${supportEmail} von deiner registrierten E-Mail-Adresse"; - static String m16(count, storageSaved) => + static String m18(count, storageSaved) => "Du hast ${Intl.plural(count, one: '${count} duplizierte Datei', other: '${count} dupliziere Dateien')} gelöscht und (${storageSaved}!) freigegeben"; - static String m17(count, formattedSize) => + static String m19(count, formattedSize) => "${count} Dateien, ${formattedSize} jede"; - static String m18(newEmail) => "E-Mail-Adresse geändert zu ${newEmail}"; + static String m20(newEmail) => "E-Mail-Adresse geändert zu ${newEmail}"; - static String m19(email) => + static String m21(email) => "${email} hat kein Ente-Konto.\n\nSenden Sie eine Einladung, um Fotos zu teilen."; - static String m20(count, formattedNumber) => + static String m22(count, formattedNumber) => "${Intl.plural(count, one: '1 Datei', other: '${formattedNumber} Dateien')} auf diesem Gerät wurde(n) sicher gespeichert"; - static String m21(count, formattedNumber) => + static String m23(count, formattedNumber) => "${Intl.plural(count, one: '1 Datei', other: '${formattedNumber} Dateien')} in diesem Album wurde(n) sicher gespeichert"; - static String m22(storageAmountInGB) => + static String m24(storageAmountInGB) => "${storageAmountInGB} GB jedes Mal, wenn sich jemand mit deinem Code für einen bezahlten Tarif anmeldet"; - static String m23(freeAmount, storageUnit) => + static String m25(freeAmount, storageUnit) => "${freeAmount} ${storageUnit} kostenlos"; - static String m24(endDate) => "Kostenlose Demo verfügbar bis zum ${endDate}"; + static String m26(endDate) => "Kostenlose Demo verfügbar bis zum ${endDate}"; - static String m25(count) => + static String m27(count) => "Sie können immer noch ${Intl.plural(count, one: 'darauf', other: 'auf sie')} auf ente zugreifen, solange Sie ein aktives Abonnement haben"; - static String m26(sizeInMBorGB) => "${sizeInMBorGB} freigeben"; + static String m28(sizeInMBorGB) => "${sizeInMBorGB} freigeben"; - static String m27(count, formattedSize) => + static String m29(count, formattedSize) => "${Intl.plural(count, one: 'Es kann vom Gerät gelöscht werden, um ${formattedSize} freizugeben', other: 'Sie können vom Gerät gelöscht werden, um ${formattedSize} freizugeben')}"; - static String m28(currentlyProcessing, totalCount) => + static String m30(currentlyProcessing, totalCount) => "Verarbeite ${currentlyProcessing} / ${totalCount}"; - static String m29(count) => + static String m31(count) => "${Intl.plural(count, one: '${count} Objekt', other: '${count} Objekte')}"; - static String m30(expiryTime) => "Link läuft am ${expiryTime} ab"; + static String m32(expiryTime) => "Link läuft am ${expiryTime} ab"; - static String m31(count, formattedCount) => + static String m33(count, formattedCount) => "${Intl.plural(count, zero: 'keine Erinnerungsstücke', one: '${formattedCount} Erinnerung', other: '${formattedCount} Erinnerungsstücke')}"; - static String m32(count) => + static String m34(count) => "${Intl.plural(count, one: 'Element verschieben', other: 'Elemente verschieben')}"; - static String m33(albumName) => "Erfolgreich zu ${albumName} hinzugefügt"; + static String m35(albumName) => "Erfolgreich zu ${albumName} hinzugefügt"; - static String m34(passwordStrengthValue) => + static String m36(passwordStrengthValue) => "Passwortstärke: ${passwordStrengthValue}"; - static String m35(providerName) => + static String m37(providerName) => "Bitte kontaktiere den Support von ${providerName}, falls etwas abgebucht wurde"; - static String m36(reason) => + static String m38(reason) => "Leider ist deine Zahlung aus folgendem Grund fehlgeschlagen: ${reason}"; - static String m37(endDate) => + static String m39(endDate) => "Kostenlose Testversion gültig bis ${endDate}.\nSie können anschließend ein bezahltes Paket auswählen."; - static String m38(toEmail) => "Bitte sende uns eine E-Mail an ${toEmail}"; + static String m40(toEmail) => "Bitte sende uns eine E-Mail an ${toEmail}"; - static String m39(toEmail) => "Bitte sende die Protokolle an ${toEmail}"; + static String m41(toEmail) => "Bitte sende die Protokolle an ${toEmail}"; - static String m40(storeName) => "Bewerte uns auf ${storeName}"; + static String m42(storeName) => "Bewerte uns auf ${storeName}"; - static String m41(storageInGB) => + static String m43(storageInGB) => "3. Ihr beide erhaltet ${storageInGB} GB* kostenlos"; - static String m42(userEmail) => + static String m44(userEmail) => "${userEmail} wird aus diesem geteilten Album entfernt\n\nAlle von ihnen hinzugefügte Fotos werden ebenfalls aus dem Album entfernt"; - static String m43(endDate) => "Erneuert am ${endDate}"; + static String m45(endDate) => "Erneuert am ${endDate}"; - static String m44(count) => + static String m46(count) => "${Intl.plural(count, one: '${count} Ergebnis gefunden', other: '${count} Ergebnisse gefunden')}"; - static String m45(count) => "${count} ausgewählt"; + static String m47(count) => "${count} ausgewählt"; - static String m46(count, yourCount) => + static String m48(count, yourCount) => "${count} ausgewählt (${yourCount} von Ihnen)"; - static String m47(verificationID) => + static String m49(verificationID) => "Hier ist meine Verifizierungs-ID: ${verificationID} für ente.io."; - static String m48(verificationID) => + static String m50(verificationID) => "Hey, kannst du bestätigen, dass dies deine ente.io Verifizierungs-ID ist: ${verificationID}"; - static String m49(referralCode, referralStorageInGB) => + static String m51(referralCode, referralStorageInGB) => "ente Weiterempfehlungs-Code: ${referralCode} \n\nEinlösen unter Einstellungen → Allgemein → Weiterempfehlungen, um ${referralStorageInGB} GB kostenlos zu erhalten, sobald Sie einen kostenpflichtigen Tarif abgeschlossen haben\n\nhttps://ente.io"; - static String m50(numberOfPeople) => + static String m52(numberOfPeople) => "${Intl.plural(numberOfPeople, zero: 'Teile mit bestimmten Personen', one: 'Teilen mit 1 Person', other: 'Teilen mit ${numberOfPeople} Personen')}"; - static String m51(emailIDs) => "Geteilt mit ${emailIDs}"; - - static String m52(fileType) => - "Dieses ${fileType} wird von deinem Gerät gelöscht."; - - static String m53(fileType) => - "Dieses ${fileType} existiert auf ente.io und deinem Gerät."; + static String m53(emailIDs) => "Geteilt mit ${emailIDs}"; static String m54(fileType) => + "Dieses ${fileType} wird von deinem Gerät gelöscht."; + + static String m55(fileType) => + "Dieses ${fileType} existiert auf ente.io und deinem Gerät."; + + static String m56(fileType) => "Dieses ${fileType} wird auf ente.io gelöscht."; - static String m55(storageAmountInGB) => "${storageAmountInGB} GB"; + static String m57(storageAmountInGB) => "${storageAmountInGB} GB"; - static String m56( + static String m58( usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) => "${usedAmount} ${usedStorageUnit} von ${totalAmount} ${totalStorageUnit} verwendet"; - static String m57(id) => + static String m59(id) => "Ihr ${id} ist bereits mit einem anderen \'ente\'-Konto verknüpft.\nWenn Sie Ihre ${id} mit diesem Konto verwenden möchten, kontaktieren Sie bitte unseren Support\'"; - static String m58(endDate) => "Ihr Abo endet am ${endDate}"; + static String m60(endDate) => "Ihr Abo endet am ${endDate}"; - static String m59(completed, total) => + static String m61(completed, total) => "${completed}/${total} Erinnerungsstücke gesichert"; - static String m60(storageAmountInGB) => + static String m62(storageAmountInGB) => "Diese erhalten auch ${storageAmountInGB} GB"; - static String m61(email) => "Dies ist ${email}s Verifizierungs-ID"; + static String m63(email) => "Dies ist ${email}s Verifizierungs-ID"; - static String m62(count) => + static String m64(count) => "${Intl.plural(count, zero: '', one: '1 Tag', other: '${count} Tage')}"; - static String m63(endDate) => "Gültig bis ${endDate}"; + static String m65(endDate) => "Gültig bis ${endDate}"; - static String m64(email) => "Verifiziere ${email}"; + static String m66(email) => "Verifiziere ${email}"; - static String m65(email) => + static String m67(email) => "Wir haben eine E-Mail an ${email} gesendet"; - static String m66(count) => + static String m68(count) => "${Intl.plural(count, one: 'vor einem Jahr', other: 'vor ${count} Jahren')}"; - static String m67(storageSaved) => + static String m69(storageSaved) => "Du hast ${storageSaved} erfolgreich freigegeben!"; final messages = _notInlinedMessages(_notInlinedMessages); @@ -228,16 +234,17 @@ class MessageLookup extends MessageLookupByLibrary { "Neue E-Mail-Adresse hinzufügen"), "addCollaborator": MessageLookupByLibrary.simpleMessage("Bearbeiter hinzufügen"), + "addCollaborators": m0, "addFromDevice": MessageLookupByLibrary.simpleMessage("Vom Gerät hinzufügen"), - "addItem": m0, + "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("Ort hinzufügen"), "addLocationButton": MessageLookupByLibrary.simpleMessage("Hinzufügen"), "addMore": MessageLookupByLibrary.simpleMessage("Mehr hinzufügen"), "addNew": MessageLookupByLibrary.simpleMessage("Hinzufügen"), "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage("Details der Add-ons"), - "addOnValidTill": m1, + "addOnValidTill": m3, "addOns": MessageLookupByLibrary.simpleMessage("Add-ons"), "addPhotos": MessageLookupByLibrary.simpleMessage("Fotos hinzufügen"), "addSelected": @@ -248,11 +255,12 @@ class MessageLookup extends MessageLookupByLibrary { "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage( "Zum versteckten Album hinzufügen"), "addViewer": MessageLookupByLibrary.simpleMessage("Album teilen"), + "addViewers": m1, "addYourPhotosNow": MessageLookupByLibrary.simpleMessage("Füge deine Foto jetzt hinzu"), "addedAs": MessageLookupByLibrary.simpleMessage("Hinzugefügt als"), - "addedBy": m2, - "addedSuccessfullyTo": m3, + "addedBy": m4, + "addedSuccessfullyTo": m5, "addingToFavorites": MessageLookupByLibrary.simpleMessage( "Wird zu Favoriten hinzugefügt..."), "advanced": MessageLookupByLibrary.simpleMessage("Erweitert"), @@ -263,7 +271,7 @@ class MessageLookup extends MessageLookupByLibrary { "after1Week": MessageLookupByLibrary.simpleMessage("Nach 1 Woche"), "after1Year": MessageLookupByLibrary.simpleMessage("Nach 1 Jahr"), "albumOwner": MessageLookupByLibrary.simpleMessage("Besitzer"), - "albumParticipantsCount": m4, + "albumParticipantsCount": m6, "albumTitle": MessageLookupByLibrary.simpleMessage("Albumtitel"), "albumUpdated": MessageLookupByLibrary.simpleMessage("Album aktualisiert"), @@ -301,7 +309,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Android, iOS, Web, Desktop"), "androidSignInTitle": MessageLookupByLibrary.simpleMessage( "Authentifizierung erforderlich"), - "appVersion": m5, + "appVersion": m7, "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"), "apply": MessageLookupByLibrary.simpleMessage("Anwenden"), "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Code nutzen"), @@ -387,12 +395,14 @@ class MessageLookup extends MessageLookupByLibrary { "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage( "Du kannst nur Dateien entfernen, die dir gehören"), "cancel": MessageLookupByLibrary.simpleMessage("Abbrechen"), - "cancelOtherSubscription": m6, + "cancelOtherSubscription": m8, "cancelSubscription": MessageLookupByLibrary.simpleMessage("Abonnement kündigen"), - "cannotAddMorePhotosAfterBecomingViewer": m7, + "cannotAddMorePhotosAfterBecomingViewer": m9, "cannotDeleteSharedFiles": MessageLookupByLibrary.simpleMessage( "Konnte geteilte Dateien nicht löschen"), + "castInstruction": MessageLookupByLibrary.simpleMessage( + "Besuche cast.ente.io auf dem Gerät, das du verbinden möchtest.\n\nGib den unten angegebenen Code ein, um das Album auf deinem Fernseher abzuspielen."), "centerPoint": MessageLookupByLibrary.simpleMessage("Mittelpunkt"), "changeEmail": MessageLookupByLibrary.simpleMessage("E-Mail-Adresse ändern"), @@ -413,10 +423,13 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Freien Speicher einlösen"), "claimMore": MessageLookupByLibrary.simpleMessage("Mehr einlösen!"), "claimed": MessageLookupByLibrary.simpleMessage("Eingelöst"), - "claimedStorageSoFar": m8, + "claimedStorageSoFar": m10, "cleanUncategorized": MessageLookupByLibrary.simpleMessage("Unkategorisiert leeren"), + "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage( + "Entferne alle Dateien von \"Unkategorisiert\" die in anderen Alben vorhanden sind"), "clearCaches": MessageLookupByLibrary.simpleMessage("Cache löschen"), + "clearIndexes": MessageLookupByLibrary.simpleMessage("Indexe löschen"), "click": MessageLookupByLibrary.simpleMessage("• Klick"), "clickOnTheOverflowMenu": MessageLookupByLibrary.simpleMessage( "• Klicken Sie auf das Überlaufmenü"), @@ -435,7 +448,7 @@ class MessageLookup extends MessageLookupByLibrary { "Erstelle einen Link, um anderen zu ermöglichen, Fotos in deinem geteilten Album hinzuzufügen und zu sehen - ohne dass diese ein Konto von ente.io oder die App benötigen. Ideal, um Fotos von Events zu sammeln."), "collaborativeLink": MessageLookupByLibrary.simpleMessage("Gemeinschaftlicher Link"), - "collaborativeLinkCreatedFor": m9, + "collaborativeLinkCreatedFor": m11, "collaborator": MessageLookupByLibrary.simpleMessage("Bearbeiter"), "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": MessageLookupByLibrary.simpleMessage( @@ -462,10 +475,10 @@ class MessageLookup extends MessageLookupByLibrary { "Wiederherstellungsschlüssel bestätigen"), "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage( "Bestätigen Sie ihren Wiederherstellungsschlüssel"), - "contactFamilyAdmin": m10, + "contactFamilyAdmin": m12, "contactSupport": MessageLookupByLibrary.simpleMessage("Support kontaktieren"), - "contactToManageSubscription": m11, + "contactToManageSubscription": m13, "contacts": MessageLookupByLibrary.simpleMessage("Kontakte"), "contents": MessageLookupByLibrary.simpleMessage("Inhalte"), "continueLabel": MessageLookupByLibrary.simpleMessage("Weiter"), @@ -543,11 +556,11 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Vom Gerät löschen"), "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Auf ente.io löschen"), - "deleteItemCount": m12, + "deleteItemCount": m14, "deleteLocation": MessageLookupByLibrary.simpleMessage("Standort löschen"), "deletePhotos": MessageLookupByLibrary.simpleMessage("Fotos löschen"), - "deleteProgress": m13, + "deleteProgress": m15, "deleteReason1": MessageLookupByLibrary.simpleMessage( "Es fehlt eine zentrale Funktion, die ich benötige"), "deleteReason2": MessageLookupByLibrary.simpleMessage( @@ -562,17 +575,20 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Geteiltes Album löschen?"), "deleteSharedAlbumDialogBody": MessageLookupByLibrary.simpleMessage( "Dieses Album wird für alle gelöscht\n\nDu wirst den Zugriff auf geteilte Fotos in diesem Album, die anderen gehören, verlieren"), - "descriptions": MessageLookupByLibrary.simpleMessage("Descriptions"), + "descriptions": MessageLookupByLibrary.simpleMessage("Beschreibungen"), "deselectAll": MessageLookupByLibrary.simpleMessage("Alle abwählen"), "designedToOutlive": MessageLookupByLibrary.simpleMessage("Entwickelt um zu bewahren"), "details": MessageLookupByLibrary.simpleMessage("Details"), "devAccountChanged": MessageLookupByLibrary.simpleMessage( "Das Entwicklerkonto, das wir verwenden, um ente im App Store zu veröffentlichen, hat sich geändert. Aus diesem Grund musst du dich erneut anmelden.\n\nWir entschuldigen uns für die Unannehmlichkeiten, aber das war unvermeidlich."), + "deviceCodeHint": MessageLookupByLibrary.simpleMessage("Code eingeben"), "deviceFilesAutoUploading": MessageLookupByLibrary.simpleMessage( "Dateien, die zu diesem Album hinzugefügt werden, werden automatisch zu ente hochgeladen."), "deviceLockExplanation": MessageLookupByLibrary.simpleMessage( "Das Sperren des Gerätes verhindern, solange \'ente\' im Vordergrund geöffnet ist und eine Sicherung läuft. \nDies wird für gewöhnlich nicht benötigt, kann aber dabei helfen große Transfers schneller durchzuführen."), + "deviceNotFound": + MessageLookupByLibrary.simpleMessage("Gerät nicht gefunden"), "didYouKnow": MessageLookupByLibrary.simpleMessage("Schon gewusst?"), "disableAutoLock": MessageLookupByLibrary.simpleMessage( "Automatische Sperre deaktivieren"), @@ -580,7 +596,7 @@ class MessageLookup extends MessageLookupByLibrary { "Zuschauer können weiterhin Screenshots oder mit anderen externen Programmen Kopien der Bilder machen."), "disableDownloadWarningTitle": MessageLookupByLibrary.simpleMessage("Bitte beachten Sie:"), - "disableLinkMessage": m14, + "disableLinkMessage": m16, "disableTwofactor": MessageLookupByLibrary.simpleMessage( "Zweiten Faktor (2FA) deaktivieren"), "disablingTwofactorAuthentication": @@ -603,9 +619,9 @@ class MessageLookup extends MessageLookupByLibrary { "Herunterladen fehlgeschlagen"), "downloading": MessageLookupByLibrary.simpleMessage("Wird heruntergeladen..."), - "dropSupportEmail": m15, - "duplicateFileCountWithStorageSaved": m16, - "duplicateItemsGroup": m17, + "dropSupportEmail": m17, + "duplicateFileCountWithStorageSaved": m18, + "duplicateItemsGroup": m19, "edit": MessageLookupByLibrary.simpleMessage("Bearbeiten"), "editLocation": MessageLookupByLibrary.simpleMessage("Standort bearbeiten"), @@ -618,8 +634,8 @@ class MessageLookup extends MessageLookupByLibrary { "Änderungen des Standorts werden nur in ente sichtbar sein"), "eligible": MessageLookupByLibrary.simpleMessage("zulässig"), "email": MessageLookupByLibrary.simpleMessage("E-Mail"), - "emailChangedTo": m18, - "emailNoEnteAccount": m19, + "emailChangedTo": m20, + "emailNoEnteAccount": m21, "emailVerificationToggle": MessageLookupByLibrary.simpleMessage("E-Mail-Verifizierung"), "emailYourLogs": MessageLookupByLibrary.simpleMessage( @@ -719,8 +735,8 @@ class MessageLookup extends MessageLookupByLibrary { "fileTypes": MessageLookupByLibrary.simpleMessage("Dateitypen"), "fileTypesAndNames": MessageLookupByLibrary.simpleMessage("Dateitypen und -namen"), - "filesBackedUpFromDevice": m20, - "filesBackedUpInAlbum": m21, + "filesBackedUpFromDevice": m22, + "filesBackedUpInAlbum": m23, "filesDeleted": MessageLookupByLibrary.simpleMessage("Dateien gelöscht"), "flip": MessageLookupByLibrary.simpleMessage("Spiegeln"), @@ -730,26 +746,26 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Passwort vergessen"), "freeStorageClaimed": MessageLookupByLibrary.simpleMessage( "Kostenlos hinzugefügter Speicherplatz"), - "freeStorageOnReferralSuccess": m22, - "freeStorageSpace": m23, + "freeStorageOnReferralSuccess": m24, + "freeStorageSpace": m25, "freeStorageUsable": MessageLookupByLibrary.simpleMessage( "Freier Speicherplatz nutzbar"), "freeTrial": MessageLookupByLibrary.simpleMessage("Kostenlose Testphase"), - "freeTrialValidTill": m24, - "freeUpAccessPostDelete": m25, - "freeUpAmount": m26, + "freeTrialValidTill": m26, + "freeUpAccessPostDelete": m27, + "freeUpAmount": m28, "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage("Gerätespeicher freiräumen"), "freeUpSpace": MessageLookupByLibrary.simpleMessage("Speicherplatz freigeben"), - "freeUpSpaceSaving": m27, + "freeUpSpaceSaving": m29, "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage( "Bis zu 1000 Erinnerungsstücke angezeigt in der Galerie"), "general": MessageLookupByLibrary.simpleMessage("Allgemein"), "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage( "Generierung von Verschlüsselungscodes..."), - "genericProgress": m28, + "genericProgress": m30, "goToSettings": MessageLookupByLibrary.simpleMessage("Zu den Einstellungen"), "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"), @@ -790,6 +806,8 @@ class MessageLookup extends MessageLookupByLibrary { "Der eingegebene Schlüssel ist ungültig"), "incorrectRecoveryKeyTitle": MessageLookupByLibrary.simpleMessage( "Falscher Wiederherstellungs-Schlüssel"), + "indexedItems": + MessageLookupByLibrary.simpleMessage("Indizierte Elemente"), "insecureDevice": MessageLookupByLibrary.simpleMessage("Unsicheres Gerät"), "installManually": @@ -810,13 +828,14 @@ class MessageLookup extends MessageLookupByLibrary { "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": MessageLookupByLibrary.simpleMessage( "Etwas ist schiefgelaufen. Bitte versuche es später noch einmal. Sollte der Fehler weiter bestehen, kontaktiere unser Supportteam."), - "itemCount": m29, + "itemCount": m31, "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": MessageLookupByLibrary.simpleMessage( "Elemente zeigen die Anzahl der Tage bis zum dauerhaften Löschen an"), "itemsWillBeRemovedFromAlbum": MessageLookupByLibrary.simpleMessage( "Ausgewählte Elemente werden aus diesem Album entfernt"), - "joinDiscord": MessageLookupByLibrary.simpleMessage("Join Discord"), + "joinDiscord": + MessageLookupByLibrary.simpleMessage("Discord beitreten"), "keepPhotos": MessageLookupByLibrary.simpleMessage("Fotos behalten"), "kiloMeterUnit": MessageLookupByLibrary.simpleMessage("km"), "kindlyHelpUsWithThisInformation": @@ -837,7 +856,7 @@ class MessageLookup extends MessageLookupByLibrary { "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("Geräte Limit"), "linkEnabled": MessageLookupByLibrary.simpleMessage("Aktiviert"), "linkExpired": MessageLookupByLibrary.simpleMessage("Abgelaufen"), - "linkExpiresOn": m30, + "linkExpiresOn": m32, "linkExpiry": MessageLookupByLibrary.simpleMessage("Ablaufdatum des Links"), "linkHasExpired": @@ -868,12 +887,14 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Lade Galerie …"), "loadingMessage": MessageLookupByLibrary.simpleMessage("Fotos werden geladen..."), + "loadingModel": + MessageLookupByLibrary.simpleMessage("Lade Modelle herunter..."), "localGallery": MessageLookupByLibrary.simpleMessage("Lokale Galerie"), "location": MessageLookupByLibrary.simpleMessage("Standort"), "locationName": MessageLookupByLibrary.simpleMessage("Standortname"), "locationTagFeatureDescription": MessageLookupByLibrary.simpleMessage( "Ein Standort-Tag gruppiert alle Fotos, die in einem Radius eines Fotos aufgenommen wurden"), - "locations": MessageLookupByLibrary.simpleMessage("Locations"), + "locations": MessageLookupByLibrary.simpleMessage("Orte"), "lockButtonLabel": MessageLookupByLibrary.simpleMessage("Sperren"), "lockScreenEnablePreSteps": MessageLookupByLibrary.simpleMessage( "Um den Sperrbildschirm zu aktivieren, legen Sie bitte den Geräte-Passcode oder die Bildschirmsperre in den Systemeinstellungen fest."), @@ -885,9 +906,17 @@ class MessageLookup extends MessageLookupByLibrary { "logout": MessageLookupByLibrary.simpleMessage("Ausloggen"), "logsDialogBody": MessageLookupByLibrary.simpleMessage( "Dies wird über Logs gesendet, um uns zu helfen, Ihr Problem zu beheben. Bitte beachten Sie, dass Dateinamen aufgenommen werden, um Probleme mit bestimmten Dateien zu beheben."), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "longpressOnAnItemToViewInFullscreen": MessageLookupByLibrary.simpleMessage( "Drücken Sie lange auf ein Element, um es im Vollbildmodus anzuzeigen"), "lostDevice": MessageLookupByLibrary.simpleMessage("Gerät verloren?"), + "machineLearning": + MessageLookupByLibrary.simpleMessage("Maschinelles Lernen"), + "magicSearch": MessageLookupByLibrary.simpleMessage("Magische Suche"), + "magicSearchDescription": MessageLookupByLibrary.simpleMessage( + "Bitte beachten Sie, dass dies mehr Bandbreite nutzt und zu einem höheren Akkuverbrauch führt, bis alle Elemente indiziert sind."), "manage": MessageLookupByLibrary.simpleMessage("Verwalten"), "manageDeviceStorage": MessageLookupByLibrary.simpleMessage("Gerätespeicher verwalten"), @@ -901,7 +930,7 @@ class MessageLookup extends MessageLookupByLibrary { "maps": MessageLookupByLibrary.simpleMessage("Karten"), "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"), "matrix": MessageLookupByLibrary.simpleMessage("Matrix"), - "memoryCount": m31, + "memoryCount": m33, "merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"), "mobileWebDesktop": MessageLookupByLibrary.simpleMessage("Mobil, Web, Desktop"), @@ -911,12 +940,12 @@ class MessageLookup extends MessageLookupByLibrary { "Ändere deine Suchanfrage oder suche nach"), "moments": MessageLookupByLibrary.simpleMessage("Momente"), "monthly": MessageLookupByLibrary.simpleMessage("Monatlich"), - "moveItem": m32, + "moveItem": m34, "moveToAlbum": MessageLookupByLibrary.simpleMessage("Zum Album verschieben"), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage( "Zu verstecktem Album verschieben"), - "movedSuccessfullyTo": m33, + "movedSuccessfullyTo": m35, "movedToTrash": MessageLookupByLibrary.simpleMessage( "In den Papierkorb verschoben"), "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage( @@ -981,19 +1010,25 @@ class MessageLookup extends MessageLookupByLibrary { "Bei Bedarf auch so kurz wie Sie wollen..."), "orPickAnExistingOne": MessageLookupByLibrary.simpleMessage( "Oder eine Vorherige auswählen"), + "pair": MessageLookupByLibrary.simpleMessage("Koppeln"), + "passkey": MessageLookupByLibrary.simpleMessage("Passkey"), + "passkeyAuthTitle": + MessageLookupByLibrary.simpleMessage("Passkey-Verifizierung"), "password": MessageLookupByLibrary.simpleMessage("Passwort"), "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage( "Passwort erfolgreich geändert"), "passwordLock": MessageLookupByLibrary.simpleMessage("Passwort Sperre"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "Wir speichern dieses Passwort nicht. Wenn du es vergisst, können wir deine Daten nicht entschlüsseln"), "paymentDetails": MessageLookupByLibrary.simpleMessage("Zahlungsdetails"), "paymentFailed": MessageLookupByLibrary.simpleMessage("Zahlung fehlgeschlagen"), - "paymentFailedTalkToProvider": m35, - "paymentFailedWithReason": m36, + "paymentFailedTalkToProvider": m37, + "paymentFailedWithReason": m38, + "pendingItems": + MessageLookupByLibrary.simpleMessage("Ausstehende Elemente"), "pendingSync": MessageLookupByLibrary.simpleMessage("Synchronisation anstehend"), "peopleUsingYourCode": MessageLookupByLibrary.simpleMessage( @@ -1016,7 +1051,9 @@ class MessageLookup extends MessageLookupByLibrary { "pickCenterPoint": MessageLookupByLibrary.simpleMessage("Mittelpunkt auswählen"), "pinAlbum": MessageLookupByLibrary.simpleMessage("Album anheften"), - "playStoreFreeTrialValidTill": m37, + "playOnTv": MessageLookupByLibrary.simpleMessage( + "Album auf dem Fernseher wiedergeben"), + "playStoreFreeTrialValidTill": m39, "playstoreSubscription": MessageLookupByLibrary.simpleMessage("PlayStore Abo"), "pleaseCheckYourInternetConnectionAndTryAgain": @@ -1028,12 +1065,12 @@ class MessageLookup extends MessageLookupByLibrary { "pleaseContactSupportIfTheProblemPersists": MessageLookupByLibrary.simpleMessage( "Bitte wenden Sie sich an den Support, falls das Problem weiterhin besteht"), - "pleaseEmailUsAt": m38, + "pleaseEmailUsAt": m40, "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage( "Bitte erteile die nötigen Berechtigungen"), "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage("Bitte logge dich erneut ein"), - "pleaseSendTheLogsTo": m39, + "pleaseSendTheLogsTo": m41, "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("Bitte versuche es erneut"), "pleaseVerifyTheCodeYouHaveEntered": @@ -1069,7 +1106,7 @@ class MessageLookup extends MessageLookupByLibrary { "raiseTicket": MessageLookupByLibrary.simpleMessage("Ticket erstellen"), "rateTheApp": MessageLookupByLibrary.simpleMessage("App bewerten"), "rateUs": MessageLookupByLibrary.simpleMessage("Bewerte uns"), - "rateUsOnStore": m40, + "rateUsOnStore": m42, "recover": MessageLookupByLibrary.simpleMessage("Wiederherstellen"), "recoverAccount": MessageLookupByLibrary.simpleMessage("Konto wiederherstellen"), @@ -1102,7 +1139,7 @@ class MessageLookup extends MessageLookupByLibrary { "1. Gib diesen Code an deine Freunde"), "referralStep2": MessageLookupByLibrary.simpleMessage( "2. Sie schließen ein bezahltes Abo ab"), - "referralStep3": m41, + "referralStep3": m43, "referrals": MessageLookupByLibrary.simpleMessage("Weiterempfehlungen"), "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage( "Einlösungen sind derzeit pausiert"), @@ -1128,7 +1165,7 @@ class MessageLookup extends MessageLookupByLibrary { "removeLink": MessageLookupByLibrary.simpleMessage("Link entfernen"), "removeParticipant": MessageLookupByLibrary.simpleMessage("Teilnehmer entfernen"), - "removeParticipantBody": m42, + "removeParticipantBody": m44, "removePublicLink": MessageLookupByLibrary.simpleMessage("Öffentlichen Link entfernen"), "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage( @@ -1142,7 +1179,7 @@ class MessageLookup extends MessageLookupByLibrary { "renameFile": MessageLookupByLibrary.simpleMessage("Datei umbenennen"), "renewSubscription": MessageLookupByLibrary.simpleMessage("Abonnement erneuern"), - "renewsOn": m43, + "renewsOn": m45, "reportABug": MessageLookupByLibrary.simpleMessage("Fehler melden"), "reportBug": MessageLookupByLibrary.simpleMessage("Fehler melden"), "resendEmail": @@ -1205,7 +1242,7 @@ class MessageLookup extends MessageLookupByLibrary { "Gruppiere Fotos, die innerhalb des Radius eines bestimmten Fotos aufgenommen wurden"), "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage( "Laden Sie Personen ein, damit Sie geteilte Fotos hier einsehen können"), - "searchResultCount": m44, + "searchResultCount": m46, "security": MessageLookupByLibrary.simpleMessage("Sicherheit"), "selectALocation": MessageLookupByLibrary.simpleMessage("Standort auswählen"), @@ -1232,8 +1269,8 @@ class MessageLookup extends MessageLookupByLibrary { "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": MessageLookupByLibrary.simpleMessage( "Ausgewählte Elemente werden aus allen Alben gelöscht und in den Papierkorb verschoben."), - "selectedPhotos": m45, - "selectedPhotosWithYours": m46, + "selectedPhotos": m47, + "selectedPhotosWithYours": m48, "send": MessageLookupByLibrary.simpleMessage("Absenden"), "sendEmail": MessageLookupByLibrary.simpleMessage("E-Mail senden"), "sendInvite": MessageLookupByLibrary.simpleMessage("Einladung senden"), @@ -1256,16 +1293,16 @@ class MessageLookup extends MessageLookupByLibrary { "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("Teile jetzt ein Album"), "shareLink": MessageLookupByLibrary.simpleMessage("Link teilen"), - "shareMyVerificationID": m47, + "shareMyVerificationID": m49, "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage( "Teile mit ausgewählten Personen"), - "shareTextConfirmOthersVerificationID": m48, + "shareTextConfirmOthersVerificationID": m50, "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage( "Lade ente herunter, damit wir einfach Fotos und Videos in höchster Qualität teilen können\n\nhttps://ente.io"), - "shareTextReferralCode": m49, + "shareTextReferralCode": m51, "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage( "Mit Nicht-Ente-Benutzern teilen"), - "shareWithPeopleSectionTitle": m50, + "shareWithPeopleSectionTitle": m52, "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage("Teile dein erstes Album"), "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage( @@ -1276,7 +1313,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Neue geteilte Fotos"), "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage( "Erhalte Benachrichtigungen, wenn jemand ein Foto zu einem gemeinsam genutzten Album hinzufügt, dem du angehörst"), - "sharedWith": m51, + "sharedWith": m53, "sharedWithMe": MessageLookupByLibrary.simpleMessage("Mit mir geteilt"), "sharedWithYou": MessageLookupByLibrary.simpleMessage("Mit dir geteilt"), @@ -1291,11 +1328,11 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Andere Geräte abmelden"), "signUpTerms": MessageLookupByLibrary.simpleMessage( "Ich stimme den Nutzungsbedingungen und der Datenschutzerklärung zu"), - "singleFileDeleteFromDevice": m52, + "singleFileDeleteFromDevice": m54, "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage( "Es wird aus allen Alben gelöscht."), - "singleFileInBothLocalAndRemote": m53, - "singleFileInRemoteOnly": m54, + "singleFileInBothLocalAndRemote": m55, + "singleFileInRemoteOnly": m56, "skip": MessageLookupByLibrary.simpleMessage("Überspringen"), "social": MessageLookupByLibrary.simpleMessage("Social Media"), "someItemsAreInBothEnteAndYourDevice": @@ -1333,16 +1370,17 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("✨ Abgeschlossen"), "startBackup": MessageLookupByLibrary.simpleMessage("Sicherung starten"), + "status": MessageLookupByLibrary.simpleMessage("Status"), "storage": MessageLookupByLibrary.simpleMessage("Speicherplatz"), "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("Familie"), "storageBreakupYou": MessageLookupByLibrary.simpleMessage("Sie"), - "storageInGB": m55, + "storageInGB": m57, "storageLimitExceeded": MessageLookupByLibrary.simpleMessage( "Speichergrenze überschritten"), - "storageUsageInfo": m56, + "storageUsageInfo": m58, "strongStrength": MessageLookupByLibrary.simpleMessage("Stark"), - "subAlreadyLinkedErrMessage": m57, - "subWillBeCancelledOn": m58, + "subAlreadyLinkedErrMessage": m59, + "subWillBeCancelledOn": m60, "subscribe": MessageLookupByLibrary.simpleMessage("Abonnieren"), "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage( "Sieht aus, als sei dein Abonnement abgelaufen. Bitte abonniere, um das Teilen zu aktivieren."), @@ -1359,7 +1397,7 @@ class MessageLookup extends MessageLookupByLibrary { "suggestFeatures": MessageLookupByLibrary.simpleMessage("Verbesserung vorschlagen"), "support": MessageLookupByLibrary.simpleMessage("Support"), - "syncProgress": m59, + "syncProgress": m61, "syncStopped": MessageLookupByLibrary.simpleMessage("Synchronisierung angehalten"), "syncing": MessageLookupByLibrary.simpleMessage("Synchronisiere …"), @@ -1388,7 +1426,7 @@ class MessageLookup extends MessageLookupByLibrary { "theseItemsWillBeDeletedFromYourDevice": MessageLookupByLibrary.simpleMessage( "Diese Elemente werden von deinem Gerät gelöscht."), - "theyAlsoGetXGb": m60, + "theyAlsoGetXGb": m62, "theyWillBeDeletedFromAllAlbums": MessageLookupByLibrary.simpleMessage( "Sie werden aus allen Alben gelöscht."), "thisActionCannotBeUndone": MessageLookupByLibrary.simpleMessage( @@ -1404,7 +1442,7 @@ class MessageLookup extends MessageLookupByLibrary { "Diese E-Mail-Adresse wird bereits verwendet"), "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage( "Dieses Bild hat keine Exif-Daten"), - "thisIsPersonVerificationId": m61, + "thisIsPersonVerificationId": m63, "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage( "Dies ist deine Verifizierungs-ID"), "thisWillLogYouOutOfTheFollowingDevice": @@ -1421,7 +1459,7 @@ class MessageLookup extends MessageLookupByLibrary { "total": MessageLookupByLibrary.simpleMessage("Gesamt"), "totalSize": MessageLookupByLibrary.simpleMessage("Gesamtgröße"), "trash": MessageLookupByLibrary.simpleMessage("Papierkorb"), - "trashDaysLeft": m62, + "trashDaysLeft": m64, "tryAgain": MessageLookupByLibrary.simpleMessage("Erneut versuchen"), "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage( "Aktiviere die Sicherung, um automatisch neu hinzugefügte Dateien dieses Ordners auf ente hochzuladen."), @@ -1476,7 +1514,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Ausgewähltes Foto verwenden"), "usedSpace": MessageLookupByLibrary.simpleMessage("Belegter Speicherplatz"), - "validTill": m63, + "validTill": m65, "verificationFailedPleaseTryAgain": MessageLookupByLibrary.simpleMessage( "Verifizierung fehlgeschlagen, bitte versuchen Sie es erneut"), @@ -1485,8 +1523,10 @@ class MessageLookup extends MessageLookupByLibrary { "verify": MessageLookupByLibrary.simpleMessage("Überprüfen"), "verifyEmail": MessageLookupByLibrary.simpleMessage("E-Mail-Adresse verifizieren"), - "verifyEmailID": m64, + "verifyEmailID": m66, "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Überprüfen"), + "verifyPasskey": + MessageLookupByLibrary.simpleMessage("Passkey verifizieren"), "verifyPassword": MessageLookupByLibrary.simpleMessage("Passwort überprüfen"), "verifying": MessageLookupByLibrary.simpleMessage("Verifiziere …"), @@ -1507,17 +1547,21 @@ class MessageLookup extends MessageLookupByLibrary { "viewer": MessageLookupByLibrary.simpleMessage("Zuschauer"), "visitWebToManage": MessageLookupByLibrary.simpleMessage( "Bitte rufen Sie \"web.ente.io\" auf um ihr Abo zu verwalten"), + "waitingForVerification": + MessageLookupByLibrary.simpleMessage("Warte auf Bestätigung..."), + "waitingForWifi": + MessageLookupByLibrary.simpleMessage("Warte auf WLAN..."), "weAreOpenSource": MessageLookupByLibrary.simpleMessage( "Unser Quellcode ist offen einsehbar!"), "weDontSupportEditingPhotosAndAlbumsThatYouDont": MessageLookupByLibrary.simpleMessage( "Wir unterstützen keine Bearbeitung von Fotos und Alben, die du noch nicht besitzt"), - "weHaveSendEmailTo": m65, + "weHaveSendEmailTo": m67, "weakStrength": MessageLookupByLibrary.simpleMessage("Schwach"), "welcomeBack": MessageLookupByLibrary.simpleMessage("Willkommen zurück!"), "yearly": MessageLookupByLibrary.simpleMessage("Jährlich"), - "yearsAgo": m66, + "yearsAgo": m68, "yes": MessageLookupByLibrary.simpleMessage("Ja"), "yesCancel": MessageLookupByLibrary.simpleMessage("Ja, kündigen"), "yesConvertToViewer": MessageLookupByLibrary.simpleMessage( @@ -1547,7 +1591,7 @@ class MessageLookup extends MessageLookupByLibrary { "Du kannst nicht mit dir selbst teilen"), "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage( "Du hast keine archivierten Elemente."), - "youHaveSuccessfullyFreedUp": m67, + "youHaveSuccessfullyFreedUp": m69, "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage( "Dein Benutzerkonto wurde gelöscht"), "yourMap": MessageLookupByLibrary.simpleMessage("Deine Karte"), diff --git a/mobile/lib/generated/intl/messages_en.dart b/mobile/lib/generated/intl/messages_en.dart index 0ca7d3024..624a7cfb2 100644 --- a/mobile/lib/generated/intl/messages_en.dart +++ b/mobile/lib/generated/intl/messages_en.dart @@ -21,191 +21,197 @@ class MessageLookup extends MessageLookupByLibrary { String get localeName => 'en'; static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m2(count) => "${Intl.plural(count, one: 'Add item', other: 'Add items')}"; - static String m1(storageAmount, endDate) => + static String m3(storageAmount, endDate) => "Your ${storageAmount} add-on is valid till ${endDate}"; - static String m2(emailOrName) => "Added by ${emailOrName}"; + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; - static String m3(albumName) => "Added successfully to ${albumName}"; + static String m4(emailOrName) => "Added by ${emailOrName}"; - static String m4(count) => + static String m5(albumName) => "Added successfully to ${albumName}"; + + static String m6(count) => "${Intl.plural(count, zero: 'No Participants', one: '1 Participant', other: '${count} Participants')}"; - static String m5(versionValue) => "Version: ${versionValue}"; + static String m7(versionValue) => "Version: ${versionValue}"; - static String m6(paymentProvider) => + static String m8(paymentProvider) => "Please cancel your existing subscription from ${paymentProvider} first"; - static String m7(user) => + static String m9(user) => "${user} will not be able to add more photos to this album\n\nThey will still be able to remove existing photos added by them"; - static String m8(isFamilyMember, storageAmountInGb) => + static String m10(isFamilyMember, storageAmountInGb) => "${Intl.select(isFamilyMember, { 'true': 'Your family has claimed ${storageAmountInGb} GB so far', 'false': 'You have claimed ${storageAmountInGb} GB so far', 'other': 'You have claimed ${storageAmountInGb} GB so far!', })}"; - static String m9(albumName) => "Collaborative link created for ${albumName}"; + static String m11(albumName) => "Collaborative link created for ${albumName}"; - static String m10(familyAdminEmail) => + static String m12(familyAdminEmail) => "Please contact ${familyAdminEmail} to manage your subscription"; - static String m11(provider) => + static String m13(provider) => "Please contact us at support@ente.io to manage your ${provider} subscription."; - static String m12(count) => + static String m14(count) => "${Intl.plural(count, one: 'Delete ${count} item', other: 'Delete ${count} items')}"; - static String m13(currentlyDeleting, totalCount) => + static String m15(currentlyDeleting, totalCount) => "Deleting ${currentlyDeleting} / ${totalCount}"; - static String m14(albumName) => + static String m16(albumName) => "This will remove the public link for accessing \"${albumName}\"."; - static String m15(supportEmail) => + static String m17(supportEmail) => "Please drop an email to ${supportEmail} from your registered email address"; - static String m16(count, storageSaved) => + static String m18(count, storageSaved) => "You have cleaned up ${Intl.plural(count, one: '${count} duplicate file', other: '${count} duplicate files')}, saving (${storageSaved}!)"; - static String m17(count, formattedSize) => + static String m19(count, formattedSize) => "${count} files, ${formattedSize} each"; - static String m18(newEmail) => "Email changed to ${newEmail}"; + static String m20(newEmail) => "Email changed to ${newEmail}"; - static String m19(email) => + static String m21(email) => "${email} does not have an ente account.\n\nSend them an invite to share photos."; - static String m20(count, formattedNumber) => + static String m22(count, formattedNumber) => "${Intl.plural(count, one: '1 file', other: '${formattedNumber} files')} on this device have been backed up safely"; - static String m21(count, formattedNumber) => + static String m23(count, formattedNumber) => "${Intl.plural(count, one: '1 file', other: '${formattedNumber} files')} in this album has been backed up safely"; - static String m22(storageAmountInGB) => + static String m24(storageAmountInGB) => "${storageAmountInGB} GB each time someone signs up for a paid plan and applies your code"; - static String m23(freeAmount, storageUnit) => + static String m25(freeAmount, storageUnit) => "${freeAmount} ${storageUnit} free"; - static String m24(endDate) => "Free trial valid till ${endDate}"; + static String m26(endDate) => "Free trial valid till ${endDate}"; - static String m25(count) => + static String m27(count) => "You can still access ${Intl.plural(count, one: 'it', other: 'them')} on ente as long as you have an active subscription"; - static String m26(sizeInMBorGB) => "Free up ${sizeInMBorGB}"; + static String m28(sizeInMBorGB) => "Free up ${sizeInMBorGB}"; - static String m27(count, formattedSize) => + static String m29(count, formattedSize) => "${Intl.plural(count, one: 'It can be deleted from the device to free up ${formattedSize}', other: 'They can be deleted from the device to free up ${formattedSize}')}"; - static String m28(currentlyProcessing, totalCount) => + static String m30(currentlyProcessing, totalCount) => "Processing ${currentlyProcessing} / ${totalCount}"; - static String m29(count) => + static String m31(count) => "${Intl.plural(count, one: '${count} item', other: '${count} items')}"; - static String m30(expiryTime) => "Link will expire on ${expiryTime}"; + static String m32(expiryTime) => "Link will expire on ${expiryTime}"; - static String m31(count, formattedCount) => + static String m33(count, formattedCount) => "${Intl.plural(count, zero: 'no memories', one: '${formattedCount} memory', other: '${formattedCount} memories')}"; - static String m32(count) => + static String m34(count) => "${Intl.plural(count, one: 'Move item', other: 'Move items')}"; - static String m33(albumName) => "Moved successfully to ${albumName}"; + static String m35(albumName) => "Moved successfully to ${albumName}"; - static String m34(passwordStrengthValue) => + static String m36(passwordStrengthValue) => "Password strength: ${passwordStrengthValue}"; - static String m35(providerName) => + static String m37(providerName) => "Please talk to ${providerName} support if you were charged"; - static String m36(reason) => + static String m38(reason) => "Unfortunately your payment failed due to ${reason}"; - static String m37(endDate) => + static String m39(endDate) => "Free trial valid till ${endDate}.\nYou can choose a paid plan afterwards."; - static String m38(toEmail) => "Please email us at ${toEmail}"; + static String m40(toEmail) => "Please email us at ${toEmail}"; - static String m39(toEmail) => "Please send the logs to \n${toEmail}"; + static String m41(toEmail) => "Please send the logs to \n${toEmail}"; - static String m40(storeName) => "Rate us on ${storeName}"; + static String m42(storeName) => "Rate us on ${storeName}"; - static String m41(storageInGB) => + static String m43(storageInGB) => "3. Both of you get ${storageInGB} GB* free"; - static String m42(userEmail) => + static String m44(userEmail) => "${userEmail} will be removed from this shared album\n\nAny photos added by them will also be removed from the album"; - static String m43(endDate) => "Subscription renews on ${endDate}"; + static String m45(endDate) => "Subscription renews on ${endDate}"; - static String m44(count) => + static String m46(count) => "${Intl.plural(count, one: '${count} result found', other: '${count} results found')}"; - static String m45(count) => "${count} selected"; + static String m47(count) => "${count} selected"; - static String m46(count, yourCount) => + static String m48(count, yourCount) => "${count} selected (${yourCount} yours)"; - static String m47(verificationID) => + static String m49(verificationID) => "Here\'s my verification ID: ${verificationID} for ente.io."; - static String m48(verificationID) => + static String m50(verificationID) => "Hey, can you confirm that this is your ente.io verification ID: ${verificationID}"; - static String m49(referralCode, referralStorageInGB) => + static String m51(referralCode, referralStorageInGB) => "ente referral code: ${referralCode} \n\nApply it in Settings → General → Referrals to get ${referralStorageInGB} GB free after you signup for a paid plan\n\nhttps://ente.io"; - static String m50(numberOfPeople) => + static String m52(numberOfPeople) => "${Intl.plural(numberOfPeople, zero: 'Share with specific people', one: 'Shared with 1 person', other: 'Shared with ${numberOfPeople} people')}"; - static String m51(emailIDs) => "Shared with ${emailIDs}"; + static String m53(emailIDs) => "Shared with ${emailIDs}"; - static String m52(fileType) => + static String m54(fileType) => "This ${fileType} will be deleted from your device."; - static String m53(fileType) => + static String m55(fileType) => "This ${fileType} is in both ente and your device."; - static String m54(fileType) => "This ${fileType} will be deleted from ente."; + static String m56(fileType) => "This ${fileType} will be deleted from ente."; - static String m55(storageAmountInGB) => "${storageAmountInGB} GB"; + static String m57(storageAmountInGB) => "${storageAmountInGB} GB"; - static String m56( + static String m58( usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) => "${usedAmount} ${usedStorageUnit} of ${totalAmount} ${totalStorageUnit} used"; - static String m57(id) => + static String m59(id) => "Your ${id} is already linked to another ente account.\nIf you would like to use your ${id} with this account, please contact our support\'\'"; - static String m58(endDate) => + static String m60(endDate) => "Your subscription will be cancelled on ${endDate}"; - static String m59(completed, total) => + static String m61(completed, total) => "${completed}/${total} memories preserved"; - static String m60(storageAmountInGB) => + static String m62(storageAmountInGB) => "They also get ${storageAmountInGB} GB"; - static String m61(email) => "This is ${email}\'s Verification ID"; + static String m63(email) => "This is ${email}\'s Verification ID"; - static String m62(count) => + static String m64(count) => "${Intl.plural(count, zero: '', one: '1 day', other: '${count} days')}"; - static String m63(endDate) => "Valid till ${endDate}"; + static String m65(endDate) => "Valid till ${endDate}"; - static String m64(email) => "Verify ${email}"; + static String m66(email) => "Verify ${email}"; - static String m65(email) => "We have sent a mail to ${email}"; + static String m67(email) => "We have sent a mail to ${email}"; - static String m66(count) => + static String m68(count) => "${Intl.plural(count, one: '${count} year ago', other: '${count} years ago')}"; - static String m67(storageSaved) => + static String m69(storageSaved) => "You have successfully freed up ${storageSaved}!"; final messages = _notInlinedMessages(_notInlinedMessages); @@ -223,16 +229,17 @@ class MessageLookup extends MessageLookupByLibrary { "addANewEmail": MessageLookupByLibrary.simpleMessage("Add a new email"), "addCollaborator": MessageLookupByLibrary.simpleMessage("Add collaborator"), + "addCollaborators": m0, "addFromDevice": MessageLookupByLibrary.simpleMessage("Add from device"), - "addItem": m0, + "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("Add location"), "addLocationButton": MessageLookupByLibrary.simpleMessage("Add"), "addMore": MessageLookupByLibrary.simpleMessage("Add more"), "addNew": MessageLookupByLibrary.simpleMessage("Add new"), "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage("Details of add-ons"), - "addOnValidTill": m1, + "addOnValidTill": m3, "addOns": MessageLookupByLibrary.simpleMessage("Add-ons"), "addPhotos": MessageLookupByLibrary.simpleMessage("Add photos"), "addSelected": MessageLookupByLibrary.simpleMessage("Add selected"), @@ -241,11 +248,12 @@ class MessageLookup extends MessageLookupByLibrary { "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Add to hidden album"), "addViewer": MessageLookupByLibrary.simpleMessage("Add viewer"), + "addViewers": m1, "addYourPhotosNow": MessageLookupByLibrary.simpleMessage("Add your photos now"), "addedAs": MessageLookupByLibrary.simpleMessage("Added as"), - "addedBy": m2, - "addedSuccessfullyTo": m3, + "addedBy": m4, + "addedSuccessfullyTo": m5, "addingToFavorites": MessageLookupByLibrary.simpleMessage("Adding to favorites..."), "advanced": MessageLookupByLibrary.simpleMessage("Advanced"), @@ -256,7 +264,7 @@ class MessageLookup extends MessageLookupByLibrary { "after1Week": MessageLookupByLibrary.simpleMessage("After 1 week"), "after1Year": MessageLookupByLibrary.simpleMessage("After 1 year"), "albumOwner": MessageLookupByLibrary.simpleMessage("Owner"), - "albumParticipantsCount": m4, + "albumParticipantsCount": m6, "albumTitle": MessageLookupByLibrary.simpleMessage("Album title"), "albumUpdated": MessageLookupByLibrary.simpleMessage("Album updated"), "albums": MessageLookupByLibrary.simpleMessage("Albums"), @@ -290,7 +298,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Android, iOS, Web, Desktop"), "androidSignInTitle": MessageLookupByLibrary.simpleMessage("Authentication required"), - "appVersion": m5, + "appVersion": m7, "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"), "apply": MessageLookupByLibrary.simpleMessage("Apply"), "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Apply code"), @@ -374,10 +382,10 @@ class MessageLookup extends MessageLookupByLibrary { "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage( "Can only remove files owned by you"), "cancel": MessageLookupByLibrary.simpleMessage("Cancel"), - "cancelOtherSubscription": m6, + "cancelOtherSubscription": m8, "cancelSubscription": MessageLookupByLibrary.simpleMessage("Cancel subscription"), - "cannotAddMorePhotosAfterBecomingViewer": m7, + "cannotAddMorePhotosAfterBecomingViewer": m9, "cannotDeleteSharedFiles": MessageLookupByLibrary.simpleMessage("Cannot delete shared files"), "castInstruction": MessageLookupByLibrary.simpleMessage( @@ -401,7 +409,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Claim free storage"), "claimMore": MessageLookupByLibrary.simpleMessage("Claim more!"), "claimed": MessageLookupByLibrary.simpleMessage("Claimed"), - "claimedStorageSoFar": m8, + "claimedStorageSoFar": m10, "cleanUncategorized": MessageLookupByLibrary.simpleMessage("Clean Uncategorized"), "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage( @@ -426,7 +434,7 @@ class MessageLookup extends MessageLookupByLibrary { "Create a link to allow people to add and view photos in your shared album without needing an ente app or account. Great for collecting event photos."), "collaborativeLink": MessageLookupByLibrary.simpleMessage("Collaborative link"), - "collaborativeLinkCreatedFor": m9, + "collaborativeLinkCreatedFor": m11, "collaborator": MessageLookupByLibrary.simpleMessage("Collaborator"), "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": MessageLookupByLibrary.simpleMessage( @@ -453,10 +461,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Confirm recovery key"), "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage("Confirm your recovery key"), - "contactFamilyAdmin": m10, + "contactFamilyAdmin": m12, "contactSupport": MessageLookupByLibrary.simpleMessage("Contact support"), - "contactToManageSubscription": m11, + "contactToManageSubscription": m13, "contacts": MessageLookupByLibrary.simpleMessage("Contacts"), "contents": MessageLookupByLibrary.simpleMessage("Contents"), "continueLabel": MessageLookupByLibrary.simpleMessage("Continue"), @@ -531,11 +539,11 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Delete from device"), "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Delete from ente"), - "deleteItemCount": m12, + "deleteItemCount": m14, "deleteLocation": MessageLookupByLibrary.simpleMessage("Delete location"), "deletePhotos": MessageLookupByLibrary.simpleMessage("Delete photos"), - "deleteProgress": m13, + "deleteProgress": m15, "deleteReason1": MessageLookupByLibrary.simpleMessage( "It’s missing a key feature that I need"), "deleteReason2": MessageLookupByLibrary.simpleMessage( @@ -572,7 +580,7 @@ class MessageLookup extends MessageLookupByLibrary { "Viewers can still take screenshots or save a copy of your photos using external tools"), "disableDownloadWarningTitle": MessageLookupByLibrary.simpleMessage("Please note"), - "disableLinkMessage": m14, + "disableLinkMessage": m16, "disableTwofactor": MessageLookupByLibrary.simpleMessage("Disable two-factor"), "disablingTwofactorAuthentication": @@ -593,9 +601,9 @@ class MessageLookup extends MessageLookupByLibrary { "downloadFailed": MessageLookupByLibrary.simpleMessage("Download failed"), "downloading": MessageLookupByLibrary.simpleMessage("Downloading..."), - "dropSupportEmail": m15, - "duplicateFileCountWithStorageSaved": m16, - "duplicateItemsGroup": m17, + "dropSupportEmail": m17, + "duplicateFileCountWithStorageSaved": m18, + "duplicateItemsGroup": m19, "edit": MessageLookupByLibrary.simpleMessage("Edit"), "editLocation": MessageLookupByLibrary.simpleMessage("Edit location"), "editLocationTagTitle": @@ -606,8 +614,8 @@ class MessageLookup extends MessageLookupByLibrary { "Edits to location will only be seen within Ente"), "eligible": MessageLookupByLibrary.simpleMessage("eligible"), "email": MessageLookupByLibrary.simpleMessage("Email"), - "emailChangedTo": m18, - "emailNoEnteAccount": m19, + "emailChangedTo": m20, + "emailNoEnteAccount": m21, "emailVerificationToggle": MessageLookupByLibrary.simpleMessage("Email verification"), "emailYourLogs": @@ -702,8 +710,8 @@ class MessageLookup extends MessageLookupByLibrary { "fileTypes": MessageLookupByLibrary.simpleMessage("File types"), "fileTypesAndNames": MessageLookupByLibrary.simpleMessage("File types and names"), - "filesBackedUpFromDevice": m20, - "filesBackedUpInAlbum": m21, + "filesBackedUpFromDevice": m22, + "filesBackedUpInAlbum": m23, "filesDeleted": MessageLookupByLibrary.simpleMessage("Files deleted"), "flip": MessageLookupByLibrary.simpleMessage("Flip"), "forYourMemories": @@ -712,24 +720,24 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Forgot password"), "freeStorageClaimed": MessageLookupByLibrary.simpleMessage("Free storage claimed"), - "freeStorageOnReferralSuccess": m22, - "freeStorageSpace": m23, + "freeStorageOnReferralSuccess": m24, + "freeStorageSpace": m25, "freeStorageUsable": MessageLookupByLibrary.simpleMessage("Free storage usable"), "freeTrial": MessageLookupByLibrary.simpleMessage("Free trial"), - "freeTrialValidTill": m24, - "freeUpAccessPostDelete": m25, - "freeUpAmount": m26, + "freeTrialValidTill": m26, + "freeUpAccessPostDelete": m27, + "freeUpAmount": m28, "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage("Free up device space"), "freeUpSpace": MessageLookupByLibrary.simpleMessage("Free up space"), - "freeUpSpaceSaving": m27, + "freeUpSpaceSaving": m29, "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage( "Up to 1000 memories shown in gallery"), "general": MessageLookupByLibrary.simpleMessage("General"), "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage( "Generating encryption keys..."), - "genericProgress": m28, + "genericProgress": m30, "goToSettings": MessageLookupByLibrary.simpleMessage("Go to settings"), "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"), "grantFullAccessPrompt": MessageLookupByLibrary.simpleMessage( @@ -787,7 +795,7 @@ class MessageLookup extends MessageLookupByLibrary { "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": MessageLookupByLibrary.simpleMessage( "It looks like something went wrong. Please retry after some time. If the error persists, please contact our support team."), - "itemCount": m29, + "itemCount": m31, "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": MessageLookupByLibrary.simpleMessage( "Items show the number of days remaining before permanent deletion"), @@ -812,7 +820,7 @@ class MessageLookup extends MessageLookupByLibrary { "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("Device limit"), "linkEnabled": MessageLookupByLibrary.simpleMessage("Enabled"), "linkExpired": MessageLookupByLibrary.simpleMessage("Expired"), - "linkExpiresOn": m30, + "linkExpiresOn": m32, "linkExpiry": MessageLookupByLibrary.simpleMessage("Link expiry"), "linkHasExpired": MessageLookupByLibrary.simpleMessage("Link has expired"), @@ -861,6 +869,9 @@ class MessageLookup extends MessageLookupByLibrary { "logout": MessageLookupByLibrary.simpleMessage("Logout"), "logsDialogBody": MessageLookupByLibrary.simpleMessage( "This will send across logs to help us debug your issue. Please note that file names will be included to help track issues with specific files."), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "longpressOnAnItemToViewInFullscreen": MessageLookupByLibrary.simpleMessage( "Long-press on an item to view in full-screen"), @@ -882,7 +893,7 @@ class MessageLookup extends MessageLookupByLibrary { "maps": MessageLookupByLibrary.simpleMessage("Maps"), "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"), "matrix": MessageLookupByLibrary.simpleMessage("Matrix"), - "memoryCount": m31, + "memoryCount": m33, "merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"), "mobileWebDesktop": MessageLookupByLibrary.simpleMessage("Mobile, Web, Desktop"), @@ -892,11 +903,11 @@ class MessageLookup extends MessageLookupByLibrary { "Modify your query, or try searching for"), "moments": MessageLookupByLibrary.simpleMessage("Moments"), "monthly": MessageLookupByLibrary.simpleMessage("Monthly"), - "moveItem": m32, + "moveItem": m34, "moveToAlbum": MessageLookupByLibrary.simpleMessage("Move to album"), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Move to hidden album"), - "movedSuccessfullyTo": m33, + "movedSuccessfullyTo": m35, "movedToTrash": MessageLookupByLibrary.simpleMessage("Moved to trash"), "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage("Moving files to album..."), @@ -965,14 +976,14 @@ class MessageLookup extends MessageLookupByLibrary { "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage( "Password changed successfully"), "passwordLock": MessageLookupByLibrary.simpleMessage("Password lock"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "We don\'t store this password, so if you forget, we cannot decrypt your data"), "paymentDetails": MessageLookupByLibrary.simpleMessage("Payment details"), "paymentFailed": MessageLookupByLibrary.simpleMessage("Payment failed"), - "paymentFailedTalkToProvider": m35, - "paymentFailedWithReason": m36, + "paymentFailedTalkToProvider": m37, + "paymentFailedWithReason": m38, "pendingItems": MessageLookupByLibrary.simpleMessage("Pending items"), "pendingSync": MessageLookupByLibrary.simpleMessage("Pending sync"), "peopleUsingYourCode": @@ -996,7 +1007,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Pick center point"), "pinAlbum": MessageLookupByLibrary.simpleMessage("Pin album"), "playOnTv": MessageLookupByLibrary.simpleMessage("Play album on TV"), - "playStoreFreeTrialValidTill": m37, + "playStoreFreeTrialValidTill": m39, "playstoreSubscription": MessageLookupByLibrary.simpleMessage("PlayStore subscription"), "pleaseCheckYourInternetConnectionAndTryAgain": @@ -1008,12 +1019,12 @@ class MessageLookup extends MessageLookupByLibrary { "pleaseContactSupportIfTheProblemPersists": MessageLookupByLibrary.simpleMessage( "Please contact support if the problem persists"), - "pleaseEmailUsAt": m38, + "pleaseEmailUsAt": m40, "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage("Please grant permissions"), "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage("Please login again"), - "pleaseSendTheLogsTo": m39, + "pleaseSendTheLogsTo": m41, "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("Please try again"), "pleaseVerifyTheCodeYouHaveEntered": @@ -1048,7 +1059,7 @@ class MessageLookup extends MessageLookupByLibrary { "raiseTicket": MessageLookupByLibrary.simpleMessage("Raise ticket"), "rateTheApp": MessageLookupByLibrary.simpleMessage("Rate the app"), "rateUs": MessageLookupByLibrary.simpleMessage("Rate us"), - "rateUsOnStore": m40, + "rateUsOnStore": m42, "recover": MessageLookupByLibrary.simpleMessage("Recover"), "recoverAccount": MessageLookupByLibrary.simpleMessage("Recover account"), @@ -1079,7 +1090,7 @@ class MessageLookup extends MessageLookupByLibrary { "1. Give this code to your friends"), "referralStep2": MessageLookupByLibrary.simpleMessage( "2. They sign up for a paid plan"), - "referralStep3": m41, + "referralStep3": m43, "referrals": MessageLookupByLibrary.simpleMessage("Referrals"), "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage( "Referrals are currently paused"), @@ -1103,7 +1114,7 @@ class MessageLookup extends MessageLookupByLibrary { "removeLink": MessageLookupByLibrary.simpleMessage("Remove link"), "removeParticipant": MessageLookupByLibrary.simpleMessage("Remove participant"), - "removeParticipantBody": m42, + "removeParticipantBody": m44, "removePublicLink": MessageLookupByLibrary.simpleMessage("Remove public link"), "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage( @@ -1117,7 +1128,7 @@ class MessageLookup extends MessageLookupByLibrary { "renameFile": MessageLookupByLibrary.simpleMessage("Rename file"), "renewSubscription": MessageLookupByLibrary.simpleMessage("Renew subscription"), - "renewsOn": m43, + "renewsOn": m45, "reportABug": MessageLookupByLibrary.simpleMessage("Report a bug"), "reportBug": MessageLookupByLibrary.simpleMessage("Report bug"), "resendEmail": MessageLookupByLibrary.simpleMessage("Resend email"), @@ -1177,7 +1188,7 @@ class MessageLookup extends MessageLookupByLibrary { "Group photos that are taken within some radius of a photo"), "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage( "Invite people, and you\'ll see all photos shared by them here"), - "searchResultCount": m44, + "searchResultCount": m46, "security": MessageLookupByLibrary.simpleMessage("Security"), "selectALocation": MessageLookupByLibrary.simpleMessage("Select a location"), @@ -1204,8 +1215,8 @@ class MessageLookup extends MessageLookupByLibrary { "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": MessageLookupByLibrary.simpleMessage( "Selected items will be deleted from all albums and moved to trash."), - "selectedPhotos": m45, - "selectedPhotosWithYours": m46, + "selectedPhotos": m47, + "selectedPhotosWithYours": m48, "send": MessageLookupByLibrary.simpleMessage("Send"), "sendEmail": MessageLookupByLibrary.simpleMessage("Send email"), "sendInvite": MessageLookupByLibrary.simpleMessage("Send invite"), @@ -1227,16 +1238,16 @@ class MessageLookup extends MessageLookupByLibrary { "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("Share an album now"), "shareLink": MessageLookupByLibrary.simpleMessage("Share link"), - "shareMyVerificationID": m47, + "shareMyVerificationID": m49, "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage( "Share only with the people you want"), - "shareTextConfirmOthersVerificationID": m48, + "shareTextConfirmOthersVerificationID": m50, "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage( "Download ente so we can easily share original quality photos and videos\n\nhttps://ente.io"), - "shareTextReferralCode": m49, + "shareTextReferralCode": m51, "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage("Share with non-ente users"), - "shareWithPeopleSectionTitle": m50, + "shareWithPeopleSectionTitle": m52, "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage("Share your first album"), "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage( @@ -1247,7 +1258,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("New shared photos"), "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage( "Receive notifications when someone adds a photo to a shared album that you\'re a part of"), - "sharedWith": m51, + "sharedWith": m53, "sharedWithMe": MessageLookupByLibrary.simpleMessage("Shared with me"), "sharedWithYou": MessageLookupByLibrary.simpleMessage("Shared with you"), @@ -1261,11 +1272,11 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Sign out other devices"), "signUpTerms": MessageLookupByLibrary.simpleMessage( "I agree to the terms of service and privacy policy"), - "singleFileDeleteFromDevice": m52, + "singleFileDeleteFromDevice": m54, "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage( "It will be deleted from all albums."), - "singleFileInBothLocalAndRemote": m53, - "singleFileInRemoteOnly": m54, + "singleFileInBothLocalAndRemote": m55, + "singleFileInRemoteOnly": m56, "skip": MessageLookupByLibrary.simpleMessage("Skip"), "social": MessageLookupByLibrary.simpleMessage("Social"), "someItemsAreInBothEnteAndYourDevice": @@ -1303,13 +1314,13 @@ class MessageLookup extends MessageLookupByLibrary { "storage": MessageLookupByLibrary.simpleMessage("Storage"), "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("Family"), "storageBreakupYou": MessageLookupByLibrary.simpleMessage("You"), - "storageInGB": m55, + "storageInGB": m57, "storageLimitExceeded": MessageLookupByLibrary.simpleMessage("Storage limit exceeded"), - "storageUsageInfo": m56, + "storageUsageInfo": m58, "strongStrength": MessageLookupByLibrary.simpleMessage("Strong"), - "subAlreadyLinkedErrMessage": m57, - "subWillBeCancelledOn": m58, + "subAlreadyLinkedErrMessage": m59, + "subWillBeCancelledOn": m60, "subscribe": MessageLookupByLibrary.simpleMessage("Subscribe"), "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage( "Looks like your subscription has expired. Please subscribe to enable sharing."), @@ -1326,7 +1337,7 @@ class MessageLookup extends MessageLookupByLibrary { "suggestFeatures": MessageLookupByLibrary.simpleMessage("Suggest features"), "support": MessageLookupByLibrary.simpleMessage("Support"), - "syncProgress": m59, + "syncProgress": m61, "syncStopped": MessageLookupByLibrary.simpleMessage("Sync stopped"), "syncing": MessageLookupByLibrary.simpleMessage("Syncing..."), "systemTheme": MessageLookupByLibrary.simpleMessage("System"), @@ -1352,7 +1363,7 @@ class MessageLookup extends MessageLookupByLibrary { "theseItemsWillBeDeletedFromYourDevice": MessageLookupByLibrary.simpleMessage( "These items will be deleted from your device."), - "theyAlsoGetXGb": m60, + "theyAlsoGetXGb": m62, "theyWillBeDeletedFromAllAlbums": MessageLookupByLibrary.simpleMessage( "They will be deleted from all albums."), "thisActionCannotBeUndone": MessageLookupByLibrary.simpleMessage( @@ -1368,7 +1379,7 @@ class MessageLookup extends MessageLookupByLibrary { "This email is already in use"), "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage("This image has no exif data"), - "thisIsPersonVerificationId": m61, + "thisIsPersonVerificationId": m63, "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage( "This is your Verification ID"), "thisWillLogYouOutOfTheFollowingDevice": @@ -1384,7 +1395,7 @@ class MessageLookup extends MessageLookupByLibrary { "total": MessageLookupByLibrary.simpleMessage("total"), "totalSize": MessageLookupByLibrary.simpleMessage("Total size"), "trash": MessageLookupByLibrary.simpleMessage("Trash"), - "trashDaysLeft": m62, + "trashDaysLeft": m64, "tryAgain": MessageLookupByLibrary.simpleMessage("Try again"), "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage( "Turn on backup to automatically upload files added to this device folder to ente."), @@ -1436,7 +1447,7 @@ class MessageLookup extends MessageLookupByLibrary { "useSelectedPhoto": MessageLookupByLibrary.simpleMessage("Use selected photo"), "usedSpace": MessageLookupByLibrary.simpleMessage("Used space"), - "validTill": m63, + "validTill": m65, "verificationFailedPleaseTryAgain": MessageLookupByLibrary.simpleMessage( "Verification failed, please try again"), @@ -1444,7 +1455,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Verification ID"), "verify": MessageLookupByLibrary.simpleMessage("Verify"), "verifyEmail": MessageLookupByLibrary.simpleMessage("Verify email"), - "verifyEmailID": m64, + "verifyEmailID": m66, "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verify"), "verifyPasskey": MessageLookupByLibrary.simpleMessage("Verify passkey"), "verifyPassword": @@ -1475,11 +1486,11 @@ class MessageLookup extends MessageLookupByLibrary { "weDontSupportEditingPhotosAndAlbumsThatYouDont": MessageLookupByLibrary.simpleMessage( "We don\'t support editing photos and albums that you don\'t own yet"), - "weHaveSendEmailTo": m65, + "weHaveSendEmailTo": m67, "weakStrength": MessageLookupByLibrary.simpleMessage("Weak"), "welcomeBack": MessageLookupByLibrary.simpleMessage("Welcome back!"), "yearly": MessageLookupByLibrary.simpleMessage("Yearly"), - "yearsAgo": m66, + "yearsAgo": m68, "yes": MessageLookupByLibrary.simpleMessage("Yes"), "yesCancel": MessageLookupByLibrary.simpleMessage("Yes, cancel"), "yesConvertToViewer": @@ -1509,7 +1520,7 @@ class MessageLookup extends MessageLookupByLibrary { "You cannot share with yourself"), "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage( "You don\'t have any archived items."), - "youHaveSuccessfullyFreedUp": m67, + "youHaveSuccessfullyFreedUp": m69, "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage( "Your account has been deleted"), "yourMap": MessageLookupByLibrary.simpleMessage("Your map"), diff --git a/mobile/lib/generated/intl/messages_es.dart b/mobile/lib/generated/intl/messages_es.dart index 7b2121bb5..0c2673d46 100644 --- a/mobile/lib/generated/intl/messages_es.dart +++ b/mobile/lib/generated/intl/messages_es.dart @@ -21,24 +21,30 @@ class MessageLookup extends MessageLookupByLibrary { String get localeName => 'es'; static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m2(count) => "${Intl.plural(count, one: 'Agregar elemento', other: 'Agregar elementos')}}"; - static String m2(emailOrName) => "Añadido por ${emailOrName}"; + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; - static String m3(albumName) => "Añadido exitosamente a ${albumName}"; + static String m4(emailOrName) => "Añadido por ${emailOrName}"; - static String m4(count) => + static String m5(albumName) => "Añadido exitosamente a ${albumName}"; + + static String m6(count) => "${Intl.plural(count, zero: 'No hay Participantes', one: '1 Participante', other: '${count} Participantes')}"; - static String m5(versionValue) => "Versión: ${versionValue}"; + static String m7(versionValue) => "Versión: ${versionValue}"; - static String m6(paymentProvider) => + static String m8(paymentProvider) => "Por favor, cancele primero su suscripción existente de ${paymentProvider}"; - static String m7(user) => + static String m9(user) => "${user} no podrá añadir más fotos a este álbum\n\nTodavía podrán eliminar las fotos ya añadidas por ellos"; - static String m8(isFamilyMember, storageAmountInGb) => + static String m10(isFamilyMember, storageAmountInGb) => "${Intl.select(isFamilyMember, { 'true': 'Su familia ha reclamado ${storageAmountInGb} GB hasta el momento', @@ -48,145 +54,146 @@ class MessageLookup extends MessageLookupByLibrary { '¡Tú has reclamado ${storageAmountInGb} GB hasta el momento!', })}"; - static String m9(albumName) => "Enlace colaborativo creado para ${albumName}"; + static String m11(albumName) => + "Enlace colaborativo creado para ${albumName}"; - static String m10(familyAdminEmail) => + static String m12(familyAdminEmail) => "Por favor contacta con ${familyAdminEmail} para administrar tu suscripción"; - static String m11(provider) => + static String m13(provider) => "Por favor, contáctenos en support@ente.io para gestionar su suscripción a ${provider}."; - static String m13(currentlyDeleting, totalCount) => + static String m15(currentlyDeleting, totalCount) => "Borrando ${currentlyDeleting} / ${totalCount}"; - static String m14(albumName) => + static String m16(albumName) => "Esto eliminará el enlace público para acceder a \"${albumName}\"."; - static String m15(supportEmail) => + static String m17(supportEmail) => "Por favor, envíe un email a ${supportEmail} desde su dirección de correo electrónico registrada"; - static String m16(count, storageSaved) => + static String m18(count, storageSaved) => "¡Has limpiado ${Intl.plural(count, one: '${count} archivo duplicado', other: '${count} archivos duplicados')}, ahorrando (${storageSaved}!)"; - static String m18(newEmail) => "Correo cambiado a ${newEmail}"; + static String m20(newEmail) => "Correo cambiado a ${newEmail}"; - static String m19(email) => + static String m21(email) => "${email} no tiene una cuenta ente.\n\nEnvíale una invitación para compartir fotos."; - static String m20(count, formattedNumber) => + static String m22(count, formattedNumber) => "${Intl.plural(count, one: '1 archivo', other: '${formattedNumber} archivos')} en este dispositivo han sido respaldados de forma segura"; - static String m21(count, formattedNumber) => + static String m23(count, formattedNumber) => "${Intl.plural(count, one: '1 archivo', other: '${formattedNumber} archivos')} en este álbum ha sido respaldado de forma segura"; - static String m22(storageAmountInGB) => + static String m24(storageAmountInGB) => "${storageAmountInGB} GB cada vez que alguien se registra en un plan de pago y aplica tu código"; - static String m23(freeAmount, storageUnit) => + static String m25(freeAmount, storageUnit) => "${freeAmount} ${storageUnit} gratis"; - static String m24(endDate) => "Prueba gratuita válida hasta${endDate}"; + static String m26(endDate) => "Prueba gratuita válida hasta${endDate}"; - static String m25(count) => + static String m27(count) => "Aún puedes acceder ${Intl.plural(count, one: 'si', other: 'entonces')} en ente mientras mantengas una suscripción activa"; - static String m26(sizeInMBorGB) => "Liberar ${sizeInMBorGB}"; + static String m28(sizeInMBorGB) => "Liberar ${sizeInMBorGB}"; - static String m27(count, formattedSize) => + static String m29(count, formattedSize) => "${Intl.plural(count, one: 'Se puede eliminar del dispositivo para liberar ${formattedSize}', other: 'Se pueden eliminar del dispositivo para liberar ${formattedSize}')}"; - static String m29(count) => + static String m31(count) => "${Intl.plural(count, one: '${count} elemento', other: '${count} elementos')}"; - static String m30(expiryTime) => "El enlace caducará en ${expiryTime}"; + static String m32(expiryTime) => "El enlace caducará en ${expiryTime}"; - static String m31(count, formattedCount) => + static String m33(count, formattedCount) => "${Intl.plural(count, zero: 'no recuerdos', one: '${formattedCount} recuerdo', other: '${formattedCount} recuerdos')}\n"; - static String m32(count) => + static String m34(count) => "${Intl.plural(count, one: 'Mover elemento', other: 'Mover elementos')}"; - static String m33(albumName) => "Movido exitosamente a ${albumName}"; + static String m35(albumName) => "Movido exitosamente a ${albumName}"; - static String m34(passwordStrengthValue) => + static String m36(passwordStrengthValue) => "Seguridad de la contraseña : ${passwordStrengthValue}"; - static String m35(providerName) => + static String m37(providerName) => "Por favor hable con el soporte de ${providerName} si se le cobró"; - static String m36(reason) => + static String m38(reason) => "Lamentablemente tu pago falló debido a ${reason}"; - static String m38(toEmail) => + static String m40(toEmail) => "Por favor, envíanos un correo electrónico a ${toEmail}"; - static String m39(toEmail) => "Por favor, envíe los registros a ${toEmail}"; + static String m41(toEmail) => "Por favor, envíe los registros a ${toEmail}"; - static String m40(storeName) => "Califícanos en ${storeName}"; + static String m42(storeName) => "Califícanos en ${storeName}"; - static String m41(storageInGB) => + static String m43(storageInGB) => "3. Ambos obtienen ${storageInGB} GB* gratis"; - static String m42(userEmail) => + static String m44(userEmail) => "${userEmail} será eliminado de este álbum compartido\n\nCualquier foto añadida por ellos también será eliminada del álbum"; - static String m43(endDate) => "Se renueva el ${endDate}"; + static String m45(endDate) => "Se renueva el ${endDate}"; - static String m45(count) => "${count} seleccionados"; + static String m47(count) => "${count} seleccionados"; - static String m46(count, yourCount) => + static String m48(count, yourCount) => "${count} seleccionados (${yourCount} tuyos)"; - static String m47(verificationID) => + static String m49(verificationID) => "Aquí está mi ID de verificación: ${verificationID} para ente.io."; - static String m48(verificationID) => + static String m50(verificationID) => "Hola, ¿puedes confirmar que esta es tu ID de verificación ente.io: ${verificationID}?"; - static String m49(referralCode, referralStorageInGB) => + static String m51(referralCode, referralStorageInGB) => "ente código de referencia: ${referralCode} \n\nAplicarlo en Ajustes → General → Referencias para obtener ${referralStorageInGB} GB gratis después de registrarse en un plan de pago\n\nhttps://ente.io"; - static String m50(numberOfPeople) => + static String m52(numberOfPeople) => "${Intl.plural(numberOfPeople, zero: 'Compartir con personas específicas', one: 'Compartido con 1 persona', other: 'Compartido con ${numberOfPeople} personas')}"; - static String m51(emailIDs) => "Compartido con ${emailIDs}"; + static String m53(emailIDs) => "Compartido con ${emailIDs}"; - static String m52(fileType) => + static String m54(fileType) => "Este ${fileType} se eliminará de tu dispositivo."; - static String m53(fileType) => + static String m55(fileType) => "Este ${fileType} está tanto en ente como en tu dispositivo."; - static String m54(fileType) => "Este ${fileType} se eliminará de ente."; + static String m56(fileType) => "Este ${fileType} se eliminará de ente."; - static String m55(storageAmountInGB) => "${storageAmountInGB} GB"; + static String m57(storageAmountInGB) => "${storageAmountInGB} GB"; - static String m56( + static String m58( usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) => "${usedAmount} ${usedStorageUnit} de ${totalAmount} ${totalStorageUnit} usados"; - static String m57(id) => + static String m59(id) => "Su ${id} ya está vinculado a otra cuenta ente.\nSi desea utilizar su ${id} con esta cuenta, póngase en contacto con nuestro servicio de asistencia\'\'"; - static String m58(endDate) => "Tu suscripción se cancelará el ${endDate}"; + static String m60(endDate) => "Tu suscripción se cancelará el ${endDate}"; - static String m59(completed, total) => + static String m61(completed, total) => "${completed}/${total} recuerdos conservados"; - static String m60(storageAmountInGB) => + static String m62(storageAmountInGB) => "También obtienen ${storageAmountInGB} GB"; - static String m61(email) => "Este es el ID de verificación de ${email}"; + static String m63(email) => "Este es el ID de verificación de ${email}"; - static String m64(email) => "Verificar ${email}"; + static String m66(email) => "Verificar ${email}"; - static String m65(email) => + static String m67(email) => "Hemos enviado un correo a ${email}"; - static String m66(count) => + static String m68(count) => "${Intl.plural(count, one: '${count} hace un año', other: '${count} hace años')}"; - static String m67(storageSaved) => "¡Has liberado ${storageSaved} con éxito!"; + static String m69(storageSaved) => "¡Has liberado ${storageSaved} con éxito!"; final messages = _notInlinedMessages(_notInlinedMessages); static Map _notInlinedMessages(_) => { @@ -204,7 +211,8 @@ class MessageLookup extends MessageLookupByLibrary { "Agregar nuevo correo electrónico"), "addCollaborator": MessageLookupByLibrary.simpleMessage("Agregar colaborador"), - "addItem": m0, + "addCollaborators": m0, + "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("Agregar ubicación"), "addLocationButton": MessageLookupByLibrary.simpleMessage("Añadir"), @@ -214,9 +222,10 @@ class MessageLookup extends MessageLookupByLibrary { "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Add to hidden album"), "addViewer": MessageLookupByLibrary.simpleMessage("Añadir espectador"), + "addViewers": m1, "addedAs": MessageLookupByLibrary.simpleMessage("Agregado como"), - "addedBy": m2, - "addedSuccessfullyTo": m3, + "addedBy": m4, + "addedSuccessfullyTo": m5, "addingToFavorites": MessageLookupByLibrary.simpleMessage("Añadiendo a favoritos..."), "advanced": MessageLookupByLibrary.simpleMessage("Avanzado"), @@ -229,7 +238,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Después de una semana"), "after1Year": MessageLookupByLibrary.simpleMessage("Después de un año"), "albumOwner": MessageLookupByLibrary.simpleMessage("Propietario"), - "albumParticipantsCount": m4, + "albumParticipantsCount": m6, "albumTitle": MessageLookupByLibrary.simpleMessage("Título del álbum"), "albumUpdated": MessageLookupByLibrary.simpleMessage("Álbum actualizado"), @@ -247,7 +256,7 @@ class MessageLookup extends MessageLookupByLibrary { "Permitir que la gente añada fotos"), "androidIosWebDesktop": MessageLookupByLibrary.simpleMessage( "Android, iOS, Web, Computadora"), - "appVersion": m5, + "appVersion": m7, "appleId": MessageLookupByLibrary.simpleMessage("ID de Apple"), "apply": MessageLookupByLibrary.simpleMessage("Aplicar"), "applyCodeTitle": MessageLookupByLibrary.simpleMessage("Usar código"), @@ -329,10 +338,10 @@ class MessageLookup extends MessageLookupByLibrary { "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage( "Sólo puede eliminar archivos de tu propiedad"), "cancel": MessageLookupByLibrary.simpleMessage("Cancelar"), - "cancelOtherSubscription": m6, + "cancelOtherSubscription": m8, "cancelSubscription": MessageLookupByLibrary.simpleMessage("Cancelar suscripción"), - "cannotAddMorePhotosAfterBecomingViewer": m7, + "cannotAddMorePhotosAfterBecomingViewer": m9, "centerPoint": MessageLookupByLibrary.simpleMessage("Punto central"), "changeEmail": MessageLookupByLibrary.simpleMessage("Cambiar correo electrónico"), @@ -353,7 +362,7 @@ class MessageLookup extends MessageLookupByLibrary { "Reclamar almacenamiento gratis"), "claimMore": MessageLookupByLibrary.simpleMessage("¡Reclama más!"), "claimed": MessageLookupByLibrary.simpleMessage("Reclamado"), - "claimedStorageSoFar": m8, + "claimedStorageSoFar": m10, "clearCaches": MessageLookupByLibrary.simpleMessage("Limpiar caché"), "click": MessageLookupByLibrary.simpleMessage("• Click"), "clickOnTheOverflowMenu": MessageLookupByLibrary.simpleMessage( @@ -371,7 +380,7 @@ class MessageLookup extends MessageLookupByLibrary { "Crea un enlace para que la gente pueda añadir y ver fotos en tu álbum compartido sin necesidad de la aplicación ente o una cuenta. Genial para recolectar fotos de eventos."), "collaborativeLink": MessageLookupByLibrary.simpleMessage("Enlace colaborativo"), - "collaborativeLinkCreatedFor": m9, + "collaborativeLinkCreatedFor": m11, "collaborator": MessageLookupByLibrary.simpleMessage("Colaborador"), "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": MessageLookupByLibrary.simpleMessage( @@ -396,10 +405,10 @@ class MessageLookup extends MessageLookupByLibrary { "Confirmar clave de recuperación"), "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage( "Confirme su clave de recuperación"), - "contactFamilyAdmin": m10, + "contactFamilyAdmin": m12, "contactSupport": MessageLookupByLibrary.simpleMessage("Contactar con soporte"), - "contactToManageSubscription": m11, + "contactToManageSubscription": m13, "contacts": MessageLookupByLibrary.simpleMessage("Contacts"), "continueLabel": MessageLookupByLibrary.simpleMessage("Continuar"), "continueOnFreeTrial": MessageLookupByLibrary.simpleMessage( @@ -472,7 +481,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Borrar la ubicación"), "deletePhotos": MessageLookupByLibrary.simpleMessage("Borrar las fotos"), - "deleteProgress": m13, + "deleteProgress": m15, "deleteReason1": MessageLookupByLibrary.simpleMessage( "Falta una característica clave que necesito"), "deleteReason2": MessageLookupByLibrary.simpleMessage( @@ -506,7 +515,7 @@ class MessageLookup extends MessageLookupByLibrary { "Los espectadores todavía pueden tomar capturas de pantalla o guardar una copia de sus fotos usando herramientas externas"), "disableDownloadWarningTitle": MessageLookupByLibrary.simpleMessage("Por favor tenga en cuenta"), - "disableLinkMessage": m14, + "disableLinkMessage": m16, "disableTwofactor": MessageLookupByLibrary.simpleMessage("Deshabilitar dos factores"), "disablingTwofactorAuthentication": @@ -527,8 +536,8 @@ class MessageLookup extends MessageLookupByLibrary { "downloadFailed": MessageLookupByLibrary.simpleMessage("Descarga fallida"), "downloading": MessageLookupByLibrary.simpleMessage("Descargando..."), - "dropSupportEmail": m15, - "duplicateFileCountWithStorageSaved": m16, + "dropSupportEmail": m17, + "duplicateFileCountWithStorageSaved": m18, "edit": MessageLookupByLibrary.simpleMessage("Editar"), "editLocation": MessageLookupByLibrary.simpleMessage("Edit location"), "editLocationTagTitle": @@ -540,8 +549,8 @@ class MessageLookup extends MessageLookupByLibrary { "Edits to location will only be seen within Ente"), "eligible": MessageLookupByLibrary.simpleMessage("elegible"), "email": MessageLookupByLibrary.simpleMessage("Correo electrónico"), - "emailChangedTo": m18, - "emailNoEnteAccount": m19, + "emailChangedTo": m20, + "emailNoEnteAccount": m21, "emailYourLogs": MessageLookupByLibrary.simpleMessage( "Envíe sus registros por correo electrónico"), "empty": MessageLookupByLibrary.simpleMessage("Vaciar"), @@ -630,8 +639,8 @@ class MessageLookup extends MessageLookupByLibrary { "fileSavedToGallery": MessageLookupByLibrary.simpleMessage( "Archivo guardado en la galería"), "fileTypes": MessageLookupByLibrary.simpleMessage("File types"), - "filesBackedUpFromDevice": m20, - "filesBackedUpInAlbum": m21, + "filesBackedUpFromDevice": m22, + "filesBackedUpInAlbum": m23, "filesDeleted": MessageLookupByLibrary.simpleMessage("Archivos eliminados"), "flip": MessageLookupByLibrary.simpleMessage("Voltear"), @@ -641,18 +650,18 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Olvidé mi contraseña"), "freeStorageClaimed": MessageLookupByLibrary.simpleMessage( "Almacenamiento gratuito reclamado"), - "freeStorageOnReferralSuccess": m22, - "freeStorageSpace": m23, + "freeStorageOnReferralSuccess": m24, + "freeStorageSpace": m25, "freeStorageUsable": MessageLookupByLibrary.simpleMessage( "Almacenamiento libre disponible"), "freeTrial": MessageLookupByLibrary.simpleMessage("Prueba gratuita"), - "freeTrialValidTill": m24, - "freeUpAccessPostDelete": m25, - "freeUpAmount": m26, + "freeTrialValidTill": m26, + "freeUpAccessPostDelete": m27, + "freeUpAmount": m28, "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage( "Liberar espacio del dispositivo"), "freeUpSpace": MessageLookupByLibrary.simpleMessage("Liberar espacio"), - "freeUpSpaceSaving": m27, + "freeUpSpaceSaving": m29, "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage( "Hasta 1000 memorias mostradas en la galería"), "general": MessageLookupByLibrary.simpleMessage("General"), @@ -698,7 +707,7 @@ class MessageLookup extends MessageLookupByLibrary { "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": MessageLookupByLibrary.simpleMessage( "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."), - "itemCount": m29, + "itemCount": m31, "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": MessageLookupByLibrary.simpleMessage( "Los artículos muestran el número de días restantes antes de ser borrados permanente"), @@ -727,7 +736,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Límite del dispositivo"), "linkEnabled": MessageLookupByLibrary.simpleMessage("Habilitado"), "linkExpired": MessageLookupByLibrary.simpleMessage("Vencido"), - "linkExpiresOn": m30, + "linkExpiresOn": m32, "linkExpiry": MessageLookupByLibrary.simpleMessage("Enlace vence"), "linkHasExpired": MessageLookupByLibrary.simpleMessage("El enlace ha caducado"), @@ -776,6 +785,9 @@ class MessageLookup extends MessageLookupByLibrary { "logout": MessageLookupByLibrary.simpleMessage("Cerrar sesión"), "logsDialogBody": MessageLookupByLibrary.simpleMessage( "Esto enviará registros para ayudarnos a depurar su problema. Tenga en cuenta que los nombres de los archivos se incluirán para ayudar a rastrear problemas con archivos específicos."), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "longpressOnAnItemToViewInFullscreen": MessageLookupByLibrary.simpleMessage( "Pulsación prolongada en un elemento para ver en pantalla completa"), "lostDevice": @@ -793,7 +805,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Administrar tu suscripción"), "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"), "matrix": MessageLookupByLibrary.simpleMessage("Matrix"), - "memoryCount": m31, + "memoryCount": m33, "merchandise": MessageLookupByLibrary.simpleMessage("Mercancías"), "mobileWebDesktop": MessageLookupByLibrary.simpleMessage("Celular, Web, Computadora"), @@ -802,11 +814,11 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage( "Modify your query, or try searching for"), "monthly": MessageLookupByLibrary.simpleMessage("Mensual"), - "moveItem": m32, + "moveItem": m34, "moveToAlbum": MessageLookupByLibrary.simpleMessage("Mover al álbum"), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Move to hidden album"), - "movedSuccessfullyTo": m33, + "movedSuccessfullyTo": m35, "movedToTrash": MessageLookupByLibrary.simpleMessage("Movido a la papelera"), "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage( @@ -856,14 +868,14 @@ class MessageLookup extends MessageLookupByLibrary { "Contraseña cambiada correctamente"), "passwordLock": MessageLookupByLibrary.simpleMessage("Bloqueo por contraseña"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "No almacenamos esta contraseña, así que si la olvidas, no podemos descifrar tus datos"), "paymentDetails": MessageLookupByLibrary.simpleMessage("Detalles de pago"), "paymentFailed": MessageLookupByLibrary.simpleMessage("Pago fallido"), - "paymentFailedTalkToProvider": m35, - "paymentFailedWithReason": m36, + "paymentFailedTalkToProvider": m37, + "paymentFailedWithReason": m38, "pendingSync": MessageLookupByLibrary.simpleMessage("Sincronización pendiente"), "peopleUsingYourCode": @@ -890,12 +902,12 @@ class MessageLookup extends MessageLookupByLibrary { "pleaseContactSupportIfTheProblemPersists": MessageLookupByLibrary.simpleMessage( "Por favor contacte a soporte técnico si el problema persiste"), - "pleaseEmailUsAt": m38, + "pleaseEmailUsAt": m40, "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage("Por favor, concede permiso"), "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage( "Por favor, vuelva a iniciar sesión"), - "pleaseSendTheLogsTo": m39, + "pleaseSendTheLogsTo": m41, "pleaseTryAgain": MessageLookupByLibrary.simpleMessage( "Por favor, inténtalo nuevamente"), "pleaseVerifyTheCodeYouHaveEntered": @@ -929,7 +941,7 @@ class MessageLookup extends MessageLookupByLibrary { "rateTheApp": MessageLookupByLibrary.simpleMessage("Evalúa la aplicación"), "rateUs": MessageLookupByLibrary.simpleMessage("Califícanos"), - "rateUsOnStore": m40, + "rateUsOnStore": m42, "recover": MessageLookupByLibrary.simpleMessage("Recuperar"), "recoverAccount": MessageLookupByLibrary.simpleMessage("Recuperar cuenta"), @@ -961,7 +973,7 @@ class MessageLookup extends MessageLookupByLibrary { "1. Dale este código a tus amigos"), "referralStep2": MessageLookupByLibrary.simpleMessage( "2. Se inscriben a un plan pagado"), - "referralStep3": m41, + "referralStep3": m43, "referrals": MessageLookupByLibrary.simpleMessage("Referidos"), "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage( "Las referencias están actualmente en pausa"), @@ -986,7 +998,7 @@ class MessageLookup extends MessageLookupByLibrary { "removeLink": MessageLookupByLibrary.simpleMessage("Eliminar enlace"), "removeParticipant": MessageLookupByLibrary.simpleMessage("Quitar participante"), - "removeParticipantBody": m42, + "removeParticipantBody": m44, "removePublicLink": MessageLookupByLibrary.simpleMessage("Quitar enlace público"), "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage( @@ -1000,7 +1012,7 @@ class MessageLookup extends MessageLookupByLibrary { "renameFile": MessageLookupByLibrary.simpleMessage("Renombrar archivo"), "renewSubscription": MessageLookupByLibrary.simpleMessage("Renovar suscripción"), - "renewsOn": m43, + "renewsOn": m45, "reportABug": MessageLookupByLibrary.simpleMessage("Reportar un error"), "reportBug": MessageLookupByLibrary.simpleMessage("Reportar error"), "resendEmail": @@ -1062,8 +1074,8 @@ class MessageLookup extends MessageLookupByLibrary { "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": MessageLookupByLibrary.simpleMessage( "Los archivos seleccionados serán eliminados de todos los álbumes y movidos a la papelera."), - "selectedPhotos": m45, - "selectedPhotosWithYours": m46, + "selectedPhotos": m47, + "selectedPhotosWithYours": m48, "send": MessageLookupByLibrary.simpleMessage("Enviar"), "sendEmail": MessageLookupByLibrary.simpleMessage("Enviar correo electrónico"), @@ -1088,32 +1100,32 @@ class MessageLookup extends MessageLookupByLibrary { "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("Compartir un álbum ahora"), "shareLink": MessageLookupByLibrary.simpleMessage("Compartir enlace"), - "shareMyVerificationID": m47, + "shareMyVerificationID": m49, "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage( "Comparte sólo con la gente que quieres"), - "shareTextConfirmOthersVerificationID": m48, + "shareTextConfirmOthersVerificationID": m50, "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage( "Descarga ente para que podamos compartir fácilmente fotos y videos en su calidad original\n\nhttps://ente.io"), - "shareTextReferralCode": m49, + "shareTextReferralCode": m51, "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage( "Compartir con usuarios no ente"), - "shareWithPeopleSectionTitle": m50, + "shareWithPeopleSectionTitle": m52, "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage("Comparte tu primer álbum"), "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage( "Crear álbumes compartidos y colaborativos con otros usuarios ente, incluyendo usuarios en planes gratuitos."), "sharedByMe": MessageLookupByLibrary.simpleMessage("Compartido por mí"), - "sharedWith": m51, + "sharedWith": m53, "sharedWithMe": MessageLookupByLibrary.simpleMessage("Compartido conmigo"), "sharing": MessageLookupByLibrary.simpleMessage("Compartiendo..."), "signUpTerms": MessageLookupByLibrary.simpleMessage( "Estoy de acuerdo con los términos del servicio y la política de privacidad"), - "singleFileDeleteFromDevice": m52, + "singleFileDeleteFromDevice": m54, "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage( "Se borrará de todos los álbumes."), - "singleFileInBothLocalAndRemote": m53, - "singleFileInRemoteOnly": m54, + "singleFileInBothLocalAndRemote": m55, + "singleFileInRemoteOnly": m56, "skip": MessageLookupByLibrary.simpleMessage("Omitir"), "social": MessageLookupByLibrary.simpleMessage("Social"), "someItemsAreInBothEnteAndYourDevice": @@ -1148,13 +1160,13 @@ class MessageLookup extends MessageLookupByLibrary { "storage": MessageLookupByLibrary.simpleMessage("Almacenamiento"), "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("Familia"), "storageBreakupYou": MessageLookupByLibrary.simpleMessage("Usted"), - "storageInGB": m55, + "storageInGB": m57, "storageLimitExceeded": MessageLookupByLibrary.simpleMessage("Límite de datos excedido"), - "storageUsageInfo": m56, + "storageUsageInfo": m58, "strongStrength": MessageLookupByLibrary.simpleMessage("Segura"), - "subAlreadyLinkedErrMessage": m57, - "subWillBeCancelledOn": m58, + "subAlreadyLinkedErrMessage": m59, + "subWillBeCancelledOn": m60, "subscribe": MessageLookupByLibrary.simpleMessage("Suscribirse"), "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage( "Parece que su suscripción ha caducado. Por favor, suscríbase para habilitar el compartir."), @@ -1167,7 +1179,7 @@ class MessageLookup extends MessageLookupByLibrary { "suggestFeatures": MessageLookupByLibrary.simpleMessage("Sugerir una característica"), "support": MessageLookupByLibrary.simpleMessage("Soporte"), - "syncProgress": m59, + "syncProgress": m61, "syncStopped": MessageLookupByLibrary.simpleMessage("Sincronización detenida"), "syncing": MessageLookupByLibrary.simpleMessage("Sincronizando..."), @@ -1195,7 +1207,7 @@ class MessageLookup extends MessageLookupByLibrary { "theseItemsWillBeDeletedFromYourDevice": MessageLookupByLibrary.simpleMessage( "Estos elementos se eliminarán de tu dispositivo."), - "theyAlsoGetXGb": m60, + "theyAlsoGetXGb": m62, "theyWillBeDeletedFromAllAlbums": MessageLookupByLibrary.simpleMessage( "Se borrarán de todos los álbumes."), "thisActionCannotBeUndone": MessageLookupByLibrary.simpleMessage( @@ -1211,7 +1223,7 @@ class MessageLookup extends MessageLookupByLibrary { "Este correo electrónico ya está en uso"), "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage( "Esta imagen no tiene datos exif"), - "thisIsPersonVerificationId": m61, + "thisIsPersonVerificationId": m63, "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage( "Esta es tu ID de verificación"), "thisWillLogYouOutOfTheFollowingDevice": @@ -1281,7 +1293,7 @@ class MessageLookup extends MessageLookupByLibrary { "verify": MessageLookupByLibrary.simpleMessage("Verificar"), "verifyEmail": MessageLookupByLibrary.simpleMessage( "Verificar correo electrónico"), - "verifyEmailID": m64, + "verifyEmailID": m66, "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verificar"), "verifyPassword": MessageLookupByLibrary.simpleMessage("Verificar contraseña"), @@ -1304,12 +1316,12 @@ class MessageLookup extends MessageLookupByLibrary { "weDontSupportEditingPhotosAndAlbumsThatYouDont": MessageLookupByLibrary.simpleMessage( "No admitimos la edición de fotos y álbunes que aún no son tuyos"), - "weHaveSendEmailTo": m65, + "weHaveSendEmailTo": m67, "weakStrength": MessageLookupByLibrary.simpleMessage("Poco segura"), "welcomeBack": MessageLookupByLibrary.simpleMessage("¡Bienvenido de nuevo!"), "yearly": MessageLookupByLibrary.simpleMessage("Anualmente"), - "yearsAgo": m66, + "yearsAgo": m68, "yes": MessageLookupByLibrary.simpleMessage("Sí"), "yesCancel": MessageLookupByLibrary.simpleMessage("Sí, cancelar"), "yesConvertToViewer": @@ -1339,7 +1351,7 @@ class MessageLookup extends MessageLookupByLibrary { "No puedes compartir contigo mismo"), "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage( "No tienes nada de elementos archivados."), - "youHaveSuccessfullyFreedUp": m67, + "youHaveSuccessfullyFreedUp": m69, "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage("Su cuenta ha sido eliminada"), "yourMap": MessageLookupByLibrary.simpleMessage("Your map"), diff --git a/mobile/lib/generated/intl/messages_fr.dart b/mobile/lib/generated/intl/messages_fr.dart index b2ac59426..6bef1659c 100644 --- a/mobile/lib/generated/intl/messages_fr.dart +++ b/mobile/lib/generated/intl/messages_fr.dart @@ -21,24 +21,30 @@ class MessageLookup extends MessageLookupByLibrary { String get localeName => 'fr'; static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m2(count) => "${Intl.plural(count, one: 'Ajoutez un objet', other: 'Ajoutez des objets')}"; - static String m2(emailOrName) => "Ajouté par ${emailOrName}"; + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; - static String m3(albumName) => "Ajouté avec succès à ${albumName}"; + static String m4(emailOrName) => "Ajouté par ${emailOrName}"; - static String m4(count) => + static String m5(albumName) => "Ajouté avec succès à ${albumName}"; + + static String m6(count) => "${Intl.plural(count, zero: 'Aucun Participant', one: '1 Participant', other: '${count} Participants')}"; - static String m5(versionValue) => "Version : ${versionValue}"; + static String m7(versionValue) => "Version : ${versionValue}"; - static String m6(paymentProvider) => + static String m8(paymentProvider) => "Veuillez d\'abord annuler votre abonnement existant de ${paymentProvider}"; - static String m7(user) => + static String m9(user) => "${user} ne pourra pas ajouter plus de photos à cet album\n\nIl pourrait toujours supprimer les photos existantes ajoutées par eux"; - static String m8(isFamilyMember, storageAmountInGb) => + static String m10(isFamilyMember, storageAmountInGb) => "${Intl.select(isFamilyMember, { 'true': 'Votre famille a demandé ${storageAmountInGb} GB jusqu\'à présent', @@ -48,161 +54,161 @@ class MessageLookup extends MessageLookupByLibrary { 'Vous avez réclamé ${storageAmountInGb} GB jusqu\'à présent!', })}"; - static String m9(albumName) => "Lien collaboratif créé pour ${albumName}"; + static String m11(albumName) => "Lien collaboratif créé pour ${albumName}"; - static String m10(familyAdminEmail) => + static String m12(familyAdminEmail) => "Veuillez contacter ${familyAdminEmail} pour gérer votre abonnement"; - static String m11(provider) => + static String m13(provider) => "Veuillez nous contacter à support@ente.io pour gérer votre abonnement ${provider}."; - static String m12(count) => + static String m14(count) => "${Intl.plural(count, one: 'Supprimer le fichier', other: 'Supprimer ${count} fichiers')}"; - static String m13(currentlyDeleting, totalCount) => + static String m15(currentlyDeleting, totalCount) => "Suppression de ${currentlyDeleting} / ${totalCount}"; - static String m14(albumName) => + static String m16(albumName) => "Cela supprimera le lien public pour accéder à \"${albumName}\"."; - static String m15(supportEmail) => + static String m17(supportEmail) => "Veuillez envoyer un e-mail à ${supportEmail} depuis votre adresse enregistrée"; - static String m16(count, storageSaved) => + static String m18(count, storageSaved) => "Vous avez nettoyé ${Intl.plural(count, one: '${count} fichier dupliqué', other: '${count} fichiers dupliqués')}, sauvegarde (${storageSaved}!)"; - static String m17(count, formattedSize) => + static String m19(count, formattedSize) => "${count} fichiers, ${formattedSize} chacun"; - static String m18(newEmail) => "L\'e-mail a été changé en ${newEmail}"; + static String m20(newEmail) => "L\'e-mail a été changé en ${newEmail}"; - static String m19(email) => + static String m21(email) => "${email} n\'a pas de compte ente.\n\nEnvoyez une invitation pour partager des photos."; - static String m20(count, formattedNumber) => + static String m22(count, formattedNumber) => "${Intl.plural(count, one: '1 fichier sur cet appareil a été sauvegardé en toute sécurité', other: '${formattedNumber} fichiers sur cet appareil ont été sauvegardés en toute sécurité')}"; - static String m21(count, formattedNumber) => + static String m23(count, formattedNumber) => "${Intl.plural(count, one: '1 fichier dans cet album a été sauvegardé en toute sécurité', other: '${formattedNumber} fichiers dans cet album ont été sauvegardés en toute sécurité')}"; - static String m22(storageAmountInGB) => + static String m24(storageAmountInGB) => "${storageAmountInGB} Go chaque fois que quelqu\'un s\'inscrit à une offre payante et applique votre code"; - static String m23(freeAmount, storageUnit) => + static String m25(freeAmount, storageUnit) => "${freeAmount} ${storageUnit} libre"; - static String m24(endDate) => "Essai gratuit valide jusqu’au ${endDate}"; + static String m26(endDate) => "Essai gratuit valide jusqu’au ${endDate}"; - static String m25(count) => + static String m27(count) => "Vous pouvez toujours ${Intl.plural(count, one: 'y', other: 'y')} accéder sur ente tant que vous avez un abonnement actif"; - static String m26(sizeInMBorGB) => "Libérer ${sizeInMBorGB}"; + static String m28(sizeInMBorGB) => "Libérer ${sizeInMBorGB}"; - static String m27(count, formattedSize) => + static String m29(count, formattedSize) => "${Intl.plural(count, one: 'Peut être supprimé de l\'appareil pour libérer ${formattedSize}', other: 'Peuvent être supprimés de l\'appareil pour libérer ${formattedSize}')}"; - static String m29(count) => + static String m31(count) => "${Intl.plural(count, one: '${count} objet', other: '${count} objets')}"; - static String m30(expiryTime) => "Le lien expirera le ${expiryTime}"; + static String m32(expiryTime) => "Le lien expirera le ${expiryTime}"; - static String m31(count, formattedCount) => + static String m33(count, formattedCount) => "${Intl.plural(count, one: '${formattedCount} mémoire', other: '${formattedCount} souvenirs')}"; - static String m32(count) => + static String m34(count) => "${Intl.plural(count, one: 'Déplacez l\'objet', other: 'Déplacez des objets')}"; - static String m33(albumName) => "Déplacé avec succès vers ${albumName}"; + static String m35(albumName) => "Déplacé avec succès vers ${albumName}"; - static String m34(passwordStrengthValue) => + static String m36(passwordStrengthValue) => "Sécurité du mot de passe : ${passwordStrengthValue}"; - static String m35(providerName) => + static String m37(providerName) => "Veuillez contacter le support ${providerName} si vous avez été facturé"; - static String m36(reason) => + static String m38(reason) => "Malheureusement, votre paiement a échoué pour ${reason}"; - static String m37(endDate) => + static String m39(endDate) => "Essai gratuit valable jusqu\'à ${endDate}.\nVous pouvez choisir un plan payant par la suite."; - static String m38(toEmail) => "Merci de nous envoyer un e-mail à ${toEmail}"; + static String m40(toEmail) => "Merci de nous envoyer un e-mail à ${toEmail}"; - static String m39(toEmail) => "Envoyez les logs à ${toEmail}"; + static String m41(toEmail) => "Envoyez les logs à ${toEmail}"; - static String m40(storeName) => "Notez-nous sur ${storeName}"; + static String m42(storeName) => "Notez-nous sur ${storeName}"; - static String m41(storageInGB) => + static String m43(storageInGB) => "3. Vous recevez tous les deux ${storageInGB} GB* gratuits"; - static String m42(userEmail) => + static String m44(userEmail) => "${userEmail} sera retiré de cet album partagé\n\nToutes les photos ajoutées par eux seront également retirées de l\'album"; - static String m43(endDate) => "Renouvellement le ${endDate}"; + static String m45(endDate) => "Renouvellement le ${endDate}"; - static String m44(count) => + static String m46(count) => "${Intl.plural(count, one: '${count} résultat trouvé', other: '${count} résultats trouvés')}"; - static String m45(count) => "${count} sélectionné(s)"; + static String m47(count) => "${count} sélectionné(s)"; - static String m46(count, yourCount) => + static String m48(count, yourCount) => "${count} sélectionné(s) (${yourCount} à vous)"; - static String m47(verificationID) => + static String m49(verificationID) => "Voici mon ID de vérification : ${verificationID} pour ente.io."; - static String m48(verificationID) => + static String m50(verificationID) => "Hé, pouvez-vous confirmer qu\'il s\'agit de votre ID de vérification ente.io : ${verificationID}"; - static String m49(referralCode, referralStorageInGB) => + static String m51(referralCode, referralStorageInGB) => "code de parrainage ente : ${referralCode} \n\nAppliquez le dans Paramètres → Général → Références pour obtenir ${referralStorageInGB} Go gratuitement après votre inscription à un plan payant\n\nhttps://ente.io"; - static String m50(numberOfPeople) => + static String m52(numberOfPeople) => "${Intl.plural(numberOfPeople, zero: 'Partagez avec des personnes spécifiques', one: 'Partagé avec 1 personne', other: 'Partagé avec ${numberOfPeople} des gens')}"; - static String m51(emailIDs) => "Partagé avec ${emailIDs}"; + static String m53(emailIDs) => "Partagé avec ${emailIDs}"; - static String m52(fileType) => + static String m54(fileType) => "Elle ${fileType} sera supprimée de votre appareil."; - static String m53(fileType) => + static String m55(fileType) => "Cette ${fileType} est à la fois sur ente et sur votre appareil."; - static String m54(fileType) => "Ce ${fileType} sera supprimé de ente."; + static String m56(fileType) => "Ce ${fileType} sera supprimé de ente."; - static String m55(storageAmountInGB) => "${storageAmountInGB} Go"; + static String m57(storageAmountInGB) => "${storageAmountInGB} Go"; - static String m56( + static String m58( usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) => "${usedAmount} ${usedStorageUnit} sur ${totalAmount} ${totalStorageUnit} utilisé"; - static String m57(id) => + static String m59(id) => "Votre ${id} est déjà lié à un autre compte ente.\nSi vous souhaitez utiliser votre ${id} avec ce compte, veuillez contacter notre support"; - static String m58(endDate) => "Votre abonnement sera annulé le ${endDate}"; + static String m60(endDate) => "Votre abonnement sera annulé le ${endDate}"; - static String m59(completed, total) => + static String m61(completed, total) => "${completed}/${total} souvenirs préservés"; - static String m60(storageAmountInGB) => + static String m62(storageAmountInGB) => "Ils obtiennent aussi ${storageAmountInGB} Go"; - static String m61(email) => "Ceci est l\'ID de vérification de ${email}"; + static String m63(email) => "Ceci est l\'ID de vérification de ${email}"; - static String m62(count) => + static String m64(count) => "${Intl.plural(count, zero: '0 jour', one: '1 jour', other: '${count} jours')}"; - static String m63(endDate) => "Valable jusqu\'au ${endDate}"; + static String m65(endDate) => "Valable jusqu\'au ${endDate}"; - static String m64(email) => "Vérifier ${email}"; + static String m66(email) => "Vérifier ${email}"; - static String m65(email) => + static String m67(email) => "Nous avons envoyé un e-mail à ${email}"; - static String m66(count) => + static String m68(count) => "${Intl.plural(count, one: 'il y a ${count} an', other: 'il y a ${count} ans')}"; - static String m67(storageSaved) => + static String m69(storageSaved) => "Vous avez libéré ${storageSaved} avec succès !"; final messages = _notInlinedMessages(_notInlinedMessages); @@ -221,9 +227,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Ajouter un nouvel email"), "addCollaborator": MessageLookupByLibrary.simpleMessage("Ajouter un collaborateur"), + "addCollaborators": m0, "addFromDevice": MessageLookupByLibrary.simpleMessage("Ajouter depuis l\'appareil"), - "addItem": m0, + "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("Ajouter la localisation"), "addLocationButton": MessageLookupByLibrary.simpleMessage("Ajouter"), @@ -243,11 +250,12 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Ajouter à un album masqué"), "addViewer": MessageLookupByLibrary.simpleMessage("Ajouter un observateur"), + "addViewers": m1, "addYourPhotosNow": MessageLookupByLibrary.simpleMessage( "Ajoutez vos photos maintenant"), "addedAs": MessageLookupByLibrary.simpleMessage("Ajouté comme"), - "addedBy": m2, - "addedSuccessfullyTo": m3, + "addedBy": m4, + "addedSuccessfullyTo": m5, "addingToFavorites": MessageLookupByLibrary.simpleMessage("Ajout aux favoris..."), "advanced": MessageLookupByLibrary.simpleMessage("Avancé"), @@ -258,7 +266,7 @@ class MessageLookup extends MessageLookupByLibrary { "after1Week": MessageLookupByLibrary.simpleMessage("Après 1 semaine"), "after1Year": MessageLookupByLibrary.simpleMessage("Après 1 an"), "albumOwner": MessageLookupByLibrary.simpleMessage("Propriétaire"), - "albumParticipantsCount": m4, + "albumParticipantsCount": m6, "albumTitle": MessageLookupByLibrary.simpleMessage("Titre de l\'album"), "albumUpdated": MessageLookupByLibrary.simpleMessage("Album mis à jour"), @@ -293,7 +301,7 @@ class MessageLookup extends MessageLookupByLibrary { "Android, iOS, Web, Ordinateur"), "androidSignInTitle": MessageLookupByLibrary.simpleMessage("Authentification requise"), - "appVersion": m5, + "appVersion": m7, "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"), "apply": MessageLookupByLibrary.simpleMessage("Appliquer"), "applyCodeTitle": @@ -383,10 +391,10 @@ class MessageLookup extends MessageLookupByLibrary { "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage( "Vous ne pouvez supprimer que les fichiers que vous possédez"), "cancel": MessageLookupByLibrary.simpleMessage("Annuler"), - "cancelOtherSubscription": m6, + "cancelOtherSubscription": m8, "cancelSubscription": MessageLookupByLibrary.simpleMessage("Annuler l\'abonnement"), - "cannotAddMorePhotosAfterBecomingViewer": m7, + "cannotAddMorePhotosAfterBecomingViewer": m9, "cannotDeleteSharedFiles": MessageLookupByLibrary.simpleMessage( "Les fichiers partagés ne peuvent pas être supprimés"), "centerPoint": MessageLookupByLibrary.simpleMessage("Point central"), @@ -409,7 +417,7 @@ class MessageLookup extends MessageLookupByLibrary { "Réclamer le stockage gratuit"), "claimMore": MessageLookupByLibrary.simpleMessage("Réclamez plus !"), "claimed": MessageLookupByLibrary.simpleMessage("Réclamée"), - "claimedStorageSoFar": m8, + "claimedStorageSoFar": m10, "clearCaches": MessageLookupByLibrary.simpleMessage("Nettoyer le cache"), "click": MessageLookupByLibrary.simpleMessage("• Click"), @@ -430,7 +438,7 @@ class MessageLookup extends MessageLookupByLibrary { "Créez un lien pour permettre aux gens d\'ajouter et de voir des photos dans votre album partagé sans avoir besoin d\'une application ente ou d\'un compte. Idéal pour collecter des photos d\'événement."), "collaborativeLink": MessageLookupByLibrary.simpleMessage("Lien collaboratif"), - "collaborativeLinkCreatedFor": m9, + "collaborativeLinkCreatedFor": m11, "collaborator": MessageLookupByLibrary.simpleMessage("Collaborateur"), "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": MessageLookupByLibrary.simpleMessage( @@ -458,10 +466,10 @@ class MessageLookup extends MessageLookupByLibrary { "Confirmer la clé de récupération"), "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage( "Confirmer la clé de récupération"), - "contactFamilyAdmin": m10, + "contactFamilyAdmin": m12, "contactSupport": MessageLookupByLibrary.simpleMessage("Contacter l\'assistance"), - "contactToManageSubscription": m11, + "contactToManageSubscription": m13, "contacts": MessageLookupByLibrary.simpleMessage("Contacts"), "contents": MessageLookupByLibrary.simpleMessage("Contenus"), "continueLabel": MessageLookupByLibrary.simpleMessage("Continuer"), @@ -542,12 +550,12 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Supprimer de l\'appareil"), "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Supprimer de ente"), - "deleteItemCount": m12, + "deleteItemCount": m14, "deleteLocation": MessageLookupByLibrary.simpleMessage("Supprimer la localisation"), "deletePhotos": MessageLookupByLibrary.simpleMessage("Supprimer des photos"), - "deleteProgress": m13, + "deleteProgress": m15, "deleteReason1": MessageLookupByLibrary.simpleMessage( "Il manque une fonction clé dont j\'ai besoin"), "deleteReason2": MessageLookupByLibrary.simpleMessage( @@ -581,7 +589,7 @@ class MessageLookup extends MessageLookupByLibrary { "Les téléspectateurs peuvent toujours prendre des captures d\'écran ou enregistrer une copie de vos photos en utilisant des outils externes"), "disableDownloadWarningTitle": MessageLookupByLibrary.simpleMessage("Veuillez remarquer"), - "disableLinkMessage": m14, + "disableLinkMessage": m16, "disableTwofactor": MessageLookupByLibrary.simpleMessage( "Désactiver la double-authentification"), "disablingTwofactorAuthentication": @@ -602,9 +610,9 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Échec du téléchargement"), "downloading": MessageLookupByLibrary.simpleMessage("Téléchargement en cours..."), - "dropSupportEmail": m15, - "duplicateFileCountWithStorageSaved": m16, - "duplicateItemsGroup": m17, + "dropSupportEmail": m17, + "duplicateFileCountWithStorageSaved": m18, + "duplicateItemsGroup": m19, "edit": MessageLookupByLibrary.simpleMessage("Éditer"), "editLocation": MessageLookupByLibrary.simpleMessage("Edit location"), "editLocationTagTitle": @@ -616,8 +624,8 @@ class MessageLookup extends MessageLookupByLibrary { "Edits to location will only be seen within Ente"), "eligible": MessageLookupByLibrary.simpleMessage("éligible"), "email": MessageLookupByLibrary.simpleMessage("E-mail"), - "emailChangedTo": m18, - "emailNoEnteAccount": m19, + "emailChangedTo": m20, + "emailNoEnteAccount": m21, "emailVerificationToggle": MessageLookupByLibrary.simpleMessage( "Vérification de l\'adresse e-mail"), "emailYourLogs": @@ -716,8 +724,8 @@ class MessageLookup extends MessageLookupByLibrary { "fileTypes": MessageLookupByLibrary.simpleMessage("Types de fichiers"), "fileTypesAndNames": MessageLookupByLibrary.simpleMessage("Types et noms de fichiers"), - "filesBackedUpFromDevice": m20, - "filesBackedUpInAlbum": m21, + "filesBackedUpFromDevice": m22, + "filesBackedUpInAlbum": m23, "filesDeleted": MessageLookupByLibrary.simpleMessage("Fichiers supprimés"), "flip": MessageLookupByLibrary.simpleMessage("Retourner"), @@ -727,19 +735,19 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Mot de passe oublié"), "freeStorageClaimed": MessageLookupByLibrary.simpleMessage("Stockage gratuit réclamé"), - "freeStorageOnReferralSuccess": m22, - "freeStorageSpace": m23, + "freeStorageOnReferralSuccess": m24, + "freeStorageSpace": m25, "freeStorageUsable": MessageLookupByLibrary.simpleMessage("Stockage gratuit utilisable"), "freeTrial": MessageLookupByLibrary.simpleMessage("Essai gratuit"), - "freeTrialValidTill": m24, - "freeUpAccessPostDelete": m25, - "freeUpAmount": m26, + "freeTrialValidTill": m26, + "freeUpAccessPostDelete": m27, + "freeUpAmount": m28, "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage( "Libérer de l\'espace sur l\'appareil"), "freeUpSpace": MessageLookupByLibrary.simpleMessage("Libérer de l\'espace"), - "freeUpSpaceSaving": m27, + "freeUpSpaceSaving": m29, "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage( "Jusqu\'à 1000 souvenirs affichés dans la galerie"), "general": MessageLookupByLibrary.simpleMessage("Général"), @@ -806,7 +814,7 @@ class MessageLookup extends MessageLookupByLibrary { "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": MessageLookupByLibrary.simpleMessage( "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."), - "itemCount": m29, + "itemCount": m31, "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": MessageLookupByLibrary.simpleMessage( "Les éléments montrent le nombre de jours restants avant la suppression définitive"), @@ -835,7 +843,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Limite d\'appareil"), "linkEnabled": MessageLookupByLibrary.simpleMessage("Activé"), "linkExpired": MessageLookupByLibrary.simpleMessage("Expiré"), - "linkExpiresOn": m30, + "linkExpiresOn": m32, "linkExpiry": MessageLookupByLibrary.simpleMessage("Expiration du lien"), "linkHasExpired": @@ -884,6 +892,9 @@ class MessageLookup extends MessageLookupByLibrary { "logout": MessageLookupByLibrary.simpleMessage("Déconnexion"), "logsDialogBody": MessageLookupByLibrary.simpleMessage( "Cela enverra des logs pour nous aider à déboguer votre problème. Veuillez noter que les noms de fichiers seront inclus pour aider à suivre les problèmes avec des fichiers spécifiques."), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "longpressOnAnItemToViewInFullscreen": MessageLookupByLibrary.simpleMessage( "Appuyez longuement sur un élément pour le voir en plein écran"), @@ -901,7 +912,7 @@ class MessageLookup extends MessageLookupByLibrary { "maps": MessageLookupByLibrary.simpleMessage("Cartes"), "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"), "matrix": MessageLookupByLibrary.simpleMessage("Matrix"), - "memoryCount": m31, + "memoryCount": m33, "merchandise": MessageLookupByLibrary.simpleMessage("Marchandise"), "mobileWebDesktop": MessageLookupByLibrary.simpleMessage("Mobile, Web, Ordinateur"), @@ -912,12 +923,12 @@ class MessageLookup extends MessageLookupByLibrary { "Modifiez votre requête, ou essayez de rechercher"), "moments": MessageLookupByLibrary.simpleMessage("Souvenirs"), "monthly": MessageLookupByLibrary.simpleMessage("Mensuel"), - "moveItem": m32, + "moveItem": m34, "moveToAlbum": MessageLookupByLibrary.simpleMessage("Déplacer vers l\'album"), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage( "Déplacer vers un album masqué"), - "movedSuccessfullyTo": m33, + "movedSuccessfullyTo": m35, "movedToTrash": MessageLookupByLibrary.simpleMessage("Déplacé dans la corbeille"), "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage( @@ -981,15 +992,15 @@ class MessageLookup extends MessageLookupByLibrary { "Le mot de passe a été modifié"), "passwordLock": MessageLookupByLibrary.simpleMessage("Mot de passe verrou"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "Nous ne stockons pas ce mot de passe, donc si vous l\'oubliez, nous ne pouvons pas déchiffrer vos données"), "paymentDetails": MessageLookupByLibrary.simpleMessage("Détails de paiement"), "paymentFailed": MessageLookupByLibrary.simpleMessage("Échec du paiement"), - "paymentFailedTalkToProvider": m35, - "paymentFailedWithReason": m36, + "paymentFailedTalkToProvider": m37, + "paymentFailedWithReason": m38, "pendingSync": MessageLookupByLibrary.simpleMessage("Synchronisation en attente"), "peopleUsingYourCode": MessageLookupByLibrary.simpleMessage( @@ -1012,7 +1023,7 @@ class MessageLookup extends MessageLookupByLibrary { "pickCenterPoint": MessageLookupByLibrary.simpleMessage( "Sélectionner le point central"), "pinAlbum": MessageLookupByLibrary.simpleMessage("Épingler l\'album"), - "playStoreFreeTrialValidTill": m37, + "playStoreFreeTrialValidTill": m39, "playstoreSubscription": MessageLookupByLibrary.simpleMessage("Abonnement au PlayStore"), "pleaseContactSupportAndWeWillBeHappyToHelp": @@ -1021,12 +1032,12 @@ class MessageLookup extends MessageLookupByLibrary { "pleaseContactSupportIfTheProblemPersists": MessageLookupByLibrary.simpleMessage( "Merci de contacter l\'assistance si cette erreur persiste"), - "pleaseEmailUsAt": m38, + "pleaseEmailUsAt": m40, "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage( "Veuillez accorder la permission"), "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage("Veuillez vous reconnecter"), - "pleaseSendTheLogsTo": m39, + "pleaseSendTheLogsTo": m41, "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("Veuillez réessayer"), "pleaseVerifyTheCodeYouHaveEntered": @@ -1062,7 +1073,7 @@ class MessageLookup extends MessageLookupByLibrary { "rateTheApp": MessageLookupByLibrary.simpleMessage("Évaluer l\'application"), "rateUs": MessageLookupByLibrary.simpleMessage("Évaluez-nous"), - "rateUsOnStore": m40, + "rateUsOnStore": m42, "recover": MessageLookupByLibrary.simpleMessage("Récupérer"), "recoverAccount": MessageLookupByLibrary.simpleMessage("Récupérer un compte"), @@ -1093,7 +1104,7 @@ class MessageLookup extends MessageLookupByLibrary { "1. Donnez ce code à vos amis"), "referralStep2": MessageLookupByLibrary.simpleMessage( "2. Ils s\'inscrivent à une offre payante"), - "referralStep3": m41, + "referralStep3": m43, "referrals": MessageLookupByLibrary.simpleMessage("Parrainages"), "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage( "Les recommandations sont actuellement en pause"), @@ -1119,7 +1130,7 @@ class MessageLookup extends MessageLookupByLibrary { "removeLink": MessageLookupByLibrary.simpleMessage("Supprimer le lien"), "removeParticipant": MessageLookupByLibrary.simpleMessage("Supprimer le participant"), - "removeParticipantBody": m42, + "removeParticipantBody": m44, "removePublicLink": MessageLookupByLibrary.simpleMessage("Supprimer le lien public"), "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage( @@ -1135,7 +1146,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Renommer le fichier"), "renewSubscription": MessageLookupByLibrary.simpleMessage("Renouveler l’abonnement"), - "renewsOn": m43, + "renewsOn": m45, "reportABug": MessageLookupByLibrary.simpleMessage("Signaler un bug"), "reportBug": MessageLookupByLibrary.simpleMessage("Signaler un bug"), "resendEmail": @@ -1200,7 +1211,7 @@ class MessageLookup extends MessageLookupByLibrary { "Grouper les photos qui sont prises dans un certain angle d\'une photo"), "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage( "Invitez des gens, et vous verrez ici toutes les photos qu\'ils partagent"), - "searchResultCount": m44, + "searchResultCount": m46, "security": MessageLookupByLibrary.simpleMessage("Sécurité"), "selectALocation": MessageLookupByLibrary.simpleMessage("Select a location"), @@ -1229,8 +1240,8 @@ class MessageLookup extends MessageLookupByLibrary { "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": MessageLookupByLibrary.simpleMessage( "Les éléments sélectionnés seront supprimés de tous les albums et déplacés dans la corbeille."), - "selectedPhotos": m45, - "selectedPhotosWithYours": m46, + "selectedPhotos": m47, + "selectedPhotosWithYours": m48, "send": MessageLookupByLibrary.simpleMessage("Envoyer"), "sendEmail": MessageLookupByLibrary.simpleMessage("Envoyer un e-mail"), "sendInvite": @@ -1256,16 +1267,16 @@ class MessageLookup extends MessageLookupByLibrary { "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage( "Partagez un album maintenant"), "shareLink": MessageLookupByLibrary.simpleMessage("Partager le lien"), - "shareMyVerificationID": m47, + "shareMyVerificationID": m49, "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage( "Partager uniquement avec les personnes que vous voulez"), - "shareTextConfirmOthersVerificationID": m48, + "shareTextConfirmOthersVerificationID": m50, "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage( "Téléchargez ente pour que nous puissions facilement partager des photos et des vidéos de qualité originale\n\nhttps://ente.io"), - "shareTextReferralCode": m49, + "shareTextReferralCode": m51, "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage( "Partager avec des utilisateurs non-ente"), - "shareWithPeopleSectionTitle": m50, + "shareWithPeopleSectionTitle": m52, "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage( "Partagez votre premier album"), "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage( @@ -1276,7 +1287,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Nouvelles photos partagées"), "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage( "Recevoir des notifications quand quelqu\'un ajoute une photo à un album partagé dont vous faites partie"), - "sharedWith": m51, + "sharedWith": m53, "sharedWithMe": MessageLookupByLibrary.simpleMessage("Partagés avec moi"), "sharedWithYou": @@ -1286,11 +1297,11 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Montrer les souvenirs"), "signUpTerms": MessageLookupByLibrary.simpleMessage( "J\'accepte les conditions d\'utilisation et la politique de confidentialité"), - "singleFileDeleteFromDevice": m52, + "singleFileDeleteFromDevice": m54, "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage( "Elle sera supprimée de tous les albums."), - "singleFileInBothLocalAndRemote": m53, - "singleFileInRemoteOnly": m54, + "singleFileInBothLocalAndRemote": m55, + "singleFileInRemoteOnly": m56, "skip": MessageLookupByLibrary.simpleMessage("Ignorer"), "social": MessageLookupByLibrary.simpleMessage("Réseaux Sociaux"), "someItemsAreInBothEnteAndYourDevice": @@ -1330,14 +1341,14 @@ class MessageLookup extends MessageLookupByLibrary { "storage": MessageLookupByLibrary.simpleMessage("Stockage"), "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("Famille"), "storageBreakupYou": MessageLookupByLibrary.simpleMessage("Vous"), - "storageInGB": m55, + "storageInGB": m57, "storageLimitExceeded": MessageLookupByLibrary.simpleMessage("Limite de stockage atteinte"), - "storageUsageInfo": m56, + "storageUsageInfo": m58, "strongStrength": MessageLookupByLibrary.simpleMessage("Securité forte"), - "subAlreadyLinkedErrMessage": m57, - "subWillBeCancelledOn": m58, + "subAlreadyLinkedErrMessage": m59, + "subWillBeCancelledOn": m60, "subscribe": MessageLookupByLibrary.simpleMessage("S\'abonner"), "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage( "Il semble que votre abonnement ait expiré. Veuillez vous abonner pour activer le partage."), @@ -1354,7 +1365,7 @@ class MessageLookup extends MessageLookupByLibrary { "suggestFeatures": MessageLookupByLibrary.simpleMessage( "Suggérer des fonctionnalités"), "support": MessageLookupByLibrary.simpleMessage("Support"), - "syncProgress": m59, + "syncProgress": m61, "syncStopped": MessageLookupByLibrary.simpleMessage("Synchronisation arrêtée ?"), "syncing": MessageLookupByLibrary.simpleMessage( @@ -1383,7 +1394,7 @@ class MessageLookup extends MessageLookupByLibrary { "theseItemsWillBeDeletedFromYourDevice": MessageLookupByLibrary.simpleMessage( "Ces éléments seront supprimés de votre appareil."), - "theyAlsoGetXGb": m60, + "theyAlsoGetXGb": m62, "theyWillBeDeletedFromAllAlbums": MessageLookupByLibrary.simpleMessage( "Ils seront supprimés de tous les albums."), "thisActionCannotBeUndone": MessageLookupByLibrary.simpleMessage( @@ -1399,7 +1410,7 @@ class MessageLookup extends MessageLookupByLibrary { "Cette adresse mail est déjà utilisé"), "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage( "Cette image n\'a pas de données exif"), - "thisIsPersonVerificationId": m61, + "thisIsPersonVerificationId": m63, "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage( "Ceci est votre ID de vérification"), "thisWillLogYouOutOfTheFollowingDevice": @@ -1415,7 +1426,7 @@ class MessageLookup extends MessageLookupByLibrary { "total": MessageLookupByLibrary.simpleMessage("total"), "totalSize": MessageLookupByLibrary.simpleMessage("Taille totale"), "trash": MessageLookupByLibrary.simpleMessage("Corbeille"), - "trashDaysLeft": m62, + "trashDaysLeft": m64, "tryAgain": MessageLookupByLibrary.simpleMessage("Réessayer"), "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage( "Activez la sauvegarde pour télécharger automatiquement les fichiers ajoutés à ce dossier de l\'appareil sur ente."), @@ -1473,7 +1484,7 @@ class MessageLookup extends MessageLookupByLibrary { "useSelectedPhoto": MessageLookupByLibrary.simpleMessage( "Utiliser la photo sélectionnée"), "usedSpace": MessageLookupByLibrary.simpleMessage("Mémoire utilisée"), - "validTill": m63, + "validTill": m65, "verificationFailedPleaseTryAgain": MessageLookupByLibrary.simpleMessage( "La vérification a échouée, veuillez réessayer"), @@ -1482,7 +1493,7 @@ class MessageLookup extends MessageLookupByLibrary { "verify": MessageLookupByLibrary.simpleMessage("Vérifier"), "verifyEmail": MessageLookupByLibrary.simpleMessage("Vérifier l\'email"), - "verifyEmailID": m64, + "verifyEmailID": m66, "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Vérifier"), "verifyPassword": MessageLookupByLibrary.simpleMessage("Vérifier le mot de passe"), @@ -1511,11 +1522,11 @@ class MessageLookup extends MessageLookupByLibrary { "weDontSupportEditingPhotosAndAlbumsThatYouDont": MessageLookupByLibrary.simpleMessage( "Nous ne prenons pas en charge l\'édition des photos et des albums que vous ne possédez pas encore"), - "weHaveSendEmailTo": m65, + "weHaveSendEmailTo": m67, "weakStrength": MessageLookupByLibrary.simpleMessage("Securité Faible"), "welcomeBack": MessageLookupByLibrary.simpleMessage("Bienvenue !"), "yearly": MessageLookupByLibrary.simpleMessage("Annuel"), - "yearsAgo": m66, + "yearsAgo": m68, "yes": MessageLookupByLibrary.simpleMessage("Oui"), "yesCancel": MessageLookupByLibrary.simpleMessage("Oui, annuler"), "yesConvertToViewer": MessageLookupByLibrary.simpleMessage( @@ -1546,7 +1557,7 @@ class MessageLookup extends MessageLookupByLibrary { "Vous ne pouvez pas partager avec vous-même"), "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage( "Vous n\'avez aucun élément archivé."), - "youHaveSuccessfullyFreedUp": m67, + "youHaveSuccessfullyFreedUp": m69, "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage("Votre compte a été supprimé"), "yourMap": MessageLookupByLibrary.simpleMessage("Votre carte"), diff --git a/mobile/lib/generated/intl/messages_it.dart b/mobile/lib/generated/intl/messages_it.dart index d18386043..8b9b28b35 100644 --- a/mobile/lib/generated/intl/messages_it.dart +++ b/mobile/lib/generated/intl/messages_it.dart @@ -21,24 +21,30 @@ class MessageLookup extends MessageLookupByLibrary { String get localeName => 'it'; static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m2(count) => "${Intl.plural(count, one: 'Aggiungi elemento', other: 'Aggiungi elementi')}"; - static String m2(emailOrName) => "Aggiunto da ${emailOrName}"; + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; - static String m3(albumName) => "Aggiunto con successo su ${albumName}"; + static String m4(emailOrName) => "Aggiunto da ${emailOrName}"; - static String m4(count) => + static String m5(albumName) => "Aggiunto con successo su ${albumName}"; + + static String m6(count) => "${Intl.plural(count, zero: 'Nessun partecipante', one: '1 Partecipante', other: '${count} Partecipanti')}"; - static String m5(versionValue) => "Versione: ${versionValue}"; + static String m7(versionValue) => "Versione: ${versionValue}"; - static String m6(paymentProvider) => + static String m8(paymentProvider) => "Annulla prima il tuo abbonamento esistente da ${paymentProvider}"; - static String m7(user) => + static String m9(user) => "${user} non sarà più in grado di aggiungere altre foto a questo album\n\nSarà ancora in grado di rimuovere le foto esistenti aggiunte da lui o lei"; - static String m8(isFamilyMember, storageAmountInGb) => + static String m10(isFamilyMember, storageAmountInGb) => "${Intl.select(isFamilyMember, { 'true': 'Il tuo piano famiglia ha già richiesto ${storageAmountInGb} GB finora', @@ -46,158 +52,158 @@ class MessageLookup extends MessageLookupByLibrary { 'other': 'Hai già richiesto ${storageAmountInGb} GB finora!', })}"; - static String m9(albumName) => "Link collaborativo creato per ${albumName}"; + static String m11(albumName) => "Link collaborativo creato per ${albumName}"; - static String m10(familyAdminEmail) => + static String m12(familyAdminEmail) => "Contatta ${familyAdminEmail} per gestire il tuo abbonamento"; - static String m11(provider) => + static String m13(provider) => "Scrivi all\'indirizzo support@ente.io per gestire il tuo abbonamento ${provider}."; - static String m12(count) => + static String m14(count) => "${Intl.plural(count, one: 'Elimina ${count} elemento', other: 'Elimina ${count} elementi')}"; - static String m13(currentlyDeleting, totalCount) => + static String m15(currentlyDeleting, totalCount) => "Eliminazione di ${currentlyDeleting} / ${totalCount}"; - static String m14(albumName) => + static String m16(albumName) => "Questo rimuoverà il link pubblico per accedere a \"${albumName}\"."; - static String m15(supportEmail) => + static String m17(supportEmail) => "Per favore invia un\'email a ${supportEmail} dall\'indirizzo email con cui ti sei registrato"; - static String m16(count, storageSaved) => + static String m18(count, storageSaved) => "Hai ripulito ${Intl.plural(count, one: '${count} doppione', other: '${count} doppioni')}, salvando (${storageSaved}!)"; - static String m17(count, formattedSize) => + static String m19(count, formattedSize) => "${count} file, ${formattedSize} l\'uno"; - static String m18(newEmail) => "Email cambiata in ${newEmail}"; + static String m20(newEmail) => "Email cambiata in ${newEmail}"; - static String m19(email) => + static String m21(email) => "${email} non ha un account su ente.\n\nInvia un invito per condividere foto."; - static String m20(count, formattedNumber) => + static String m22(count, formattedNumber) => "${Intl.plural(count, one: '1 file', other: '${formattedNumber} file')} di quest\'album sono stati salvati in modo sicuro"; - static String m21(count, formattedNumber) => + static String m23(count, formattedNumber) => "${Intl.plural(count, one: '1 file', other: '${formattedNumber} file')} di quest\'album sono stati salvati in modo sicuro"; - static String m22(storageAmountInGB) => + static String m24(storageAmountInGB) => "${storageAmountInGB} GB ogni volta che qualcuno si iscrive a un piano a pagamento e applica il tuo codice"; - static String m23(freeAmount, storageUnit) => + static String m25(freeAmount, storageUnit) => "${freeAmount} ${storageUnit} liberi"; - static String m24(endDate) => "La prova gratuita termina il ${endDate}"; + static String m26(endDate) => "La prova gratuita termina il ${endDate}"; - static String m25(count) => + static String m27(count) => "Puoi ancora accedere a ${Intl.plural(count, one: '', other: 'loro')} su ente finché hai un abbonamento attivo"; - static String m26(sizeInMBorGB) => "Libera ${sizeInMBorGB}"; + static String m28(sizeInMBorGB) => "Libera ${sizeInMBorGB}"; - static String m27(count, formattedSize) => + static String m29(count, formattedSize) => "${Intl.plural(count, one: 'Può essere cancellata per liberare ${formattedSize}', other: 'Possono essere cancellati per liberare ${formattedSize}')}"; - static String m29(count) => + static String m31(count) => "${Intl.plural(count, one: '${count} elemento', other: '${count} elementi')}"; - static String m30(expiryTime) => "Il link scadrà il ${expiryTime}"; + static String m32(expiryTime) => "Il link scadrà il ${expiryTime}"; - static String m31(count, formattedCount) => + static String m33(count, formattedCount) => "${Intl.plural(count, one: '${formattedCount} ricordo', other: '${formattedCount} ricordi')}"; - static String m32(count) => + static String m34(count) => "${Intl.plural(count, one: 'Sposta elemento', other: 'Sposta elementi')}"; - static String m33(albumName) => "Spostato con successo su ${albumName}"; + static String m35(albumName) => "Spostato con successo su ${albumName}"; - static String m34(passwordStrengthValue) => + static String m36(passwordStrengthValue) => "Sicurezza password: ${passwordStrengthValue}"; - static String m35(providerName) => + static String m37(providerName) => "Si prega di parlare con il supporto di ${providerName} se ti è stato addebitato qualcosa"; - static String m36(reason) => + static String m38(reason) => "Purtroppo il tuo pagamento non è riuscito a causa di ${reason}"; - static String m37(endDate) => + static String m39(endDate) => "Prova gratuita valida fino al ${endDate}.\nPuoi scegliere un piano a pagamento in seguito."; - static String m38(toEmail) => "Per favore invia un\'email a ${toEmail}"; + static String m40(toEmail) => "Per favore invia un\'email a ${toEmail}"; - static String m39(toEmail) => "Invia i log a \n${toEmail}"; + static String m41(toEmail) => "Invia i log a \n${toEmail}"; - static String m40(storeName) => "Valutaci su ${storeName}"; + static String m42(storeName) => "Valutaci su ${storeName}"; - static String m41(storageInGB) => + static String m43(storageInGB) => "3. Ottenete entrambi ${storageInGB} GB* gratis"; - static String m42(userEmail) => + static String m44(userEmail) => "${userEmail} verrà rimosso da questo album condiviso\n\nQualsiasi foto aggiunta dall\'utente verrà rimossa dall\'album"; - static String m43(endDate) => "Si rinnova il ${endDate}"; + static String m45(endDate) => "Si rinnova il ${endDate}"; - static String m45(count) => "${count} selezionati"; + static String m47(count) => "${count} selezionati"; - static String m46(count, yourCount) => + static String m48(count, yourCount) => "${count} selezionato (${yourCount} tuoi)"; - static String m47(verificationID) => + static String m49(verificationID) => "Ecco il mio ID di verifica: ${verificationID} per ente.io."; - static String m48(verificationID) => + static String m50(verificationID) => "Hey, puoi confermare che questo è il tuo ID di verifica: ${verificationID} su ente.io"; - static String m49(referralCode, referralStorageInGB) => + static String m51(referralCode, referralStorageInGB) => "ente referral code: ${referralCode} \n\nApplicalo in Impostazioni → Generale → Referral per ottenere ${referralStorageInGB} GB gratis dopo la registrazione di un piano a pagamento\n\nhttps://ente.io"; - static String m50(numberOfPeople) => + static String m52(numberOfPeople) => "${Intl.plural(numberOfPeople, zero: 'Condividi con persone specifiche', one: 'Condividi con una persona', other: 'Condividi con ${numberOfPeople} persone')}"; - static String m51(emailIDs) => "Condiviso con ${emailIDs}"; + static String m53(emailIDs) => "Condiviso con ${emailIDs}"; - static String m52(fileType) => + static String m54(fileType) => "Questo ${fileType} verrà eliminato dal tuo dispositivo."; - static String m53(fileType) => + static String m55(fileType) => "Questo ${fileType} è sia su ente che sul tuo dispositivo."; - static String m54(fileType) => "Questo ${fileType} verrà eliminato su ente."; + static String m56(fileType) => "Questo ${fileType} verrà eliminato su ente."; - static String m55(storageAmountInGB) => "${storageAmountInGB} GB"; + static String m57(storageAmountInGB) => "${storageAmountInGB} GB"; - static String m56( + static String m58( usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) => "${usedAmount} ${usedStorageUnit} di ${totalAmount} ${totalStorageUnit} utilizzati"; - static String m57(id) => + static String m59(id) => "Il tuo ${id} è già collegato ad un altro account ente.\nSe desideri utilizzare il tuo ${id} con questo account, contatta il nostro supporto\'\'"; - static String m58(endDate) => "L\'abbonamento verrà cancellato il ${endDate}"; + static String m60(endDate) => "L\'abbonamento verrà cancellato il ${endDate}"; - static String m59(completed, total) => + static String m61(completed, total) => "${completed}/${total} ricordi conservati"; - static String m60(storageAmountInGB) => + static String m62(storageAmountInGB) => "Anche loro riceveranno ${storageAmountInGB} GB"; - static String m61(email) => "Questo è l\'ID di verifica di ${email}"; + static String m63(email) => "Questo è l\'ID di verifica di ${email}"; - static String m62(count) => + static String m64(count) => "${Intl.plural(count, zero: '', one: '1 giorno', other: '${count} giorni')}"; - static String m63(endDate) => "Valido fino al ${endDate}"; + static String m65(endDate) => "Valido fino al ${endDate}"; - static String m64(email) => "Verifica ${email}"; + static String m66(email) => "Verifica ${email}"; - static String m65(email) => + static String m67(email) => "Abbiamo inviato una mail a ${email}"; - static String m66(count) => + static String m68(count) => "${Intl.plural(count, one: '${count} anno fa', other: '${count} anni fa')}"; - static String m67(storageSaved) => + static String m69(storageSaved) => "Hai liberato con successo ${storageSaved}!"; final messages = _notInlinedMessages(_notInlinedMessages); @@ -216,9 +222,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Aggiungi una nuova email"), "addCollaborator": MessageLookupByLibrary.simpleMessage("Aggiungi collaboratore"), + "addCollaborators": m0, "addFromDevice": MessageLookupByLibrary.simpleMessage("Aggiungi dal dispositivo"), - "addItem": m0, + "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("Aggiungi luogo"), "addLocationButton": MessageLookupByLibrary.simpleMessage("Aggiungi"), "addMore": MessageLookupByLibrary.simpleMessage("Aggiungi altri"), @@ -235,9 +242,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Aggiungi ad album nascosto"), "addViewer": MessageLookupByLibrary.simpleMessage("Aggiungi in sola lettura"), + "addViewers": m1, "addedAs": MessageLookupByLibrary.simpleMessage("Aggiunto come"), - "addedBy": m2, - "addedSuccessfullyTo": m3, + "addedBy": m4, + "addedSuccessfullyTo": m5, "addingToFavorites": MessageLookupByLibrary.simpleMessage("Aggiunto ai preferiti..."), "advanced": MessageLookupByLibrary.simpleMessage("Avanzate"), @@ -249,7 +257,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Dopo una settimana"), "after1Year": MessageLookupByLibrary.simpleMessage("Dopo un anno"), "albumOwner": MessageLookupByLibrary.simpleMessage("Proprietario"), - "albumParticipantsCount": m4, + "albumParticipantsCount": m6, "albumTitle": MessageLookupByLibrary.simpleMessage("Titolo album"), "albumUpdated": MessageLookupByLibrary.simpleMessage("Album aggiornato"), @@ -286,7 +294,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Android, iOS, Web, Desktop"), "androidSignInTitle": MessageLookupByLibrary.simpleMessage("Autenticazione necessaria"), - "appVersion": m5, + "appVersion": m7, "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"), "apply": MessageLookupByLibrary.simpleMessage("Applica"), "applyCodeTitle": @@ -370,10 +378,10 @@ class MessageLookup extends MessageLookupByLibrary { "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage( "Puoi rimuovere solo i file di tua proprietà"), "cancel": MessageLookupByLibrary.simpleMessage("Annulla"), - "cancelOtherSubscription": m6, + "cancelOtherSubscription": m8, "cancelSubscription": MessageLookupByLibrary.simpleMessage("Annulla abbonamento"), - "cannotAddMorePhotosAfterBecomingViewer": m7, + "cannotAddMorePhotosAfterBecomingViewer": m9, "cannotDeleteSharedFiles": MessageLookupByLibrary.simpleMessage( "Impossibile eliminare i file condivisi"), "centerPoint": MessageLookupByLibrary.simpleMessage("Punto centrale"), @@ -396,7 +404,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Richiedi spazio gratuito"), "claimMore": MessageLookupByLibrary.simpleMessage("Richiedine di più!"), "claimed": MessageLookupByLibrary.simpleMessage("Riscattato"), - "claimedStorageSoFar": m8, + "claimedStorageSoFar": m10, "clearCaches": MessageLookupByLibrary.simpleMessage("Svuota cache"), "click": MessageLookupByLibrary.simpleMessage("• Clic"), "clickOnTheOverflowMenu": @@ -416,7 +424,7 @@ class MessageLookup extends MessageLookupByLibrary { "Crea un link per consentire alle persone di aggiungere e visualizzare foto nel tuo album condiviso senza bisogno di un\'applicazione o di un account ente. Ottimo per raccogliere foto di un evento."), "collaborativeLink": MessageLookupByLibrary.simpleMessage("Link collaborativo"), - "collaborativeLinkCreatedFor": m9, + "collaborativeLinkCreatedFor": m11, "collaborator": MessageLookupByLibrary.simpleMessage("Collaboratore"), "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": MessageLookupByLibrary.simpleMessage( @@ -444,10 +452,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Conferma chiave di recupero"), "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage( "Conferma la tua chiave di recupero"), - "contactFamilyAdmin": m10, + "contactFamilyAdmin": m12, "contactSupport": MessageLookupByLibrary.simpleMessage("Contatta il supporto"), - "contactToManageSubscription": m11, + "contactToManageSubscription": m13, "contacts": MessageLookupByLibrary.simpleMessage("Contacts"), "continueLabel": MessageLookupByLibrary.simpleMessage("Continua"), "continueOnFreeTrial": @@ -523,11 +531,11 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Elimina dal dispositivo"), "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Elimina da ente"), - "deleteItemCount": m12, + "deleteItemCount": m14, "deleteLocation": MessageLookupByLibrary.simpleMessage("Elimina posizione"), "deletePhotos": MessageLookupByLibrary.simpleMessage("Elimina foto"), - "deleteProgress": m13, + "deleteProgress": m15, "deleteReason1": MessageLookupByLibrary.simpleMessage( "Manca una caratteristica chiave di cui ho bisogno"), "deleteReason2": MessageLookupByLibrary.simpleMessage( @@ -561,7 +569,7 @@ class MessageLookup extends MessageLookupByLibrary { "I visualizzatori possono scattare screenshot o salvare una copia delle foto utilizzando strumenti esterni"), "disableDownloadWarningTitle": MessageLookupByLibrary.simpleMessage("Nota bene"), - "disableLinkMessage": m14, + "disableLinkMessage": m16, "disableTwofactor": MessageLookupByLibrary.simpleMessage( "Disabilita autenticazione a due fattori"), "disablingTwofactorAuthentication": @@ -582,9 +590,9 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Scaricamento fallito"), "downloading": MessageLookupByLibrary.simpleMessage("Scaricamento in corso..."), - "dropSupportEmail": m15, - "duplicateFileCountWithStorageSaved": m16, - "duplicateItemsGroup": m17, + "dropSupportEmail": m17, + "duplicateFileCountWithStorageSaved": m18, + "duplicateItemsGroup": m19, "edit": MessageLookupByLibrary.simpleMessage("Modifica"), "editLocation": MessageLookupByLibrary.simpleMessage("Edit location"), "editLocationTagTitle": @@ -595,8 +603,8 @@ class MessageLookup extends MessageLookupByLibrary { "Edits to location will only be seen within Ente"), "eligible": MessageLookupByLibrary.simpleMessage("idoneo"), "email": MessageLookupByLibrary.simpleMessage("Email"), - "emailChangedTo": m18, - "emailNoEnteAccount": m19, + "emailChangedTo": m20, + "emailNoEnteAccount": m21, "emailVerificationToggle": MessageLookupByLibrary.simpleMessage("Verifica Email"), "emailYourLogs": MessageLookupByLibrary.simpleMessage( @@ -689,8 +697,8 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Aggiungi descrizione..."), "fileSavedToGallery": MessageLookupByLibrary.simpleMessage("File salvato nella galleria"), - "filesBackedUpFromDevice": m20, - "filesBackedUpInAlbum": m21, + "filesBackedUpFromDevice": m22, + "filesBackedUpInAlbum": m23, "filesDeleted": MessageLookupByLibrary.simpleMessage("File eliminati"), "flip": MessageLookupByLibrary.simpleMessage("Capovolgi"), "forYourMemories": @@ -699,18 +707,18 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Password dimenticata"), "freeStorageClaimed": MessageLookupByLibrary.simpleMessage("Spazio gratuito richiesto"), - "freeStorageOnReferralSuccess": m22, - "freeStorageSpace": m23, + "freeStorageOnReferralSuccess": m24, + "freeStorageSpace": m25, "freeStorageUsable": MessageLookupByLibrary.simpleMessage("Spazio libero utilizzabile"), "freeTrial": MessageLookupByLibrary.simpleMessage("Prova gratuita"), - "freeTrialValidTill": m24, - "freeUpAccessPostDelete": m25, - "freeUpAmount": m26, + "freeTrialValidTill": m26, + "freeUpAccessPostDelete": m27, + "freeUpAmount": m28, "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage("Libera spazio"), "freeUpSpace": MessageLookupByLibrary.simpleMessage("Libera spazio"), - "freeUpSpaceSaving": m27, + "freeUpSpaceSaving": m29, "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage( "Fino a 1000 ricordi mostrati nella galleria"), "general": MessageLookupByLibrary.simpleMessage("Generali"), @@ -775,7 +783,7 @@ class MessageLookup extends MessageLookupByLibrary { "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": MessageLookupByLibrary.simpleMessage( "Sembra che qualcosa sia andato storto. Riprova tra un po\'. Se l\'errore persiste, contatta il nostro team di supporto."), - "itemCount": m29, + "itemCount": m31, "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": MessageLookupByLibrary.simpleMessage( "Gli elementi mostrano il numero di giorni rimanenti prima della cancellazione permanente"), @@ -804,7 +812,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Limite dei dispositivi"), "linkEnabled": MessageLookupByLibrary.simpleMessage("Attivato"), "linkExpired": MessageLookupByLibrary.simpleMessage("Scaduto"), - "linkExpiresOn": m30, + "linkExpiresOn": m32, "linkExpiry": MessageLookupByLibrary.simpleMessage("Scadenza del link"), "linkHasExpired": MessageLookupByLibrary.simpleMessage("Il link è scaduto"), @@ -852,6 +860,9 @@ class MessageLookup extends MessageLookupByLibrary { "logout": MessageLookupByLibrary.simpleMessage("Disconnetti"), "logsDialogBody": MessageLookupByLibrary.simpleMessage( "Invia i log per aiutarci a risolvere il tuo problema. Si prega di notare che i nomi dei file saranno inclusi per aiutare a tenere traccia di problemi con file specifici."), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "longpressOnAnItemToViewInFullscreen": MessageLookupByLibrary.simpleMessage( "Premi a lungo su un elemento per visualizzarlo a schermo intero"), @@ -870,7 +881,7 @@ class MessageLookup extends MessageLookupByLibrary { "maps": MessageLookupByLibrary.simpleMessage("Mappe"), "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"), "matrix": MessageLookupByLibrary.simpleMessage("Matrix"), - "memoryCount": m31, + "memoryCount": m33, "merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"), "mobileWebDesktop": MessageLookupByLibrary.simpleMessage("Mobile, Web, Desktop"), @@ -879,12 +890,12 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage( "Modify your query, or try searching for"), "monthly": MessageLookupByLibrary.simpleMessage("Mensile"), - "moveItem": m32, + "moveItem": m34, "moveToAlbum": MessageLookupByLibrary.simpleMessage("Sposta nell\'album"), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Sposta in album nascosto"), - "movedSuccessfullyTo": m33, + "movedSuccessfullyTo": m35, "movedToTrash": MessageLookupByLibrary.simpleMessage("Spostato nel cestino"), "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage( @@ -948,15 +959,15 @@ class MessageLookup extends MessageLookupByLibrary { "Password modificata con successo"), "passwordLock": MessageLookupByLibrary.simpleMessage("Blocco con password"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "Noi non memorizziamo la tua password, quindi se te la dimentichi, non possiamo decriptare i tuoi dati"), "paymentDetails": MessageLookupByLibrary.simpleMessage("Dettagli di Pagamento"), "paymentFailed": MessageLookupByLibrary.simpleMessage("Pagamento non riuscito"), - "paymentFailedTalkToProvider": m35, - "paymentFailedWithReason": m36, + "paymentFailedTalkToProvider": m37, + "paymentFailedWithReason": m38, "pendingSync": MessageLookupByLibrary.simpleMessage("Sincronizzazione in sospeso"), "peopleUsingYourCode": MessageLookupByLibrary.simpleMessage( @@ -976,7 +987,7 @@ class MessageLookup extends MessageLookupByLibrary { "pickCenterPoint": MessageLookupByLibrary.simpleMessage( "Selezionare il punto centrale"), "pinAlbum": MessageLookupByLibrary.simpleMessage("Fissa l\'album"), - "playStoreFreeTrialValidTill": m37, + "playStoreFreeTrialValidTill": m39, "playstoreSubscription": MessageLookupByLibrary.simpleMessage("Abbonamento su PlayStore"), "pleaseContactSupportAndWeWillBeHappyToHelp": @@ -985,12 +996,12 @@ class MessageLookup extends MessageLookupByLibrary { "pleaseContactSupportIfTheProblemPersists": MessageLookupByLibrary.simpleMessage( "Riprova. Se il problema persiste, ti invitiamo a contattare l\'assistenza"), - "pleaseEmailUsAt": m38, + "pleaseEmailUsAt": m40, "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage("Concedi i permessi"), "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage( "Effettua nuovamente l\'accesso"), - "pleaseSendTheLogsTo": m39, + "pleaseSendTheLogsTo": m41, "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("Riprova"), "pleaseVerifyTheCodeYouHaveEntered": MessageLookupByLibrary.simpleMessage( @@ -1024,7 +1035,7 @@ class MessageLookup extends MessageLookupByLibrary { "raiseTicket": MessageLookupByLibrary.simpleMessage("Invia ticket"), "rateTheApp": MessageLookupByLibrary.simpleMessage("Valuta l\'app"), "rateUs": MessageLookupByLibrary.simpleMessage("Lascia una recensione"), - "rateUsOnStore": m40, + "rateUsOnStore": m42, "recover": MessageLookupByLibrary.simpleMessage("Recupera"), "recoverAccount": MessageLookupByLibrary.simpleMessage("Recupera account"), @@ -1056,7 +1067,7 @@ class MessageLookup extends MessageLookupByLibrary { "1. Condividi questo codice con i tuoi amici"), "referralStep2": MessageLookupByLibrary.simpleMessage( "2. Si iscrivono per un piano a pagamento"), - "referralStep3": m41, + "referralStep3": m43, "referrals": MessageLookupByLibrary.simpleMessage("Invita un Amico"), "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage( "I referral code sono attualmente in pausa"), @@ -1080,7 +1091,7 @@ class MessageLookup extends MessageLookupByLibrary { "removeLink": MessageLookupByLibrary.simpleMessage("Elimina link"), "removeParticipant": MessageLookupByLibrary.simpleMessage("Rimuovi partecipante"), - "removeParticipantBody": m42, + "removeParticipantBody": m44, "removePublicLink": MessageLookupByLibrary.simpleMessage("Rimuovi link pubblico"), "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage( @@ -1094,7 +1105,7 @@ class MessageLookup extends MessageLookupByLibrary { "renameFile": MessageLookupByLibrary.simpleMessage("Rinomina file"), "renewSubscription": MessageLookupByLibrary.simpleMessage("Rinnova abbonamento"), - "renewsOn": m43, + "renewsOn": m45, "reportABug": MessageLookupByLibrary.simpleMessage("Segnala un bug"), "reportBug": MessageLookupByLibrary.simpleMessage("Segnala un bug"), "resendEmail": MessageLookupByLibrary.simpleMessage("Rinvia email"), @@ -1159,8 +1170,8 @@ class MessageLookup extends MessageLookupByLibrary { "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": MessageLookupByLibrary.simpleMessage( "Gli elementi selezionati verranno eliminati da tutti gli album e spostati nel cestino."), - "selectedPhotos": m45, - "selectedPhotosWithYours": m46, + "selectedPhotos": m47, + "selectedPhotosWithYours": m48, "send": MessageLookupByLibrary.simpleMessage("Invia"), "sendEmail": MessageLookupByLibrary.simpleMessage("Invia email"), "sendInvite": MessageLookupByLibrary.simpleMessage("Invita"), @@ -1184,16 +1195,16 @@ class MessageLookup extends MessageLookupByLibrary { "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("Condividi un album"), "shareLink": MessageLookupByLibrary.simpleMessage("Condividi link"), - "shareMyVerificationID": m47, + "shareMyVerificationID": m49, "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage( "Condividi solo con le persone che vuoi"), - "shareTextConfirmOthersVerificationID": m48, + "shareTextConfirmOthersVerificationID": m50, "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage( "Scarica ente in modo da poter facilmente condividere foto e video senza perdita di qualità\n\nhttps://ente.io"), - "shareTextReferralCode": m49, + "shareTextReferralCode": m51, "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage( "Condividi con utenti che non hanno un account ente"), - "shareWithPeopleSectionTitle": m50, + "shareWithPeopleSectionTitle": m52, "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage( "Condividi il tuo primo album"), "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage( @@ -1204,7 +1215,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Nuove foto condivise"), "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage( "Ricevi notifiche quando qualcuno aggiunge una foto a un album condiviso, di cui fai parte"), - "sharedWith": m51, + "sharedWith": m53, "sharedWithMe": MessageLookupByLibrary.simpleMessage("Condivisi con me"), "sharedWithYou": @@ -1214,11 +1225,11 @@ class MessageLookup extends MessageLookupByLibrary { "showMemories": MessageLookupByLibrary.simpleMessage("Mostra ricordi"), "signUpTerms": MessageLookupByLibrary.simpleMessage( "Accetto i termini di servizio e la politica sulla privacy"), - "singleFileDeleteFromDevice": m52, + "singleFileDeleteFromDevice": m54, "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage( "Verrà eliminato da tutti gli album."), - "singleFileInBothLocalAndRemote": m53, - "singleFileInRemoteOnly": m54, + "singleFileInBothLocalAndRemote": m55, + "singleFileInRemoteOnly": m56, "skip": MessageLookupByLibrary.simpleMessage("Salta"), "social": MessageLookupByLibrary.simpleMessage("Social"), "someItemsAreInBothEnteAndYourDevice": @@ -1259,13 +1270,13 @@ class MessageLookup extends MessageLookupByLibrary { "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("Famiglia"), "storageBreakupYou": MessageLookupByLibrary.simpleMessage("Tu"), - "storageInGB": m55, + "storageInGB": m57, "storageLimitExceeded": MessageLookupByLibrary.simpleMessage( "Limite d\'archiviazione superato"), - "storageUsageInfo": m56, + "storageUsageInfo": m58, "strongStrength": MessageLookupByLibrary.simpleMessage("Forte"), - "subAlreadyLinkedErrMessage": m57, - "subWillBeCancelledOn": m58, + "subAlreadyLinkedErrMessage": m59, + "subWillBeCancelledOn": m60, "subscribe": MessageLookupByLibrary.simpleMessage("Iscriviti"), "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage( "Sembra che il tuo abbonamento sia scaduto. Iscriviti per abilitare la condivisione."), @@ -1282,7 +1293,7 @@ class MessageLookup extends MessageLookupByLibrary { "suggestFeatures": MessageLookupByLibrary.simpleMessage("Suggerisci una funzionalità"), "support": MessageLookupByLibrary.simpleMessage("Assistenza"), - "syncProgress": m59, + "syncProgress": m61, "syncStopped": MessageLookupByLibrary.simpleMessage("Sincronizzazione interrotta"), "syncing": MessageLookupByLibrary.simpleMessage( @@ -1311,7 +1322,7 @@ class MessageLookup extends MessageLookupByLibrary { "theseItemsWillBeDeletedFromYourDevice": MessageLookupByLibrary.simpleMessage( "Questi file verranno eliminati dal tuo dispositivo."), - "theyAlsoGetXGb": m60, + "theyAlsoGetXGb": m62, "theyWillBeDeletedFromAllAlbums": MessageLookupByLibrary.simpleMessage( "Verranno eliminati da tutti gli album."), "thisActionCannotBeUndone": MessageLookupByLibrary.simpleMessage( @@ -1328,7 +1339,7 @@ class MessageLookup extends MessageLookupByLibrary { "Questo indirizzo email è già registrato"), "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage( "Questa immagine non ha dati EXIF"), - "thisIsPersonVerificationId": m61, + "thisIsPersonVerificationId": m63, "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage( "Questo è il tuo ID di verifica"), "thisWillLogYouOutOfTheFollowingDevice": @@ -1344,7 +1355,7 @@ class MessageLookup extends MessageLookupByLibrary { "total": MessageLookupByLibrary.simpleMessage("totale"), "totalSize": MessageLookupByLibrary.simpleMessage("Dimensioni totali"), "trash": MessageLookupByLibrary.simpleMessage("Cestino"), - "trashDaysLeft": m62, + "trashDaysLeft": m64, "tryAgain": MessageLookupByLibrary.simpleMessage("Riprova"), "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage( "Attiva il backup per caricare automaticamente i file aggiunti in questa cartella del dispositivo su ente."), @@ -1401,7 +1412,7 @@ class MessageLookup extends MessageLookupByLibrary { "useSelectedPhoto": MessageLookupByLibrary.simpleMessage("Usa la foto selezionata"), "usedSpace": MessageLookupByLibrary.simpleMessage("Spazio utilizzato"), - "validTill": m63, + "validTill": m65, "verificationFailedPleaseTryAgain": MessageLookupByLibrary.simpleMessage( "Verifica fallita, per favore prova di nuovo"), @@ -1409,7 +1420,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("ID di verifica"), "verify": MessageLookupByLibrary.simpleMessage("Verifica"), "verifyEmail": MessageLookupByLibrary.simpleMessage("Verifica email"), - "verifyEmailID": m64, + "verifyEmailID": m66, "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verifica"), "verifyPassword": MessageLookupByLibrary.simpleMessage("Verifica password"), @@ -1436,11 +1447,11 @@ class MessageLookup extends MessageLookupByLibrary { "weDontSupportEditingPhotosAndAlbumsThatYouDont": MessageLookupByLibrary.simpleMessage( "Non puoi modificare foto e album che non possiedi"), - "weHaveSendEmailTo": m65, + "weHaveSendEmailTo": m67, "weakStrength": MessageLookupByLibrary.simpleMessage("Debole"), "welcomeBack": MessageLookupByLibrary.simpleMessage("Bentornato/a!"), "yearly": MessageLookupByLibrary.simpleMessage("Annuale"), - "yearsAgo": m66, + "yearsAgo": m68, "yes": MessageLookupByLibrary.simpleMessage("Si"), "yesCancel": MessageLookupByLibrary.simpleMessage("Sì, cancella"), "yesConvertToViewer": MessageLookupByLibrary.simpleMessage( @@ -1470,7 +1481,7 @@ class MessageLookup extends MessageLookupByLibrary { "Non puoi condividere con te stesso"), "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage( "Non hai nulla di archiviato."), - "youHaveSuccessfullyFreedUp": m67, + "youHaveSuccessfullyFreedUp": m69, "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage( "Il tuo account è stato eliminato"), "yourMap": MessageLookupByLibrary.simpleMessage("Your map"), diff --git a/mobile/lib/generated/intl/messages_ko.dart b/mobile/lib/generated/intl/messages_ko.dart index a97232feb..83d8495a0 100644 --- a/mobile/lib/generated/intl/messages_ko.dart +++ b/mobile/lib/generated/intl/messages_ko.dart @@ -20,10 +20,18 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'ko'; + static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; + final messages = _notInlinedMessages(_notInlinedMessages); static Map _notInlinedMessages(_) => { + "addCollaborators": m0, "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Add to hidden album"), + "addViewers": m1, "changeLocationOfSelectedItems": MessageLookupByLibrary.simpleMessage( "Change location of selected items?"), "contacts": MessageLookupByLibrary.simpleMessage("Contacts"), @@ -37,6 +45,9 @@ class MessageLookup extends MessageLookupByLibrary { "fileTypes": MessageLookupByLibrary.simpleMessage("File types"), "joinDiscord": MessageLookupByLibrary.simpleMessage("Join Discord"), "locations": MessageLookupByLibrary.simpleMessage("Locations"), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "modifyYourQueryOrTrySearchingFor": MessageLookupByLibrary.simpleMessage( "Modify your query, or try searching for"), diff --git a/mobile/lib/generated/intl/messages_nl.dart b/mobile/lib/generated/intl/messages_nl.dart index 1a5492224..1f53a6ffe 100644 --- a/mobile/lib/generated/intl/messages_nl.dart +++ b/mobile/lib/generated/intl/messages_nl.dart @@ -21,27 +21,33 @@ class MessageLookup extends MessageLookupByLibrary { String get localeName => 'nl'; static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m2(count) => "${Intl.plural(count, one: 'Bestand toevoegen', other: 'Bestanden toevoegen')}"; - static String m1(storageAmount, endDate) => + static String m3(storageAmount, endDate) => "Jouw ${storageAmount} add-on is geldig tot ${endDate}"; - static String m2(emailOrName) => "Toegevoegd door ${emailOrName}"; + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; - static String m3(albumName) => "Succesvol toegevoegd aan ${albumName}"; + static String m4(emailOrName) => "Toegevoegd door ${emailOrName}"; - static String m4(count) => + static String m5(albumName) => "Succesvol toegevoegd aan ${albumName}"; + + static String m6(count) => "${Intl.plural(count, zero: 'Geen deelnemers', one: '1 deelnemer', other: '${count} deelnemers')}"; - static String m5(versionValue) => "Versie: ${versionValue}"; + static String m7(versionValue) => "Versie: ${versionValue}"; - static String m6(paymentProvider) => + static String m8(paymentProvider) => "Annuleer eerst uw bestaande abonnement bij ${paymentProvider}"; - static String m7(user) => + static String m9(user) => "${user} zal geen foto\'s meer kunnen toevoegen aan dit album\n\nDe gebruiker zal nog steeds bestaande foto\'s kunnen verwijderen die door hen zijn toegevoegd"; - static String m8(isFamilyMember, storageAmountInGb) => + static String m10(isFamilyMember, storageAmountInGb) => "${Intl.select(isFamilyMember, { 'true': 'Jouw familie heeft ${storageAmountInGb} GB geclaimd tot nu toe', @@ -49,167 +55,167 @@ class MessageLookup extends MessageLookupByLibrary { 'other': 'Je hebt ${storageAmountInGb} GB geclaimd tot nu toe!', })}"; - static String m9(albumName) => + static String m11(albumName) => "Gezamenlijke link aangemaakt voor ${albumName}"; - static String m10(familyAdminEmail) => + static String m12(familyAdminEmail) => "Neem contact op met ${familyAdminEmail} om uw abonnement te beheren"; - static String m11(provider) => + static String m13(provider) => "Neem contact met ons op via support@ente.io om uw ${provider} abonnement te beheren."; - static String m12(count) => + static String m14(count) => "${Intl.plural(count, one: 'Verwijder ${count} bestand', other: 'Verwijder ${count} bestanden')}"; - static String m13(currentlyDeleting, totalCount) => + static String m15(currentlyDeleting, totalCount) => "Verwijderen van ${currentlyDeleting} / ${totalCount}"; - static String m14(albumName) => + static String m16(albumName) => "Dit verwijdert de openbare link voor toegang tot \"${albumName}\"."; - static String m15(supportEmail) => + static String m17(supportEmail) => "Stuur een e-mail naar ${supportEmail} vanaf het door jou geregistreerde e-mailadres"; - static String m16(count, storageSaved) => + static String m18(count, storageSaved) => "Je hebt ${Intl.plural(count, one: '${count} dubbel bestand', other: '${count} dubbele bestanden')} opgeruimd, totaal (${storageSaved}!)"; - static String m17(count, formattedSize) => + static String m19(count, formattedSize) => "${count} bestanden, elk ${formattedSize}"; - static String m18(newEmail) => "E-mailadres gewijzigd naar ${newEmail}"; + static String m20(newEmail) => "E-mailadres gewijzigd naar ${newEmail}"; - static String m19(email) => + static String m21(email) => "${email} heeft geen ente account.\n\nStuur ze een uitnodiging om foto\'s te delen."; - static String m20(count, formattedNumber) => + static String m22(count, formattedNumber) => "${Intl.plural(count, one: '1 bestand', other: '${formattedNumber} bestanden')} in dit album zijn veilig geback-upt"; - static String m21(count, formattedNumber) => + static String m23(count, formattedNumber) => "${Intl.plural(count, one: '1 bestand', other: '${formattedNumber} bestanden')} in dit album is veilig geback-upt"; - static String m22(storageAmountInGB) => + static String m24(storageAmountInGB) => "${storageAmountInGB} GB telkens als iemand zich aanmeldt voor een betaald abonnement en je code toepast"; - static String m23(freeAmount, storageUnit) => + static String m25(freeAmount, storageUnit) => "${freeAmount} ${storageUnit} vrij"; - static String m24(endDate) => "Gratis proefversie geldig tot ${endDate}"; + static String m26(endDate) => "Gratis proefversie geldig tot ${endDate}"; - static String m25(count) => + static String m27(count) => "U heeft nog steeds toegang tot ${Intl.plural(count, one: 'het', other: 'ze')} op ente zolang u een actief abonnement heeft"; - static String m26(sizeInMBorGB) => "Maak ${sizeInMBorGB} vrij"; + static String m28(sizeInMBorGB) => "Maak ${sizeInMBorGB} vrij"; - static String m27(count, formattedSize) => + static String m29(count, formattedSize) => "${Intl.plural(count, one: 'Het kan verwijderd worden van het apparaat om ${formattedSize} vrij te maken', other: 'Ze kunnen verwijderd worden van het apparaat om ${formattedSize} vrij te maken')}"; - static String m28(currentlyProcessing, totalCount) => + static String m30(currentlyProcessing, totalCount) => "Verwerken van ${currentlyProcessing} / ${totalCount}"; - static String m29(count) => + static String m31(count) => "${Intl.plural(count, one: '${count} item', other: '${count} items')}"; - static String m30(expiryTime) => "Link vervalt op ${expiryTime}"; + static String m32(expiryTime) => "Link vervalt op ${expiryTime}"; - static String m31(count, formattedCount) => + static String m33(count, formattedCount) => "${Intl.plural(count, zero: 'geen herinneringen', one: '${formattedCount} herinnering', other: '${formattedCount} herinneringen')}"; - static String m32(count) => + static String m34(count) => "${Intl.plural(count, one: 'Bestand verplaatsen', other: 'Bestanden verplaatsen')}"; - static String m33(albumName) => "Succesvol verplaatst naar ${albumName}"; + static String m35(albumName) => "Succesvol verplaatst naar ${albumName}"; - static String m34(passwordStrengthValue) => + static String m36(passwordStrengthValue) => "Wachtwoord sterkte: ${passwordStrengthValue}"; - static String m35(providerName) => + static String m37(providerName) => "Praat met ${providerName} klantenservice als u in rekening bent gebracht"; - static String m36(reason) => + static String m38(reason) => "Helaas is uw betaling mislukt vanwege ${reason}"; - static String m37(endDate) => + static String m39(endDate) => "Gratis proefperiode geldig tot ${endDate}.\nU kunt naderhand een betaald abonnement kiezen."; - static String m38(toEmail) => "Stuur ons een e-mail op ${toEmail}"; + static String m40(toEmail) => "Stuur ons een e-mail op ${toEmail}"; - static String m39(toEmail) => + static String m41(toEmail) => "Verstuur de logboeken alstublieft naar ${toEmail}"; - static String m40(storeName) => "Beoordeel ons op ${storeName}"; + static String m42(storeName) => "Beoordeel ons op ${storeName}"; - static String m41(storageInGB) => + static String m43(storageInGB) => "Jullie krijgen allebei ${storageInGB} GB* gratis"; - static String m42(userEmail) => + static String m44(userEmail) => "${userEmail} zal worden verwijderd uit dit gedeelde album\n\nAlle door hen toegevoegde foto\'s worden ook uit het album verwijderd"; - static String m43(endDate) => "Wordt verlengd op ${endDate}"; + static String m45(endDate) => "Wordt verlengd op ${endDate}"; - static String m44(count) => + static String m46(count) => "${Intl.plural(count, one: '${count} resultaat gevonden', other: '${count} resultaten gevonden')}"; - static String m45(count) => "${count} geselecteerd"; + static String m47(count) => "${count} geselecteerd"; - static String m46(count, yourCount) => + static String m48(count, yourCount) => "${count} geselecteerd (${yourCount} van jou)"; - static String m47(verificationID) => + static String m49(verificationID) => "Hier is mijn verificatie-ID: ${verificationID} voor ente.io."; - static String m48(verificationID) => + static String m50(verificationID) => "Hey, kunt u bevestigen dat dit uw ente.io verificatie-ID is: ${verificationID}"; - static String m49(referralCode, referralStorageInGB) => + static String m51(referralCode, referralStorageInGB) => "ente verwijzingscode: ${referralCode} \n\nPas het toe bij Instellingen → Algemeen → Verwijzingen om ${referralStorageInGB} GB gratis te krijgen nadat je je hebt aangemeld voor een betaald abonnement\n\nhttps://ente.io"; - static String m50(numberOfPeople) => + static String m52(numberOfPeople) => "${Intl.plural(numberOfPeople, zero: 'Deel met specifieke mensen', one: 'Gedeeld met 1 persoon', other: 'Gedeeld met ${numberOfPeople} mensen')}"; - static String m51(emailIDs) => "Gedeeld met ${emailIDs}"; - - static String m52(fileType) => - "Deze ${fileType} zal worden verwijderd van jouw apparaat."; - - static String m53(fileType) => - "Deze ${fileType} staat zowel in ente als op jouw apparaat."; + static String m53(emailIDs) => "Gedeeld met ${emailIDs}"; static String m54(fileType) => + "Deze ${fileType} zal worden verwijderd van jouw apparaat."; + + static String m55(fileType) => + "Deze ${fileType} staat zowel in ente als op jouw apparaat."; + + static String m56(fileType) => "Deze ${fileType} zal worden verwijderd uit ente."; - static String m55(storageAmountInGB) => "${storageAmountInGB} GB"; + static String m57(storageAmountInGB) => "${storageAmountInGB} GB"; - static String m56( + static String m58( usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) => "${usedAmount} ${usedStorageUnit} van ${totalAmount} ${totalStorageUnit} gebruikt"; - static String m57(id) => + static String m59(id) => "Uw ${id} is al aan een ander ente account gekoppeld.\nAls u uw ${id} wilt gebruiken met dit account, neem dan contact op met onze klantenservice"; - static String m58(endDate) => "Uw abonnement loopt af op ${endDate}"; + static String m60(endDate) => "Uw abonnement loopt af op ${endDate}"; - static String m59(completed, total) => + static String m61(completed, total) => "${completed}/${total} herinneringen bewaard"; - static String m60(storageAmountInGB) => + static String m62(storageAmountInGB) => "Zij krijgen ook ${storageAmountInGB} GB"; - static String m61(email) => "Dit is de verificatie-ID van ${email}"; + static String m63(email) => "Dit is de verificatie-ID van ${email}"; - static String m62(count) => + static String m64(count) => "${Intl.plural(count, zero: '', one: '1 dag', other: '${count} dagen')}"; - static String m63(endDate) => "Geldig tot ${endDate}"; + static String m65(endDate) => "Geldig tot ${endDate}"; - static String m64(email) => "Verifieer ${email}"; + static String m66(email) => "Verifieer ${email}"; - static String m65(email) => + static String m67(email) => "We hebben een e-mail gestuurd naar ${email}"; - static String m66(count) => + static String m68(count) => "${Intl.plural(count, one: '${count} jaar geleden', other: '${count} jaar geleden')}"; - static String m67(storageSaved) => + static String m69(storageSaved) => "Je hebt ${storageSaved} succesvol vrijgemaakt!"; final messages = _notInlinedMessages(_notInlinedMessages); @@ -228,9 +234,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Nieuw e-mailadres toevoegen"), "addCollaborator": MessageLookupByLibrary.simpleMessage("Samenwerker toevoegen"), + "addCollaborators": m0, "addFromDevice": MessageLookupByLibrary.simpleMessage("Toevoegen vanaf apparaat"), - "addItem": m0, + "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("Locatie toevoegen"), "addLocationButton": MessageLookupByLibrary.simpleMessage("Toevoegen"), @@ -238,7 +245,7 @@ class MessageLookup extends MessageLookupByLibrary { "addNew": MessageLookupByLibrary.simpleMessage("Nieuwe toevoegen"), "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage("Details van add-ons"), - "addOnValidTill": m1, + "addOnValidTill": m3, "addOns": MessageLookupByLibrary.simpleMessage("Add-ons"), "addPhotos": MessageLookupByLibrary.simpleMessage("Foto\'s toevoegen"), "addSelected": @@ -249,11 +256,12 @@ class MessageLookup extends MessageLookupByLibrary { "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage( "Toevoegen aan verborgen album"), "addViewer": MessageLookupByLibrary.simpleMessage("Voeg kijker toe"), + "addViewers": m1, "addYourPhotosNow": MessageLookupByLibrary.simpleMessage("Voeg nu je foto\'s toe"), "addedAs": MessageLookupByLibrary.simpleMessage("Toegevoegd als"), - "addedBy": m2, - "addedSuccessfullyTo": m3, + "addedBy": m4, + "addedSuccessfullyTo": m5, "addingToFavorites": MessageLookupByLibrary.simpleMessage("Toevoegen aan favorieten..."), "advanced": MessageLookupByLibrary.simpleMessage("Geavanceerd"), @@ -264,7 +272,7 @@ class MessageLookup extends MessageLookupByLibrary { "after1Week": MessageLookupByLibrary.simpleMessage("Na 1 week"), "after1Year": MessageLookupByLibrary.simpleMessage("Na 1 jaar"), "albumOwner": MessageLookupByLibrary.simpleMessage("Eigenaar"), - "albumParticipantsCount": m4, + "albumParticipantsCount": m6, "albumTitle": MessageLookupByLibrary.simpleMessage("Albumtitel"), "albumUpdated": MessageLookupByLibrary.simpleMessage("Album bijgewerkt"), @@ -300,7 +308,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Android, iOS, Web, Desktop"), "androidSignInTitle": MessageLookupByLibrary.simpleMessage("Verificatie vereist"), - "appVersion": m5, + "appVersion": m7, "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"), "apply": MessageLookupByLibrary.simpleMessage("Toepassen"), "applyCodeTitle": @@ -386,10 +394,10 @@ class MessageLookup extends MessageLookupByLibrary { "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage( "Kan alleen bestanden verwijderen die jouw eigendom zijn"), "cancel": MessageLookupByLibrary.simpleMessage("Annuleer"), - "cancelOtherSubscription": m6, + "cancelOtherSubscription": m8, "cancelSubscription": MessageLookupByLibrary.simpleMessage("Abonnement opzeggen"), - "cannotAddMorePhotosAfterBecomingViewer": m7, + "cannotAddMorePhotosAfterBecomingViewer": m9, "cannotDeleteSharedFiles": MessageLookupByLibrary.simpleMessage( "Kan gedeelde bestanden niet verwijderen"), "castInstruction": MessageLookupByLibrary.simpleMessage( @@ -413,7 +421,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Claim gratis opslag"), "claimMore": MessageLookupByLibrary.simpleMessage("Claim meer!"), "claimed": MessageLookupByLibrary.simpleMessage("Geclaimd"), - "claimedStorageSoFar": m8, + "claimedStorageSoFar": m10, "cleanUncategorized": MessageLookupByLibrary.simpleMessage("Ongecategoriseerd opschonen"), "clearCaches": MessageLookupByLibrary.simpleMessage("Cache legen"), @@ -436,7 +444,7 @@ class MessageLookup extends MessageLookupByLibrary { "Maak een link waarmee mensen foto\'s in jouw gedeelde album kunnen toevoegen en bekijken zonder dat ze daarvoor een ente app of account nodig hebben. Handig voor het verzamelen van foto\'s van evenementen."), "collaborativeLink": MessageLookupByLibrary.simpleMessage("Gezamenlijke link"), - "collaborativeLinkCreatedFor": m9, + "collaborativeLinkCreatedFor": m11, "collaborator": MessageLookupByLibrary.simpleMessage("Samenwerker"), "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": MessageLookupByLibrary.simpleMessage( @@ -464,10 +472,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Bevestig herstelsleutel"), "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage("Bevestig herstelsleutel"), - "contactFamilyAdmin": m10, + "contactFamilyAdmin": m12, "contactSupport": MessageLookupByLibrary.simpleMessage("Contacteer klantenservice"), - "contactToManageSubscription": m11, + "contactToManageSubscription": m13, "contacts": MessageLookupByLibrary.simpleMessage("Contacten"), "contents": MessageLookupByLibrary.simpleMessage("Inhoud"), "continueLabel": MessageLookupByLibrary.simpleMessage("Doorgaan"), @@ -544,12 +552,12 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Verwijder van apparaat"), "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Verwijder van ente"), - "deleteItemCount": m12, + "deleteItemCount": m14, "deleteLocation": MessageLookupByLibrary.simpleMessage("Verwijder locatie"), "deletePhotos": MessageLookupByLibrary.simpleMessage("Foto\'s verwijderen"), - "deleteProgress": m13, + "deleteProgress": m15, "deleteReason1": MessageLookupByLibrary.simpleMessage( "Ik mis een belangrijke functie"), "deleteReason2": MessageLookupByLibrary.simpleMessage( @@ -587,7 +595,7 @@ class MessageLookup extends MessageLookupByLibrary { "Kijkers kunnen nog steeds screenshots maken of een kopie van je foto\'s opslaan met behulp van externe tools"), "disableDownloadWarningTitle": MessageLookupByLibrary.simpleMessage("Let op"), - "disableLinkMessage": m14, + "disableLinkMessage": m16, "disableTwofactor": MessageLookupByLibrary.simpleMessage( "Tweestapsverificatie uitschakelen"), "disablingTwofactorAuthentication": @@ -608,9 +616,9 @@ class MessageLookup extends MessageLookupByLibrary { "downloadFailed": MessageLookupByLibrary.simpleMessage("Download mislukt"), "downloading": MessageLookupByLibrary.simpleMessage("Downloaden..."), - "dropSupportEmail": m15, - "duplicateFileCountWithStorageSaved": m16, - "duplicateItemsGroup": m17, + "dropSupportEmail": m17, + "duplicateFileCountWithStorageSaved": m18, + "duplicateItemsGroup": m19, "edit": MessageLookupByLibrary.simpleMessage("Bewerken"), "editLocation": MessageLookupByLibrary.simpleMessage("Locatie bewerken"), @@ -623,8 +631,8 @@ class MessageLookup extends MessageLookupByLibrary { "Bewerkte locatie wordt alleen gezien binnen Ente"), "eligible": MessageLookupByLibrary.simpleMessage("gerechtigd"), "email": MessageLookupByLibrary.simpleMessage("E-mail"), - "emailChangedTo": m18, - "emailNoEnteAccount": m19, + "emailChangedTo": m20, + "emailNoEnteAccount": m21, "emailVerificationToggle": MessageLookupByLibrary.simpleMessage("E-mailverificatie"), "emailYourLogs": @@ -728,8 +736,8 @@ class MessageLookup extends MessageLookupByLibrary { "fileTypes": MessageLookupByLibrary.simpleMessage("Bestandstype"), "fileTypesAndNames": MessageLookupByLibrary.simpleMessage("Bestandstypen en namen"), - "filesBackedUpFromDevice": m20, - "filesBackedUpInAlbum": m21, + "filesBackedUpFromDevice": m22, + "filesBackedUpInAlbum": m23, "filesDeleted": MessageLookupByLibrary.simpleMessage("Bestanden verwijderd"), "flip": MessageLookupByLibrary.simpleMessage("Omdraaien"), @@ -739,24 +747,24 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Wachtwoord vergeten"), "freeStorageClaimed": MessageLookupByLibrary.simpleMessage("Gratis opslag geclaimd"), - "freeStorageOnReferralSuccess": m22, - "freeStorageSpace": m23, + "freeStorageOnReferralSuccess": m24, + "freeStorageSpace": m25, "freeStorageUsable": MessageLookupByLibrary.simpleMessage("Gratis opslag bruikbaar"), "freeTrial": MessageLookupByLibrary.simpleMessage("Gratis proefversie"), - "freeTrialValidTill": m24, - "freeUpAccessPostDelete": m25, - "freeUpAmount": m26, + "freeTrialValidTill": m26, + "freeUpAccessPostDelete": m27, + "freeUpAmount": m28, "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage("Apparaatruimte vrijmaken"), "freeUpSpace": MessageLookupByLibrary.simpleMessage("Ruimte vrijmaken"), - "freeUpSpaceSaving": m27, + "freeUpSpaceSaving": m29, "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage( "Tot 1000 herinneringen getoond in de galerij"), "general": MessageLookupByLibrary.simpleMessage("Algemeen"), "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage( "Encryptiesleutels genereren..."), - "genericProgress": m28, + "genericProgress": m30, "goToSettings": MessageLookupByLibrary.simpleMessage("Ga naar instellingen"), "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"), @@ -817,7 +825,7 @@ class MessageLookup extends MessageLookupByLibrary { "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": MessageLookupByLibrary.simpleMessage( "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."), - "itemCount": m29, + "itemCount": m31, "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": MessageLookupByLibrary.simpleMessage( "Bestanden tonen het aantal resterende dagen voordat ze permanent worden verwijderd"), @@ -844,7 +852,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Apparaat limiet"), "linkEnabled": MessageLookupByLibrary.simpleMessage("Ingeschakeld"), "linkExpired": MessageLookupByLibrary.simpleMessage("Verlopen"), - "linkExpiresOn": m30, + "linkExpiresOn": m32, "linkExpiry": MessageLookupByLibrary.simpleMessage("Vervaldatum"), "linkHasExpired": MessageLookupByLibrary.simpleMessage("Link is vervallen"), @@ -893,6 +901,9 @@ class MessageLookup extends MessageLookupByLibrary { "logout": MessageLookupByLibrary.simpleMessage("Uitloggen"), "logsDialogBody": MessageLookupByLibrary.simpleMessage( "Dit zal logboeken verzenden om ons te helpen uw probleem op te lossen. Houd er rekening mee dat bestandsnamen zullen worden meegenomen om problemen met specifieke bestanden bij te houden."), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "longpressOnAnItemToViewInFullscreen": MessageLookupByLibrary.simpleMessage( "Houd een bestand lang ingedrukt om te bekijken op volledig scherm"), "lostDevice": @@ -916,7 +927,7 @@ class MessageLookup extends MessageLookupByLibrary { "maps": MessageLookupByLibrary.simpleMessage("Kaarten"), "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"), "matrix": MessageLookupByLibrary.simpleMessage("Matrix"), - "memoryCount": m31, + "memoryCount": m33, "merchandise": MessageLookupByLibrary.simpleMessage("Merchandise"), "mobileWebDesktop": MessageLookupByLibrary.simpleMessage("Mobiel, Web, Desktop"), @@ -926,12 +937,12 @@ class MessageLookup extends MessageLookupByLibrary { "Pas je zoekopdracht aan of zoek naar"), "moments": MessageLookupByLibrary.simpleMessage("Momenten"), "monthly": MessageLookupByLibrary.simpleMessage("Maandelijks"), - "moveItem": m32, + "moveItem": m34, "moveToAlbum": MessageLookupByLibrary.simpleMessage("Verplaats naar album"), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage( "Verplaatsen naar verborgen album"), - "movedSuccessfullyTo": m33, + "movedSuccessfullyTo": m35, "movedToTrash": MessageLookupByLibrary.simpleMessage("Naar prullenbak verplaatst"), "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage( @@ -1001,15 +1012,15 @@ class MessageLookup extends MessageLookupByLibrary { "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage( "Wachtwoord succesvol aangepast"), "passwordLock": MessageLookupByLibrary.simpleMessage("Wachtwoord slot"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "Wij slaan dit wachtwoord niet op, dus als je het vergeet, kunnen we je gegevens niet ontsleutelen"), "paymentDetails": MessageLookupByLibrary.simpleMessage("Betaalgegevens"), "paymentFailed": MessageLookupByLibrary.simpleMessage("Betaling mislukt"), - "paymentFailedTalkToProvider": m35, - "paymentFailedWithReason": m36, + "paymentFailedTalkToProvider": m37, + "paymentFailedWithReason": m38, "pendingItems": MessageLookupByLibrary.simpleMessage("Bestanden in behandeling"), "pendingSync": MessageLookupByLibrary.simpleMessage( @@ -1037,7 +1048,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Album bovenaan vastzetten"), "playOnTv": MessageLookupByLibrary.simpleMessage("Album afspelen op TV"), - "playStoreFreeTrialValidTill": m37, + "playStoreFreeTrialValidTill": m39, "playstoreSubscription": MessageLookupByLibrary.simpleMessage("PlayStore abonnement"), "pleaseCheckYourInternetConnectionAndTryAgain": @@ -1049,12 +1060,12 @@ class MessageLookup extends MessageLookupByLibrary { "pleaseContactSupportIfTheProblemPersists": MessageLookupByLibrary.simpleMessage( "Neem contact op met klantenservice als het probleem aanhoudt"), - "pleaseEmailUsAt": m38, + "pleaseEmailUsAt": m40, "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage( "Geef alstublieft toestemming"), "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage("Log opnieuw in"), - "pleaseSendTheLogsTo": m39, + "pleaseSendTheLogsTo": m41, "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("Probeer het nog eens"), "pleaseVerifyTheCodeYouHaveEntered": @@ -1089,7 +1100,7 @@ class MessageLookup extends MessageLookupByLibrary { "raiseTicket": MessageLookupByLibrary.simpleMessage("Meld probleem"), "rateTheApp": MessageLookupByLibrary.simpleMessage("Beoordeel de app"), "rateUs": MessageLookupByLibrary.simpleMessage("Beoordeel ons"), - "rateUsOnStore": m40, + "rateUsOnStore": m42, "recover": MessageLookupByLibrary.simpleMessage("Herstellen"), "recoverAccount": MessageLookupByLibrary.simpleMessage("Account herstellen"), @@ -1120,7 +1131,7 @@ class MessageLookup extends MessageLookupByLibrary { "1. Geef deze code aan je vrienden"), "referralStep2": MessageLookupByLibrary.simpleMessage( "2. Ze registreren voor een betaald plan"), - "referralStep3": m41, + "referralStep3": m43, "referrals": MessageLookupByLibrary.simpleMessage("Referenties"), "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage( "Verwijzingen zijn momenteel gepauzeerd"), @@ -1146,7 +1157,7 @@ class MessageLookup extends MessageLookupByLibrary { "removeLink": MessageLookupByLibrary.simpleMessage("Verwijder link"), "removeParticipant": MessageLookupByLibrary.simpleMessage("Deelnemer verwijderen"), - "removeParticipantBody": m42, + "removeParticipantBody": m44, "removePublicLink": MessageLookupByLibrary.simpleMessage("Verwijder publieke link"), "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage( @@ -1162,7 +1173,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Bestandsnaam wijzigen"), "renewSubscription": MessageLookupByLibrary.simpleMessage("Abonnement verlengen"), - "renewsOn": m43, + "renewsOn": m45, "reportABug": MessageLookupByLibrary.simpleMessage("Een fout melden"), "reportBug": MessageLookupByLibrary.simpleMessage("Fout melden"), "resendEmail": @@ -1224,7 +1235,7 @@ class MessageLookup extends MessageLookupByLibrary { "Foto\'s groeperen die in een bepaalde straal van een foto worden genomen"), "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage( "Nodig mensen uit, en je ziet alle foto\'s die door hen worden gedeeld hier"), - "searchResultCount": m44, + "searchResultCount": m46, "security": MessageLookupByLibrary.simpleMessage("Beveiliging"), "selectALocation": MessageLookupByLibrary.simpleMessage("Selecteer een locatie"), @@ -1251,8 +1262,8 @@ class MessageLookup extends MessageLookupByLibrary { "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": MessageLookupByLibrary.simpleMessage( "Geselecteerde bestanden worden verwijderd uit alle albums en verplaatst naar de prullenbak."), - "selectedPhotos": m45, - "selectedPhotosWithYours": m46, + "selectedPhotos": m47, + "selectedPhotosWithYours": m48, "send": MessageLookupByLibrary.simpleMessage("Verzenden"), "sendEmail": MessageLookupByLibrary.simpleMessage("E-mail versturen"), "sendInvite": @@ -1276,16 +1287,16 @@ class MessageLookup extends MessageLookupByLibrary { "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("Deel nu een album"), "shareLink": MessageLookupByLibrary.simpleMessage("Link delen"), - "shareMyVerificationID": m47, + "shareMyVerificationID": m49, "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage( "Deel alleen met de mensen die u wilt"), - "shareTextConfirmOthersVerificationID": m48, + "shareTextConfirmOthersVerificationID": m50, "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage( "Download ente zodat we gemakkelijk foto\'s en video\'s van originele kwaliteit kunnen delen\n\nhttps://ente.io"), - "shareTextReferralCode": m49, + "shareTextReferralCode": m51, "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage( "Delen met niet-ente gebruikers"), - "shareWithPeopleSectionTitle": m50, + "shareWithPeopleSectionTitle": m52, "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage("Deel jouw eerste album"), "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage( @@ -1296,7 +1307,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Nieuwe gedeelde foto\'s"), "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage( "Ontvang meldingen wanneer iemand een foto toevoegt aan een gedeeld album waar je deel van uitmaakt"), - "sharedWith": m51, + "sharedWith": m53, "sharedWithMe": MessageLookupByLibrary.simpleMessage("Gedeeld met mij"), "sharedWithYou": MessageLookupByLibrary.simpleMessage("Gedeeld met jou"), @@ -1311,11 +1322,11 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Log uit op andere apparaten"), "signUpTerms": MessageLookupByLibrary.simpleMessage( "Ik ga akkoord met de gebruiksvoorwaarden en privacybeleid"), - "singleFileDeleteFromDevice": m52, + "singleFileDeleteFromDevice": m54, "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage( "Het wordt uit alle albums verwijderd."), - "singleFileInBothLocalAndRemote": m53, - "singleFileInRemoteOnly": m54, + "singleFileInBothLocalAndRemote": m55, + "singleFileInRemoteOnly": m56, "skip": MessageLookupByLibrary.simpleMessage("Overslaan"), "social": MessageLookupByLibrary.simpleMessage("Sociale media"), "someItemsAreInBothEnteAndYourDevice": MessageLookupByLibrary.simpleMessage( @@ -1353,13 +1364,13 @@ class MessageLookup extends MessageLookupByLibrary { "storage": MessageLookupByLibrary.simpleMessage("Opslagruimte"), "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("Familie"), "storageBreakupYou": MessageLookupByLibrary.simpleMessage("Jij"), - "storageInGB": m55, + "storageInGB": m57, "storageLimitExceeded": MessageLookupByLibrary.simpleMessage("Opslaglimiet overschreden"), - "storageUsageInfo": m56, + "storageUsageInfo": m58, "strongStrength": MessageLookupByLibrary.simpleMessage("Sterk"), - "subAlreadyLinkedErrMessage": m57, - "subWillBeCancelledOn": m58, + "subAlreadyLinkedErrMessage": m59, + "subWillBeCancelledOn": m60, "subscribe": MessageLookupByLibrary.simpleMessage("Abonneer"), "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage( "Het lijkt erop dat je abonnement is verlopen. Abonneer om delen mogelijk te maken."), @@ -1376,7 +1387,7 @@ class MessageLookup extends MessageLookupByLibrary { "suggestFeatures": MessageLookupByLibrary.simpleMessage("Features voorstellen"), "support": MessageLookupByLibrary.simpleMessage("Ondersteuning"), - "syncProgress": m59, + "syncProgress": m61, "syncStopped": MessageLookupByLibrary.simpleMessage("Synchronisatie gestopt"), "syncing": MessageLookupByLibrary.simpleMessage("Synchroniseren..."), @@ -1404,7 +1415,7 @@ class MessageLookup extends MessageLookupByLibrary { "theseItemsWillBeDeletedFromYourDevice": MessageLookupByLibrary.simpleMessage( "Deze bestanden zullen worden verwijderd van uw apparaat."), - "theyAlsoGetXGb": m60, + "theyAlsoGetXGb": m62, "theyWillBeDeletedFromAllAlbums": MessageLookupByLibrary.simpleMessage( "Ze zullen uit alle albums worden verwijderd."), "thisActionCannotBeUndone": MessageLookupByLibrary.simpleMessage( @@ -1420,7 +1431,7 @@ class MessageLookup extends MessageLookupByLibrary { "Dit e-mailadres is al in gebruik"), "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage( "Deze foto heeft geen exif gegevens"), - "thisIsPersonVerificationId": m61, + "thisIsPersonVerificationId": m63, "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage("Dit is uw verificatie-ID"), "thisWillLogYouOutOfTheFollowingDevice": @@ -1437,7 +1448,7 @@ class MessageLookup extends MessageLookupByLibrary { "total": MessageLookupByLibrary.simpleMessage("totaal"), "totalSize": MessageLookupByLibrary.simpleMessage("Totale grootte"), "trash": MessageLookupByLibrary.simpleMessage("Prullenbak"), - "trashDaysLeft": m62, + "trashDaysLeft": m64, "tryAgain": MessageLookupByLibrary.simpleMessage("Probeer opnieuw"), "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage( "Schakel back-up in om bestanden die toegevoegd zijn aan deze map op dit apparaat automatisch te uploaden."), @@ -1493,7 +1504,7 @@ class MessageLookup extends MessageLookupByLibrary { "useSelectedPhoto": MessageLookupByLibrary.simpleMessage("Gebruik geselecteerde foto"), "usedSpace": MessageLookupByLibrary.simpleMessage("Gebruikte ruimte"), - "validTill": m63, + "validTill": m65, "verificationFailedPleaseTryAgain": MessageLookupByLibrary.simpleMessage( "Verificatie mislukt, probeer het opnieuw"), @@ -1501,7 +1512,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Verificatie ID"), "verify": MessageLookupByLibrary.simpleMessage("Verifiëren"), "verifyEmail": MessageLookupByLibrary.simpleMessage("Bevestig e-mail"), - "verifyEmailID": m64, + "verifyEmailID": m66, "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verifiëren"), "verifyPassword": MessageLookupByLibrary.simpleMessage("Bevestig wachtwoord"), @@ -1530,11 +1541,11 @@ class MessageLookup extends MessageLookupByLibrary { "weDontSupportEditingPhotosAndAlbumsThatYouDont": MessageLookupByLibrary.simpleMessage( "We ondersteunen het bewerken van foto\'s en albums waar je niet de eigenaar van bent nog niet"), - "weHaveSendEmailTo": m65, + "weHaveSendEmailTo": m67, "weakStrength": MessageLookupByLibrary.simpleMessage("Zwak"), "welcomeBack": MessageLookupByLibrary.simpleMessage("Welkom terug!"), "yearly": MessageLookupByLibrary.simpleMessage("Jaarlijks"), - "yearsAgo": m66, + "yearsAgo": m68, "yes": MessageLookupByLibrary.simpleMessage("Ja"), "yesCancel": MessageLookupByLibrary.simpleMessage("Ja, opzeggen"), "yesConvertToViewer": @@ -1564,7 +1575,7 @@ class MessageLookup extends MessageLookupByLibrary { "Je kunt niet met jezelf delen"), "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage( "U heeft geen gearchiveerde bestanden."), - "youHaveSuccessfullyFreedUp": m67, + "youHaveSuccessfullyFreedUp": m69, "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage("Je account is verwijderd"), "yourMap": MessageLookupByLibrary.simpleMessage("Jouw kaart"), diff --git a/mobile/lib/generated/intl/messages_no.dart b/mobile/lib/generated/intl/messages_no.dart index 795caf200..05477cfeb 100644 --- a/mobile/lib/generated/intl/messages_no.dart +++ b/mobile/lib/generated/intl/messages_no.dart @@ -20,12 +20,20 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'no'; + static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; + final messages = _notInlinedMessages(_notInlinedMessages); static Map _notInlinedMessages(_) => { "accountWelcomeBack": MessageLookupByLibrary.simpleMessage("Velkommen tilbake!"), + "addCollaborators": m0, "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Add to hidden album"), + "addViewers": m1, "askDeleteReason": MessageLookupByLibrary.simpleMessage( "Hva er hovedårsaken til at du sletter kontoen din?"), "cancel": MessageLookupByLibrary.simpleMessage("Avbryt"), @@ -59,6 +67,9 @@ class MessageLookup extends MessageLookupByLibrary { "kindlyHelpUsWithThisInformation": MessageLookupByLibrary.simpleMessage( "Vær vennlig og hjelp oss med denne informasjonen"), "locations": MessageLookupByLibrary.simpleMessage("Locations"), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "modifyYourQueryOrTrySearchingFor": MessageLookupByLibrary.simpleMessage( "Modify your query, or try searching for"), diff --git a/mobile/lib/generated/intl/messages_pl.dart b/mobile/lib/generated/intl/messages_pl.dart index 2647e1191..af6ba4353 100644 --- a/mobile/lib/generated/intl/messages_pl.dart +++ b/mobile/lib/generated/intl/messages_pl.dart @@ -20,7 +20,13 @@ typedef String MessageIfAbsent(String messageStr, List args); class MessageLookup extends MessageLookupByLibrary { String get localeName => 'pl'; - static String m34(passwordStrengthValue) => + static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; + + static String m36(passwordStrengthValue) => "Siła hasła: ${passwordStrengthValue}"; final messages = _notInlinedMessages(_notInlinedMessages); @@ -28,8 +34,10 @@ class MessageLookup extends MessageLookupByLibrary { "accountWelcomeBack": MessageLookupByLibrary.simpleMessage("Witaj ponownie!"), "activeSessions": MessageLookupByLibrary.simpleMessage("Aktywne sesje"), + "addCollaborators": m0, "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Add to hidden album"), + "addViewers": m1, "askDeleteReason": MessageLookupByLibrary.simpleMessage( "Jaka jest przyczyna usunięcia konta?"), "cancel": MessageLookupByLibrary.simpleMessage("Anuluj"), @@ -119,6 +127,9 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Pomóż nam z tą informacją"), "locations": MessageLookupByLibrary.simpleMessage("Locations"), "logInLabel": MessageLookupByLibrary.simpleMessage("Zaloguj się"), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "moderateStrength": MessageLookupByLibrary.simpleMessage("Umiarkowana"), "modifyYourQueryOrTrySearchingFor": MessageLookupByLibrary.simpleMessage( @@ -134,7 +145,7 @@ class MessageLookup extends MessageLookupByLibrary { "password": MessageLookupByLibrary.simpleMessage("Hasło"), "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage( "Hasło zostało pomyślnie zmienione"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "Nie przechowujemy tego hasła, więc jeśli go zapomnisz, nie będziemy w stanie odszyfrować Twoich danych"), "pleaseTryAgain": diff --git a/mobile/lib/generated/intl/messages_pt.dart b/mobile/lib/generated/intl/messages_pt.dart index 4a2bfa26d..ffdc0d257 100644 --- a/mobile/lib/generated/intl/messages_pt.dart +++ b/mobile/lib/generated/intl/messages_pt.dart @@ -21,27 +21,33 @@ class MessageLookup extends MessageLookupByLibrary { String get localeName => 'pt'; static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m2(count) => "${Intl.plural(count, one: 'Adicionar item', other: 'Adicionar itens')}"; - static String m1(storageAmount, endDate) => + static String m3(storageAmount, endDate) => "Seu complemento ${storageAmount} é válido até o dia ${endDate}"; - static String m2(emailOrName) => "Adicionado por ${emailOrName}"; + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; - static String m3(albumName) => "Adicionado com sucesso a ${albumName}"; + static String m4(emailOrName) => "Adicionado por ${emailOrName}"; - static String m4(count) => + static String m5(albumName) => "Adicionado com sucesso a ${albumName}"; + + static String m6(count) => "${Intl.plural(count, zero: 'Nenhum Participante', one: '1 Participante', other: '${count} Participantes')}"; - static String m5(versionValue) => "Versão: ${versionValue}"; + static String m7(versionValue) => "Versão: ${versionValue}"; - static String m6(paymentProvider) => + static String m8(paymentProvider) => "Por favor, cancele sua assinatura existente do ${paymentProvider} primeiro"; - static String m7(user) => + static String m9(user) => "${user} Não poderá adicionar mais fotos a este álbum\n\nEles ainda poderão remover as fotos existentes adicionadas por eles"; - static String m8(isFamilyMember, storageAmountInGb) => + static String m10(isFamilyMember, storageAmountInGb) => "${Intl.select(isFamilyMember, { 'true': 'Sua família reeinvindicou ${storageAmountInGb} GB até agora', @@ -49,163 +55,163 @@ class MessageLookup extends MessageLookupByLibrary { 'other': 'Você reeinvindicou ${storageAmountInGb} GB até agora', })}"; - static String m9(albumName) => "Link colaborativo criado para ${albumName}"; + static String m11(albumName) => "Link colaborativo criado para ${albumName}"; - static String m10(familyAdminEmail) => + static String m12(familyAdminEmail) => "Entre em contato com ${familyAdminEmail} para gerenciar sua assinatura"; - static String m11(provider) => + static String m13(provider) => "Entre em contato conosco pelo e-mail support@ente.io para gerenciar sua assinatura ${provider}."; - static String m12(count) => + static String m14(count) => "${Intl.plural(count, one: 'Excluir ${count} item', other: 'Excluir ${count} itens')}"; - static String m13(currentlyDeleting, totalCount) => + static String m15(currentlyDeleting, totalCount) => "Excluindo ${currentlyDeleting} / ${totalCount}"; - static String m14(albumName) => + static String m16(albumName) => "Isso removerá o link público para acessar \"${albumName}\"."; - static String m15(supportEmail) => + static String m17(supportEmail) => "Por favor, envie um e-mail para ${supportEmail} a partir do seu endereço de e-mail registrado"; - static String m16(count, storageSaved) => + static String m18(count, storageSaved) => "Você limpou ${Intl.plural(count, one: '${count} arquivo duplicado', other: '${count} arquivos duplicados')}, salvando (${storageSaved}!)"; - static String m17(count, formattedSize) => + static String m19(count, formattedSize) => "${count} Arquivos, ${formattedSize} cada"; - static String m18(newEmail) => "E-mail alterado para ${newEmail}"; + static String m20(newEmail) => "E-mail alterado para ${newEmail}"; - static String m19(email) => + static String m21(email) => "${email} Não possui uma conta Ente.\n\nEnvie um convite para compartilhar fotos."; - static String m20(count, formattedNumber) => + static String m22(count, formattedNumber) => "${Intl.plural(count, one: '1 arquivo', other: '${formattedNumber} arquivos')} neste dispositivo teve um backup seguro"; - static String m21(count, formattedNumber) => + static String m23(count, formattedNumber) => "${Intl.plural(count, one: '1 arquivo', other: '${formattedNumber} arquivos')} neste álbum teve um backup seguro"; - static String m22(storageAmountInGB) => + static String m24(storageAmountInGB) => "${storageAmountInGB} GB cada vez que alguém se inscrever para um plano pago e aplica o seu código"; - static String m23(freeAmount, storageUnit) => + static String m25(freeAmount, storageUnit) => "${freeAmount} ${storageUnit} grátis"; - static String m24(endDate) => "Teste gratuito acaba em ${endDate}"; + static String m26(endDate) => "Teste gratuito acaba em ${endDate}"; - static String m25(count) => + static String m27(count) => "Você ainda pode acessar ${Intl.plural(count, one: 'ele', other: 'eles')} no ente contanto que você tenha uma assinatura ativa"; - static String m26(sizeInMBorGB) => "Liberar ${sizeInMBorGB}"; + static String m28(sizeInMBorGB) => "Liberar ${sizeInMBorGB}"; - static String m27(count, formattedSize) => + static String m29(count, formattedSize) => "${Intl.plural(count, one: 'Pode ser excluído do dispositivo para liberar ${formattedSize}', other: 'Eles podem ser excluídos do dispositivo para liberar ${formattedSize}')}"; - static String m28(currentlyProcessing, totalCount) => + static String m30(currentlyProcessing, totalCount) => "Processando ${currentlyProcessing} / ${totalCount}"; - static String m29(count) => + static String m31(count) => "${Intl.plural(count, one: '${count} item', other: '${count} items')}"; - static String m30(expiryTime) => "O link irá expirar em ${expiryTime}"; + static String m32(expiryTime) => "O link irá expirar em ${expiryTime}"; - static String m31(count, formattedCount) => + static String m33(count, formattedCount) => "${Intl.plural(count, zero: 'no memories', one: '${formattedCount} memory', other: '${formattedCount} memories')}"; - static String m32(count) => + static String m34(count) => "${Intl.plural(count, one: 'Mover item', other: 'Mover itens')}"; - static String m33(albumName) => "Movido com sucesso para ${albumName}"; + static String m35(albumName) => "Movido com sucesso para ${albumName}"; - static String m34(passwordStrengthValue) => + static String m36(passwordStrengthValue) => "Segurança da senha: ${passwordStrengthValue}"; - static String m35(providerName) => + static String m37(providerName) => "Por favor, fale com o suporte ${providerName} se você foi cobrado"; - static String m36(reason) => + static String m38(reason) => "Infelizmente o seu pagamento falhou devido a ${reason}"; - static String m37(endDate) => + static String m39(endDate) => "Teste gratuito válido até ${endDate}.\nVocê pode escolher um plano pago depois."; - static String m38(toEmail) => + static String m40(toEmail) => "Por favor, envie-nos um e-mail para ${toEmail}"; - static String m39(toEmail) => "Por favor, envie os logs para \n${toEmail}"; + static String m41(toEmail) => "Por favor, envie os logs para \n${toEmail}"; - static String m40(storeName) => "Avalie-nos em ${storeName}"; + static String m42(storeName) => "Avalie-nos em ${storeName}"; - static String m41(storageInGB) => "3. Ambos ganham ${storageInGB} GB* grátis"; + static String m43(storageInGB) => "3. Ambos ganham ${storageInGB} GB* grátis"; - static String m42(userEmail) => + static String m44(userEmail) => "${userEmail} será removido deste álbum compartilhado\n\nQuaisquer fotos adicionadas por eles também serão removidas do álbum"; - static String m43(endDate) => "Renovação de assinatura em ${endDate}"; + static String m45(endDate) => "Renovação de assinatura em ${endDate}"; - static String m44(count) => + static String m46(count) => "${Intl.plural(count, one: '${count} resultado encontrado', other: '${count} resultado encontrado')}"; - static String m45(count) => "${count} Selecionados"; + static String m47(count) => "${count} Selecionados"; - static String m46(count, yourCount) => + static String m48(count, yourCount) => "${count} Selecionado (${yourCount} seus)"; - static String m47(verificationID) => + static String m49(verificationID) => "Aqui está meu ID de verificação para o Ente.io: ${verificationID}"; - static String m48(verificationID) => + static String m50(verificationID) => "Ei, você pode confirmar que este é seu ID de verificação do Ente.io? ${verificationID}"; - static String m49(referralCode, referralStorageInGB) => + static String m51(referralCode, referralStorageInGB) => "Código de referência do ente: ${referralCode} \n\nAplique em Configurações → Geral → Indicações para obter ${referralStorageInGB} GB gratuitamente após a sua inscrição em um plano pago\n\nhttps://ente.io"; - static String m50(numberOfPeople) => + static String m52(numberOfPeople) => "${Intl.plural(numberOfPeople, zero: 'Compartilhe com pessoas específicas', one: 'Compartilhado com 1 pessoa', other: 'Compartilhado com ${numberOfPeople} pessoas')}"; - static String m51(emailIDs) => "Compartilhado com ${emailIDs}"; + static String m53(emailIDs) => "Compartilhado com ${emailIDs}"; - static String m52(fileType) => + static String m54(fileType) => "Este ${fileType} será excluído do seu dispositivo."; - static String m53(fileType) => + static String m55(fileType) => "Este ${fileType} está em ente e no seu dispositivo."; - static String m54(fileType) => "Este ${fileType} será excluído do ente."; + static String m56(fileType) => "Este ${fileType} será excluído do ente."; - static String m55(storageAmountInGB) => "${storageAmountInGB} GB"; + static String m57(storageAmountInGB) => "${storageAmountInGB} GB"; - static String m56( + static String m58( usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) => "${usedAmount} ${usedStorageUnit} de ${totalAmount} ${totalStorageUnit} usado"; - static String m57(id) => + static String m59(id) => "Seu ${id} já está vinculado a outra conta ente.\nSe você gostaria de usar seu ${id} com esta conta, por favor contate nosso suporte\'\'"; - static String m58(endDate) => "Sua assinatura será cancelada em ${endDate}"; + static String m60(endDate) => "Sua assinatura será cancelada em ${endDate}"; - static String m59(completed, total) => + static String m61(completed, total) => "${completed}/${total} memórias preservadas"; - static String m60(storageAmountInGB) => + static String m62(storageAmountInGB) => "Eles também recebem ${storageAmountInGB} GB"; - static String m61(email) => "Este é o ID de verificação de ${email}"; + static String m63(email) => "Este é o ID de verificação de ${email}"; - static String m62(count) => + static String m64(count) => "${Intl.plural(count, zero: '', one: '1 dia', other: '${count} dias')}"; - static String m63(endDate) => "Válido até ${endDate}"; + static String m65(endDate) => "Válido até ${endDate}"; - static String m64(email) => "Verificar ${email}"; + static String m66(email) => "Verificar ${email}"; - static String m65(email) => "Enviamos um e-mail à ${email}"; + static String m67(email) => "Enviamos um e-mail à ${email}"; - static String m66(count) => + static String m68(count) => "${Intl.plural(count, one: '${count} anos atrás', other: '${count} anos atrás')}"; - static String m67(storageSaved) => + static String m69(storageSaved) => "Você liberou ${storageSaved} com sucesso!"; final messages = _notInlinedMessages(_notInlinedMessages); @@ -224,16 +230,17 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Adicionar um novo email"), "addCollaborator": MessageLookupByLibrary.simpleMessage("Adicionar colaborador"), + "addCollaborators": m0, "addFromDevice": MessageLookupByLibrary.simpleMessage( "Adicionar a partir do dispositivo"), - "addItem": m0, + "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("Adicionar local"), "addLocationButton": MessageLookupByLibrary.simpleMessage("Adicionar"), "addMore": MessageLookupByLibrary.simpleMessage("Adicione mais"), "addNew": MessageLookupByLibrary.simpleMessage("Adicionar novo"), "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage("Detalhes dos complementos"), - "addOnValidTill": m1, + "addOnValidTill": m3, "addOns": MessageLookupByLibrary.simpleMessage("Complementos"), "addPhotos": MessageLookupByLibrary.simpleMessage("Adicionar fotos"), "addSelected": @@ -245,11 +252,12 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Adicionar a álbum oculto"), "addViewer": MessageLookupByLibrary.simpleMessage("Adicionar visualizador"), + "addViewers": m1, "addYourPhotosNow": MessageLookupByLibrary.simpleMessage("Adicione suas fotos agora"), "addedAs": MessageLookupByLibrary.simpleMessage("Adicionado como"), - "addedBy": m2, - "addedSuccessfullyTo": m3, + "addedBy": m4, + "addedSuccessfullyTo": m5, "addingToFavorites": MessageLookupByLibrary.simpleMessage( "Adicionando aos favoritos..."), "advanced": MessageLookupByLibrary.simpleMessage("Avançado"), @@ -260,7 +268,7 @@ class MessageLookup extends MessageLookupByLibrary { "after1Week": MessageLookupByLibrary.simpleMessage("Após 1 semana"), "after1Year": MessageLookupByLibrary.simpleMessage("Após 1 ano"), "albumOwner": MessageLookupByLibrary.simpleMessage("Proprietário"), - "albumParticipantsCount": m4, + "albumParticipantsCount": m6, "albumTitle": MessageLookupByLibrary.simpleMessage("Título do álbum"), "albumUpdated": MessageLookupByLibrary.simpleMessage("Álbum atualizado"), @@ -297,7 +305,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Android, iOS, Web, Desktop"), "androidSignInTitle": MessageLookupByLibrary.simpleMessage("Autenticação necessária"), - "appVersion": m5, + "appVersion": m7, "appleId": MessageLookupByLibrary.simpleMessage("ID da Apple"), "apply": MessageLookupByLibrary.simpleMessage("Aplicar"), "applyCodeTitle": @@ -384,10 +392,10 @@ class MessageLookup extends MessageLookupByLibrary { "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage( "Só é possível remover arquivos de sua propriedade"), "cancel": MessageLookupByLibrary.simpleMessage("Cancelar"), - "cancelOtherSubscription": m6, + "cancelOtherSubscription": m8, "cancelSubscription": MessageLookupByLibrary.simpleMessage("Cancelar assinatura"), - "cannotAddMorePhotosAfterBecomingViewer": m7, + "cannotAddMorePhotosAfterBecomingViewer": m9, "cannotDeleteSharedFiles": MessageLookupByLibrary.simpleMessage( "Não é possível excluir arquivos compartilhados"), "castInstruction": MessageLookupByLibrary.simpleMessage( @@ -411,9 +419,11 @@ class MessageLookup extends MessageLookupByLibrary { "Reivindicar armazenamento gratuito"), "claimMore": MessageLookupByLibrary.simpleMessage("Reivindique mais!"), "claimed": MessageLookupByLibrary.simpleMessage("Reivindicado"), - "claimedStorageSoFar": m8, + "claimedStorageSoFar": m10, "cleanUncategorized": MessageLookupByLibrary.simpleMessage("Limpar Sem Categoria"), + "cleanUncategorizedDescription": MessageLookupByLibrary.simpleMessage( + "Remover todos os arquivos de Não Categorizados que estão presentes em outros álbuns"), "clearCaches": MessageLookupByLibrary.simpleMessage("Limpar cache"), "clearIndexes": MessageLookupByLibrary.simpleMessage("Limpar índices"), "click": MessageLookupByLibrary.simpleMessage("Clique"), @@ -434,7 +444,7 @@ class MessageLookup extends MessageLookupByLibrary { "Crie um link para permitir pessoas adicionar e ver fotos no seu álbum compartilhado sem a necessidade do aplicativo ou uma conta Ente. Ótimo para colecionar fotos de eventos."), "collaborativeLink": MessageLookupByLibrary.simpleMessage("Link Colaborativo"), - "collaborativeLinkCreatedFor": m9, + "collaborativeLinkCreatedFor": m11, "collaborator": MessageLookupByLibrary.simpleMessage("Colaborador"), "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": MessageLookupByLibrary.simpleMessage( @@ -461,10 +471,10 @@ class MessageLookup extends MessageLookupByLibrary { "Confirme a chave de recuperação"), "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage( "Confirme sua chave de recuperação"), - "contactFamilyAdmin": m10, + "contactFamilyAdmin": m12, "contactSupport": MessageLookupByLibrary.simpleMessage("Contate o suporte"), - "contactToManageSubscription": m11, + "contactToManageSubscription": m13, "contacts": MessageLookupByLibrary.simpleMessage("Contatos"), "contents": MessageLookupByLibrary.simpleMessage("Conteúdos"), "continueLabel": MessageLookupByLibrary.simpleMessage("Continuar"), @@ -540,10 +550,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Excluir do dispositivo"), "deleteFromEnte": MessageLookupByLibrary.simpleMessage("Excluir do ente"), - "deleteItemCount": m12, + "deleteItemCount": m14, "deleteLocation": MessageLookupByLibrary.simpleMessage("Excluir Local"), "deletePhotos": MessageLookupByLibrary.simpleMessage("Excluir fotos"), - "deleteProgress": m13, + "deleteProgress": m15, "deleteReason1": MessageLookupByLibrary.simpleMessage( "Está faltando um recurso-chave que eu preciso"), "deleteReason2": MessageLookupByLibrary.simpleMessage( @@ -558,7 +568,7 @@ class MessageLookup extends MessageLookupByLibrary { "Excluir álbum compartilhado?"), "deleteSharedAlbumDialogBody": MessageLookupByLibrary.simpleMessage( "O álbum será apagado para todos\n\nVocê perderá o acesso a fotos compartilhadas neste álbum que pertencem aos outros"), - "descriptions": MessageLookupByLibrary.simpleMessage("Descriptions"), + "descriptions": MessageLookupByLibrary.simpleMessage("Descrições"), "deselectAll": MessageLookupByLibrary.simpleMessage("Desmarcar todos"), "designedToOutlive": MessageLookupByLibrary.simpleMessage("Feito para ter logenvidade"), @@ -580,7 +590,7 @@ class MessageLookup extends MessageLookupByLibrary { "Os espectadores ainda podem tirar screenshots ou salvar uma cópia de suas fotos usando ferramentas externas"), "disableDownloadWarningTitle": MessageLookupByLibrary.simpleMessage("Observe"), - "disableLinkMessage": m14, + "disableLinkMessage": m16, "disableTwofactor": MessageLookupByLibrary.simpleMessage( "Desativar autenticação de dois fatores"), "disablingTwofactorAuthentication": @@ -603,9 +613,9 @@ class MessageLookup extends MessageLookupByLibrary { "downloadFailed": MessageLookupByLibrary.simpleMessage("Falha ao baixar"), "downloading": MessageLookupByLibrary.simpleMessage("Baixando..."), - "dropSupportEmail": m15, - "duplicateFileCountWithStorageSaved": m16, - "duplicateItemsGroup": m17, + "dropSupportEmail": m17, + "duplicateFileCountWithStorageSaved": m18, + "duplicateItemsGroup": m19, "edit": MessageLookupByLibrary.simpleMessage("Editar"), "editLocation": MessageLookupByLibrary.simpleMessage("Editar local"), "editLocationTagTitle": @@ -616,8 +626,8 @@ class MessageLookup extends MessageLookupByLibrary { "Edições para local só serão vistas dentro do Ente"), "eligible": MessageLookupByLibrary.simpleMessage("elegível"), "email": MessageLookupByLibrary.simpleMessage("E-mail"), - "emailChangedTo": m18, - "emailNoEnteAccount": m19, + "emailChangedTo": m20, + "emailNoEnteAccount": m21, "emailVerificationToggle": MessageLookupByLibrary.simpleMessage("Verificação de e-mail"), "emailYourLogs": @@ -716,8 +726,8 @@ class MessageLookup extends MessageLookupByLibrary { "fileTypes": MessageLookupByLibrary.simpleMessage("Tipos de arquivo"), "fileTypesAndNames": MessageLookupByLibrary.simpleMessage("Tipos de arquivo e nomes"), - "filesBackedUpFromDevice": m20, - "filesBackedUpInAlbum": m21, + "filesBackedUpFromDevice": m22, + "filesBackedUpInAlbum": m23, "filesDeleted": MessageLookupByLibrary.simpleMessage("Arquivos excluídos"), "flip": MessageLookupByLibrary.simpleMessage("Inverter"), @@ -727,24 +737,24 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Esqueceu sua senha"), "freeStorageClaimed": MessageLookupByLibrary.simpleMessage( "Armazenamento gratuito reivindicado"), - "freeStorageOnReferralSuccess": m22, - "freeStorageSpace": m23, + "freeStorageOnReferralSuccess": m24, + "freeStorageSpace": m25, "freeStorageUsable": MessageLookupByLibrary.simpleMessage( "Armazenamento livre utilizável"), "freeTrial": MessageLookupByLibrary.simpleMessage("Teste gratuito"), - "freeTrialValidTill": m24, - "freeUpAccessPostDelete": m25, - "freeUpAmount": m26, + "freeTrialValidTill": m26, + "freeUpAccessPostDelete": m27, + "freeUpAmount": m28, "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage( "Liberar espaço no dispositivo"), "freeUpSpace": MessageLookupByLibrary.simpleMessage("Liberar espaço"), - "freeUpSpaceSaving": m27, + "freeUpSpaceSaving": m29, "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage( "Até 1000 memórias mostradas na galeria"), "general": MessageLookupByLibrary.simpleMessage("Geral"), "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage( "Gerando chaves de criptografia..."), - "genericProgress": m28, + "genericProgress": m30, "goToSettings": MessageLookupByLibrary.simpleMessage("Ir para Configurações"), "googlePlayId": @@ -806,7 +816,7 @@ class MessageLookup extends MessageLookupByLibrary { "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": MessageLookupByLibrary.simpleMessage( "Parece que algo deu errado. Por favor, tente novamente mais tarde. Se o erro persistir, entre em contato com nossa equipe de suporte."), - "itemCount": m29, + "itemCount": m31, "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": MessageLookupByLibrary.simpleMessage( "Os itens mostram o número de dias restantes antes da exclusão permanente"), @@ -834,7 +844,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Limite do dispositivo"), "linkEnabled": MessageLookupByLibrary.simpleMessage("Ativado"), "linkExpired": MessageLookupByLibrary.simpleMessage("Expirado"), - "linkExpiresOn": m30, + "linkExpiresOn": m32, "linkExpiry": MessageLookupByLibrary.simpleMessage("Expiração do link"), "linkHasExpired": MessageLookupByLibrary.simpleMessage("O link expirou"), @@ -872,7 +882,7 @@ class MessageLookup extends MessageLookupByLibrary { "locationName": MessageLookupByLibrary.simpleMessage("Nome do Local"), "locationTagFeatureDescription": MessageLookupByLibrary.simpleMessage( "Uma tag em grupo de todas as fotos que foram tiradas dentro de algum raio de uma foto"), - "locations": MessageLookupByLibrary.simpleMessage("Locations"), + "locations": MessageLookupByLibrary.simpleMessage("Locais"), "lockButtonLabel": MessageLookupByLibrary.simpleMessage("Bloquear"), "lockScreenEnablePreSteps": MessageLookupByLibrary.simpleMessage( "Para ativar o bloqueio de tela, por favor ative um método de autenticação nas configurações do sistema do seu dispositivo."), @@ -884,6 +894,9 @@ class MessageLookup extends MessageLookupByLibrary { "logout": MessageLookupByLibrary.simpleMessage("Encerrar sessão"), "logsDialogBody": MessageLookupByLibrary.simpleMessage( "Isso enviará através dos logs para nos ajudar a depurar o seu problema. Por favor, note que nomes de arquivos serão incluídos para ajudar a rastrear problemas com arquivos específicos."), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "longpressOnAnItemToViewInFullscreen": MessageLookupByLibrary.simpleMessage( "Pressione e segure em um item para exibir em tela cheia"), @@ -907,7 +920,7 @@ class MessageLookup extends MessageLookupByLibrary { "maps": MessageLookupByLibrary.simpleMessage("Mapas"), "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"), "matrix": MessageLookupByLibrary.simpleMessage("Matrix"), - "memoryCount": m31, + "memoryCount": m33, "merchandise": MessageLookupByLibrary.simpleMessage("Produtos"), "mobileWebDesktop": MessageLookupByLibrary.simpleMessage("Mobile, Web, Desktop"), @@ -917,11 +930,11 @@ class MessageLookup extends MessageLookupByLibrary { "Modifique sua consulta ou tente procurar por"), "moments": MessageLookupByLibrary.simpleMessage("Momentos"), "monthly": MessageLookupByLibrary.simpleMessage("Mensal"), - "moveItem": m32, + "moveItem": m34, "moveToAlbum": MessageLookupByLibrary.simpleMessage("Mover para álbum"), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("Mover para álbum oculto"), - "movedSuccessfullyTo": m33, + "movedSuccessfullyTo": m35, "movedToTrash": MessageLookupByLibrary.simpleMessage("Movido para a lixeira"), "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage( @@ -994,15 +1007,15 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Senha alterada com sucesso"), "passwordLock": MessageLookupByLibrary.simpleMessage("Bloqueio de senha"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "Nós não salvamos essa senha, se você esquecer nós não poderemos descriptografar seus dados"), "paymentDetails": MessageLookupByLibrary.simpleMessage("Detalhes de pagamento"), "paymentFailed": MessageLookupByLibrary.simpleMessage("Falha no pagamento"), - "paymentFailedTalkToProvider": m35, - "paymentFailedWithReason": m36, + "paymentFailedTalkToProvider": m37, + "paymentFailedWithReason": m38, "pendingItems": MessageLookupByLibrary.simpleMessage("Itens pendentes"), "pendingSync": MessageLookupByLibrary.simpleMessage("Sincronização pendente"), @@ -1028,7 +1041,7 @@ class MessageLookup extends MessageLookupByLibrary { "pinAlbum": MessageLookupByLibrary.simpleMessage("Fixar álbum"), "playOnTv": MessageLookupByLibrary.simpleMessage("Reproduzir álbum na TV"), - "playStoreFreeTrialValidTill": m37, + "playStoreFreeTrialValidTill": m39, "playstoreSubscription": MessageLookupByLibrary.simpleMessage("Assinatura da PlayStore"), "pleaseCheckYourInternetConnectionAndTryAgain": @@ -1040,12 +1053,12 @@ class MessageLookup extends MessageLookupByLibrary { "pleaseContactSupportIfTheProblemPersists": MessageLookupByLibrary.simpleMessage( "Por favor, contate o suporte se o problema persistir"), - "pleaseEmailUsAt": m38, + "pleaseEmailUsAt": m40, "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage( "Por favor, conceda as permissões"), "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage( "Por favor, faça login novamente"), - "pleaseSendTheLogsTo": m39, + "pleaseSendTheLogsTo": m41, "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("Por favor, tente novamente"), "pleaseVerifyTheCodeYouHaveEntered": @@ -1082,7 +1095,7 @@ class MessageLookup extends MessageLookupByLibrary { "rateTheApp": MessageLookupByLibrary.simpleMessage("Avalie o aplicativo"), "rateUs": MessageLookupByLibrary.simpleMessage("Avalie-nos"), - "rateUsOnStore": m40, + "rateUsOnStore": m42, "recover": MessageLookupByLibrary.simpleMessage("Recuperar"), "recoverAccount": MessageLookupByLibrary.simpleMessage("Recuperar conta"), @@ -1114,7 +1127,7 @@ class MessageLookup extends MessageLookupByLibrary { "Envie esse código aos seus amigos"), "referralStep2": MessageLookupByLibrary.simpleMessage( "2. Eles se inscreveram para um plano pago"), - "referralStep3": m41, + "referralStep3": m43, "referrals": MessageLookupByLibrary.simpleMessage("Indicações"), "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage( "Referências estão atualmente pausadas"), @@ -1138,7 +1151,7 @@ class MessageLookup extends MessageLookupByLibrary { "removeLink": MessageLookupByLibrary.simpleMessage("Remover link"), "removeParticipant": MessageLookupByLibrary.simpleMessage("Remover participante"), - "removeParticipantBody": m42, + "removeParticipantBody": m44, "removePublicLink": MessageLookupByLibrary.simpleMessage("Remover link público"), "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage( @@ -1152,7 +1165,7 @@ class MessageLookup extends MessageLookupByLibrary { "renameFile": MessageLookupByLibrary.simpleMessage("Renomear arquivo"), "renewSubscription": MessageLookupByLibrary.simpleMessage("Renovar assinatura"), - "renewsOn": m43, + "renewsOn": m45, "reportABug": MessageLookupByLibrary.simpleMessage("Reportar um problema"), "reportBug": @@ -1217,7 +1230,7 @@ class MessageLookup extends MessageLookupByLibrary { "Fotos de grupo que estão sendo tiradas em algum raio da foto"), "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage( "Convide pessoas e você verá todas as fotos compartilhadas por elas aqui"), - "searchResultCount": m44, + "searchResultCount": m46, "security": MessageLookupByLibrary.simpleMessage("Segurança"), "selectALocation": MessageLookupByLibrary.simpleMessage("Selecionar um local"), @@ -1245,8 +1258,8 @@ class MessageLookup extends MessageLookupByLibrary { "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": MessageLookupByLibrary.simpleMessage( "Os itens selecionados serão excluídos de todos os álbuns e movidos para o lixo."), - "selectedPhotos": m45, - "selectedPhotosWithYours": m46, + "selectedPhotos": m47, + "selectedPhotosWithYours": m48, "send": MessageLookupByLibrary.simpleMessage("Enviar"), "sendEmail": MessageLookupByLibrary.simpleMessage("Enviar e-mail"), "sendInvite": MessageLookupByLibrary.simpleMessage("Enviar convite"), @@ -1270,16 +1283,16 @@ class MessageLookup extends MessageLookupByLibrary { "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("Compartilhar um álbum agora"), "shareLink": MessageLookupByLibrary.simpleMessage("Compartilhar link"), - "shareMyVerificationID": m47, + "shareMyVerificationID": m49, "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage( "Compartilhar apenas com as pessoas que você quiser"), - "shareTextConfirmOthersVerificationID": m48, + "shareTextConfirmOthersVerificationID": m50, "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage( "Baixe o Ente para podermos compartilhar facilmente fotos e vídeos de alta qualidade\n\nhttps://ente.io"), - "shareTextReferralCode": m49, + "shareTextReferralCode": m51, "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage( "Compartilhar com usuários não-Ente"), - "shareWithPeopleSectionTitle": m50, + "shareWithPeopleSectionTitle": m52, "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage( "Compartilhar seu primeiro álbum"), "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage( @@ -1292,7 +1305,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Novas fotos compartilhadas"), "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage( "Receber notificações quando alguém adicionar uma foto em um álbum compartilhado que você faz parte"), - "sharedWith": m51, + "sharedWith": m53, "sharedWithMe": MessageLookupByLibrary.simpleMessage("Compartilhado comigo"), "sharedWithYou": @@ -1308,11 +1321,11 @@ class MessageLookup extends MessageLookupByLibrary { "Terminar sessão em outros dispositivos"), "signUpTerms": MessageLookupByLibrary.simpleMessage( "Eu concordo com os termos de serviço e a política de privacidade"), - "singleFileDeleteFromDevice": m52, + "singleFileDeleteFromDevice": m54, "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage( "Ele será excluído de todos os álbuns."), - "singleFileInBothLocalAndRemote": m53, - "singleFileInRemoteOnly": m54, + "singleFileInBothLocalAndRemote": m55, + "singleFileInRemoteOnly": m56, "skip": MessageLookupByLibrary.simpleMessage("Pular"), "social": MessageLookupByLibrary.simpleMessage("Redes sociais"), "someItemsAreInBothEnteAndYourDevice": @@ -1353,13 +1366,13 @@ class MessageLookup extends MessageLookupByLibrary { "storage": MessageLookupByLibrary.simpleMessage("Armazenamento"), "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("Família"), "storageBreakupYou": MessageLookupByLibrary.simpleMessage("Você"), - "storageInGB": m55, + "storageInGB": m57, "storageLimitExceeded": MessageLookupByLibrary.simpleMessage( "Limite de armazenamento excedido"), - "storageUsageInfo": m56, + "storageUsageInfo": m58, "strongStrength": MessageLookupByLibrary.simpleMessage("Forte"), - "subAlreadyLinkedErrMessage": m57, - "subWillBeCancelledOn": m58, + "subAlreadyLinkedErrMessage": m59, + "subWillBeCancelledOn": m60, "subscribe": MessageLookupByLibrary.simpleMessage("Assinar"), "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage( "Parece que sua assinatura expirou. Por favor inscreva-se para ativar o compartilhamento."), @@ -1376,7 +1389,7 @@ class MessageLookup extends MessageLookupByLibrary { "suggestFeatures": MessageLookupByLibrary.simpleMessage("Sugerir funcionalidades"), "support": MessageLookupByLibrary.simpleMessage("Suporte"), - "syncProgress": m59, + "syncProgress": m61, "syncStopped": MessageLookupByLibrary.simpleMessage("Sincronização interrompida"), "syncing": MessageLookupByLibrary.simpleMessage("Sincronizando..."), @@ -1403,7 +1416,7 @@ class MessageLookup extends MessageLookupByLibrary { "theseItemsWillBeDeletedFromYourDevice": MessageLookupByLibrary.simpleMessage( "Estes itens serão excluídos do seu dispositivo."), - "theyAlsoGetXGb": m60, + "theyAlsoGetXGb": m62, "theyWillBeDeletedFromAllAlbums": MessageLookupByLibrary.simpleMessage( "Ele será excluído de todos os álbuns."), "thisActionCannotBeUndone": MessageLookupByLibrary.simpleMessage( @@ -1419,7 +1432,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("Este e-mail já está em uso"), "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage( "Esta imagem não tem dados exif"), - "thisIsPersonVerificationId": m61, + "thisIsPersonVerificationId": m63, "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage( "Este é o seu ID de verificação"), "thisWillLogYouOutOfTheFollowingDevice": @@ -1435,7 +1448,7 @@ class MessageLookup extends MessageLookupByLibrary { "total": MessageLookupByLibrary.simpleMessage("total"), "totalSize": MessageLookupByLibrary.simpleMessage("Tamanho total"), "trash": MessageLookupByLibrary.simpleMessage("Lixeira"), - "trashDaysLeft": m62, + "trashDaysLeft": m64, "tryAgain": MessageLookupByLibrary.simpleMessage("Tente novamente"), "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage( "Ative o backup para enviar automaticamente arquivos adicionados a esta pasta do dispositivo para o ente."), @@ -1488,7 +1501,7 @@ class MessageLookup extends MessageLookupByLibrary { "useSelectedPhoto": MessageLookupByLibrary.simpleMessage("Utilizar foto selecionada"), "usedSpace": MessageLookupByLibrary.simpleMessage("Espaço em uso"), - "validTill": m63, + "validTill": m65, "verificationFailedPleaseTryAgain": MessageLookupByLibrary.simpleMessage( "Falha na verificação, por favor, tente novamente"), @@ -1496,8 +1509,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("ID de Verificação"), "verify": MessageLookupByLibrary.simpleMessage("Verificar"), "verifyEmail": MessageLookupByLibrary.simpleMessage("Verificar email"), - "verifyEmailID": m64, + "verifyEmailID": m66, "verifyIDLabel": MessageLookupByLibrary.simpleMessage("Verificar"), + "verifyPasskey": + MessageLookupByLibrary.simpleMessage("Verificar chave de acesso"), "verifyPassword": MessageLookupByLibrary.simpleMessage("Verificar senha"), "verifying": MessageLookupByLibrary.simpleMessage("Verificando..."), @@ -1518,6 +1533,8 @@ class MessageLookup extends MessageLookupByLibrary { "viewer": MessageLookupByLibrary.simpleMessage("Visualizador"), "visitWebToManage": MessageLookupByLibrary.simpleMessage( "Por favor visite web.ente.io para gerenciar sua assinatura"), + "waitingForVerification": MessageLookupByLibrary.simpleMessage( + "Esperando por verificação..."), "waitingForWifi": MessageLookupByLibrary.simpleMessage("Esperando por Wi-Fi..."), "weAreOpenSource": @@ -1525,12 +1542,12 @@ class MessageLookup extends MessageLookupByLibrary { "weDontSupportEditingPhotosAndAlbumsThatYouDont": MessageLookupByLibrary.simpleMessage( "Não suportamos a edição de fotos e álbuns que você ainda não possui"), - "weHaveSendEmailTo": m65, + "weHaveSendEmailTo": m67, "weakStrength": MessageLookupByLibrary.simpleMessage("Fraca"), "welcomeBack": MessageLookupByLibrary.simpleMessage("Bem-vindo de volta!"), "yearly": MessageLookupByLibrary.simpleMessage("Anual"), - "yearsAgo": m66, + "yearsAgo": m68, "yes": MessageLookupByLibrary.simpleMessage("Sim"), "yesCancel": MessageLookupByLibrary.simpleMessage("Sim, cancelar"), "yesConvertToViewer": MessageLookupByLibrary.simpleMessage( @@ -1561,7 +1578,7 @@ class MessageLookup extends MessageLookupByLibrary { "Você não pode compartilhar consigo mesmo"), "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage( "Você não tem nenhum item arquivado."), - "youHaveSuccessfullyFreedUp": m67, + "youHaveSuccessfullyFreedUp": m69, "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage("Sua conta foi excluída"), "yourMap": MessageLookupByLibrary.simpleMessage("Seu mapa"), diff --git a/mobile/lib/generated/intl/messages_zh.dart b/mobile/lib/generated/intl/messages_zh.dart index 4a056efe8..ca420142b 100644 --- a/mobile/lib/generated/intl/messages_zh.dart +++ b/mobile/lib/generated/intl/messages_zh.dart @@ -21,174 +21,180 @@ class MessageLookup extends MessageLookupByLibrary { String get localeName => 'zh'; static String m0(count) => + "${Intl.plural(count, zero: 'Add collaborator', one: 'Add collaborator', other: 'Add collaborators')}"; + + static String m2(count) => "${Intl.plural(count, one: '添加一个项目', other: '添加一些项目')}"; - static String m1(storageAmount, endDate) => + static String m3(storageAmount, endDate) => "您的 ${storageAmount} 插件有效期至 ${endDate}"; - static String m2(emailOrName) => "由 ${emailOrName} 添加"; + static String m1(count) => + "${Intl.plural(count, zero: 'Add viewer', one: 'Add viewer', other: 'Add viewers')}"; - static String m3(albumName) => "成功添加到 ${albumName}"; + static String m4(emailOrName) => "由 ${emailOrName} 添加"; - static String m4(count) => + static String m5(albumName) => "成功添加到 ${albumName}"; + + static String m6(count) => "${Intl.plural(count, zero: '无参与者', one: '1个参与者', other: '${count} 个参与者')}"; - static String m5(versionValue) => "版本: ${versionValue}"; + static String m7(versionValue) => "版本: ${versionValue}"; - static String m6(paymentProvider) => "请先取消您现有的订阅 ${paymentProvider}"; + static String m8(paymentProvider) => "请先取消您现有的订阅 ${paymentProvider}"; - static String m7(user) => "${user} 将无法添加更多照片到此相册\n\n他们仍然能够删除他们添加的现有照片"; + static String m9(user) => "${user} 将无法添加更多照片到此相册\n\n他们仍然能够删除他们添加的现有照片"; - static String m8(isFamilyMember, storageAmountInGb) => + static String m10(isFamilyMember, storageAmountInGb) => "${Intl.select(isFamilyMember, { 'true': '到目前为止，您的家庭已经领取了 ${storageAmountInGb} GB', 'false': '到目前为止，您已经领取了 ${storageAmountInGb} GB', 'other': '到目前为止，您已经领取了${storageAmountInGb} GB', })}"; - static String m9(albumName) => "为 ${albumName} 创建了协作链接"; + static String m11(albumName) => "为 ${albumName} 创建了协作链接"; - static String m10(familyAdminEmail) => + static String m12(familyAdminEmail) => "请联系 ${familyAdminEmail} 来管理您的订阅"; - static String m11(provider) => + static String m13(provider) => "请通过support@ente.io 用英语联系我们来管理您的 ${provider} 订阅。"; - static String m12(count) => + static String m14(count) => "${Intl.plural(count, one: '删除 ${count} 个项目', other: '删除 ${count} 个项目')}"; - static String m13(currentlyDeleting, totalCount) => + static String m15(currentlyDeleting, totalCount) => "正在删除 ${currentlyDeleting} /共 ${totalCount}"; - static String m14(albumName) => "这将删除用于访问\"${albumName}\"的公共链接。"; + static String m16(albumName) => "这将删除用于访问\"${albumName}\"的公共链接。"; - static String m15(supportEmail) => "请从您注册的邮箱发送一封邮件到 ${supportEmail}"; + static String m17(supportEmail) => "请从您注册的邮箱发送一封邮件到 ${supportEmail}"; - static String m16(count, storageSaved) => + static String m18(count, storageSaved) => "您已经清理了 ${Intl.plural(count, other: '${count} 个重复文件')}, 释放了 (${storageSaved}!)"; - static String m17(count, formattedSize) => + static String m19(count, formattedSize) => "${count} 个文件，每个文件 ${formattedSize}"; - static String m18(newEmail) => "电子邮件已更改为 ${newEmail}"; + static String m20(newEmail) => "电子邮件已更改为 ${newEmail}"; - static String m19(email) => "${email} 没有 ente 账户。\n\n向他们发送分享照片的邀请。"; + static String m21(email) => "${email} 没有 ente 账户。\n\n向他们发送分享照片的邀请。"; - static String m20(count, formattedNumber) => + static String m22(count, formattedNumber) => "此设备上的 ${Intl.plural(count, one: '1 个文件', other: '${formattedNumber} 个文件')} 已安全备份"; - static String m21(count, formattedNumber) => + static String m23(count, formattedNumber) => "此相册中的 ${Intl.plural(count, one: '1 个文件', other: '${formattedNumber} 个文件')} 已安全备份"; - static String m22(storageAmountInGB) => + static String m24(storageAmountInGB) => "每当有人使用您的代码注册付费计划时您将获得${storageAmountInGB} GB"; - static String m23(freeAmount, storageUnit) => + static String m25(freeAmount, storageUnit) => "${freeAmount} ${storageUnit} 空闲"; - static String m24(endDate) => "免费试用有效期至 ${endDate}"; + static String m26(endDate) => "免费试用有效期至 ${endDate}"; - static String m25(count) => + static String m27(count) => "只要您有有效的订阅，您仍然可以在 ente 上访问 ${Intl.plural(count, one: 'it', other: 'them')}"; - static String m26(sizeInMBorGB) => "释放 ${sizeInMBorGB}"; + static String m28(sizeInMBorGB) => "释放 ${sizeInMBorGB}"; - static String m27(count, formattedSize) => + static String m29(count, formattedSize) => "${Intl.plural(count, one: '它可以从设备中删除以释放 ${formattedSize}', other: '它们可以从设备中删除以释放 ${formattedSize}')}"; - static String m28(currentlyProcessing, totalCount) => + static String m30(currentlyProcessing, totalCount) => "正在处理 ${currentlyProcessing} / ${totalCount}"; - static String m29(count) => + static String m31(count) => "${Intl.plural(count, one: '${count} 个项目', other: '${count} 个项目')}"; - static String m30(expiryTime) => "链接将在 ${expiryTime} 过期"; + static String m32(expiryTime) => "链接将在 ${expiryTime} 过期"; - static String m31(count, formattedCount) => + static String m33(count, formattedCount) => "${Intl.plural(count, zero: '没有回忆', one: '${formattedCount} 个回忆', other: '${formattedCount} 个回忆')}"; - static String m32(count) => + static String m34(count) => "${Intl.plural(count, one: '移动一个项目', other: '移动一些项目')}"; - static String m33(albumName) => "成功移动到 ${albumName}"; + static String m35(albumName) => "成功移动到 ${albumName}"; - static String m34(passwordStrengthValue) => "密码强度： ${passwordStrengthValue}"; + static String m36(passwordStrengthValue) => "密码强度： ${passwordStrengthValue}"; - static String m35(providerName) => "如果您被收取费用，请用英语与 ${providerName} 的客服聊天"; + static String m37(providerName) => "如果您被收取费用，请用英语与 ${providerName} 的客服聊天"; - static String m36(reason) => "很抱歉，您的支付因 ${reason} 而失败"; + static String m38(reason) => "很抱歉，您的支付因 ${reason} 而失败"; - static String m37(endDate) => "免费试用有效期至 ${endDate}。\n之后您可以选择付费计划。"; + static String m39(endDate) => "免费试用有效期至 ${endDate}。\n之后您可以选择付费计划。"; - static String m38(toEmail) => "请给我们发送电子邮件至 ${toEmail}"; + static String m40(toEmail) => "请给我们发送电子邮件至 ${toEmail}"; - static String m39(toEmail) => "请将日志发送至 \n${toEmail}"; + static String m41(toEmail) => "请将日志发送至 \n${toEmail}"; - static String m40(storeName) => "在 ${storeName} 上给我们评分"; + static String m42(storeName) => "在 ${storeName} 上给我们评分"; - static String m41(storageInGB) => "3. 你和朋友都将免费获得 ${storageInGB} GB*"; + static String m43(storageInGB) => "3. 你和朋友都将免费获得 ${storageInGB} GB*"; - static String m42(userEmail) => + static String m44(userEmail) => "${userEmail} 将从这个共享相册中删除\n\nTA们添加的任何照片也将从相册中删除"; - static String m43(endDate) => "在 ${endDate} 前续费"; + static String m45(endDate) => "在 ${endDate} 前续费"; - static String m44(count) => + static String m46(count) => "${Intl.plural(count, other: '已找到 ${count} 个结果')}"; - static String m45(count) => "已选择 ${count} 个"; + static String m47(count) => "已选择 ${count} 个"; - static String m46(count, yourCount) => "选择了 ${count} 个 (您的 ${yourCount} 个)"; + static String m48(count, yourCount) => "选择了 ${count} 个 (您的 ${yourCount} 个)"; - static String m47(verificationID) => "这是我的ente.io 的验证 ID： ${verificationID}。"; + static String m49(verificationID) => "这是我的ente.io 的验证 ID： ${verificationID}。"; - static String m48(verificationID) => + static String m50(verificationID) => "嘿，你能确认这是你的 ente.io 验证 ID吗：${verificationID}"; - static String m49(referralCode, referralStorageInGB) => + static String m51(referralCode, referralStorageInGB) => "ente推荐码: ${referralCode} \n\n注册付费计划后在设置 → 常规 → 推荐中应用它以免费获得 ${referralStorageInGB} GB空间\n\nhttps://ente.io"; - static String m50(numberOfPeople) => + static String m52(numberOfPeople) => "${Intl.plural(numberOfPeople, zero: '与特定人员共享', one: '与 1 人共享', other: '与 ${numberOfPeople} 人共享')}"; - static String m51(emailIDs) => "与 ${emailIDs} 共享"; + static String m53(emailIDs) => "与 ${emailIDs} 共享"; - static String m52(fileType) => "此 ${fileType} 将从您的设备中删除。"; + static String m54(fileType) => "此 ${fileType} 将从您的设备中删除。"; - static String m53(fileType) => "此 ${fileType} 同时在ente和您的设备中。"; + static String m55(fileType) => "此 ${fileType} 同时在ente和您的设备中。"; - static String m54(fileType) => "此 ${fileType} 将从ente中删除。"; + static String m56(fileType) => "此 ${fileType} 将从ente中删除。"; - static String m55(storageAmountInGB) => "${storageAmountInGB} GB"; + static String m57(storageAmountInGB) => "${storageAmountInGB} GB"; - static String m56( + static String m58( usedAmount, usedStorageUnit, totalAmount, totalStorageUnit) => "已使用 ${usedAmount} ${usedStorageUnit} / ${totalAmount} ${totalStorageUnit}"; - static String m57(id) => + static String m59(id) => "您的 ${id} 已经链接到另一个ente账户。\n如果您想要通过此账户使用您的 ${id} ，请联系我们的客服\'\'"; - static String m58(endDate) => "您的订阅将于 ${endDate} 取消"; + static String m60(endDate) => "您的订阅将于 ${endDate} 取消"; - static String m59(completed, total) => "已保存的回忆 ${completed}/共 ${total}"; + static String m61(completed, total) => "已保存的回忆 ${completed}/共 ${total}"; - static String m60(storageAmountInGB) => "他们也会获得 ${storageAmountInGB} GB"; + static String m62(storageAmountInGB) => "他们也会获得 ${storageAmountInGB} GB"; - static String m61(email) => "这是 ${email} 的验证ID"; + static String m63(email) => "这是 ${email} 的验证ID"; - static String m62(count) => + static String m64(count) => "${Intl.plural(count, zero: '', one: '1天', other: '${count} 天')}"; - static String m63(endDate) => "有效期至 ${endDate}"; + static String m65(endDate) => "有效期至 ${endDate}"; - static String m64(email) => "验证 ${email}"; + static String m66(email) => "验证 ${email}"; - static String m65(email) => "我们已经发送邮件到 ${email}"; + static String m67(email) => "我们已经发送邮件到 ${email}"; - static String m66(count) => + static String m68(count) => "${Intl.plural(count, one: '${count} 年前', other: '${count} 年前')}"; - static String m67(storageSaved) => "您已成功释放了 ${storageSaved}！"; + static String m69(storageSaved) => "您已成功释放了 ${storageSaved}！"; final messages = _notInlinedMessages(_notInlinedMessages); static Map _notInlinedMessages(_) => { @@ -202,14 +208,15 @@ class MessageLookup extends MessageLookupByLibrary { "activeSessions": MessageLookupByLibrary.simpleMessage("已登录的设备"), "addANewEmail": MessageLookupByLibrary.simpleMessage("添加新的电子邮件"), "addCollaborator": MessageLookupByLibrary.simpleMessage("添加协作者"), + "addCollaborators": m0, "addFromDevice": MessageLookupByLibrary.simpleMessage("从设备添加"), - "addItem": m0, + "addItem": m2, "addLocation": MessageLookupByLibrary.simpleMessage("添加地点"), "addLocationButton": MessageLookupByLibrary.simpleMessage("添加"), "addMore": MessageLookupByLibrary.simpleMessage("添加更多"), "addNew": MessageLookupByLibrary.simpleMessage("新建"), "addOnPageSubtitle": MessageLookupByLibrary.simpleMessage("附加组件详情"), - "addOnValidTill": m1, + "addOnValidTill": m3, "addOns": MessageLookupByLibrary.simpleMessage("附加组件"), "addPhotos": MessageLookupByLibrary.simpleMessage("添加照片"), "addSelected": MessageLookupByLibrary.simpleMessage("添加所选项"), @@ -217,10 +224,11 @@ class MessageLookup extends MessageLookupByLibrary { "addToEnte": MessageLookupByLibrary.simpleMessage("添加到 ente"), "addToHiddenAlbum": MessageLookupByLibrary.simpleMessage("添加到隐藏相册"), "addViewer": MessageLookupByLibrary.simpleMessage("添加查看者"), + "addViewers": m1, "addYourPhotosNow": MessageLookupByLibrary.simpleMessage("立即添加您的照片"), "addedAs": MessageLookupByLibrary.simpleMessage("已添加为"), - "addedBy": m2, - "addedSuccessfullyTo": m3, + "addedBy": m4, + "addedSuccessfullyTo": m5, "addingToFavorites": MessageLookupByLibrary.simpleMessage("正在添加到收藏..."), "advanced": MessageLookupByLibrary.simpleMessage("高级设置"), "advancedSettings": MessageLookupByLibrary.simpleMessage("高级设置"), @@ -230,7 +238,7 @@ class MessageLookup extends MessageLookupByLibrary { "after1Week": MessageLookupByLibrary.simpleMessage("1 周后"), "after1Year": MessageLookupByLibrary.simpleMessage("1 年后"), "albumOwner": MessageLookupByLibrary.simpleMessage("所有者"), - "albumParticipantsCount": m4, + "albumParticipantsCount": m6, "albumTitle": MessageLookupByLibrary.simpleMessage("相册标题"), "albumUpdated": MessageLookupByLibrary.simpleMessage("相册已更新"), "albums": MessageLookupByLibrary.simpleMessage("相册"), @@ -259,7 +267,7 @@ class MessageLookup extends MessageLookupByLibrary { "androidIosWebDesktop": MessageLookupByLibrary.simpleMessage("安卓, iOS, 网页端, 桌面端"), "androidSignInTitle": MessageLookupByLibrary.simpleMessage("需要身份验证"), - "appVersion": m5, + "appVersion": m7, "appleId": MessageLookupByLibrary.simpleMessage("Apple ID"), "apply": MessageLookupByLibrary.simpleMessage("应用"), "applyCodeTitle": MessageLookupByLibrary.simpleMessage("应用代码"), @@ -331,9 +339,9 @@ class MessageLookup extends MessageLookupByLibrary { "canOnlyRemoveFilesOwnedByYou": MessageLookupByLibrary.simpleMessage("只能删除您拥有的文件"), "cancel": MessageLookupByLibrary.simpleMessage("取消"), - "cancelOtherSubscription": m6, + "cancelOtherSubscription": m8, "cancelSubscription": MessageLookupByLibrary.simpleMessage("取消订阅"), - "cannotAddMorePhotosAfterBecomingViewer": m7, + "cannotAddMorePhotosAfterBecomingViewer": m9, "cannotDeleteSharedFiles": MessageLookupByLibrary.simpleMessage("无法删除共享文件"), "castInstruction": MessageLookupByLibrary.simpleMessage( @@ -352,8 +360,10 @@ class MessageLookup extends MessageLookupByLibrary { "claimFreeStorage": MessageLookupByLibrary.simpleMessage("领取免费存储"), "claimMore": MessageLookupByLibrary.simpleMessage("领取更多！"), "claimed": MessageLookupByLibrary.simpleMessage("已领取"), - "claimedStorageSoFar": m8, + "claimedStorageSoFar": m10, "cleanUncategorized": MessageLookupByLibrary.simpleMessage("清除未分类的"), + "cleanUncategorizedDescription": + MessageLookupByLibrary.simpleMessage("从“未分类”中删除其他相册中存在的所有文件"), "clearCaches": MessageLookupByLibrary.simpleMessage("清除缓存"), "clearIndexes": MessageLookupByLibrary.simpleMessage("清空索引"), "click": MessageLookupByLibrary.simpleMessage("• 点击"), @@ -369,7 +379,7 @@ class MessageLookup extends MessageLookupByLibrary { "collabLinkSectionDescription": MessageLookupByLibrary.simpleMessage( "创建一个链接以允许其他人在您的共享相册中添加和查看照片，而无需应用程序或ente账户。 非常适合收集活动照片。"), "collaborativeLink": MessageLookupByLibrary.simpleMessage("协作链接"), - "collaborativeLinkCreatedFor": m9, + "collaborativeLinkCreatedFor": m11, "collaborator": MessageLookupByLibrary.simpleMessage("协作者"), "collaboratorsCanAddPhotosAndVideosToTheSharedAlbum": MessageLookupByLibrary.simpleMessage("协作者可以将照片和视频添加到共享相册中。"), @@ -390,9 +400,9 @@ class MessageLookup extends MessageLookupByLibrary { "confirmRecoveryKey": MessageLookupByLibrary.simpleMessage("确认恢复密钥"), "confirmYourRecoveryKey": MessageLookupByLibrary.simpleMessage("确认您的恢复密钥"), - "contactFamilyAdmin": m10, + "contactFamilyAdmin": m12, "contactSupport": MessageLookupByLibrary.simpleMessage("联系支持"), - "contactToManageSubscription": m11, + "contactToManageSubscription": m13, "contacts": MessageLookupByLibrary.simpleMessage("联系人"), "contents": MessageLookupByLibrary.simpleMessage("内容"), "continueLabel": MessageLookupByLibrary.simpleMessage("继续"), @@ -450,10 +460,10 @@ class MessageLookup extends MessageLookupByLibrary { "deleteFromBoth": MessageLookupByLibrary.simpleMessage("同时从两者中删除"), "deleteFromDevice": MessageLookupByLibrary.simpleMessage("从设备中删除"), "deleteFromEnte": MessageLookupByLibrary.simpleMessage("从ente 中删除"), - "deleteItemCount": m12, + "deleteItemCount": m14, "deleteLocation": MessageLookupByLibrary.simpleMessage("删除位置"), "deletePhotos": MessageLookupByLibrary.simpleMessage("删除照片"), - "deleteProgress": m13, + "deleteProgress": m15, "deleteReason1": MessageLookupByLibrary.simpleMessage("找不到我想要的功能"), "deleteReason2": MessageLookupByLibrary.simpleMessage("应用或某个功能没有按我的预期运行"), @@ -465,7 +475,7 @@ class MessageLookup extends MessageLookupByLibrary { "deleteSharedAlbum": MessageLookupByLibrary.simpleMessage("要删除共享相册吗？"), "deleteSharedAlbumDialogBody": MessageLookupByLibrary.simpleMessage( "将为所有人删除相册\n\n您将无法访问此相册中他人拥有的共享照片"), - "descriptions": MessageLookupByLibrary.simpleMessage("Descriptions"), + "descriptions": MessageLookupByLibrary.simpleMessage("描述"), "deselectAll": MessageLookupByLibrary.simpleMessage("取消全选"), "designedToOutlive": MessageLookupByLibrary.simpleMessage("经久耐用"), "details": MessageLookupByLibrary.simpleMessage("详情"), @@ -483,7 +493,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("查看者仍然可以使用外部工具截图或保存您的照片副本"), "disableDownloadWarningTitle": MessageLookupByLibrary.simpleMessage("请注意"), - "disableLinkMessage": m14, + "disableLinkMessage": m16, "disableTwofactor": MessageLookupByLibrary.simpleMessage("禁用双因素认证"), "disablingTwofactorAuthentication": MessageLookupByLibrary.simpleMessage("正在禁用双因素认证..."), @@ -500,9 +510,9 @@ class MessageLookup extends MessageLookupByLibrary { "download": MessageLookupByLibrary.simpleMessage("下载"), "downloadFailed": MessageLookupByLibrary.simpleMessage("下載失敗"), "downloading": MessageLookupByLibrary.simpleMessage("正在下载..."), - "dropSupportEmail": m15, - "duplicateFileCountWithStorageSaved": m16, - "duplicateItemsGroup": m17, + "dropSupportEmail": m17, + "duplicateFileCountWithStorageSaved": m18, + "duplicateItemsGroup": m19, "edit": MessageLookupByLibrary.simpleMessage("编辑"), "editLocation": MessageLookupByLibrary.simpleMessage("编辑位置"), "editLocationTagTitle": MessageLookupByLibrary.simpleMessage("编辑位置"), @@ -511,8 +521,8 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("对位置的编辑只能在 Ente 内看到"), "eligible": MessageLookupByLibrary.simpleMessage("符合资格"), "email": MessageLookupByLibrary.simpleMessage("电子邮件地址"), - "emailChangedTo": m18, - "emailNoEnteAccount": m19, + "emailChangedTo": m20, + "emailNoEnteAccount": m21, "emailVerificationToggle": MessageLookupByLibrary.simpleMessage("电子邮件验证"), "emailYourLogs": MessageLookupByLibrary.simpleMessage("通过电子邮件发送您的日志"), @@ -589,29 +599,29 @@ class MessageLookup extends MessageLookupByLibrary { "fileSavedToGallery": MessageLookupByLibrary.simpleMessage("文件已保存到相册"), "fileTypes": MessageLookupByLibrary.simpleMessage("文件类型"), "fileTypesAndNames": MessageLookupByLibrary.simpleMessage("文件类型和名称"), - "filesBackedUpFromDevice": m20, - "filesBackedUpInAlbum": m21, + "filesBackedUpFromDevice": m22, + "filesBackedUpInAlbum": m23, "filesDeleted": MessageLookupByLibrary.simpleMessage("文件已删除"), "flip": MessageLookupByLibrary.simpleMessage("上下翻转"), "forYourMemories": MessageLookupByLibrary.simpleMessage("为您的回忆"), "forgotPassword": MessageLookupByLibrary.simpleMessage("忘记密码"), "freeStorageClaimed": MessageLookupByLibrary.simpleMessage("已领取的免费存储"), - "freeStorageOnReferralSuccess": m22, - "freeStorageSpace": m23, + "freeStorageOnReferralSuccess": m24, + "freeStorageSpace": m25, "freeStorageUsable": MessageLookupByLibrary.simpleMessage("可用的免费存储"), "freeTrial": MessageLookupByLibrary.simpleMessage("免费试用"), - "freeTrialValidTill": m24, - "freeUpAccessPostDelete": m25, - "freeUpAmount": m26, + "freeTrialValidTill": m26, + "freeUpAccessPostDelete": m27, + "freeUpAmount": m28, "freeUpDeviceSpace": MessageLookupByLibrary.simpleMessage("释放设备空间"), "freeUpSpace": MessageLookupByLibrary.simpleMessage("释放空间"), - "freeUpSpaceSaving": m27, + "freeUpSpaceSaving": m29, "galleryMemoryLimitInfo": MessageLookupByLibrary.simpleMessage("在图库中显示最多1000个回忆"), "general": MessageLookupByLibrary.simpleMessage("通用"), "generatingEncryptionKeys": MessageLookupByLibrary.simpleMessage("正在生成加密密钥..."), - "genericProgress": m28, + "genericProgress": m30, "goToSettings": MessageLookupByLibrary.simpleMessage("前往设置"), "googlePlayId": MessageLookupByLibrary.simpleMessage("Google Play ID"), "grantFullAccessPrompt": @@ -662,7 +672,7 @@ class MessageLookup extends MessageLookupByLibrary { "itLooksLikeSomethingWentWrongPleaseRetryAfterSome": MessageLookupByLibrary.simpleMessage( "看起来出了点问题。 请稍后重试。 如果错误仍然存在，请联系我们的支持团队。"), - "itemCount": m29, + "itemCount": m31, "itemsShowTheNumberOfDaysRemainingBeforePermanentDeletion": MessageLookupByLibrary.simpleMessage("项目显示永久删除前剩余的天数"), "itemsWillBeRemovedFromAlbum": @@ -685,7 +695,7 @@ class MessageLookup extends MessageLookupByLibrary { "linkDeviceLimit": MessageLookupByLibrary.simpleMessage("设备限制"), "linkEnabled": MessageLookupByLibrary.simpleMessage("已启用"), "linkExpired": MessageLookupByLibrary.simpleMessage("已过期"), - "linkExpiresOn": m30, + "linkExpiresOn": m32, "linkExpiry": MessageLookupByLibrary.simpleMessage("链接过期"), "linkHasExpired": MessageLookupByLibrary.simpleMessage("链接已过期"), "linkNeverExpires": MessageLookupByLibrary.simpleMessage("永不"), @@ -716,7 +726,7 @@ class MessageLookup extends MessageLookupByLibrary { "locationName": MessageLookupByLibrary.simpleMessage("地点名称"), "locationTagFeatureDescription": MessageLookupByLibrary.simpleMessage("位置标签将在照片的某个半径范围内拍摄的所有照片进行分组"), - "locations": MessageLookupByLibrary.simpleMessage("Locations"), + "locations": MessageLookupByLibrary.simpleMessage("位置"), "lockButtonLabel": MessageLookupByLibrary.simpleMessage("锁定"), "lockScreenEnablePreSteps": MessageLookupByLibrary.simpleMessage("要启用锁屏，请在系统设置中设置设备密码或屏幕锁定。"), @@ -728,6 +738,9 @@ class MessageLookup extends MessageLookupByLibrary { "logout": MessageLookupByLibrary.simpleMessage("退出登录"), "logsDialogBody": MessageLookupByLibrary.simpleMessage( "这将跨日志发送以帮助我们调试您的问题。 请注意，将包含文件名以帮助跟踪特定文件的问题。"), + "longPressAnEmailToVerifyEndToEndEncryption": + MessageLookupByLibrary.simpleMessage( + "Long press an email to verify end to end encryption."), "longpressOnAnItemToViewInFullscreen": MessageLookupByLibrary.simpleMessage("长按一个项目来全屏查看"), "lostDevice": MessageLookupByLibrary.simpleMessage("丢失了设备吗？"), @@ -745,7 +758,7 @@ class MessageLookup extends MessageLookupByLibrary { "maps": MessageLookupByLibrary.simpleMessage("地图"), "mastodon": MessageLookupByLibrary.simpleMessage("Mastodon"), "matrix": MessageLookupByLibrary.simpleMessage("Matrix"), - "memoryCount": m31, + "memoryCount": m33, "merchandise": MessageLookupByLibrary.simpleMessage("商品"), "mobileWebDesktop": MessageLookupByLibrary.simpleMessage("移动端, 网页端, 桌面端"), @@ -754,10 +767,10 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("修改您的查询，或尝试搜索"), "moments": MessageLookupByLibrary.simpleMessage("瞬间"), "monthly": MessageLookupByLibrary.simpleMessage("每月"), - "moveItem": m32, + "moveItem": m34, "moveToAlbum": MessageLookupByLibrary.simpleMessage("移动到相册"), "moveToHiddenAlbum": MessageLookupByLibrary.simpleMessage("移至隐藏相册"), - "movedSuccessfullyTo": m33, + "movedSuccessfullyTo": m35, "movedToTrash": MessageLookupByLibrary.simpleMessage("已移至回收站"), "movingFilesToAlbum": MessageLookupByLibrary.simpleMessage("正在将文件移动到相册..."), @@ -819,13 +832,13 @@ class MessageLookup extends MessageLookupByLibrary { "passwordChangedSuccessfully": MessageLookupByLibrary.simpleMessage("密码修改成功"), "passwordLock": MessageLookupByLibrary.simpleMessage("密码锁"), - "passwordStrength": m34, + "passwordStrength": m36, "passwordWarning": MessageLookupByLibrary.simpleMessage( "我们不储存这个密码，所以如果忘记， 我们将无法解密您的数据"), "paymentDetails": MessageLookupByLibrary.simpleMessage("付款明细"), "paymentFailed": MessageLookupByLibrary.simpleMessage("支付失败"), - "paymentFailedTalkToProvider": m35, - "paymentFailedWithReason": m36, + "paymentFailedTalkToProvider": m37, + "paymentFailedWithReason": m38, "pendingItems": MessageLookupByLibrary.simpleMessage("待处理项目"), "pendingSync": MessageLookupByLibrary.simpleMessage("正在等待同步"), "peopleUsingYourCode": MessageLookupByLibrary.simpleMessage("使用您的代码的人"), @@ -843,7 +856,7 @@ class MessageLookup extends MessageLookupByLibrary { "pickCenterPoint": MessageLookupByLibrary.simpleMessage("选择中心点"), "pinAlbum": MessageLookupByLibrary.simpleMessage("置顶相册"), "playOnTv": MessageLookupByLibrary.simpleMessage("在电视上播放相册"), - "playStoreFreeTrialValidTill": m37, + "playStoreFreeTrialValidTill": m39, "playstoreSubscription": MessageLookupByLibrary.simpleMessage("PlayStore 订阅"), "pleaseCheckYourInternetConnectionAndTryAgain": @@ -853,10 +866,10 @@ class MessageLookup extends MessageLookupByLibrary { "请用英语联系 support@ente.io ，我们将乐意提供帮助！"), "pleaseContactSupportIfTheProblemPersists": MessageLookupByLibrary.simpleMessage("如果问题仍然存在，请联系支持"), - "pleaseEmailUsAt": m38, + "pleaseEmailUsAt": m40, "pleaseGrantPermissions": MessageLookupByLibrary.simpleMessage("请授予权限"), "pleaseLoginAgain": MessageLookupByLibrary.simpleMessage("请重新登录"), - "pleaseSendTheLogsTo": m39, + "pleaseSendTheLogsTo": m41, "pleaseTryAgain": MessageLookupByLibrary.simpleMessage("请重试"), "pleaseVerifyTheCodeYouHaveEntered": MessageLookupByLibrary.simpleMessage("请验证您输入的代码"), @@ -882,7 +895,7 @@ class MessageLookup extends MessageLookupByLibrary { "raiseTicket": MessageLookupByLibrary.simpleMessage("提升工单"), "rateTheApp": MessageLookupByLibrary.simpleMessage("为此应用评分"), "rateUs": MessageLookupByLibrary.simpleMessage("给我们评分"), - "rateUsOnStore": m40, + "rateUsOnStore": m42, "recover": MessageLookupByLibrary.simpleMessage("恢复"), "recoverAccount": MessageLookupByLibrary.simpleMessage("恢复账户"), "recoverButton": MessageLookupByLibrary.simpleMessage("恢复"), @@ -907,7 +920,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("把我们推荐给你的朋友然后获得延长一倍的订阅计划"), "referralStep1": MessageLookupByLibrary.simpleMessage("1. 将此代码提供给您的朋友"), "referralStep2": MessageLookupByLibrary.simpleMessage("2. 他们注册一个付费计划"), - "referralStep3": m41, + "referralStep3": m43, "referrals": MessageLookupByLibrary.simpleMessage("推荐人"), "referralsAreCurrentlyPaused": MessageLookupByLibrary.simpleMessage("推荐已暂停"), @@ -926,7 +939,7 @@ class MessageLookup extends MessageLookupByLibrary { "removeFromFavorite": MessageLookupByLibrary.simpleMessage("从收藏中移除"), "removeLink": MessageLookupByLibrary.simpleMessage("移除链接"), "removeParticipant": MessageLookupByLibrary.simpleMessage("移除参与者"), - "removeParticipantBody": m42, + "removeParticipantBody": m44, "removePublicLink": MessageLookupByLibrary.simpleMessage("删除公开链接"), "removeShareItemsWarning": MessageLookupByLibrary.simpleMessage("您要删除的某些项目是由其他人添加的，您将无法访问它们"), @@ -937,7 +950,7 @@ class MessageLookup extends MessageLookupByLibrary { "renameAlbum": MessageLookupByLibrary.simpleMessage("重命名相册"), "renameFile": MessageLookupByLibrary.simpleMessage("重命名文件"), "renewSubscription": MessageLookupByLibrary.simpleMessage("续费订阅"), - "renewsOn": m43, + "renewsOn": m45, "reportABug": MessageLookupByLibrary.simpleMessage("报告错误"), "reportBug": MessageLookupByLibrary.simpleMessage("报告错误"), "resendEmail": MessageLookupByLibrary.simpleMessage("重新发送电子邮件"), @@ -984,7 +997,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("在照片的一定半径内拍摄的几组照片"), "searchPeopleEmptySection": MessageLookupByLibrary.simpleMessage("邀请他人，您将在此看到他们分享的所有照片"), - "searchResultCount": m44, + "searchResultCount": m46, "security": MessageLookupByLibrary.simpleMessage("安全"), "selectALocation": MessageLookupByLibrary.simpleMessage("选择一个位置"), "selectALocationFirst": @@ -1004,8 +1017,8 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("所选文件夹将被加密和备份"), "selectedItemsWillBeDeletedFromAllAlbumsAndMoved": MessageLookupByLibrary.simpleMessage("所选项目将从所有相册中删除并移动到回收站。"), - "selectedPhotos": m45, - "selectedPhotosWithYours": m46, + "selectedPhotos": m47, + "selectedPhotosWithYours": m48, "send": MessageLookupByLibrary.simpleMessage("发送"), "sendEmail": MessageLookupByLibrary.simpleMessage("发送电子邮件"), "sendInvite": MessageLookupByLibrary.simpleMessage("发送邀请"), @@ -1024,16 +1037,16 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("打开相册并点击右上角的分享按钮进行分享"), "shareAnAlbumNow": MessageLookupByLibrary.simpleMessage("立即分享相册"), "shareLink": MessageLookupByLibrary.simpleMessage("分享链接"), - "shareMyVerificationID": m47, + "shareMyVerificationID": m49, "shareOnlyWithThePeopleYouWant": MessageLookupByLibrary.simpleMessage("仅与您想要的人分享"), - "shareTextConfirmOthersVerificationID": m48, + "shareTextConfirmOthersVerificationID": m50, "shareTextRecommendUsingEnte": MessageLookupByLibrary.simpleMessage( "下载 ente，以便我们轻松分享原始质量的照片和视频\n\nhttps://ente.io"), - "shareTextReferralCode": m49, + "shareTextReferralCode": m51, "shareWithNonenteUsers": MessageLookupByLibrary.simpleMessage("与非ente 用户分享"), - "shareWithPeopleSectionTitle": m50, + "shareWithPeopleSectionTitle": m52, "shareYourFirstAlbum": MessageLookupByLibrary.simpleMessage("分享您的第一个相册"), "sharedAlbumSectionDescription": MessageLookupByLibrary.simpleMessage( @@ -1044,7 +1057,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("新共享的照片"), "sharedPhotoNotificationsExplanation": MessageLookupByLibrary.simpleMessage("当有人将照片添加到您所属的共享相册时收到通知"), - "sharedWith": m51, + "sharedWith": m53, "sharedWithMe": MessageLookupByLibrary.simpleMessage("与我共享"), "sharedWithYou": MessageLookupByLibrary.simpleMessage("已与您共享"), "sharing": MessageLookupByLibrary.simpleMessage("正在分享..."), @@ -1056,11 +1069,11 @@ class MessageLookup extends MessageLookupByLibrary { "signOutOtherDevices": MessageLookupByLibrary.simpleMessage("登出其他设备"), "signUpTerms": MessageLookupByLibrary.simpleMessage( "我同意 服务条款 和 隐私政策"), - "singleFileDeleteFromDevice": m52, + "singleFileDeleteFromDevice": m54, "singleFileDeleteHighlight": MessageLookupByLibrary.simpleMessage("它将从所有相册中删除。"), - "singleFileInBothLocalAndRemote": m53, - "singleFileInRemoteOnly": m54, + "singleFileInBothLocalAndRemote": m55, + "singleFileInRemoteOnly": m56, "skip": MessageLookupByLibrary.simpleMessage("跳过"), "social": MessageLookupByLibrary.simpleMessage("社交"), "someItemsAreInBothEnteAndYourDevice": @@ -1091,12 +1104,12 @@ class MessageLookup extends MessageLookupByLibrary { "storage": MessageLookupByLibrary.simpleMessage("存储空间"), "storageBreakupFamily": MessageLookupByLibrary.simpleMessage("家庭"), "storageBreakupYou": MessageLookupByLibrary.simpleMessage("您"), - "storageInGB": m55, + "storageInGB": m57, "storageLimitExceeded": MessageLookupByLibrary.simpleMessage("已超出存储限制"), - "storageUsageInfo": m56, + "storageUsageInfo": m58, "strongStrength": MessageLookupByLibrary.simpleMessage("强"), - "subAlreadyLinkedErrMessage": m57, - "subWillBeCancelledOn": m58, + "subAlreadyLinkedErrMessage": m59, + "subWillBeCancelledOn": m60, "subscribe": MessageLookupByLibrary.simpleMessage("订阅"), "subscribeToEnableSharing": MessageLookupByLibrary.simpleMessage("您的订阅似乎已过期。请订阅以启用分享。"), @@ -1109,7 +1122,7 @@ class MessageLookup extends MessageLookupByLibrary { "successfullyUnhid": MessageLookupByLibrary.simpleMessage("已成功取消隐藏"), "suggestFeatures": MessageLookupByLibrary.simpleMessage("建议新功能"), "support": MessageLookupByLibrary.simpleMessage("支持"), - "syncProgress": m59, + "syncProgress": m61, "syncStopped": MessageLookupByLibrary.simpleMessage("同步已停止"), "syncing": MessageLookupByLibrary.simpleMessage("正在同步···"), "systemTheme": MessageLookupByLibrary.simpleMessage("适应系统"), @@ -1132,7 +1145,7 @@ class MessageLookup extends MessageLookupByLibrary { "theme": MessageLookupByLibrary.simpleMessage("主题"), "theseItemsWillBeDeletedFromYourDevice": MessageLookupByLibrary.simpleMessage("这些项目将从您的设备中删除。"), - "theyAlsoGetXGb": m60, + "theyAlsoGetXGb": m62, "theyWillBeDeletedFromAllAlbums": MessageLookupByLibrary.simpleMessage("他们将从所有相册中删除。"), "thisActionCannotBeUndone": @@ -1146,7 +1159,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("这个邮箱地址已经被使用"), "thisImageHasNoExifData": MessageLookupByLibrary.simpleMessage("此图像没有Exif 数据"), - "thisIsPersonVerificationId": m61, + "thisIsPersonVerificationId": m63, "thisIsYourVerificationId": MessageLookupByLibrary.simpleMessage("这是您的验证 ID"), "thisWillLogYouOutOfTheFollowingDevice": @@ -1160,7 +1173,7 @@ class MessageLookup extends MessageLookupByLibrary { "total": MessageLookupByLibrary.simpleMessage("总计"), "totalSize": MessageLookupByLibrary.simpleMessage("总大小"), "trash": MessageLookupByLibrary.simpleMessage("回收站"), - "trashDaysLeft": m62, + "trashDaysLeft": m64, "tryAgain": MessageLookupByLibrary.simpleMessage("请再试一次"), "turnOnBackupForAutoUpload": MessageLookupByLibrary.simpleMessage("打开备份以自动上传添加到此设备文件夹的文件。"), @@ -1203,14 +1216,15 @@ class MessageLookup extends MessageLookupByLibrary { "useRecoveryKey": MessageLookupByLibrary.simpleMessage("使用恢复密钥"), "useSelectedPhoto": MessageLookupByLibrary.simpleMessage("使用所选照片"), "usedSpace": MessageLookupByLibrary.simpleMessage("已用空间"), - "validTill": m63, + "validTill": m65, "verificationFailedPleaseTryAgain": MessageLookupByLibrary.simpleMessage("验证失败，请重试"), "verificationId": MessageLookupByLibrary.simpleMessage("验证 ID"), "verify": MessageLookupByLibrary.simpleMessage("验证"), "verifyEmail": MessageLookupByLibrary.simpleMessage("验证电子邮件"), - "verifyEmailID": m64, + "verifyEmailID": m66, "verifyIDLabel": MessageLookupByLibrary.simpleMessage("验证"), + "verifyPasskey": MessageLookupByLibrary.simpleMessage("验证通行密钥"), "verifyPassword": MessageLookupByLibrary.simpleMessage("验证密码"), "verifying": MessageLookupByLibrary.simpleMessage("正在验证..."), "verifyingRecoveryKey": @@ -1226,15 +1240,17 @@ class MessageLookup extends MessageLookupByLibrary { "viewer": MessageLookupByLibrary.simpleMessage("查看者"), "visitWebToManage": MessageLookupByLibrary.simpleMessage("请访问 web.ente.io 来管理您的订阅"), + "waitingForVerification": + MessageLookupByLibrary.simpleMessage("等待验证..."), "waitingForWifi": MessageLookupByLibrary.simpleMessage("正在等待 WiFi..."), "weAreOpenSource": MessageLookupByLibrary.simpleMessage("我们是开源的 ！"), "weDontSupportEditingPhotosAndAlbumsThatYouDont": MessageLookupByLibrary.simpleMessage("我们不支持编辑您尚未拥有的照片和相册"), - "weHaveSendEmailTo": m65, + "weHaveSendEmailTo": m67, "weakStrength": MessageLookupByLibrary.simpleMessage("弱"), "welcomeBack": MessageLookupByLibrary.simpleMessage("欢迎回来！"), "yearly": MessageLookupByLibrary.simpleMessage("每年"), - "yearsAgo": m66, + "yearsAgo": m68, "yes": MessageLookupByLibrary.simpleMessage("是"), "yesCancel": MessageLookupByLibrary.simpleMessage("是的，取消"), "yesConvertToViewer": MessageLookupByLibrary.simpleMessage("是的，转换为查看者"), @@ -1260,7 +1276,7 @@ class MessageLookup extends MessageLookupByLibrary { MessageLookupByLibrary.simpleMessage("莫开玩笑，您不能与自己分享"), "youDontHaveAnyArchivedItems": MessageLookupByLibrary.simpleMessage("您没有任何存档的项目。"), - "youHaveSuccessfullyFreedUp": m67, + "youHaveSuccessfullyFreedUp": m69, "yourAccountHasBeenDeleted": MessageLookupByLibrary.simpleMessage("您的账户已删除"), "yourMap": MessageLookupByLibrary.simpleMessage("您的地图"), diff --git a/mobile/lib/generated/l10n.dart b/mobile/lib/generated/l10n.dart index 03b753399..78e376d48 100644 --- a/mobile/lib/generated/l10n.dart +++ b/mobile/lib/generated/l10n.dart @@ -8427,6 +8427,42 @@ class S { args: [], ); } + + /// `{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}` + String addViewers(num count) { + return Intl.plural( + count, + zero: 'Add viewer', + one: 'Add viewer', + other: 'Add viewers', + name: 'addViewers', + desc: '', + args: [count], + ); + } + + /// `{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}` + String addCollaborators(num count) { + return Intl.plural( + count, + zero: 'Add collaborator', + one: 'Add collaborator', + other: 'Add collaborators', + name: 'addCollaborators', + desc: '', + args: [count], + ); + } + + /// `Long press an email to verify end to end encryption.` + String get longPressAnEmailToVerifyEndToEndEncryption { + return Intl.message( + 'Long press an email to verify end to end encryption.', + name: 'longPressAnEmailToVerifyEndToEndEncryption', + desc: '', + args: [], + ); + } } class AppLocalizationDelegate extends LocalizationsDelegate { diff --git a/mobile/lib/l10n/intl_cs.arb b/mobile/lib/l10n/intl_cs.arb index d9ce7ebeb..b552b1052 100644 --- a/mobile/lib/l10n/intl_cs.arb +++ b/mobile/lib/l10n/intl_cs.arb @@ -13,5 +13,8 @@ "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_de.arb b/mobile/lib/l10n/intl_de.arb index 50a4a1b21..6b971ff63 100644 --- a/mobile/lib/l10n/intl_de.arb +++ b/mobile/lib/l10n/intl_de.arb @@ -1199,5 +1199,8 @@ "deviceCodeHint": "Code eingeben", "joinDiscord": "Discord beitreten", "locations": "Orte", - "descriptions": "Beschreibungen" + "descriptions": "Beschreibungen", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_en.arb b/mobile/lib/l10n/intl_en.arb index 16b203128..eff0f8940 100644 --- a/mobile/lib/l10n/intl_en.arb +++ b/mobile/lib/l10n/intl_en.arb @@ -1199,5 +1199,8 @@ "deviceCodeHint": "Enter the code", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_es.arb b/mobile/lib/l10n/intl_es.arb index cbbb60a45..fcdff5ccf 100644 --- a/mobile/lib/l10n/intl_es.arb +++ b/mobile/lib/l10n/intl_es.arb @@ -975,5 +975,8 @@ "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_fr.arb b/mobile/lib/l10n/intl_fr.arb index f0afcaa98..d24e11827 100644 --- a/mobile/lib/l10n/intl_fr.arb +++ b/mobile/lib/l10n/intl_fr.arb @@ -1156,5 +1156,8 @@ "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_it.arb b/mobile/lib/l10n/intl_it.arb index be0dc1e2c..ef8eeda34 100644 --- a/mobile/lib/l10n/intl_it.arb +++ b/mobile/lib/l10n/intl_it.arb @@ -1118,5 +1118,8 @@ "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_ko.arb b/mobile/lib/l10n/intl_ko.arb index d9ce7ebeb..b552b1052 100644 --- a/mobile/lib/l10n/intl_ko.arb +++ b/mobile/lib/l10n/intl_ko.arb @@ -13,5 +13,8 @@ "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_nl.arb b/mobile/lib/l10n/intl_nl.arb index 0f2ab0ec2..43ca7ee5d 100644 --- a/mobile/lib/l10n/intl_nl.arb +++ b/mobile/lib/l10n/intl_nl.arb @@ -1194,5 +1194,8 @@ "deviceCodeHint": "Voer de code in", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_no.arb b/mobile/lib/l10n/intl_no.arb index 8d40561fc..b4ba1d96d 100644 --- a/mobile/lib/l10n/intl_no.arb +++ b/mobile/lib/l10n/intl_no.arb @@ -27,5 +27,8 @@ "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_pl.arb b/mobile/lib/l10n/intl_pl.arb index 6bd5a30aa..8dd33fda6 100644 --- a/mobile/lib/l10n/intl_pl.arb +++ b/mobile/lib/l10n/intl_pl.arb @@ -114,5 +114,8 @@ "editsToLocationWillOnlyBeSeenWithinEnte": "Edits to location will only be seen within Ente", "joinDiscord": "Join Discord", "locations": "Locations", - "descriptions": "Descriptions" + "descriptions": "Descriptions", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_pt.arb b/mobile/lib/l10n/intl_pt.arb index bf0e53409..9c47deb67 100644 --- a/mobile/lib/l10n/intl_pt.arb +++ b/mobile/lib/l10n/intl_pt.arb @@ -1199,5 +1199,8 @@ "deviceCodeHint": "Insira o código", "joinDiscord": "Junte-se ao Discord", "locations": "Locais", - "descriptions": "Descrições" + "descriptions": "Descrições", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/l10n/intl_zh.arb b/mobile/lib/l10n/intl_zh.arb index 4e9e9e4eb..dd9b9f160 100644 --- a/mobile/lib/l10n/intl_zh.arb +++ b/mobile/lib/l10n/intl_zh.arb @@ -1199,5 +1199,8 @@ "deviceCodeHint": "输入代码", "joinDiscord": "加入 Discord", "locations": "位置", - "descriptions": "描述" + "descriptions": "描述", + "addViewers": "{count, plural, zero {Add viewer} one {Add viewer} other {Add viewers}}", + "addCollaborators": "{count, plural, zero {Add collaborator} one {Add collaborator} other {Add collaborators}}", + "longPressAnEmailToVerifyEndToEndEncryption": "Long press an email to verify end to end encryption." } \ No newline at end of file diff --git a/mobile/lib/services/machine_learning/machine_learning_controller.dart b/mobile/lib/services/machine_learning/machine_learning_controller.dart index a31da95b1..145670f2c 100644 --- a/mobile/lib/services/machine_learning/machine_learning_controller.dart +++ b/mobile/lib/services/machine_learning/machine_learning_controller.dart @@ -17,8 +17,7 @@ class MachineLearningController { static const kMaximumTemperature = 42; // 42 degree celsius static const kMinimumBatteryLevel = 20; // 20% - static const kInitialInteractionTimeout = Duration(seconds: 10); - static const kDefaultInteractionTimeout = Duration(seconds: 5); + static const kDefaultInteractionTimeout = Duration(seconds: 15); static const kUnhealthyStates = ["over_heat", "over_voltage", "dead"]; bool _isDeviceHealthy = true; @@ -28,7 +27,7 @@ class MachineLearningController { void init() { if (Platform.isAndroid) { - _startInteractionTimer(timeout: kInitialInteractionTimeout); + _startInteractionTimer(); BatteryInfoPlugin() .androidBatteryInfoStream .listen((AndroidBatteryInfo? batteryInfo) { diff --git a/mobile/lib/services/machine_learning/semantic_search/frameworks/ml_framework.dart b/mobile/lib/services/machine_learning/semantic_search/frameworks/ml_framework.dart index 35616b1b1..3abd57db7 100644 --- a/mobile/lib/services/machine_learning/semantic_search/frameworks/ml_framework.dart +++ b/mobile/lib/services/machine_learning/semantic_search/frameworks/ml_framework.dart @@ -6,7 +6,6 @@ import "package:logging/logging.dart"; import "package:photos/core/errors.dart"; import "package:photos/core/event_bus.dart"; -import "package:photos/core/network/network.dart"; import "package:photos/events/event.dart"; import "package:photos/services/remote_assets_service.dart"; @@ -17,9 +16,9 @@ abstract class MLFramework { static final _logger = Logger("MLFramework"); final bool shouldDownloadOverMobileData; + final _initializationCompleter = Completer(); InitializationState _state = InitializationState.notInitialized; - final _initializationCompleter = Completer(); MLFramework(this.shouldDownloadOverMobileData) { Connectivity() @@ -65,6 +64,7 @@ abstract class MLFramework { /// instead of a CDN. Future init() async { try { + _initState = InitializationState.initializing; await Future.wait([_initImageModel(), _initTextModel()]); } catch (e, s) { _logger.warning(e, s); @@ -102,41 +102,32 @@ abstract class MLFramework { if (!kImageEncoderEnabled) { return; } - _initState = InitializationState.initializingImageModel; - final imageModel = - await RemoteAssetsService.instance.getAsset(getImageModelRemotePath()); + final imageModel = await _getModel(getImageModelRemotePath()); await loadImageModel(imageModel.path); - _initState = InitializationState.initializedImageModel; } Future _initTextModel() async { - _initState = InitializationState.initializingTextModel; - final textModel = - await RemoteAssetsService.instance.getAsset(getTextModelRemotePath()); + final textModel = await _getModel(getTextModelRemotePath()); await loadTextModel(textModel.path); - _initState = InitializationState.initializedTextModel; } - Future _downloadFile( - String url, - String savePath, { + Future _getModel( + String url, { int trialCount = 1, }) async { + if (await RemoteAssetsService.instance.hasAsset(url)) { + return RemoteAssetsService.instance.getAsset(url); + } if (!await _canDownload()) { _initState = InitializationState.waitingForNetwork; throw WiFiUnavailableError(); } - _logger.info("Downloading " + url); - final existingFile = File(savePath); - if (await existingFile.exists()) { - await existingFile.delete(); - } try { - await NetworkClient.instance.getDio().download(url, savePath); + return RemoteAssetsService.instance.getAsset(url); } catch (e, s) { _logger.severe(e, s); if (trialCount < kMaximumRetrials) { - return _downloadFile(url, savePath, trialCount: trialCount + 1); + return _getModel(url, trialCount: trialCount + 1); } else { rethrow; } @@ -159,9 +150,6 @@ class MLFrameworkInitializationUpdateEvent extends Event { enum InitializationState { notInitialized, waitingForNetwork, - initializingImageModel, - initializedImageModel, - initializingTextModel, - initializedTextModel, + initializing, initialized, } diff --git a/mobile/lib/services/remote_assets_service.dart b/mobile/lib/services/remote_assets_service.dart index 0e75b983d..251ce6c15 100644 --- a/mobile/lib/services/remote_assets_service.dart +++ b/mobile/lib/services/remote_assets_service.dart @@ -26,6 +26,11 @@ class RemoteAssetsService { } } + Future hasAsset(String remotePath) async { + final path = await _getLocalPath(remotePath); + return File(path).exists(); + } + Future _getLocalPath(String remotePath) async { return (await getApplicationSupportDirectory()).path + "/assets/" + diff --git a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart index 1e3ac0d95..dc28197bd 100644 --- a/mobile/lib/ui/actions/collection/collection_sharing_actions.dart +++ b/mobile/lib/ui/actions/collection/collection_sharing_actions.dart @@ -198,6 +198,62 @@ class CollectionActions { return false; } + Future doesEmailHaveAccount( + BuildContext context, + String email, { + bool showProgress = false, + }) async { + ProgressDialog? dialog; + String? publicKey; + if (showProgress) { + dialog = createProgressDialog( + context, + S.of(context).sharing, + isDismissible: true, + ); + await dialog.show(); + } + try { + publicKey = await UserService.instance.getPublicKey(email); + } catch (e) { + await dialog?.hide(); + logger.severe("Failed to get public key", e); + await showGenericErrorDialog(context: context, error: e); + return false; + } + // getPublicKey can return null when no user is associated with given + // email id + if (publicKey == null || publicKey == '') { + // todo: neeraj replace this as per the design where a new screen + // is used for error. Do this change along with handling of network errors + await showDialogWidget( + context: context, + title: S.of(context).inviteToEnte, + icon: Icons.info_outline, + body: S.of(context).emailNoEnteAccount(email), + isDismissible: true, + buttons: [ + ButtonWidget( + buttonType: ButtonType.neutral, + icon: Icons.adaptive.share, + labelText: S.of(context).sendInvite, + isInAlert: true, + onTap: () async { + unawaited( + shareText( + S.of(context).shareTextRecommendUsingEnte, + ), + ); + }, + ), + ], + ); + return false; + } else { + return true; + } + } + // addEmailToCollection returns true if add operation was successful Future addEmailToCollection( BuildContext context, diff --git a/mobile/lib/ui/components/buttons/button_widget.dart b/mobile/lib/ui/components/buttons/button_widget.dart index 2d1b170fe..2e4d2d1dc 100644 --- a/mobile/lib/ui/components/buttons/button_widget.dart +++ b/mobile/lib/ui/components/buttons/button_widget.dart @@ -202,14 +202,14 @@ class _ButtonChildWidgetState extends State { @override void initState() { - _setButtonTheme(); super.initState(); + _setButtonTheme(); } @override void didUpdateWidget(covariant ButtonChildWidget oldWidget) { - _setButtonTheme(); super.didUpdateWidget(oldWidget); + _setButtonTheme(); } @override diff --git a/mobile/lib/ui/components/keyboard/keybiard_oveylay.dart b/mobile/lib/ui/components/keyboard/keyboard_oveylay.dart similarity index 100% rename from mobile/lib/ui/components/keyboard/keybiard_oveylay.dart rename to mobile/lib/ui/components/keyboard/keyboard_oveylay.dart diff --git a/mobile/lib/ui/sharing/add_participant_page.dart b/mobile/lib/ui/sharing/add_participant_page.dart new file mode 100644 index 000000000..91378b3a5 --- /dev/null +++ b/mobile/lib/ui/sharing/add_participant_page.dart @@ -0,0 +1,402 @@ +import 'package:email_validator/email_validator.dart'; +import 'package:flutter/material.dart'; +import 'package:photos/core/configuration.dart'; +import "package:photos/generated/l10n.dart"; +import "package:photos/models/api/collection/user.dart"; +import 'package:photos/models/collection/collection.dart'; +import 'package:photos/services/collections_service.dart'; +import "package:photos/services/user_service.dart"; +import 'package:photos/theme/ente_theme.dart'; +import 'package:photos/ui/actions/collection/collection_sharing_actions.dart'; +import 'package:photos/ui/components/buttons/button_widget.dart'; +import 'package:photos/ui/components/captioned_text_widget.dart'; +import 'package:photos/ui/components/divider_widget.dart'; +import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart'; +import 'package:photos/ui/components/menu_section_description_widget.dart'; +import 'package:photos/ui/components/menu_section_title.dart'; +import 'package:photos/ui/components/models/button_type.dart'; +import 'package:photos/ui/sharing/user_avator_widget.dart'; +import "package:photos/ui/sharing/verify_identity_dialog.dart"; +import "package:photos/utils/toast_util.dart"; + +class AddParticipantPage extends StatefulWidget { + final Collection collection; + final bool isAddingViewer; + + const AddParticipantPage(this.collection, this.isAddingViewer, {super.key}); + + @override + State createState() => _AddParticipantPage(); +} + +class _AddParticipantPage extends State { + final _selectedEmails = {}; + String _newEmail = ''; + bool _emailIsValid = false; + bool isKeypadOpen = false; + late CollectionActions collectionActions; + late List _suggestedUsers; + + // Focus nodes are necessary + final textFieldFocusNode = FocusNode(); + final _textController = TextEditingController(); + + @override + void initState() { + super.initState(); + collectionActions = CollectionActions(CollectionsService.instance); + _suggestedUsers = _getSuggestedUser(); + } + + @override + void dispose() { + _textController.dispose(); + textFieldFocusNode.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + final filterSuggestedUsers = _suggestedUsers + .where( + (element) => element.email.toLowerCase().contains( + _textController.text.trim().toLowerCase(), + ), + ) + .toList(); + isKeypadOpen = MediaQuery.viewInsetsOf(context).bottom > 100; + final enteTextTheme = getEnteTextTheme(context); + final enteColorScheme = getEnteColorScheme(context); + return Scaffold( + resizeToAvoidBottomInset: isKeypadOpen, + appBar: AppBar( + title: Text( + widget.isAddingViewer + ? S.of(context).addViewer + : S.of(context).addCollaborator, + ), + ), + body: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const SizedBox(height: 12), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Text( + S.of(context).addANewEmail, + style: enteTextTheme.small + .copyWith(color: enteColorScheme.textMuted), + ), + ), + const SizedBox(height: 4), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: _enterEmailField(), + ), + Expanded( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16.0), + child: Column( + children: [ + filterSuggestedUsers.isNotEmpty + ? MenuSectionTitle( + title: S.of(context).orPickAnExistingOne, + ) + : const SizedBox.shrink(), + Expanded( + child: ListView.builder( + physics: const BouncingScrollPhysics(), + itemBuilder: (context, index) { + if (index >= filterSuggestedUsers.length) { + return Padding( + padding: const EdgeInsets.symmetric( + vertical: 8.0, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + filterSuggestedUsers.isNotEmpty + ? MenuSectionDescriptionWidget( + content: S + .of(context) + .longPressAnEmailToVerifyEndToEndEncryption, + ) + : const SizedBox.shrink(), + widget.isAddingViewer + ? const SizedBox.shrink() + : MenuSectionDescriptionWidget( + content: S + .of(context) + .collaboratorsCanAddPhotosAndVideosToTheSharedAlbum, + ), + ], + ), + ); + } + final currentUser = filterSuggestedUsers[index]; + return Column( + children: [ + MenuItemWidget( + captionedTextWidget: CaptionedTextWidget( + title: currentUser.email, + ), + leadingIconSize: 24.0, + leadingIconWidget: UserAvatarWidget( + currentUser, + type: AvatarType.mini, + ), + menuItemColor: + getEnteColorScheme(context).fillFaint, + pressedColor: + getEnteColorScheme(context).fillFaint, + trailingIcon: + (_selectedEmails.contains(currentUser.email)) + ? Icons.check + : null, + onTap: () async { + textFieldFocusNode.unfocus(); + if (_selectedEmails + .contains(currentUser.email)) { + _selectedEmails.remove(currentUser.email); + } else { + _selectedEmails.add(currentUser.email); + } + + setState(() => {}); + // showShortToast(context, "yet to implement"); + }, + onLongPress: () { + showDialog( + context: context, + builder: (BuildContext context) { + return VerifyIdentifyDialog( + self: false, + email: currentUser.email, + ); + }, + ); + }, + isTopBorderRadiusRemoved: index > 0, + isBottomBorderRadiusRemoved: + index < (filterSuggestedUsers.length - 1), + ), + (index == (filterSuggestedUsers.length - 1)) + ? const SizedBox.shrink() + : DividerWidget( + dividerType: DividerType.menu, + bgColor: + getEnteColorScheme(context).fillFaint, + ), + ], + ); + }, + itemCount: filterSuggestedUsers.length + 1, + ), + ), + ], + ), + ), + ), + SafeArea( + child: Padding( + padding: const EdgeInsets.only( + top: 8, + bottom: 8, + left: 16, + right: 16, + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + const SizedBox(height: 8), + ButtonWidget( + buttonType: ButtonType.primary, + buttonSize: ButtonSize.large, + labelText: widget.isAddingViewer + ? S.of(context).addViewers(_selectedEmails.length) + : S + .of(context) + .addCollaborators(_selectedEmails.length), + isDisabled: _selectedEmails.isEmpty, + onTap: () async { + final results = []; + for (String email in _selectedEmails) { + results.add( + await collectionActions.addEmailToCollection( + context, + widget.collection, + email, + widget.isAddingViewer + ? CollectionParticipantRole.viewer + : CollectionParticipantRole.collaborator, + ), + ); + } + + final noOfSuccessfullAdds = + results.where((e) => e).length; + showToast( + context, + "Added $noOfSuccessfullAdds ${widget.isAddingViewer ? "viewers" : "collaborators"}", + ); + + if (!results.any((e) => e == false) && mounted) { + Navigator.of(context).pop(true); + } + }, + ), + const SizedBox(height: 12), + ], + ), + ), + ), + ], + ), + ); + } + + void clearFocus() { + _textController.clear(); + _newEmail = _textController.text; + _emailIsValid = false; + textFieldFocusNode.unfocus(); + setState(() => {}); + } + + Widget _enterEmailField() { + return Row( + children: [ + Expanded( + child: TextFormField( + controller: _textController, + focusNode: textFieldFocusNode, + style: getEnteTextTheme(context).body, + autofillHints: const [AutofillHints.email], + decoration: InputDecoration( + focusedBorder: OutlineInputBorder( + borderRadius: const BorderRadius.all(Radius.circular(4.0)), + borderSide: + BorderSide(color: getEnteColorScheme(context).strokeMuted), + ), + fillColor: getEnteColorScheme(context).fillFaint, + filled: true, + hintText: S.of(context).enterEmail, + contentPadding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 14, + ), + border: UnderlineInputBorder( + borderSide: BorderSide.none, + borderRadius: BorderRadius.circular(4), + ), + prefixIcon: Icon( + Icons.email_outlined, + color: getEnteColorScheme(context).strokeMuted, + ), + suffixIcon: _newEmail == '' + ? null + : IconButton( + onPressed: clearFocus, + icon: Icon( + Icons.cancel, + color: getEnteColorScheme(context).strokeMuted, + ), + ), + ), + onChanged: (value) { + _newEmail = value.trim(); + _emailIsValid = EmailValidator.validate(_newEmail); + setState(() {}); + }, + autocorrect: false, + keyboardType: TextInputType.emailAddress, + //initialValue: _email, + textInputAction: TextInputAction.next, + ), + ), + const SizedBox(width: 8), + ButtonWidget( + buttonType: ButtonType.secondary, + buttonSize: ButtonSize.small, + labelText: "Add", + isDisabled: !_emailIsValid, + onTap: () async { + if (_emailIsValid) { + final result = await collectionActions.doesEmailHaveAccount( + context, + _newEmail, + ); + if (result && mounted) { + setState(() { + for (var suggestedUser in _suggestedUsers) { + if (suggestedUser.email == _newEmail) { + _selectedEmails.add(suggestedUser.email); + clearFocus(); + + return; + } + } + _suggestedUsers.insert(0, User(email: _newEmail)); + _selectedEmails.add(_newEmail); + clearFocus(); + }); + } + } + }, + ), + ], + ); + } + + List _getSuggestedUser() { + final List suggestedUsers = []; + final Set existingEmails = {}; + final int ownerID = Configuration.instance.getUserID()!; + existingEmails.add(Configuration.instance.getEmail()!); + for (final User? u in widget.collection.sharees ?? []) { + if (u != null && u.id != null && u.email.isNotEmpty) { + existingEmails.add(u.email); + } + } + for (final c in CollectionsService.instance.getActiveCollections()) { + if (c.owner?.id == ownerID) { + for (final User? u in c.sharees ?? []) { + if (u != null && + u.id != null && + u.email.isNotEmpty && + !existingEmails.contains(u.email)) { + existingEmails.add(u.email); + suggestedUsers.add(u); + } + } + } else if (c.owner != null && + c.owner!.id != null && + c.owner!.email.isNotEmpty && + !existingEmails.contains(c.owner!.email)) { + existingEmails.add(c.owner!.email); + suggestedUsers.add(c.owner!); + } + } + final cachedUserDetails = UserService.instance.getCachedUserDetails(); + if (cachedUserDetails != null && + (cachedUserDetails.familyData?.members?.isNotEmpty ?? false)) { + for (final member in cachedUserDetails.familyData!.members!) { + if (!existingEmails.contains(member.email)) { + existingEmails.add(member.email); + suggestedUsers.add(User(email: member.email)); + } + } + } + if (_textController.text.trim().isNotEmpty) { + suggestedUsers.removeWhere( + (element) => !element.email + .toLowerCase() + .contains(_textController.text.trim().toLowerCase()), + ); + } + suggestedUsers.sort((a, b) => a.email.compareTo(b.email)); + + return suggestedUsers; + } +} diff --git a/mobile/lib/ui/sharing/add_partipant_page.dart b/mobile/lib/ui/sharing/add_partipant_page.dart deleted file mode 100644 index cf828e1fe..000000000 --- a/mobile/lib/ui/sharing/add_partipant_page.dart +++ /dev/null @@ -1,361 +0,0 @@ -import 'package:email_validator/email_validator.dart'; -import 'package:flutter/material.dart'; -import 'package:photos/core/configuration.dart'; -import "package:photos/generated/l10n.dart"; -import "package:photos/models/api/collection/user.dart"; -import 'package:photos/models/collection/collection.dart'; -import 'package:photos/services/collections_service.dart'; -import "package:photos/services/user_service.dart"; -import 'package:photos/theme/ente_theme.dart'; -import 'package:photos/ui/actions/collection/collection_sharing_actions.dart'; -import 'package:photos/ui/components/buttons/button_widget.dart'; -import 'package:photos/ui/components/captioned_text_widget.dart'; -import 'package:photos/ui/components/divider_widget.dart'; -import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart'; -import 'package:photos/ui/components/menu_section_description_widget.dart'; -import 'package:photos/ui/components/menu_section_title.dart'; -import 'package:photos/ui/components/models/button_type.dart'; -import 'package:photos/ui/sharing/user_avator_widget.dart'; -import "package:photos/ui/sharing/verify_identity_dialog.dart"; -import "package:photos/utils/dialog_util.dart"; - -class AddParticipantPage extends StatefulWidget { - final Collection collection; - final bool isAddingViewer; - - const AddParticipantPage(this.collection, this.isAddingViewer, {super.key}); - - @override - State createState() => _AddParticipantPage(); -} - -class _AddParticipantPage extends State { - String selectedEmail = ''; - String _email = ''; - bool isEmailListEmpty = false; - bool _emailIsValid = false; - bool isKeypadOpen = false; - late CollectionActions collectionActions; - - // Focus nodes are necessary - final textFieldFocusNode = FocusNode(); - final _textController = TextEditingController(); - - @override - void initState() { - collectionActions = CollectionActions(CollectionsService.instance); - super.initState(); - } - - @override - void dispose() { - _textController.dispose(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - isKeypadOpen = MediaQuery.of(context).viewInsets.bottom > 100; - final enteTextTheme = getEnteTextTheme(context); - final enteColorScheme = getEnteColorScheme(context); - final List suggestedUsers = _getSuggestedUser(); - isEmailListEmpty = suggestedUsers.isEmpty; - return Scaffold( - resizeToAvoidBottomInset: isKeypadOpen, - appBar: AppBar( - title: Text( - widget.isAddingViewer - ? S.of(context).addViewer - : S.of(context).addCollaborator, - ), - ), - body: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const SizedBox(height: 12), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Text( - S.of(context).addANewEmail, - style: enteTextTheme.small - .copyWith(color: enteColorScheme.textMuted), - ), - ), - const SizedBox(height: 4), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: _getEmailField(), - ), - (isEmailListEmpty && widget.isAddingViewer) - ? const Expanded(child: SizedBox.shrink()) - : Expanded( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16.0), - child: Column( - children: [ - !isEmailListEmpty - ? MenuSectionTitle( - title: S.of(context).orPickAnExistingOne, - ) - : const SizedBox.shrink(), - Expanded( - child: ListView.builder( - itemBuilder: (context, index) { - if (index >= suggestedUsers.length) { - return Padding( - padding: const EdgeInsets.symmetric( - vertical: 8.0, - ), - child: MenuSectionDescriptionWidget( - content: S - .of(context) - .collaboratorsCanAddPhotosAndVideosToTheSharedAlbum, - ), - ); - } - final currentUser = suggestedUsers[index]; - return Column( - children: [ - MenuItemWidget( - captionedTextWidget: CaptionedTextWidget( - title: currentUser.email, - ), - leadingIconSize: 24.0, - leadingIconWidget: UserAvatarWidget( - currentUser, - type: AvatarType.mini, - ), - menuItemColor: - getEnteColorScheme(context).fillFaint, - pressedColor: - getEnteColorScheme(context).fillFaint, - trailingIcon: - (selectedEmail == currentUser.email) - ? Icons.check - : null, - onTap: () async { - textFieldFocusNode.unfocus(); - if (selectedEmail == currentUser.email) { - selectedEmail = ''; - } else { - selectedEmail = currentUser.email; - } - - setState(() => {}); - // showShortToast(context, "yet to implement"); - }, - isTopBorderRadiusRemoved: index > 0, - isBottomBorderRadiusRemoved: - index < (suggestedUsers.length - 1), - ), - (index == (suggestedUsers.length - 1)) - ? const SizedBox.shrink() - : DividerWidget( - dividerType: DividerType.menu, - bgColor: getEnteColorScheme(context) - .fillFaint, - ), - ], - ); - }, - itemCount: suggestedUsers.length + - (widget.isAddingViewer ? 0 : 1), - // physics: const ClampingScrollPhysics(), - ), - ), - ], - ), - ), - ), - SafeArea( - child: Padding( - padding: const EdgeInsets.only( - top: 8, - bottom: 8, - left: 16, - right: 16, - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - const SizedBox(height: 8), - ButtonWidget( - buttonType: ButtonType.primary, - buttonSize: ButtonSize.large, - labelText: widget.isAddingViewer - ? S.of(context).addViewer - : S.of(context).addCollaborator, - isDisabled: (selectedEmail == '' && !_emailIsValid), - onTap: (selectedEmail == '' && !_emailIsValid) - ? null - : () async { - final emailToAdd = - selectedEmail == '' ? _email : selectedEmail; - final result = - await collectionActions.addEmailToCollection( - context, - widget.collection, - emailToAdd, - widget.isAddingViewer - ? CollectionParticipantRole.viewer - : CollectionParticipantRole.collaborator, - ); - if (result && mounted) { - Navigator.of(context).pop(true); - } - }, - ), - const SizedBox(height: 12), - GestureDetector( - onTap: () async { - if ((selectedEmail == '' && !_emailIsValid)) { - await showErrorDialog( - context, - S.of(context).invalidEmailAddress, - S.of(context).enterValidEmail, - ); - return; - } - final emailToAdd = - selectedEmail == '' ? _email : selectedEmail; - // ignore: unawaited_futures - showDialog( - context: context, - builder: (BuildContext context) { - return VerifyIdentifyDialog( - self: false, - email: emailToAdd, - ); - }, - ); - }, - child: Text( - S.of(context).verifyIDLabel, - textAlign: TextAlign.center, - style: enteTextTheme.smallMuted.copyWith( - decoration: TextDecoration.underline, - ), - ), - ), - const SizedBox(height: 12), - ], - ), - ), - ), - ], - ), - ); - } - - void clearFocus() { - _textController.clear(); - _email = _textController.text; - _emailIsValid = false; - textFieldFocusNode.unfocus(); - setState(() => {}); - } - - Widget _getEmailField() { - return TextFormField( - controller: _textController, - focusNode: textFieldFocusNode, - style: getEnteTextTheme(context).body, - autofillHints: const [AutofillHints.email], - decoration: InputDecoration( - focusedBorder: OutlineInputBorder( - borderRadius: const BorderRadius.all(Radius.circular(4.0)), - borderSide: - BorderSide(color: getEnteColorScheme(context).strokeMuted), - ), - fillColor: getEnteColorScheme(context).fillFaint, - filled: true, - hintText: S.of(context).enterEmail, - contentPadding: const EdgeInsets.symmetric( - horizontal: 16, - vertical: 14, - ), - border: UnderlineInputBorder( - borderSide: BorderSide.none, - borderRadius: BorderRadius.circular(4), - ), - prefixIcon: Icon( - Icons.email_outlined, - color: getEnteColorScheme(context).strokeMuted, - ), - suffixIcon: _email == '' - ? null - : IconButton( - onPressed: clearFocus, - icon: Icon( - Icons.cancel, - color: getEnteColorScheme(context).strokeMuted, - ), - ), - ), - onChanged: (value) { - if (selectedEmail != '') { - selectedEmail = ''; - } - _email = value.trim(); - _emailIsValid = EmailValidator.validate(_email); - setState(() {}); - }, - autocorrect: false, - keyboardType: TextInputType.emailAddress, - //initialValue: _email, - textInputAction: TextInputAction.next, - ); - } - - List _getSuggestedUser() { - final List suggestedUsers = []; - final Set existingEmails = {}; - final int ownerID = Configuration.instance.getUserID()!; - existingEmails.add(Configuration.instance.getEmail()!); - for (final User? u in widget.collection.sharees ?? []) { - if (u != null && u.id != null && u.email.isNotEmpty) { - existingEmails.add(u.email); - } - } - for (final c in CollectionsService.instance.getActiveCollections()) { - if (c.owner?.id == ownerID) { - for (final User? u in c.sharees ?? []) { - if (u != null && - u.id != null && - u.email.isNotEmpty && - !existingEmails.contains(u.email)) { - existingEmails.add(u.email); - suggestedUsers.add(u); - } - } - } else if (c.owner != null && - c.owner!.id != null && - c.owner!.email.isNotEmpty && - !existingEmails.contains(c.owner!.email)) { - existingEmails.add(c.owner!.email); - suggestedUsers.add(c.owner!); - } - } - final cachedUserDetails = UserService.instance.getCachedUserDetails(); - if (cachedUserDetails != null && - (cachedUserDetails.familyData?.members?.isNotEmpty ?? false)) { - for (final member in cachedUserDetails.familyData!.members!) { - if (!existingEmails.contains(member.email)) { - existingEmails.add(member.email); - suggestedUsers.add(User(email: member.email)); - } - } - } - if (_textController.text.trim().isNotEmpty) { - suggestedUsers.removeWhere( - (element) => !element.email - .toLowerCase() - .contains(_textController.text.trim().toLowerCase()), - ); - } - suggestedUsers.sort((a, b) => a.email.compareTo(b.email)); - - return suggestedUsers; - } -} diff --git a/mobile/lib/ui/sharing/album_participants_page.dart b/mobile/lib/ui/sharing/album_participants_page.dart index 494df319f..0c137f300 100644 --- a/mobile/lib/ui/sharing/album_participants_page.dart +++ b/mobile/lib/ui/sharing/album_participants_page.dart @@ -11,7 +11,7 @@ import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart'; import 'package:photos/ui/components/menu_section_title.dart'; import 'package:photos/ui/components/title_bar_title_widget.dart'; import 'package:photos/ui/components/title_bar_widget.dart'; -import 'package:photos/ui/sharing/add_partipant_page.dart'; +import "package:photos/ui/sharing/add_participant_page.dart"; import 'package:photos/ui/sharing/manage_album_participant.dart'; import 'package:photos/ui/sharing/user_avator_widget.dart'; import 'package:photos/utils/navigation_util.dart'; diff --git a/mobile/lib/ui/sharing/share_collection_page.dart b/mobile/lib/ui/sharing/share_collection_page.dart index e63a39f3e..8e515fc68 100644 --- a/mobile/lib/ui/sharing/share_collection_page.dart +++ b/mobile/lib/ui/sharing/share_collection_page.dart @@ -13,7 +13,7 @@ import 'package:photos/ui/components/divider_widget.dart'; import 'package:photos/ui/components/menu_item_widget/menu_item_widget.dart'; import 'package:photos/ui/components/menu_section_description_widget.dart'; import 'package:photos/ui/components/menu_section_title.dart'; -import 'package:photos/ui/sharing/add_partipant_page.dart'; +import "package:photos/ui/sharing/add_participant_page.dart"; import 'package:photos/ui/sharing/album_participants_page.dart'; import "package:photos/ui/sharing/album_share_info_widget.dart"; import "package:photos/ui/sharing/manage_album_participant.dart"; diff --git a/mobile/lib/ui/viewer/file/file_caption_widget.dart b/mobile/lib/ui/viewer/file/file_caption_widget.dart index 446c9ce55..bec10c7b2 100644 --- a/mobile/lib/ui/viewer/file/file_caption_widget.dart +++ b/mobile/lib/ui/viewer/file/file_caption_widget.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import "package:photos/generated/l10n.dart"; import 'package:photos/models/file/file.dart'; import 'package:photos/theme/ente_theme.dart'; -import 'package:photos/ui/components/keyboard/keybiard_oveylay.dart'; +import 'package:photos/ui/components/keyboard/keyboard_oveylay.dart'; import 'package:photos/ui/components/keyboard/keyboard_top_button.dart'; import 'package:photos/utils/magic_util.dart'; diff --git a/mobile/lib/ui/viewer/location/add_location_sheet.dart b/mobile/lib/ui/viewer/location/add_location_sheet.dart index cf6629431..9e1345dc0 100644 --- a/mobile/lib/ui/viewer/location/add_location_sheet.dart +++ b/mobile/lib/ui/viewer/location/add_location_sheet.dart @@ -12,7 +12,7 @@ import "package:photos/ui/common/loading_widget.dart"; import "package:photos/ui/components/bottom_of_title_bar_widget.dart"; import "package:photos/ui/components/buttons/button_widget.dart"; import "package:photos/ui/components/divider_widget.dart"; -import "package:photos/ui/components/keyboard/keybiard_oveylay.dart"; +import 'package:photos/ui/components/keyboard/keyboard_oveylay.dart'; import "package:photos/ui/components/keyboard/keyboard_top_button.dart"; import "package:photos/ui/components/models/button_type.dart"; import "package:photos/ui/components/text_input_widget.dart"; diff --git a/mobile/lib/ui/viewer/location/edit_location_sheet.dart b/mobile/lib/ui/viewer/location/edit_location_sheet.dart index b5c517a66..66df52e90 100644 --- a/mobile/lib/ui/viewer/location/edit_location_sheet.dart +++ b/mobile/lib/ui/viewer/location/edit_location_sheet.dart @@ -13,7 +13,7 @@ import "package:photos/ui/common/loading_widget.dart"; import "package:photos/ui/components/bottom_of_title_bar_widget.dart"; import "package:photos/ui/components/buttons/button_widget.dart"; import "package:photos/ui/components/divider_widget.dart"; -import "package:photos/ui/components/keyboard/keybiard_oveylay.dart"; +import 'package:photos/ui/components/keyboard/keyboard_oveylay.dart'; import "package:photos/ui/components/keyboard/keyboard_top_button.dart"; import "package:photos/ui/components/models/button_type.dart"; import "package:photos/ui/components/text_input_widget.dart"; diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 5c3f8e2f2..7e4534520 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -936,7 +936,7 @@ packages: path: "." ref: main resolved-ref: "49158ce4a517e87817dc84c6b96c00639281229a" - url: "https://github.com/prateekmedia/FlutterHomeWidget" + url: "https://github.com/ente-io/FlutterHomeWidget" source: git version: "0.4.1" html: diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index fdf00a1d2..ca8efa9c1 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -12,7 +12,7 @@ description: ente photos application # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.8.70+590 +version: 0.8.71+591 publish_to: none environment: @@ -93,7 +93,7 @@ dependencies: google_nav_bar: ^5.0.5 home_widget: git: - url: https://github.com/prateekmedia/FlutterHomeWidget + url: https://github.com/ente-io/FlutterHomeWidget ref: main html_unescape: ^2.0.0 http: ^1.1.0 diff --git a/.gitattributes b/server/.gitattributes similarity index 100% rename from .gitattributes rename to server/.gitattributes diff --git a/server/README.md b/server/README.md index 9c4b2f696..06fdcb518 100644 --- a/server/README.md +++ b/server/README.md @@ -113,6 +113,11 @@ repository's [Discussions](https://github.com/ente-io/ente/discussions), or on try to clarify, and also document such FAQs. Please feel free to open documentation PRs around this too. +> [!TIP] +> +> You can find more guides and documentation around self-hosting at +> [help.ente.io/self-hosting](https://help.ente.io/self-hosting). + ## Thanks ❤️ We've had great fun with this combination (Golang + Postgres + Docker), and we diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go index 5dc1bc0b7..8e4d08deb 100644 --- a/server/cmd/museum/main.go +++ b/server/cmd/museum/main.go @@ -178,7 +178,8 @@ func main() { authCache := cache.New(1*time.Minute, 15*time.Minute) accessTokenCache := cache.New(1*time.Minute, 15*time.Minute) discordController := discord.NewDiscordController(userRepo, hostName, environment) - rateLimiter := middleware.NewRateLimitMiddleware(discordController) + rateLimiter := middleware.NewRateLimitMiddleware(discordController, 1000, 1*time.Second) + defer rateLimiter.Stop() emailNotificationCtrl := &email.EmailNotificationController{ UserRepo: userRepo, @@ -360,22 +361,22 @@ func main() { server.Use(requestid.New(), middleware.Logger(urlSanitizer), cors(), gzip.Gzip(gzip.DefaultCompression), middleware.PanicRecover()) publicAPI := server.Group("/") - publicAPI.Use(rateLimiter.APIRateLimitMiddleware(urlSanitizer)) + publicAPI.Use(rateLimiter.GlobalRateLimiter(), rateLimiter.APIRateLimitMiddleware(urlSanitizer)) privateAPI := server.Group("/") - privateAPI.Use(authMiddleware.TokenAuthMiddleware(nil), rateLimiter.APIRateLimitForUserMiddleware(urlSanitizer)) + privateAPI.Use(rateLimiter.GlobalRateLimiter(), authMiddleware.TokenAuthMiddleware(nil), rateLimiter.APIRateLimitForUserMiddleware(urlSanitizer)) adminAPI := server.Group("/admin") - adminAPI.Use(authMiddleware.TokenAuthMiddleware(nil), authMiddleware.AdminAuthMiddleware()) + adminAPI.Use(rateLimiter.GlobalRateLimiter(), authMiddleware.TokenAuthMiddleware(nil), authMiddleware.AdminAuthMiddleware()) paymentJwtAuthAPI := server.Group("/") - paymentJwtAuthAPI.Use(authMiddleware.TokenAuthMiddleware(jwt.PAYMENT.Ptr())) + paymentJwtAuthAPI.Use(rateLimiter.GlobalRateLimiter(), authMiddleware.TokenAuthMiddleware(jwt.PAYMENT.Ptr())) familiesJwtAuthAPI := server.Group("/") //The middleware order matters. First, the userID must be set in the context, so that we can apply limit for user. - familiesJwtAuthAPI.Use(authMiddleware.TokenAuthMiddleware(jwt.FAMILIES.Ptr()), rateLimiter.APIRateLimitForUserMiddleware(urlSanitizer)) + familiesJwtAuthAPI.Use(rateLimiter.GlobalRateLimiter(), authMiddleware.TokenAuthMiddleware(jwt.FAMILIES.Ptr()), rateLimiter.APIRateLimitForUserMiddleware(urlSanitizer)) publicCollectionAPI := server.Group("/public-collection") - publicCollectionAPI.Use(accessTokenMiddleware.AccessTokenAuthMiddleware(urlSanitizer)) + publicCollectionAPI.Use(rateLimiter.GlobalRateLimiter(), accessTokenMiddleware.AccessTokenAuthMiddleware(urlSanitizer)) healthCheckHandler := &api.HealthCheckHandler{ DB: db, @@ -472,7 +473,7 @@ func main() { privateAPI.DELETE("/users/delete", userHandler.DeleteUser) accountsJwtAuthAPI := server.Group("/") - accountsJwtAuthAPI.Use(authMiddleware.TokenAuthMiddleware(jwt.ACCOUNTS.Ptr()), rateLimiter.APIRateLimitForUserMiddleware(urlSanitizer)) + accountsJwtAuthAPI.Use(rateLimiter.GlobalRateLimiter(), authMiddleware.TokenAuthMiddleware(jwt.ACCOUNTS.Ptr()), rateLimiter.APIRateLimitForUserMiddleware(urlSanitizer)) passkeysHandler := &api.PasskeyHandler{ Controller: passkeyCtrl, } @@ -531,7 +532,7 @@ func main() { castCtrl := cast.NewController(&castDb, accessCtrl) castMiddleware := middleware.CastMiddleware{CastCtrl: castCtrl, Cache: authCache} - castAPI.Use(castMiddleware.CastAuthMiddleware()) + castAPI.Use(rateLimiter.GlobalRateLimiter(), castMiddleware.CastAuthMiddleware()) castHandler := &api.CastHandler{ CollectionCtrl: collectionController, @@ -620,6 +621,7 @@ func main() { adminAPI.POST("/user/disable-2fa", adminHandler.DisableTwoFactor) adminAPI.POST("/user/disable-passkeys", adminHandler.RemovePasskeys) adminAPI.POST("/user/close-family", adminHandler.CloseFamily) + adminAPI.PUT("/user/change-email", adminHandler.ChangeEmail) adminAPI.DELETE("/user/delete", adminHandler.DeleteUser) adminAPI.POST("/user/recover", adminHandler.RecoverAccount) adminAPI.GET("/email-hash", adminHandler.GetEmailHash) diff --git a/server/configurations/local.yaml b/server/configurations/local.yaml index 47d6f0d37..4bab089b6 100644 --- a/server/configurations/local.yaml +++ b/server/configurations/local.yaml @@ -113,10 +113,7 @@ s3: # # 1. Disable SSL. # - # 2. Use "path" style S3 URLs where the bucket is part of the URL path, e.g. - # http://localhost:3200/b2-eu-cen. By default the bucket name is part of - # the (sub)domain, e.g. http://b2-eu-cen.localhost:3200/ and cannot be - # resolved when running locally. + # 2. Use "path" style S3 URLs (see `use_path_style_urls` below). # # 3. Directly download the file during replication instead of going via the # Cloudflare worker. @@ -125,6 +122,17 @@ s3: # not support them, specifically it doesn't support GLACIER). # #are_local_buckets: true + # Uncomment this to use "path" style S3 URLs. + # + # By default the bucket name is part of the (sub)domain, e.g. + # http://b2-eu-cen.localhost:3200/. If this is true, then we use "path" + # style S3 URLs where the bucket is part of the URL path, e.g. + # http://localhost:3200/b2-eu-cen. + # + # This is useful in scenarios when sub-domain based addressing cannot be + # resolved, e.g. when running a local instance, or when using MinIO as a + # production store. + #use_path_style_urls: true # Key used for encrypting customer emails before storing them in DB # @@ -174,7 +182,7 @@ stripe: webauthn: rpid: "example.com" rporigins: - - "https://example.com:3005" + - "https://example.com:3005" # Roadmap SSO (optional) # @@ -220,13 +228,17 @@ internal: # If provided, this external healthcheck url is periodically pinged. health-check-url: # Hardcoded verification codes, useful for logging in when developing. - hardcoded-ott: - emails: - - "example@example.org,123456" - # When running in a local environment, hardcode the verification code to - # 123456 for email addresses ending with @example.org - local-domain-suffix: "@example.org" - local-domain-value: 123456 + # + # Uncomment this and set these to your email ID or domain so that you don't + # need to peek into the server logs for obtaining the OTP when trying to log + # into an instance you're developing on. + # hardcoded-ott: + # emails: + # - "example@example.org,123456" + # # When running in a local environment, hardcode the verification code to + # # 123456 for email addresses ending with @example.org + # local-domain-suffix: "@example.org" + # local-domain-value: 123456 # List of user IDs that can use the admin API endpoints. admins: [] diff --git a/server/ente/admin.go b/server/ente/admin.go index 66ad27741..c56e48e5b 100644 --- a/server/ente/admin.go +++ b/server/ente/admin.go @@ -46,6 +46,11 @@ type UpdateSubscriptionRequest struct { Attributes SubscriptionAttributes `json:"attributes"` } +type ChangeEmailRequest struct { + UserID int64 `json:"userID" binding:"required"` + Email string `json:"email" binding:"required"` +} + type AddOnAction string const ( diff --git a/server/pkg/api/admin.go b/server/pkg/api/admin.go index 90c9fd3e6..b153e19bb 100644 --- a/server/pkg/api/admin.go +++ b/server/pkg/api/admin.go @@ -306,6 +306,25 @@ func (h *AdminHandler) UpdateSubscription(c *gin.Context) { c.JSON(http.StatusOK, gin.H{}) } +func (h *AdminHandler) ChangeEmail(c *gin.Context) { + var r ente.ChangeEmailRequest + if err := c.ShouldBindJSON(&r); err != nil { + handler.Error(c, stacktrace.Propagate(ente.ErrBadRequest, "Bad request")) + return + } + adminID := auth.GetUserID(c.Request.Header) + go h.DiscordController.NotifyAdminAction( + fmt.Sprintf("Admin (%d) updating email for user: %d", adminID, r.UserID)) + err := h.UserController.UpdateEmail(c, r.UserID, r.Email) + if err != nil { + logrus.WithError(err).Error("Failed to update email") + handler.Error(c, stacktrace.Propagate(err, "")) + return + } + logrus.Info("Updated email") + c.JSON(http.StatusOK, gin.H{}) +} + func (h *AdminHandler) ReQueueItem(c *gin.Context) { var r ente.ReQueueItemRequest if err := c.ShouldBindJSON(&r); err != nil { diff --git a/server/pkg/controller/discord/discord.go b/server/pkg/controller/discord/discord.go index 2c07fe404..94876c814 100644 --- a/server/pkg/controller/discord/discord.go +++ b/server/pkg/controller/discord/discord.go @@ -106,7 +106,7 @@ func (c *DiscordController) NotifyAccountDelete(userID int64, paymentProvider st } func (c *DiscordController) NotifyPotentialAbuse(message string) { - c.Notify(message) + c.Notify(fmt.Sprintf("%s: %s", c.HostName, message)) } func (c *DiscordController) getTimeSinceSignUp(userID int64) string { diff --git a/server/pkg/controller/user/userauth.go b/server/pkg/controller/user/userauth.go index bf092cb14..bbc9942de 100644 --- a/server/pkg/controller/user/userauth.go +++ b/server/pkg/controller/user/userauth.go @@ -197,7 +197,13 @@ func (c *UserController) ChangeEmail(ctx *gin.Context, request ente.EmailVerific if err != nil { return stacktrace.Propagate(err, "") } - _, err = c.UserRepo.GetUserIDWithEmail(email) + + return c.UpdateEmail(ctx, auth.GetUserID(ctx.Request.Header), email) +} + +// UpdateEmail updates the email address of the user with the provided userID +func (c *UserController) UpdateEmail(ctx *gin.Context, userID int64, email string) error { + _, err := c.UserRepo.GetUserIDWithEmail(email) if err == nil { // email already owned by a user return stacktrace.Propagate(ente.ErrPermissionDenied, "") @@ -206,7 +212,6 @@ func (c *UserController) ChangeEmail(ctx *gin.Context, request ente.EmailVerific // unknown error, rethrow return stacktrace.Propagate(err, "") } - userID := auth.GetUserID(ctx.Request.Header) user, err := c.UserRepo.Get(userID) if err != nil { return stacktrace.Propagate(err, "") diff --git a/server/pkg/middleware/rate_limit.go b/server/pkg/middleware/rate_limit.go index 391c01887..08e0f00b6 100644 --- a/server/pkg/middleware/rate_limit.go +++ b/server/pkg/middleware/rate_limit.go @@ -5,6 +5,8 @@ import ( "net/http" "strconv" "strings" + "sync/atomic" + "time" "github.com/ente-io/museum/pkg/controller/discord" "github.com/ente-io/museum/pkg/utils/auth" @@ -20,14 +22,40 @@ type RateLimitMiddleware struct { limit10ReqPerMin *limiter.Limiter limit200ReqPerSec *limiter.Limiter discordCtrl *discord.DiscordController + count int64 // Use int64 for atomic operations + limit int64 + reset time.Duration + ticker *time.Ticker } -func NewRateLimitMiddleware(discordCtrl *discord.DiscordController) *RateLimitMiddleware { - return &RateLimitMiddleware{ +func NewRateLimitMiddleware(discordCtrl *discord.DiscordController, limit int64, reset time.Duration) *RateLimitMiddleware { + rl := &RateLimitMiddleware{ limit10ReqPerMin: rateLimiter("10-M"), limit200ReqPerSec: rateLimiter("200-S"), discordCtrl: discordCtrl, + limit: limit, + reset: reset, + ticker: time.NewTicker(reset), } + go func() { + for range rl.ticker.C { + atomic.StoreInt64(&rl.count, 0) // Reset the count every reset interval + } + }() + return rl +} + +// Increment increments the counter in a thread-safe manner. +// Returns true if the increment was within the rate limit, false if the rate limit was exceeded. +func (r *RateLimitMiddleware) Increment() bool { + // Atomically increment the count + newCount := atomic.AddInt64(&r.count, 1) + return newCount <= r.limit +} + +// Stop the internal ticker, effectively stopping the rate limiter. +func (r *RateLimitMiddleware) Stop() { + r.ticker.Stop() } // rateLimiter will return instance of limiter.Limiter based on internal - @@ -44,6 +72,20 @@ func rateLimiter(interval string) *limiter.Limiter { return instance } +// GlobalRateLimiter rate limits all requests to the server, regardless of the endpoint. +func (r *RateLimitMiddleware) GlobalRateLimiter() gin.HandlerFunc { + return func(c *gin.Context) { + if !r.Increment() { + if r.count%100 == 0 { + go r.discordCtrl.NotifyPotentialAbuse(fmt.Sprintf("Global ratelimit (%d) breached %d", r.limit, r.count)) + } + c.AbortWithStatusJSON(http.StatusTooManyRequests, gin.H{"error": "Rate limit breached, try later"}) + return + } + c.Next() + } +} + // APIRateLimitMiddleware only rate limits sensitive public endpoints which have a higher risk // of abuse by any bad actor. func (r *RateLimitMiddleware) APIRateLimitMiddleware(urlSanitizer func(_ *gin.Context) string) gin.HandlerFunc { diff --git a/server/pkg/utils/s3config/s3config.go b/server/pkg/utils/s3config/s3config.go index fe83ce6ea..9b273bd61 100644 --- a/server/pkg/utils/s3config/s3config.go +++ b/server/pkg/utils/s3config/s3config.go @@ -104,6 +104,7 @@ func (config *S3Config) initialize() { config.s3Configs = make(map[string]*aws.Config) config.s3Clients = make(map[string]s3.S3) + usePathStyleURLs := viper.GetBool("s3.use_path_style_urls") areLocalBuckets := viper.GetBool("s3.are_local_buckets") config.areLocalBuckets = areLocalBuckets @@ -116,6 +117,9 @@ func (config *S3Config) initialize() { Endpoint: aws.String(viper.GetString("s3." + dc + ".endpoint")), Region: aws.String(viper.GetString("s3." + dc + ".region")), } + if usePathStyleURLs { + s3Config.S3ForcePathStyle = aws.Bool(true) + } if areLocalBuckets { s3Config.DisableSSL = aws.Bool(true) s3Config.S3ForcePathStyle = aws.Bool(true) diff --git a/server/scripts/images/museum.png b/server/scripts/images/museum.png index a93370da8..bd837dc36 100644 Binary files a/server/scripts/images/museum.png and b/server/scripts/images/museum.png differ diff --git a/web/apps/accounts/src/pages/passkeys/flow/Recover.tsx b/web/apps/accounts/src/pages/passkeys/flow/Recover.tsx new file mode 100644 index 000000000..aea836f6e --- /dev/null +++ b/web/apps/accounts/src/pages/passkeys/flow/Recover.tsx @@ -0,0 +1,19 @@ +import { TwoFactorType } from "@ente/accounts/constants/twofactor"; +import RecoverPage from "@ente/accounts/pages/recover"; +import { APPS } from "@ente/shared/apps/constants"; +import { useRouter } from "next/router"; +import { AppContext } from "pages/_app"; +import { useContext } from "react"; + +export default function Recover() { + const appContext = useContext(AppContext); + const router = useRouter(); + return ( + + ); +} diff --git a/web/apps/accounts/src/pages/passkeys/flow/index.tsx b/web/apps/accounts/src/pages/passkeys/flow/index.tsx index 517777b9c..1f082bf6b 100644 --- a/web/apps/accounts/src/pages/passkeys/flow/index.tsx +++ b/web/apps/accounts/src/pages/passkeys/flow/index.tsx @@ -257,6 +257,18 @@ const PasskeysFlow = () => { > {t("TRY_AGAIN")} + + {t("RECOVER_TWO_FACTOR")} + diff --git a/web/apps/photos/package.json b/web/apps/photos/package.json index 1a088c99d..e0098cd36 100644 --- a/web/apps/photos/package.json +++ b/web/apps/photos/package.json @@ -56,7 +56,7 @@ "sanitize-filename": "^1.6.3", "similarity-transformation": "^0.0.1", "transformation-matrix": "^2.15.0", - "uuid": "^9.0.0", + "uuid": "^9.0.1", "vscode-uri": "^3.0.7", "xml-js": "^1.6.11", "zxcvbn": "^4.4.2" diff --git a/web/apps/photos/public/locales/bg-BG/translation.json b/web/apps/photos/public/locales/bg-BG/translation.json index 6b02fae65..03faf16c2 100644 --- a/web/apps/photos/public/locales/bg-BG/translation.json +++ b/web/apps/photos/public/locales/bg-BG/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/de-DE/translation.json b/web/apps/photos/public/locales/de-DE/translation.json index f5a6f13b3..9a1c4073c 100644 --- a/web/apps/photos/public/locales/de-DE/translation.json +++ b/web/apps/photos/public/locales/de-DE/translation.json @@ -163,7 +163,7 @@ "SUBSCRIPTION_PURCHASE_CANCELLED": "Dein Kauf wurde abgebrochen. Bitte versuche es erneut, wenn du abonnieren willst", "SUBSCRIPTION_PURCHASE_FAILED": "Kauf des Abonnements fehlgeschlagen Bitte versuchen Sie es erneut", "SUBSCRIPTION_UPDATE_FAILED": "Aktualisierung des Abonnements fehlgeschlagen Bitte versuchen Sie es erneut", - "UPDATE_PAYMENT_METHOD_MESSAGE": "", + "UPDATE_PAYMENT_METHOD_MESSAGE": "Es tut uns leid, die Zahlung ist fehlgeschlagen, als wir versuchten Ihre Karte zu belasten. Bitte aktualisieren Sie Ihre Zahlungsmethode und versuchen Sie es erneut", "STRIPE_AUTHENTICATION_FAILED": "Wir können deine Zahlungsmethode nicht authentifizieren. Bitte wähle eine andere Zahlungsmethode und versuche es erneut", "UPDATE_PAYMENT_METHOD": "Zahlungsmethode aktualisieren", "MONTHLY": "Monatlich", @@ -260,13 +260,13 @@ "ENABLE": "Aktivieren", "LOST_DEVICE": "Zwei-Faktor-Gerät verloren", "INCORRECT_CODE": "Falscher Code", - "TWO_FACTOR_INFO": "", + "TWO_FACTOR_INFO": "Fügen Sie eine zusätzliche Sicherheitsebene hinzu, indem Sie mehr als Ihre E-Mail und Ihr Passwort benötigen, um sich mit Ihrem Account anzumelden", "DISABLE_TWO_FACTOR_LABEL": "Deaktiviere die Zwei-Faktor-Authentifizierung", "UPDATE_TWO_FACTOR_LABEL": "Authentifizierungsgerät aktualisieren", "DISABLE": "Deaktivieren", "RECONFIGURE": "Neu einrichten", "UPDATE_TWO_FACTOR": "Zweiten Faktor aktualisieren", - "UPDATE_TWO_FACTOR_MESSAGE": "", + "UPDATE_TWO_FACTOR_MESSAGE": "Fahren Sie fort, werden alle Ihre zuvor konfigurierten Authentifikatoren ungültig", "UPDATE": "Aktualisierung", "DISABLE_TWO_FACTOR": "Zweiten Faktor deaktivieren", "DISABLE_TWO_FACTOR_MESSAGE": "Bist du sicher, dass du die Zwei-Faktor-Authentifizierung deaktivieren willst", @@ -277,25 +277,25 @@ "START": "Start", "LAST_EXPORT_TIME": "Letztes Exportdatum", "EXPORT_AGAIN": "Neusynchronisation", - "LOCAL_STORAGE_NOT_ACCESSIBLE": "", - "LOCAL_STORAGE_NOT_ACCESSIBLE_MESSAGE": "", + "LOCAL_STORAGE_NOT_ACCESSIBLE": "Lokaler Speicher nicht zugänglich", + "LOCAL_STORAGE_NOT_ACCESSIBLE_MESSAGE": "Ihr Browser oder ein Addon blockiert ente vor der Speicherung von Daten im lokalen Speicher. Bitte versuchen Sie, den Browser-Modus zu wechseln und die Seite neu zu laden.", "SEND_OTT": "OTP senden", "EMAIl_ALREADY_OWNED": "Diese E-Mail wird bereits verwendet", "ETAGS_BLOCKED": "", "SKIPPED_VIDEOS_INFO": "", "LIVE_PHOTOS_DETECTED": "", - "RETRY_FAILED": "", + "RETRY_FAILED": "Fehlgeschlagene Uploads erneut probieren", "FAILED_UPLOADS": "Fehlgeschlagene Uploads ", "SKIPPED_FILES": "Ignorierte Uploads", "THUMBNAIL_GENERATION_FAILED_UPLOADS": "Das Vorschaubild konnte nicht erzeugt werden", "UNSUPPORTED_FILES": "Nicht unterstützte Dateien", - "SUCCESSFUL_UPLOADS": "", + "SUCCESSFUL_UPLOADS": "Erfolgreiche Uploads", "SKIPPED_INFO": "", "UNSUPPORTED_INFO": "ente unterstützt diese Dateiformate noch nicht", "BLOCKED_UPLOADS": "Blockierte Uploads", "SKIPPED_VIDEOS": "Übersprungene Videos", "INPROGRESS_METADATA_EXTRACTION": "In Bearbeitung", - "INPROGRESS_UPLOADS": "", + "INPROGRESS_UPLOADS": "Upload läuft", "TOO_LARGE_UPLOADS": "Große Dateien", "LARGER_THAN_AVAILABLE_STORAGE_UPLOADS": "Zu wenig Speicher", "LARGER_THAN_AVAILABLE_STORAGE_INFO": "Diese Dateien wurden nicht hochgeladen, da sie die maximale Größe für Ihren Speicherplan überschreiten", @@ -338,45 +338,45 @@ "SORT_BY_CREATION_TIME_ASCENDING": "Ältestem", "SORT_BY_UPDATION_TIME_DESCENDING": "Zuletzt aktualisiert", "SORT_BY_NAME": "Name", - "COMPRESS_THUMBNAILS": "", - "THUMBNAIL_REPLACED": "", + "COMPRESS_THUMBNAILS": "Vorschaubilder komprimieren", + "THUMBNAIL_REPLACED": "Vorschaubilder komprimiert", "FIX_THUMBNAIL": "Komprimiere", "FIX_THUMBNAIL_LATER": "Später komprimieren", "REPLACE_THUMBNAIL_NOT_STARTED": "", "REPLACE_THUMBNAIL_COMPLETED": "", "REPLACE_THUMBNAIL_NOOP": "", "REPLACE_THUMBNAIL_COMPLETED_WITH_ERROR": "", - "FIX_CREATION_TIME": "", - "FIX_CREATION_TIME_IN_PROGRESS": "", - "CREATION_TIME_UPDATED": "", - "UPDATE_CREATION_TIME_NOT_STARTED": "", + "FIX_CREATION_TIME": "Zeit reparieren", + "FIX_CREATION_TIME_IN_PROGRESS": "Zeit wird repariert", + "CREATION_TIME_UPDATED": "Datei-Zeit aktualisiert", + "UPDATE_CREATION_TIME_NOT_STARTED": "Wählen Sie die Option, die Sie verwenden möchten", "UPDATE_CREATION_TIME_COMPLETED": "", "UPDATE_CREATION_TIME_COMPLETED_WITH_ERROR": "", - "CAPTION_CHARACTER_LIMIT": "", + "CAPTION_CHARACTER_LIMIT": "Maximal 5000 Zeichen", "DATE_TIME_ORIGINAL": "", "DATE_TIME_DIGITIZED": "", "METADATA_DATE": "", - "CUSTOM_TIME": "", + "CUSTOM_TIME": "Benutzerdefinierte Zeit", "REOPEN_PLAN_SELECTOR_MODAL": "", - "OPEN_PLAN_SELECTOR_MODAL_FAILED": "", + "OPEN_PLAN_SELECTOR_MODAL_FAILED": "Fehler beim Öffnen der Pläne", "INSTALL": "Installieren", "SHARING_DETAILS": "Details teilen", - "MODIFY_SHARING": "", - "ADD_COLLABORATORS": "", - "ADD_NEW_EMAIL": "", - "shared_with_people_zero": "", - "shared_with_people_one": "", - "shared_with_people_other": "", - "participants_zero": "", - "participants_one": "", - "participants_other": "", - "ADD_VIEWERS": "", - "PARTICIPANTS": "", + "MODIFY_SHARING": "Freigabe ändern", + "ADD_COLLABORATORS": "Bearbeiter hinzufügen", + "ADD_NEW_EMAIL": "Neue E-Mail-Adresse hinzufügen", + "shared_with_people_zero": "Mit bestimmten Personen teilen", + "shared_with_people_one": "Geteilt mit einer Person", + "shared_with_people_other": "Geteilt mit {{count, number}} Personen", + "participants_zero": "Keine Teilnehmer", + "participants_one": "1 Teilnehmer", + "participants_other": "{{count, number}} Teilnehmer", + "ADD_VIEWERS": "Betrachter hinzufügen", + "PARTICIPANTS": "Teilnehmer", "CHANGE_PERMISSIONS_TO_VIEWER": "", "CHANGE_PERMISSIONS_TO_COLLABORATOR": "", "CONVERT_TO_VIEWER": "Ja, zu \"Beobachter\" ändern", "CONVERT_TO_COLLABORATOR": "", - "CHANGE_PERMISSION": "", + "CHANGE_PERMISSION": "Berechtigung ändern?", "REMOVE_PARTICIPANT": "Entfernen?", "CONFIRM_REMOVE": "Ja, entfernen", "MANAGE": "Verwalten", @@ -384,9 +384,9 @@ "COLLABORATOR_RIGHTS": "Bearbeiter können Fotos & Videos zu dem geteilten Album hinzufügen", "REMOVE_PARTICIPANT_HEAD": "Teilnehmer entfernen", "OWNER": "Besitzer", - "COLLABORATORS": "", + "COLLABORATORS": "Bearbeiter", "ADD_MORE": "Mehr hinzufügen", - "VIEWERS": "", + "VIEWERS": "Zuschauer", "OR_ADD_EXISTING": "Oder eine Vorherige auswählen", "REMOVE_PARTICIPANT_MESSAGE": "", "NOT_FOUND": "404 - Nicht gefunden", @@ -401,19 +401,19 @@ "NO_DEVICE_LIMIT": "Keins", "LINK_EXPIRY": "Ablaufdatum des Links", "NEVER": "Niemals", - "DISABLE_FILE_DOWNLOAD": "", + "DISABLE_FILE_DOWNLOAD": "Download deaktivieren", "DISABLE_FILE_DOWNLOAD_MESSAGE": "", - "MALICIOUS_CONTENT": "", - "COPYRIGHT": "", - "SHARED_USING": "", + "MALICIOUS_CONTENT": "Enthält schädliche Inhalte", + "COPYRIGHT": "Verletzung des Urheberrechts von jemandem, den ich repräsentieren darf", + "SHARED_USING": "Freigegeben über ", "ENTE_IO": "ente.io", "SHARING_REFERRAL_CODE": "", "LIVE": "LIVE", - "DISABLE_PASSWORD": "", - "DISABLE_PASSWORD_MESSAGE": "", + "DISABLE_PASSWORD": "Passwort-Sperre deaktivieren", + "DISABLE_PASSWORD_MESSAGE": "Sind Sie sicher, dass Sie die Passwort-Sperre deaktivieren möchten?", "PASSWORD_LOCK": "Passwort Sperre", "LOCK": "Sperren", - "DOWNLOAD_UPLOAD_LOGS": "", + "DOWNLOAD_UPLOAD_LOGS": "Debug-Logs", "UPLOAD_FILES": "Datei", "UPLOAD_DIRS": "Ordner", "UPLOAD_GOOGLE_TAKEOUT": "Google Takeout", @@ -467,13 +467,13 @@ "FAMILY_PLAN": "Familientarif", "DOWNLOAD_LOGS": "Logs herunterladen", "DOWNLOAD_LOGS_MESSAGE": "", - "CHANGE_FOLDER": "", - "TWO_MONTHS_FREE": "", + "CHANGE_FOLDER": "Ordner ändern", + "TWO_MONTHS_FREE": "Erhalte 2 Monate kostenlos bei Jahresabonnements", "GB": "GB", "POPULAR": "Beliebt", - "FREE_PLAN_OPTION_LABEL": "", + "FREE_PLAN_OPTION_LABEL": "Mit kostenloser Testversion fortfahren", "FREE_PLAN_DESCRIPTION": "1 GB für 1 Jahr", - "CURRENT_USAGE": "", + "CURRENT_USAGE": "Aktuelle Nutzung ist {{usage}}", "WEAK_DEVICE": "", "DRAG_AND_DROP_HINT": "", "CONFIRM_ACCOUNT_DELETION_MESSAGE": "", @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/en-US/translation.json b/web/apps/photos/public/locales/en-US/translation.json index ea74f4f5f..de8d2fe2a 100644 --- a/web/apps/photos/public/locales/en-US/translation.json +++ b/web/apps/photos/public/locales/en-US/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "Visit cast.ente.io on the device you want to pair.", "CAST_AUTO_PAIR_FAILED": "Chromecast Auto Pair failed. Please try again.", "CACHE_DIRECTORY": "Cache folder", - "PASSKEYS": "Passkeys", "FREEHAND": "Freehand", "APPLY_CROP": "Apply Crop", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "At least one transformation or color adjustment must be performed before saving." + "PHOTO_EDIT_REQUIRED_TO_SAVE": "At least one transformation or color adjustment must be performed before saving.", + "PASSKEYS": "Passkeys", + "DELETE_PASSKEY": "Delete passkey", + "DELETE_PASSKEY_CONFIRMATION": "Are you sure you want to delete this passkey? This action is irreversible.", + "RENAME_PASSKEY": "Rename passkey", + "ADD_PASSKEY": "Add passkey", + "ENTER_PASSKEY_NAME": "Enter passkey name", + "PASSKEYS_DESCRIPTION": "Passkeys are a modern and secure second-factor for your Ente account. They use on-device biometric authentication for convenience and security.", + "CREATED_AT": "Created at", + "PASSKEY_LOGIN_FAILED": "Passkey login failed", + "PASSKEY_LOGIN_URL_INVALID": "The login URL is invalid.", + "PASSKEY_LOGIN_ERRORED": "An error occurred while logging in with passkey.", + "TRY_AGAIN": "Try again", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "Follow the steps from your browser to continue logging in.", + "LOGIN_WITH_PASSKEY": "Login with passkey" } diff --git a/web/apps/photos/public/locales/es-ES/translation.json b/web/apps/photos/public/locales/es-ES/translation.json index 64c2849eb..a29165e4e 100644 --- a/web/apps/photos/public/locales/es-ES/translation.json +++ b/web/apps/photos/public/locales/es-ES/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/fa-IR/translation.json b/web/apps/photos/public/locales/fa-IR/translation.json index 68e1da3b9..2d21fcb3d 100644 --- a/web/apps/photos/public/locales/fa-IR/translation.json +++ b/web/apps/photos/public/locales/fa-IR/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/fi-FI/translation.json b/web/apps/photos/public/locales/fi-FI/translation.json index fbc0b937a..888ed7093 100644 --- a/web/apps/photos/public/locales/fi-FI/translation.json +++ b/web/apps/photos/public/locales/fi-FI/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/fr-FR/translation.json b/web/apps/photos/public/locales/fr-FR/translation.json index 2d183c9eb..43d959069 100644 --- a/web/apps/photos/public/locales/fr-FR/translation.json +++ b/web/apps/photos/public/locales/fr-FR/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "Visitez cast.ente.io sur l'appareil que vous voulez associer.", "CAST_AUTO_PAIR_FAILED": "La paire automatique de Chromecast a échoué. Veuillez réessayer.", "CACHE_DIRECTORY": "Dossier du cache", - "PASSKEYS": "Clés d'accès", "FREEHAND": "Main levée", "APPLY_CROP": "Appliquer le recadrage", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "Au moins une transformation ou un ajustement de couleur doit être effectué avant de sauvegarder." + "PHOTO_EDIT_REQUIRED_TO_SAVE": "Au moins une transformation ou un ajustement de couleur doit être effectué avant de sauvegarder.", + "PASSKEYS": "Clés d'accès", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/it-IT/translation.json b/web/apps/photos/public/locales/it-IT/translation.json index dd7afc158..ae450e5fe 100644 --- a/web/apps/photos/public/locales/it-IT/translation.json +++ b/web/apps/photos/public/locales/it-IT/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/ko-KR/translation.json b/web/apps/photos/public/locales/ko-KR/translation.json index 754fef892..4fbe6c077 100644 --- a/web/apps/photos/public/locales/ko-KR/translation.json +++ b/web/apps/photos/public/locales/ko-KR/translation.json @@ -2,80 +2,80 @@ "HERO_SLIDE_1_TITLE": "추억을 안전하게 백업하세요", "HERO_SLIDE_1": "종단간 암호화가 기본지원입니다", "HERO_SLIDE_2_TITLE": "낙진대피소에 안전하게 보관됩니다", - "HERO_SLIDE_2": "", - "HERO_SLIDE_3_TITLE": "", - "HERO_SLIDE_3": "", - "LOGIN": "", - "SIGN_UP": "", - "NEW_USER": "", - "EXISTING_USER": "", - "ENTER_NAME": "", - "PUBLIC_UPLOADER_NAME_MESSAGE": "", - "ENTER_EMAIL": "", - "EMAIL_ERROR": "", - "REQUIRED": "", - "EMAIL_SENT": "", - "CHECK_INBOX": "", - "ENTER_OTT": "", - "RESEND_MAIL": "", - "VERIFY": "", - "UNKNOWN_ERROR": "", - "INVALID_CODE": "", - "EXPIRED_CODE": "", - "SENDING": "", - "SENT": "", - "PASSWORD": "", - "LINK_PASSWORD": "", - "RETURN_PASSPHRASE_HINT": "", - "SET_PASSPHRASE": "", - "VERIFY_PASSPHRASE": "", - "INCORRECT_PASSPHRASE": "", - "ENTER_ENC_PASSPHRASE": "", - "PASSPHRASE_DISCLAIMER": "", - "WELCOME_TO_ENTE_HEADING": "", - "WELCOME_TO_ENTE_SUBHEADING": "", - "WHERE_YOUR_BEST_PHOTOS_LIVE": "", - "KEY_GENERATION_IN_PROGRESS_MESSAGE": "", - "PASSPHRASE_HINT": "", - "CONFIRM_PASSPHRASE": "", - "REFERRAL_CODE_HINT": "", - "REFERRAL_INFO": "", - "PASSPHRASE_MATCH_ERROR": "", - "CREATE_COLLECTION": "", - "ENTER_ALBUM_NAME": "", - "CLOSE_OPTION": "", - "ENTER_FILE_NAME": "", - "CLOSE": "", - "NO": "", - "NOTHING_HERE": "", - "UPLOAD": "", - "IMPORT": "", - "ADD_PHOTOS": "", - "ADD_MORE_PHOTOS": "", - "add_photos_one": "", - "add_photos_other": "", - "SELECT_PHOTOS": "", - "FILE_UPLOAD": "", + "HERO_SLIDE_2": "오랫동안 보존할 수 있도록한 설계", + "HERO_SLIDE_3_TITLE": "
어디에서나
이용가능
", + "HERO_SLIDE_3": "안드로이드, iOS, 웹, 데스크탑", + "LOGIN": "로그인", + "SIGN_UP": "회원가입", + "NEW_USER": "ente의 새소식", + "EXISTING_USER": "기존 사용자", + "ENTER_NAME": "이름 입력", + "PUBLIC_UPLOADER_NAME_MESSAGE": "친구들이 이 멋진 사진에 대해 고마워할 수 있도록 이름을 추가하세요!", + "ENTER_EMAIL": "이메일 주소를 입력하세요", + "EMAIL_ERROR": "올바른 이메일을 입력하세요", + "REQUIRED": "필수", + "EMAIL_SENT": "{{email}} 로 인증 코드가 전송되었습니다", + "CHECK_INBOX": "인증을 완료하기 위해 당신의 메일 수신함(그리고 스팸 수신함)을 확인하세요.", + "ENTER_OTT": "인증 코드", + "RESEND_MAIL": "코드 재전송하기", + "VERIFY": "인증", + "UNKNOWN_ERROR": "문제가 생긴 것 같아요. 다시 시도하세요", + "INVALID_CODE": "잘못된 인증 코드", + "EXPIRED_CODE": "입력한 인증 코드가 만료되었습니다", + "SENDING": "전송 중...", + "SENT": "발송 완료!", + "PASSWORD": "비밀번호", + "LINK_PASSWORD": "앨범 잠금해제를 위해 비밀번호를 입력하세요", + "RETURN_PASSPHRASE_HINT": "비밀번호", + "SET_PASSPHRASE": "비밀번호 설정", + "VERIFY_PASSPHRASE": "로그인", + "INCORRECT_PASSPHRASE": "잘못된 비밀번호입니다", + "ENTER_ENC_PASSPHRASE": "당신의 데이터를 암호화하는 데 사용할 수 있는 비밀번호를 입력하세요", + "PASSPHRASE_DISCLAIMER": "우리는 귀하의 비밀번호를 저장하지 않습니다. 만약 비밀번호를 잊어버린 경우 복구 키 없다면 데이터 복구를 도와드릴 수 없습니다.", + "WELCOME_TO_ENTE_HEADING": "환영합니다 ", + "WELCOME_TO_ENTE_SUBHEADING": "End-to-End 암호화된 사진 저장 및 공유", + "WHERE_YOUR_BEST_PHOTOS_LIVE": "당신 최고의 사진이 있는 곳", + "KEY_GENERATION_IN_PROGRESS_MESSAGE": "암호 키 생성 중...", + "PASSPHRASE_HINT": "비밀번호", + "CONFIRM_PASSPHRASE": "비밀번호 확인", + "REFERRAL_CODE_HINT": "어떻게 Ente에 대해 들으셨나요? (선택사항)", + "REFERRAL_INFO": "우리는 앱 설치를 추적하지 않습니다. 우리를 알게 된 곳을 남겨주시면 우리에게 도움이 될꺼에요!", + "PASSPHRASE_MATCH_ERROR": "비밀번호가 일치하지 않습니다", + "CREATE_COLLECTION": "새 앨범", + "ENTER_ALBUM_NAME": "앨범 이름", + "CLOSE_OPTION": "닫기 (Esc)", + "ENTER_FILE_NAME": "파일 이름", + "CLOSE": "닫기", + "NO": "아니오", + "NOTHING_HERE": "아직 볼 수 있는 것이 없어요 👀", + "UPLOAD": "업로드", + "IMPORT": "가져오기", + "ADD_PHOTOS": "사진 추가", + "ADD_MORE_PHOTOS": "사진 더 추가하기", + "add_photos_one": "아이템 하나 추가", + "add_photos_other": "아이템 {{count, number}} 개 추가하기", + "SELECT_PHOTOS": "사진 선택하기", + "FILE_UPLOAD": "파일 업로드", "UPLOAD_STAGE_MESSAGE": { - "0": "", - "1": "", - "2": "", - "3": "", - "4": "", - "5": "" + "0": "업로드 준비중", + "1": "구글 메타데이타 파일들 읽는중", + "2": "{{uploadCounter.finished, number}} / {{uploadCounter.total, number}} 파일 메타데이터가 추출되었습니다", + "3": "{{uploadCounter.finished, number}} / {{uploadCounter.total, number}} 파일이 처리되었습니다", + "4": "남은 업로드 취소중", + "5": "백업 완료" }, - "FILE_NOT_UPLOADED_LIST": "", - "SUBSCRIPTION_EXPIRED": "", - "SUBSCRIPTION_EXPIRED_MESSAGE": "", - "STORAGE_QUOTA_EXCEEDED": "", - "INITIAL_LOAD_DELAY_WARNING": "", - "USER_DOES_NOT_EXIST": "", - "NO_ACCOUNT": "", - "ACCOUNT_EXISTS": "", - "CREATE": "", - "DOWNLOAD": "", - "DOWNLOAD_OPTION": "", - "DOWNLOAD_FAVORITES": "", + "FILE_NOT_UPLOADED_LIST": "아래 파일들은 업로드 되지 않았습니다", + "SUBSCRIPTION_EXPIRED": "구독 만료", + "SUBSCRIPTION_EXPIRED_MESSAGE": "당신 구독이 만료되었으니, 구독을 갱신해주세요", + "STORAGE_QUOTA_EXCEEDED": "스토리지 제한이 초과되었습니다", + "INITIAL_LOAD_DELAY_WARNING": "처음 로딩시 다소 시간이 걸릴 수 있습니다", + "USER_DOES_NOT_EXIST": "죄송합니다. 해당 이메일을 사용하는 사용자를 찾을 수 없습니다", + "NO_ACCOUNT": "계정이 없습니다", + "ACCOUNT_EXISTS": "이미 계정이 있습니다", + "CREATE": "만들기", + "DOWNLOAD": "다운로드", + "DOWNLOAD_OPTION": "다운로드 (D)", + "DOWNLOAD_FAVORITES": "즐겨찾기 다운로드", "DOWNLOAD_UNCATEGORIZED": "", "DOWNLOAD_HIDDEN_ITEMS": "", "COPY_OPTION": "", @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/nl-NL/translation.json b/web/apps/photos/public/locales/nl-NL/translation.json index 2b2aa1111..15d9bfdba 100644 --- a/web/apps/photos/public/locales/nl-NL/translation.json +++ b/web/apps/photos/public/locales/nl-NL/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "Cache map", - "PASSKEYS": "", "FREEHAND": "Losse hand", "APPLY_CROP": "Bijsnijden toepassen", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "Tenminste één transformatie of kleuraanpassing moet worden uitgevoerd voordat u opslaat." + "PHOTO_EDIT_REQUIRED_TO_SAVE": "Tenminste één transformatie of kleuraanpassing moet worden uitgevoerd voordat u opslaat.", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/pt-BR/translation.json b/web/apps/photos/public/locales/pt-BR/translation.json index 4eaa398c4..0da001742 100644 --- a/web/apps/photos/public/locales/pt-BR/translation.json +++ b/web/apps/photos/public/locales/pt-BR/translation.json @@ -8,7 +8,7 @@ "LOGIN": "Entrar", "SIGN_UP": "Registrar", "NEW_USER": "Novo no ente", - "EXISTING_USER": "Utilizador existente", + "EXISTING_USER": "Usuário existente", "ENTER_NAME": "Insira o nome", "PUBLIC_UPLOADER_NAME_MESSAGE": "Adicione um nome para que os seus amigos saibam a quem agradecer por estas ótimas fotos!", "ENTER_EMAIL": "Insira o endereço de e-mail", @@ -227,7 +227,7 @@ "INDEXING_SCHEDULED": "Indexação está programada...", "ANALYZING_PHOTOS": "Indexando fotos ({{indexStatus.nSyncedFiles,number}} / {{indexStatus.nTotalFiles,number}})", "INDEXING_PEOPLE": "Indexando pessoas em {{indexStatus.nSyncedFiles,number}} fotos...", - "INDEXING_DONE": "", + "INDEXING_DONE": "Foram indexadas {{indexStatus.nSyncedFiles,number}} fotos", "UNIDENTIFIED_FACES": "rostos não identificados", "OBJECTS": "objetos", "TEXT": "texto", @@ -347,15 +347,15 @@ "REPLACE_THUMBNAIL_NOOP": "Você não tem nenhuma miniatura que possa ser compactadas mais", "REPLACE_THUMBNAIL_COMPLETED_WITH_ERROR": "Não foi possível compactar algumas das suas miniaturas, por favor tente novamente", "FIX_CREATION_TIME": "Corrigir hora", - "FIX_CREATION_TIME_IN_PROGRESS": "", - "CREATION_TIME_UPDATED": "", + "FIX_CREATION_TIME_IN_PROGRESS": "Corrigindo horário", + "CREATION_TIME_UPDATED": "Hora do arquivo atualizado", "UPDATE_CREATION_TIME_NOT_STARTED": "Selecione a carteira que você deseja usar", "UPDATE_CREATION_TIME_COMPLETED": "Todos os arquivos atualizados com sucesso", - "UPDATE_CREATION_TIME_COMPLETED_WITH_ERROR": "", + "UPDATE_CREATION_TIME_COMPLETED_WITH_ERROR": "A atualização do horário falhou para alguns arquivos, por favor, tente novamente", "CAPTION_CHARACTER_LIMIT": "5000 caracteres no máximo", - "DATE_TIME_ORIGINAL": "", - "DATE_TIME_DIGITIZED": "", - "METADATA_DATE": "", + "DATE_TIME_ORIGINAL": "Data e Hora Original", + "DATE_TIME_DIGITIZED": "Data e Hora Digitalizada", + "METADATA_DATE": "Data de Metadados", "CUSTOM_TIME": "Tempo personalizado", "REOPEN_PLAN_SELECTOR_MODAL": "Reabrir planos", "OPEN_PLAN_SELECTOR_MODAL_FAILED": "Falha ao abrir planos", @@ -408,7 +408,7 @@ "SHARED_USING": "Compartilhar usando ", "ENTE_IO": "ente.io", "SHARING_REFERRAL_CODE": "Use o código {{referralCode}} para obter 10 GB de graça", - "LIVE": "", + "LIVE": "AO VIVO", "DISABLE_PASSWORD": "Desativar bloqueio por senha", "DISABLE_PASSWORD_MESSAGE": "Tem certeza que deseja desativar o bloqueio por senha?", "PASSWORD_LOCK": "Bloqueio de senha", @@ -506,8 +506,8 @@ "DISABLE_FACE_SEARCH_DESCRIPTION": "

Ente irá parar de processar geometria facial.

Você pode reativar o reconhecimento facial novamente, se desejar, então esta operação está segura.

", "ADVANCED": "Avançado", "FACE_SEARCH_CONFIRMATION": "Eu entendo, e desejo permitir que o ente processe a geometria do rosto", - "LABS": "", - "YOURS": "", + "LABS": "Laboratórios", + "YOURS": "seu", "PASSPHRASE_STRENGTH_WEAK": "Força da senha: fraca", "PASSPHRASE_STRENGTH_MODERATE": "Força da senha: moderada", "PASSPHRASE_STRENGTH_STRONG": "Força da senha: forte", @@ -570,7 +570,7 @@ "FEEDBACK_REQUIRED": "Por favor, ajude-nos com esta informação", "FEEDBACK_REQUIRED_FOUND_ANOTHER_SERVICE": "O que o outro serviço faz melhor?", "RECOVER_TWO_FACTOR": "Recuperar dois fatores", - "at": "", + "at": "em", "AUTH_NEXT": "próximo", "AUTH_DOWNLOAD_MOBILE_APP": "Baixe nosso aplicativo móvel para gerenciar seus segredos", "HIDDEN": "Escondido", @@ -604,7 +604,7 @@ "BLUR": "Desfoque", "INVERT_COLORS": "Inverter Cores", "ASPECT_RATIO": "Proporção da imagem", - "SQUARE": "", + "SQUARE": "Quadrado", "ROTATE_LEFT": "Girar para a Esquerda", "ROTATE_RIGHT": "Girar para a Direita", "FLIP_VERTICALLY": "Inverter verticalmente", @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "Acesse cast.ente.io no dispositivo que você deseja parear.", "CAST_AUTO_PAIR_FAILED": "Chromecast Auto Pair falhou. Por favor, tente novamente.", "CACHE_DIRECTORY": "Pasta de Cache", - "PASSKEYS": "", - "FREEHAND": "", + "FREEHAND": "Mão livre", "APPLY_CROP": "Aplicar Recorte", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "Pelo menos uma transformação ou ajuste de cor deve ser feito antes de salvar." + "PHOTO_EDIT_REQUIRED_TO_SAVE": "Pelo menos uma transformação ou ajuste de cor deve ser feito antes de salvar.", + "PASSKEYS": "Chaves de acesso", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/pt-PT/translation.json b/web/apps/photos/public/locales/pt-PT/translation.json index ac7d17968..230980326 100644 --- a/web/apps/photos/public/locales/pt-PT/translation.json +++ b/web/apps/photos/public/locales/pt-PT/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/ru-RU/translation.json b/web/apps/photos/public/locales/ru-RU/translation.json index 0e9715563..c85db2236 100644 --- a/web/apps/photos/public/locales/ru-RU/translation.json +++ b/web/apps/photos/public/locales/ru-RU/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/sv-SE/translation.json b/web/apps/photos/public/locales/sv-SE/translation.json index 550780b44..f88535795 100644 --- a/web/apps/photos/public/locales/sv-SE/translation.json +++ b/web/apps/photos/public/locales/sv-SE/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/th-TH/translation.json b/web/apps/photos/public/locales/th-TH/translation.json index fbc0b937a..888ed7093 100644 --- a/web/apps/photos/public/locales/th-TH/translation.json +++ b/web/apps/photos/public/locales/th-TH/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/tr-TR/translation.json b/web/apps/photos/public/locales/tr-TR/translation.json index fbc0b937a..888ed7093 100644 --- a/web/apps/photos/public/locales/tr-TR/translation.json +++ b/web/apps/photos/public/locales/tr-TR/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "", "CAST_AUTO_PAIR_FAILED": "", "CACHE_DIRECTORY": "", - "PASSKEYS": "", "FREEHAND": "", "APPLY_CROP": "", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "", + "PASSKEYS": "", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/public/locales/zh-CN/translation.json b/web/apps/photos/public/locales/zh-CN/translation.json index 6e513f24b..0a72e1c70 100644 --- a/web/apps/photos/public/locales/zh-CN/translation.json +++ b/web/apps/photos/public/locales/zh-CN/translation.json @@ -634,8 +634,21 @@ "VISIT_CAST_ENTE_IO": "在您要配对的设备上访问 cast.ente.io 。", "CAST_AUTO_PAIR_FAILED": "Chromecast 自动配对失败。请再试一次。", "CACHE_DIRECTORY": "缓存文件夹", - "PASSKEYS": "通行密钥", "FREEHAND": "手画", "APPLY_CROP": "应用裁剪", - "PHOTO_EDIT_REQUIRED_TO_SAVE": "保存之前必须至少执行一项转换或颜色调整。" + "PHOTO_EDIT_REQUIRED_TO_SAVE": "保存之前必须至少执行一项转换或颜色调整。", + "PASSKEYS": "通行密钥", + "DELETE_PASSKEY": "", + "DELETE_PASSKEY_CONFIRMATION": "", + "RENAME_PASSKEY": "", + "ADD_PASSKEY": "", + "ENTER_PASSKEY_NAME": "", + "PASSKEYS_DESCRIPTION": "", + "CREATED_AT": "", + "PASSKEY_LOGIN_FAILED": "", + "PASSKEY_LOGIN_URL_INVALID": "", + "PASSKEY_LOGIN_ERRORED": "", + "TRY_AGAIN": "", + "PASSKEY_FOLLOW_THE_STEPS_FROM_YOUR_BROWSER": "", + "LOGIN_WITH_PASSKEY": "" } diff --git a/web/apps/photos/src/components/PhotoList/index.tsx b/web/apps/photos/src/components/PhotoList/index.tsx index 3eee1d683..e6d955cda 100644 --- a/web/apps/photos/src/components/PhotoList/index.tsx +++ b/web/apps/photos/src/components/PhotoList/index.tsx @@ -780,23 +780,28 @@ export function PhotoList({ listItem: TimeStampListItem, isScrolling: boolean, ) => { + // Enhancement: This logic doesn't work on the shared album screen, the + // galleryContext.selectedFile is always null there. + const haveSelection = (galleryContext.selectedFile?.count ?? 0) > 0; switch (listItem.itemType) { case ITEM_TYPE.TIME: return listItem.dates ? ( listItem.dates .map((item) => [ - - onChangeSelectAllCheckBox(item.date) - } - size="small" - sx={{ pl: 0 }} - disableRipple={true} - /> + {haveSelection && ( + + onChangeSelectAllCheckBox(item.date) + } + size="small" + sx={{ pl: 0 }} + disableRipple={true} + /> + )} {item.date} ,
, @@ -804,17 +809,19 @@ export function PhotoList({ .flat() ) : ( - - onChangeSelectAllCheckBox(listItem.date) - } - size="small" - sx={{ pl: 0 }} - disableRipple={true} - /> + {haveSelection && ( + + onChangeSelectAllCheckBox(listItem.date) + } + size="small" + sx={{ pl: 0 }} + disableRipple={true} + /> + )} {listItem.date} ); diff --git a/web/apps/photos/src/components/PhotoViewer/index.tsx b/web/apps/photos/src/components/PhotoViewer/index.tsx index 702542172..425290023 100644 --- a/web/apps/photos/src/components/PhotoViewer/index.tsx +++ b/web/apps/photos/src/components/PhotoViewer/index.tsx @@ -178,6 +178,14 @@ function PhotoViewer(props: Iprops) { switch (event.key) { case "i": case "I": + // Enhancement: This should be calling handleOpenInfo, but + // that handling the case where a keybinding triggers an + // exit from fullscreen and opening the info drawer is not + // currently working (the info drawer opens, but the exit + // from fullscreen doesn't happen). + // + // So for now, let the keybinding only work when not in + // fullscreen instead of doing a mish-mash. setShowInfo(true); break; case "Backspace": @@ -616,7 +624,18 @@ function PhotoViewer(props: Iprops) { const handleCloseInfo = () => { setShowInfo(false); }; - const handleOpenInfo = () => { + + const handleOpenInfo = (photoSwipe: any) => { + // Get out of full screen mode if needed first to be able to show info + if (isInFullScreenMode) { + const fullScreenApi: PhotoswipeFullscreenAPI = + photoSwipe?.ui?.getFullscreenAPI(); + if (fullScreenApi && fullScreenApi.isFullscreen()) { + fullScreenApi.exit(); + setIsInFullScreenMode(false); + } + } + setShowInfo(true); }; @@ -851,7 +870,7 @@ function PhotoViewer(props: Iprops) { diff --git a/web/apps/photos/src/components/Sidebar/UtilitySection.tsx b/web/apps/photos/src/components/Sidebar/UtilitySection.tsx index bf9782e3b..b297f36ee 100644 --- a/web/apps/photos/src/components/Sidebar/UtilitySection.tsx +++ b/web/apps/photos/src/components/Sidebar/UtilitySection.tsx @@ -11,8 +11,17 @@ import TwoFactorModal from "components/TwoFactor/Modal"; import { useRouter } from "next/router"; import { AppContext } from "pages/_app"; // import mlIDbStorage from 'utils/storage/mlIDbStorage'; +import { + configurePasskeyRecovery, + isPasskeyRecoveryEnabled, +} from "@ente/accounts/services/passkey"; import { APPS, CLIENT_PACKAGE_NAMES } from "@ente/shared/apps/constants"; import ThemeSwitcher from "@ente/shared/components/ThemeSwitcher"; +import { getRecoveryKey } from "@ente/shared/crypto/helpers"; +import { + encryptToB64, + generateEncryptionKey, +} from "@ente/shared/crypto/internal/libsodium"; import { getAccountsURL } from "@ente/shared/network/api"; import { logError } from "@ente/shared/sentry"; import { THEME_COLOR } from "@ente/shared/themes/constants"; @@ -72,13 +81,35 @@ export default function UtilitySection({ closeSidebar }) { closeSidebar(); try { + // check if the user has passkey recovery enabled + const recoveryEnabled = await isPasskeyRecoveryEnabled(); + if (!recoveryEnabled) { + // let's create the necessary recovery information + const recoveryKey = await getRecoveryKey(); + + const resetSecret = await generateEncryptionKey(); + + const encryptionResult = await encryptToB64( + resetSecret, + recoveryKey, + ); + + await configurePasskeyRecovery( + resetSecret, + encryptionResult.encryptedData, + encryptionResult.nonce, + ); + } + const accountsToken = await getAccountsToken(); - window.location.href = `${getAccountsURL()}${ - ACCOUNTS_PAGES.ACCOUNT_HANDOFF - }?package=${CLIENT_PACKAGE_NAMES.get( - APPS.PHOTOS, - )}&token=${accountsToken}`; + window.open( + `${getAccountsURL()}${ + ACCOUNTS_PAGES.ACCOUNT_HANDOFF + }?package=${CLIENT_PACKAGE_NAMES.get( + APPS.PHOTOS, + )}&token=${accountsToken}`, + ); } catch (e) { logError(e, "failed to redirect to accounts page"); } diff --git a/web/packages/accounts/api/user.ts b/web/packages/accounts/api/user.ts index def8fa8c4..0aa534306 100644 --- a/web/packages/accounts/api/user.ts +++ b/web/packages/accounts/api/user.ts @@ -15,6 +15,7 @@ import { logError } from "@ente/shared/sentry"; import { getToken } from "@ente/shared/storage/localStorage/helpers"; import { KeyAttributes } from "@ente/shared/user/types"; import { HttpStatusCode } from "axios"; +import { TwoFactorType } from "../constants/twofactor"; const ENDPOINT = getEndpoint(); @@ -79,17 +80,26 @@ export const verifyTwoFactor = async (code: string, sessionID: string) => { return resp.data as UserVerificationResponse; }; -export const recoverTwoFactor = async (sessionID: string) => { +export const recoverTwoFactor = async ( + sessionID: string, + twoFactorType: TwoFactorType = TwoFactorType.TOTP, +) => { const resp = await HTTPService.get(`${ENDPOINT}/users/two-factor/recover`, { sessionID, + twoFactorType, }); return resp.data as TwoFactorRecoveryResponse; }; -export const removeTwoFactor = async (sessionID: string, secret: string) => { +export const removeTwoFactor = async ( + sessionID: string, + secret: string, + twoFactorType: TwoFactorType = TwoFactorType.TOTP, +) => { const resp = await HTTPService.post(`${ENDPOINT}/users/two-factor/remove`, { sessionID, secret, + twoFactorType, }); return resp.data as TwoFactorVerificationResponse; }; diff --git a/web/packages/accounts/constants/twofactor.ts b/web/packages/accounts/constants/twofactor.ts new file mode 100644 index 000000000..92b10730d --- /dev/null +++ b/web/packages/accounts/constants/twofactor.ts @@ -0,0 +1,4 @@ +export enum TwoFactorType { + PASSKEY = "passkey", + TOTP = "totp", +} diff --git a/web/packages/accounts/pages/two-factor/recover.tsx b/web/packages/accounts/pages/two-factor/recover.tsx index 67bd709e1..fcaf05eab 100644 --- a/web/packages/accounts/pages/two-factor/recover.tsx +++ b/web/packages/accounts/pages/two-factor/recover.tsx @@ -8,6 +8,7 @@ import { useEffect, useState } from "react"; import { recoverTwoFactor, removeTwoFactor } from "@ente/accounts/api/user"; import { PAGES } from "@ente/accounts/constants/pages"; +import { TwoFactorType } from "@ente/accounts/constants/twofactor"; import { logoutUser } from "@ente/accounts/services/user"; import { PageProps } from "@ente/shared/apps/types"; import { DialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types"; @@ -28,7 +29,11 @@ const bip39 = require("bip39"); // mobile client library only supports english. bip39.setDefaultWordlist("english"); -export default function Recover({ router, appContext }: PageProps) { +export default function Recover({ + router, + appContext, + twoFactorType = TwoFactorType.TOTP, +}: PageProps) { const [encryptedTwoFactorSecret, setEncryptedTwoFactorSecret] = useState(null); const [sessionID, setSessionID] = useState(null); @@ -49,7 +54,10 @@ export default function Recover({ router, appContext }: PageProps) { } const main = async () => { try { - const resp = await recoverTwoFactor(user.twoFactorSessionID); + const resp = await recoverTwoFactor( + user.twoFactorSessionID, + twoFactorType, + ); setDoesHaveEncryptedRecoveryKey(!!resp.encryptedSecret); if (!resp.encryptedSecret) { showContactSupportDialog({ @@ -106,7 +114,11 @@ export default function Recover({ router, appContext }: PageProps) { encryptedTwoFactorSecret.nonce, await cryptoWorker.fromHex(recoveryKey), ); - const resp = await removeTwoFactor(sessionID, twoFactorSecret); + const resp = await removeTwoFactor( + sessionID, + twoFactorSecret, + twoFactorType, + ); const { keyAttributes, encryptedToken, token, id } = resp; setData(LS_KEYS.USER, { ...getData(LS_KEYS.USER), diff --git a/web/packages/accounts/services/passkey.ts b/web/packages/accounts/services/passkey.ts new file mode 100644 index 000000000..89a9ae61a --- /dev/null +++ b/web/packages/accounts/services/passkey.ts @@ -0,0 +1,56 @@ +import { CustomError } from "@ente/shared/error"; +import HTTPService from "@ente/shared/network/HTTPService"; +import { logError } from "@ente/shared/sentry"; +import { getToken } from "@ente/shared/storage/localStorage/helpers"; + +export const isPasskeyRecoveryEnabled = async () => { + try { + const token = getToken(); + + const resp = await HTTPService.get( + "/users/two-factor/recovery-status", + {}, + { + "X-Auth-Token": token, + }, + ); + + if (typeof resp.data === "undefined") { + throw Error(CustomError.REQUEST_FAILED); + } + + return resp.data["isPasskeyRecoveryEnabled"] as boolean; + } catch (e) { + logError(e, "failed to get passkey recovery status"); + throw e; + } +}; + +export const configurePasskeyRecovery = async ( + secret: string, + userEncryptedSecret: string, + userSecretNonce: string, +) => { + try { + const token = getToken(); + + const resp = await HTTPService.post( + "/users/two-factor/passkeys/configure-recovery", + { + secret, + userEncryptedSecret, + userSecretNonce, + }, + { + "X-Auth-Token": token, + }, + ); + + if (typeof resp.data === "undefined") { + throw Error(CustomError.REQUEST_FAILED); + } + } catch (e) { + logError(e, "failed to configure passkey recovery"); + throw e; + } +}; diff --git a/web/packages/shared/apps/types.ts b/web/packages/shared/apps/types.ts index da5451311..364342516 100644 --- a/web/packages/shared/apps/types.ts +++ b/web/packages/shared/apps/types.ts @@ -1,4 +1,5 @@ import { EmotionCache } from "@emotion/react"; +import { TwoFactorType } from "@ente/accounts/constants/twofactor"; import { SetDialogBoxAttributesV2 } from "@ente/shared/components/DialogBoxV2/types"; import { AppProps } from "next/app"; import { NextRouter } from "next/router"; @@ -16,4 +17,5 @@ export interface PageProps { }; router: NextRouter; appName: APPS; + twoFactorType?: TwoFactorType; } diff --git a/web/yarn.lock b/web/yarn.lock index 2f5cbb105..4e31afe7e 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -1979,11 +1979,7 @@ fastq@^1.6.0: reusify "^1.0.4" "ffmpeg-wasm@file:./apps/photos/thirdparty/ffmpeg-wasm": - version "0.10.1" - dependencies: - is-url "^1.2.4" - node-fetch "^2.6.1" - regenerator-runtime "^0.13.7" + version "0.0.0" file-entry-cache@^6.0.1: version "6.0.1" @@ -2618,11 +2614,6 @@ is-typed-array@^1.1.13: dependencies: which-typed-array "^1.1.14" -is-url@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52" - integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww== - is-weakmap@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" @@ -3253,7 +3244,7 @@ peek-readable@^4.1.0: integrity sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg== "photoswipe@file:./apps/photos/thirdparty/photoswipe": - version "4.1.6" + version "0.0.0" picocolors@^1.0.0: version "1.0.0" @@ -3585,11 +3576,6 @@ reflect.getprototypeof@^1.0.4: globalthis "^1.0.3" which-builtin-type "^1.1.3" -regenerator-runtime@^0.13.7: - version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" - integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== - regenerator-runtime@^0.14.0: version "0.14.1" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" @@ -4201,7 +4187,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -uuid@^9.0.0: +uuid@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==