Merge remote-tracking branch 'origin/auth-login-and-2fa-login' into auth-recover-password
# Conflicts: # modules/auth/lib/src/core/data/datasource/auth_remote_datasource.dart # modules/auth/lib/src/core/data/datasource/auth_remote_datasource_impl.dart # modules/auth/lib/src/core/data/repositories/auth_repository_impl.dart # modules/auth/lib/src/core/domain/repositories/auth_repository.dart # modules/auth/lib/src/features/recover_password/presentation/new_password_screen.dart # modules/auth/lib/src/features/recover_password/presentation/restore_password_screen.dart # packages/design_system/lib/src/inputs/textfields.dart # packages/sf_localizations/assets/l10n/de.json # packages/sf_localizations/assets/l10n/en.json # packages/sf_localizations/assets/l10n/es.json # packages/sf_localizations/assets/l10n/fr.json # packages/sf_localizations/assets/l10n/it.json # packages/sf_localizations/assets/l10n/pt.json # packages/sf_localizations/lib/src/generated/i18n.dart
This commit is contained in:
@@ -21,6 +21,17 @@
|
||||
"enter": "Enter",
|
||||
"didNotReceiveIt": "Didn't receive it?",
|
||||
"tryAgain": "Try again",
|
||||
"welcome": "Welcome!",
|
||||
"username": "Username",
|
||||
"password": "Password",
|
||||
"forgotPassword": "Forgot your password?",
|
||||
"signIn": "Sign in",
|
||||
"orContinueWith": "or continue with",
|
||||
"google": "Google",
|
||||
"apple": "Apple",
|
||||
"dontHaveAccount": "Don't have an account?",
|
||||
"createOneNow": "Create one now",
|
||||
"tryAgain": "Try again",
|
||||
"recoverPasswordTitle": "Recover password",
|
||||
"recoverPasswordSubtitle": "Insert your email to send you a recovery link",
|
||||
"send": "Send",
|
||||
|
||||
Reference in New Issue
Block a user