From aa143c12fbd04f6a9fbf7caf37a3e1c8b6ceb094 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 9 Dec 2022 10:27:45 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle.kts | 1 + .../tap/common/feedback/FeedbackData.kt | 4 +- .../details/ui/details/DetailsScreenState.kt | 2 +- .../details/ui/resetcard/ResetCardScreen.kt | 3 +- .../saltPay/ui/OnboardingSaltPayView.kt | 2 +- .../ui/components/SaveWalletScreenContent.kt | 7 +- .../WallectSelectorScreenContent.kt | 5 +- .../ui/components/WelcomeScreenContent.kt | 10 +- app/src/main/res/values-de/strings.xml | 5 - .../main/res/values-de/strings_blockchain.xml | 2 - app/src/main/res/values-fr/strings.xml | 5 - .../main/res/values-fr/strings_blockchain.xml | 1 - app/src/main/res/values-it/strings.xml | 5 - .../main/res/values-it/strings_blockchain.xml | 1 - app/src/main/res/values-ru/strings.xml | 28 +--- .../main/res/values-ru/strings_blockchain.xml | 2 - app/src/main/res/values/strings.xml | 7 - .../main/res/values/strings_blockchain.xml | 2 - .../main/res/values/strings_untranslated.xml | 19 --- core/res/.gitignore | 1 + core/res/build.gradle.kts | 21 +++ core/res/src/main/AndroidManifest.xml | 2 + .../src/main/res/values-de}/strings_final.xml | 132 +++++++++++----- .../res/values-de/strings_plurals_final.xml | 5 + .../src/main/res/values-fr}/strings_final.xml | 121 ++++++++++++--- .../res/values-fr}/strings_plurals_final.xml | 6 + .../src/main/res/values-it}/strings_final.xml | 121 ++++++++++++--- .../res/values-it}/strings_plurals_final.xml | 7 +- .../src/main/res/values-ru/strings_final.xml | 141 ++++++++++++------ .../res/values-ru/strings_plurals_final.xml | 7 + .../src/main/res/values}/strings_final.xml | 127 +++++++++++++--- .../main/res/values/strings_plurals_final.xml | 5 + core/ui/build.gradle.kts | 2 + .../ui/src/main/res/values-de/strings-app.xml | 6 + .../ui/src/main/res/values-fr/strings-app.xml | 6 + .../ui/src/main/res/values-it/strings-app.xml | 6 + .../src/main/res/values-ru/string_common.xml | 6 - .../ui/src/main/res/values-ru/strings-app.xml | 6 + core/ui/src/main/res/values/string_common.xml | 6 - core/ui/src/main/res/values/strings-app.xml | 6 + .../referral/presentation/build.gradle.kts | 1 + .../referral/ui/ParticipateBottomBlock.kt | 10 +- .../src/main/res/values-ru/string.xml | 25 ---- .../src/main/res/values/strings.xml | 25 ---- settings.gradle.kts | 1 + 45 files changed, 613 insertions(+), 300 deletions(-) create mode 100644 core/res/.gitignore create mode 100644 core/res/build.gradle.kts create mode 100644 core/res/src/main/AndroidManifest.xml rename core/{ui/src/main/res/values => res/src/main/res/values-de}/strings_final.xml (69%) rename core/{ui => res}/src/main/res/values-de/strings_plurals_final.xml (65%) rename core/{ui/src/main/res/values-it => res/src/main/res/values-fr}/strings_final.xml (62%) rename core/{ui/src/main/res/values-it => res/src/main/res/values-fr}/strings_plurals_final.xml (65%) rename core/{ui/src/main/res/values-de => res/src/main/res/values-it}/strings_final.xml (62%) rename core/{ui/src/main/res/values-fr => res/src/main/res/values-it}/strings_plurals_final.xml (65%) rename core/{ui => res}/src/main/res/values-ru/strings_final.xml (67%) rename core/{ui => res}/src/main/res/values-ru/strings_plurals_final.xml (64%) rename core/{ui/src/main/res/values-fr => res/src/main/res/values}/strings_final.xml (61%) rename core/{ui => res}/src/main/res/values/strings_plurals_final.xml (75%) create mode 100644 core/ui/src/main/res/values-de/strings-app.xml create mode 100644 core/ui/src/main/res/values-fr/strings-app.xml create mode 100644 core/ui/src/main/res/values-it/strings-app.xml delete mode 100644 core/ui/src/main/res/values-ru/string_common.xml create mode 100644 core/ui/src/main/res/values-ru/strings-app.xml delete mode 100644 core/ui/src/main/res/values/string_common.xml create mode 100644 core/ui/src/main/res/values/strings-app.xml delete mode 100644 features/referral/presentation/src/main/res/values-ru/string.xml delete mode 100644 features/referral/presentation/src/main/res/values/strings.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8dd72df3e7..2deae5eec6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -110,6 +110,7 @@ dependencies { implementation(project(":domain")) implementation(project(":network")) implementation(project(":common")) + implementation(project(":core:res")) implementation(project(":core:ui")) implementation(project(":core:utils")) implementation(project(":libs:crypto")) diff --git a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackData.kt b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackData.kt index 6578b97356..8a426cccfc 100644 --- a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackData.kt +++ b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackData.kt @@ -96,8 +96,8 @@ class FeedbackEmail : FeedbackData { } class SupportInfo : FeedbackData { - override val subjectResId: Int = R.string.details_ask_a_question - override val mainMessageResId: Int = R.string.details_ask_a_question + override val subjectResId: Int = R.string.details_chat + override val mainMessageResId: Int = R.string.details_chat override fun createOptionalMessage(infoHolder: AdditionalFeedbackInfo): String { return FeedbackDataBuilder(infoHolder) diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt index 2120746a74..68da6ac85f 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/details/DetailsScreenState.kt @@ -21,7 +21,7 @@ enum class SettingsElement( val titleRes: Int, ) { WalletConnect(R.drawable.ic_walletconnect, R.string.wallet_connect_title), - Chat(R.drawable.ic_chat, R.string.details_ask_a_question), + Chat(R.drawable.ic_chat, R.string.details_chat), SendFeedback(R.drawable.ic_comment, R.string.details_row_title_send_feedback), // ReferralProgram(R.drawable.ic_add_friends, R.string.details_referral_title), CardSettings(R.drawable.ic_card_settings, R.string.card_settings_title), diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt index 6f29a508b1..85d53a13eb 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt @@ -1,7 +1,6 @@ package com.tangem.tap.features.details.ui.resetcard import androidx.compose.foundation.Image -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -64,7 +63,7 @@ fun ResetCardView( contentDescription = "", modifier = modifier.offset(y = (-82).dp), ) - ScreenTitle(titleRes = R.string.reset_card_to_factory_navigation_title) + ScreenTitle(titleRes = R.string.card_settings_reset_card_to_factory) } Spacer( modifier = modifier.weight(1f), diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/ui/OnboardingSaltPayView.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/ui/OnboardingSaltPayView.kt index dc934546aa..fcbcfb74ff 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/ui/OnboardingSaltPayView.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/ui/OnboardingSaltPayView.kt @@ -250,7 +250,7 @@ internal class OnboardingSaltPayView( } private fun handleClaim(state: OnboardingSaltPayState) = with(walletFragment.bindingSaltPay) { - toolbar.title = getText(R.string.onboarding_navbar_claim) + toolbar.title = getText(R.string.onboarding_getting_started) val btnMain = actionContainer.btnContainer.findViewById(R.id.btn_main_action) val tvHeader = actionContainer.tvHeader val tvBody = actionContainer.tvBody diff --git a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt index b2eeba4b72..2451c9234a 100644 --- a/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt +++ b/app/src/main/java/com/tangem/tap/features/saveWallet/ui/components/SaveWalletScreenContent.kt @@ -83,7 +83,7 @@ internal fun SaveWalletScreenContent( SpacerH24() Text( modifier = Modifier.fillMaxWidth(), - text = stringResource(R.string.save_user_wallet_agreement_header), + text = stringResource(R.string.onboarding_navbar_save_wallet), style = TangemTheme.typography.h2, color = TangemTheme.colors.text.primary1, textAlign = TextAlign.Center, @@ -100,7 +100,10 @@ internal fun SaveWalletScreenContent( PrimaryButton( modifier = Modifier.fillMaxWidth(), showProgress = showProgress, - text = stringResource(R.string.save_user_wallet_agreement_allow), + text = stringResource( + id = R.string.save_user_wallet_agreement_allow, + stringResource(id = R.string.common_biometric_authentication), + ), onClick = onSaveWalletClick, ) SpacerH16() diff --git a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt index 28995ad24b..106ff7f37b 100644 --- a/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt +++ b/app/src/main/java/com/tangem/tap/features/walletSelector/ui/components/WallectSelectorScreenContent.kt @@ -81,7 +81,10 @@ internal fun WalletSelectorScreenContent( modifier = Modifier .padding(horizontal = TangemTheme.dimens.spacing16) .fillMaxWidth(), - text = stringResource(R.string.user_wallet_list_unlock_all_face_id), + text = stringResource( + id = R.string.user_wallet_list_unlock_all, + stringResource(id = R.string.common_biometrics), + ), showProgress = state.showUnlockProgress, onClick = onUnlockClick, ) diff --git a/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt index f9543d5c97..c0a780226b 100644 --- a/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt +++ b/app/src/main/java/com/tangem/tap/features/welcome/ui/components/WelcomeScreenContent.kt @@ -58,7 +58,10 @@ internal fun WelcomeScreenContent( modifier = Modifier .padding(horizontal = TangemTheme.dimens.spacing44) .fillMaxWidth(), - text = stringResource(R.string.welcome_unlock_description), + text = stringResource( + id = R.string.welcome_unlock_description, + stringResource(id = R.string.common_biometric_authentication), + ), style = TangemTheme.typography.body1, color = TangemTheme.colors.text.secondary, textAlign = TextAlign.Center, @@ -68,7 +71,10 @@ internal fun WelcomeScreenContent( modifier = Modifier .padding(horizontal = TangemTheme.dimens.spacing16) .fillMaxWidth(), - text = stringResource(R.string.welcome_unlock_face_id), + text = stringResource( + id = R.string.welcome_unlock, + stringResource(id = R.string.common_biometrics), + ), showProgress = showUnlockProgress, onClick = onUnlockClick, ) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cc06be0a27..c4e3022f03 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2,18 +2,14 @@ Änderungen speichern Warnung - Erneut versuchen Erledigt - Abbrechen Akzeptieren Entfernen Sie haben keinen Zugang zur Kamera erteilt, bitte passen Sie Ihre Datenschutzeinstellungen an - Karte scannen Absenden ein Wallet erstellen Tangem - Tokens Verifizierte Bilanz Die Bilanz wird aufgeladen… Das Konto ist nicht erstellt @@ -49,7 +45,6 @@ inkl. Gebühr %s wird gesendet %s und %s werden gesendet - Bilanz: %s Die Transaktion wurde erfolgreich signiert und an den Blockchain-Knoten gesendet. Die Walletbilanz wird aktualisiert Details KartenID diff --git a/app/src/main/res/values-de/strings_blockchain.xml b/app/src/main/res/values-de/strings_blockchain.xml index 910ae90ce2..83e9734f88 100644 --- a/app/src/main/res/values-de/strings_blockchain.xml +++ b/app/src/main/res/values-de/strings_blockchain.xml @@ -11,12 +11,10 @@ Damit Sie beim nächsten Aufladen Ihrer Brieftasche keine erhöhte Provision zahlen, soll der Betrag um %s XTZ reduziert werden Um %s XTZ reduzieren Nein, alles senden - Ungültige Adresse Ungültiger Betrag Der Betrag geht über die Bilanz hinaus Der Gesamtbetrag geht über die Bilanz hinaus Die Gebühr geht über die Bilanz hinaus Minimum balance is %s - %s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed. Destination account is not active. Send %s or more to activate the account. \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f631f44d40..25ebbdc84a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -3,18 +3,14 @@ Sauvegarder les modifications Alerte - Réessayer Exécuté - Annuler J\'accepte Supprimer Vous n\'avez pas octroyé l\'accès à votre caméra, veuillez modifier vos paramètres de confidentialité - Scannez la carte Envoyer Créer un portefeuille Tangem - Jetons d\'authentification Solde confirmé Solde est en cours de téléchargement … Compte n\'est pas créé @@ -50,7 +46,6 @@ Inclure les commissions Sera envoyé %s Sera envoyé %s et %s - Solde : %s La transaction a été signée avec succès et envoyée au nœud de blockchain. Le solde du portefeuille sera mis à jour après un certain temps Référénces ID de la carte diff --git a/app/src/main/res/values-fr/strings_blockchain.xml b/app/src/main/res/values-fr/strings_blockchain.xml index 60b04a9489..818ddca1ea 100644 --- a/app/src/main/res/values-fr/strings_blockchain.xml +++ b/app/src/main/res/values-fr/strings_blockchain.xml @@ -8,7 +8,6 @@ Le compte cible n\'a pas été créé. Le montant à envoyer doit être de %s + commissions ou plus Échec de réception des commissions Erreur inconnue - Adresse incorrecte Somme incorrecte Le montant dépasse le solde Le total dépasse le solde diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 613ba4dfc2..832d16e7e1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3,16 +3,12 @@ Mantieni le modifiche Avviso - Riprova Fatto - Annulla Rimuovere Non hai fornito l\'accesso alla tua videocamera, modifica le tue impostazioni sulla privacy - Scansiona carta Invia Crea portafoglio Tangem - Token Saldo verificato Il saldo sta per essere caricato… Conto non creato @@ -49,7 +45,6 @@ Includi commissione Sarà inviato %s Sarà inviato %s e %s - Saldo: %s La transazione è stata firmata con successo e inviata al nodo blockchain. Il saldo del portafoglio verrà aggiornato dopo un po\' di tempo Requisiti ID carta diff --git a/app/src/main/res/values-it/strings_blockchain.xml b/app/src/main/res/values-it/strings_blockchain.xml index d51ca39197..e7f2fa6d3f 100644 --- a/app/src/main/res/values-it/strings_blockchain.xml +++ b/app/src/main/res/values-it/strings_blockchain.xml @@ -9,7 +9,6 @@ L\'importo supera il saldo Il conto totale non è stato creato L\'importo da inviare deve essere %s + commissione o maggiore Impossibile ottenere la commissione - Indirizzo non valido Importo non valido Il totale supera il saldo La commissione supera il saldo diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3b187cf2d3..c248c5c69d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3,21 +3,16 @@ Tangem Сохранить изменения Предупреждение - Повторить Готово - Отмена Принять Удалить %s Вы не предоставили доступ к своей камере, измените настройки конфиденциальности - Сканировать карту Отправить Создать кошелек Tangem - Токены Подтвержденный баланс Загрузка баланса… - Сеть недоступна Аккаунт не создан Пополните счет на %s+ %s, чтобы создать аккаунт Карта пуста @@ -51,7 +46,6 @@ Включить коммисию %s будет отправлено %s и %s будет отправлено - Баланс: %s Транзакция успешно подписана и отправлена в блокчейн. Баланс будет обновлен через некоторое время Подробности ID карты @@ -117,30 +111,12 @@ Один вопрос Вам нравится приложение Tangem? Добавить токен - Адрес контракта - Обязательное поле - Пожалуйста, выберите сеть - Количество знаков после запятой должно быть корректным числом не больше %d - Адрес контракта некорректен - Путь деривации некорректен - Токены могут быть созданы кем угодно. Остерегайтесь мошеннических токенов, они могут ничего не стоить - Этот токен/сеть уже находится в вашем списке - Знаков после запятой - Сеть - Не выбрано - Например, USD Coin - Название токена - Например, USDC - Символ токена - Деривация по BIP44 - По-умолчанию Пожалуйста, дождитесь завершения транзакции %s, чтобы иметь возможность отправить средства Проверка подлинности не удалась Эта карта может быть производственным образцом или подделкой Важная информация о безопасности \u26A0 Эта карта ранее подписывала транзакции Узнать подробнее - Я понял На этой карте доступно только %s подписей. Вы должны вывести все свои средства. Отключить Подписать @@ -162,7 +138,6 @@ Показать адрес кошелька Успешно! Ваша карта активирована и готова к использованию - Продолжить Баланс Отправляйте только %s (%s) на этот адрес. Иначе это может привести к утрате средств. Отправляйте только %s (%s) из сети %s на этот адрес. Иначе это может привести к утрате средств. @@ -171,7 +146,7 @@ Блокчейн недоступен. Попробуй позже. Хорошо, понял! Успешно! - Начнем + Подготовка Выполнить резервное копирование Оставить на потом Завершить процесс резервного копирования @@ -254,6 +229,5 @@ Пожалуйста, расскажите нам больше о Вашей проблеме. Каждая маленькая деталь может помочь. Привет, команда поддержки, Информация ниже не является обязательной. Вы можете стереть её, если хотите. - Нет ≈ %s (вкл. комиссию: %s) diff --git a/app/src/main/res/values-ru/strings_blockchain.xml b/app/src/main/res/values-ru/strings_blockchain.xml index ee2464671d..7378ec8c0d 100644 --- a/app/src/main/res/values-ru/strings_blockchain.xml +++ b/app/src/main/res/values-ru/strings_blockchain.xml @@ -8,7 +8,6 @@ Не удалось получить комиссию Аккаунт получателя не создан. Сумма для отправки должна быть %s + комиссия или больше Неизвестная ошибка - Неверный адрес Недопустимая сумма Сумма превышает остаток Отправляемая сумма превышает остаток @@ -17,6 +16,5 @@ Уменьшить на %s XTZ Нет, отправить все Минимальный баланс: %s - Сеть %s использует концепцию экзистенциального депозита. Если баланс вашего счета опустится ниже %s, он будет деактивирован, а все оставшиеся средства будут уничтожены. Аккаунт получателя не активирован. Отправьте %s или более для активации аккаунта. \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 31d6ed2a36..ad66d064a0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,25 +4,19 @@ Save changes Warning - Retry Done - Cancel Accept Delete %s You have not given access to your camera, please adjust your privacy settings - Scan card - Send Create wallet Tangem - Tokens Verified Balance Balance is loading… - Network is unreachable Account is not created Load %s+ %s to create account @@ -61,7 +55,6 @@ Include fee %s will be sent %s and %s will be sent - Balance: %s Transaction has been successfully signed and sent to the blockchain node. Wallet balance will be updated in a while Details diff --git a/app/src/main/res/values/strings_blockchain.xml b/app/src/main/res/values/strings_blockchain.xml index a286c1a5f8..a8875b9313 100644 --- a/app/src/main/res/values/strings_blockchain.xml +++ b/app/src/main/res/values/strings_blockchain.xml @@ -8,7 +8,6 @@ Failed to get fee Target account is not created. Amount to send should be %s + fee or more Unknown error - Invalid address Invalid amount Amount exceeds balance Total amount exceeds balance @@ -17,6 +16,5 @@ Reduce by %s XTZ No, send all Minimum balance is %s - %s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed. Destination account is not active. Send %s or more to activate the account. \ No newline at end of file diff --git a/app/src/main/res/values/strings_untranslated.xml b/app/src/main/res/values/strings_untranslated.xml index 369b860e27..ba3342790f 100644 --- a/app/src/main/res/values/strings_untranslated.xml +++ b/app/src/main/res/values/strings_untranslated.xml @@ -43,23 +43,6 @@ //Manage tokens Add Token - Contract address - Required field - Please select the network - Decimal number must be a valid integer, no higher than %d - Contract address is invalid - Derivation path is invalid - Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing. - This token/network has already been added to your list - Decimals - Network - Not selected - E.g. USD Coin - Name - E.g. USDC - Token symbol - BIP44 coin type - Default //Details @@ -73,7 +56,6 @@ This card has signed transactions in the past Learn more This card is not a bearer note. We can\'t currently match the signature count on the card with the information on the blockchain. This is normal but in rare cases can mean a previous holder is holding back an offline signature, which is a security concern.\nDo not accept this card as physical payment from someone you don\'t trust.\nIt\'s perfectly safe in all other respects.\nTangem is the only hardware wallet to offer signature count protection. - I understand There are only %s signatures available on this card. You must withdraw all of your funds. @@ -129,7 +111,6 @@ Success! Your card is activated and ready to be used - Continue Balance Send only %s (%s) to this address. Using other tokens and networks may result in loss of funds. Send only %s (%s) from %s network to this address. Using other tokens and networks may result in loss of funds. diff --git a/core/res/.gitignore b/core/res/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/core/res/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core/res/build.gradle.kts b/core/res/build.gradle.kts new file mode 100644 index 0000000000..ff743d3748 --- /dev/null +++ b/core/res/build.gradle.kts @@ -0,0 +1,21 @@ +plugins { + id("com.android.library") + kotlin("android") +} + +android { + defaultConfig { + compileSdk = AppConfig.compileSdkVersion + minSdk = AppConfig.minSdkVersion + targetSdk = AppConfig.targetSdkVersion + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8.toString() + } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } +} \ No newline at end of file diff --git a/core/res/src/main/AndroidManifest.xml b/core/res/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..1420909c0e --- /dev/null +++ b/core/res/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/core/ui/src/main/res/values/strings_final.xml b/core/res/src/main/res/values-de/strings_final.xml similarity index 69% rename from core/ui/src/main/res/values/strings_final.xml rename to core/res/src/main/res/values-de/strings_final.xml index 450d76907c..106dd30cc9 100644 --- a/core/ui/src/main/res/values/strings_final.xml +++ b/core/res/src/main/res/values-de/strings_final.xml @@ -35,38 +35,58 @@ This feature is disabled in Demo mode Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first. Available networks + %s network not found. Please, add it first and try again. + Attention Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds. Tokens in Solana network are not supported by this card due to firmware limitation. Contract address copied! - If you chose the wrong network during your crypto transfer from the exchange, this guide will help you recover your funds - Attention + Contract address + Required field + Please select the network + Decimal number must be a valid integer, no higher than %d + Contract address is invalid + Derivation path is invalid + Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing. + This token/network has already been added to your list + Decimals + Network + Not selected + E.g. USD Coin + Name + E.g. USDC + Token symbol + BIP44 coin type + Default The server is not available, please try again later Total balance The amount does not include some of your funds + Tokens Manage tokens No rate + Network is unreachable Hide token Hide %s Hide You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page. Unable to hide %s The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list. - %s network not found. Please, add it first and try again. - This network is not supported. Please select another network. - %s network Your wallet has not been backed up To protect your assets, we advise you to carry out this procedure - Remove token + Erneut versuchen + Chat + %s network + I understand + Yes + No Russian bank cards are not accepted at the moment Do you have a bank card of another country or a UnionPay card? - Yes - No - Chat - Tangem Bot + This network is not supported. Please select another network. Card Settings Security Mode Change access code Access code will be changed on this card only + Continue + Tangem Bot Get your card ready! Scan the card to change its settings. The changes will impact only the card you\'ve scanned and will not affect other cards tied to your wallet. Scan Card @@ -79,9 +99,6 @@ This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code. WalletConnect Connect to Dapps - Link More Cards - Privacy policy - Reset to factory settings This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. I understand that after performing this action, I will no longer have access to the current wallet Reset the card @@ -90,12 +107,26 @@ Select network Scan your card To access all the networks you need to scan the card - Failed to establish WalletConnect session - Memo - Tag - Invalid Memo. It won\'t be added to the transaction. - Invalid Tag. It won\'t be added to the transaction. Connection with this Dapp cannot be established due to its technical implementation. + Welcome back! + Use %s or scan a card to access the app + Log in with %s + Karte scannen + Save your Wallet + Note that making a transaction with your funds will still require your card + Allow to use %s + New feature + My Wallets + Multi-currency + Single-currency + Add new wallet + Rename Wallet + Wallet name + Unlock all with %s + Invalid Tag. It won\'t be added to the transaction. + Invalid Memo. It won\'t be added to the transaction. + Tag + Memo Attention Tap the card with the visa logo No funds for activation @@ -128,7 +159,6 @@ Tap the SaltPay card Tap the Tangem card Support - Getting started Claim %s To get started, simply claim wxDAI to your wallet Claim @@ -140,27 +170,53 @@ Do you want to exit the activation process? In this case, you will need to start from the beginning. You have used a card from another wallet. Tap the card associated with this wallet - Internal error: wallet manager not found - Welcome back! - Use biometric authentication or scan a card to access the app - Log in with biometric - Scan card - New feature - Save your Wallet - Save your Wallet feature allows you to use your wallet with biometric auth without tapping your card to the phone to gain access. - Allow to link wallet - Making a transaction with your funds will still require card tapping + Referral program + Refer your friends to Tangem + You + Will get + for each wallet bought by your friend on your %s network address%s + Your friend + Will get a + %s discount + when buying a card on tangem.com + Your friends bought + Your personal code + Participate + terms and conditions + By tapping this button you accept + You\'ve accepted + of the referral program + Internal error: wallet manager not found + Bilanz: %s + Share + Copy + Erfolg + Give Permission + To continue you need to allow 1inch smart contracts to use your %s + Amount %s + Your Wallet + Spender + Approve + Swap of %s to + Swap + Insufficient funds + Give Permission + Permit and Swap + Failed to load the information about the referral program. Please try again later. + Failed to load the information about the referral program. Reason: %s. Please try again later. + Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support. + Personal code copied! + Buy Tangem Wallet with discount!\n%s + %s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed. + Ungültige Adresse + This wallet has already been saved, you can add another one + Entfernen + Privacy policy Enable biometric authorization It looks like you have biometric authorization disabled, it is necessary to save wallets Enable - Cancel - Multi-currency - Single-currency - Rename Wallet - Wallet name - Unlock all with biometrics - Add new wallet + Save your Wallet feature allows you to use your wallet with biometric auth without tapping your card to the phone to gain access. %d selected - My Wallets - This wallet has already been saved, you can add another one + biometric authentication + biometrics diff --git a/core/ui/src/main/res/values-de/strings_plurals_final.xml b/core/res/src/main/res/values-de/strings_plurals_final.xml similarity index 65% rename from core/ui/src/main/res/values-de/strings_plurals_final.xml rename to core/res/src/main/res/values-de/strings_plurals_final.xml index 02204c79ec..0d9fa7c350 100644 --- a/core/ui/src/main/res/values-de/strings_plurals_final.xml +++ b/core/res/src/main/res/values-de/strings_plurals_final.xml @@ -8,4 +8,9 @@ %d token %d tokens + + + %d wallet + %d wallets + diff --git a/core/ui/src/main/res/values-it/strings_final.xml b/core/res/src/main/res/values-fr/strings_final.xml similarity index 62% rename from core/ui/src/main/res/values-it/strings_final.xml rename to core/res/src/main/res/values-fr/strings_final.xml index ca07d2b5c7..740d0d8faf 100644 --- a/core/ui/src/main/res/values-it/strings_final.xml +++ b/core/res/src/main/res/values-fr/strings_final.xml @@ -5,7 +5,7 @@ 2 cards Shipping Free - I have a promo code... + I have a promo code… Total Other payment methods Buy now @@ -35,38 +35,58 @@ This feature is disabled in Demo mode Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first. Available networks + %s network not found. Please, add it first and try again. + Attention Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds. Tokens in Solana network are not supported by this card due to firmware limitation. Contract address copied! - If you chose the wrong network during your crypto transfer from the exchange, this guide will help you recover your funds - Attention + Contract address + Required field + Please select the network + Decimal number must be a valid integer, no higher than %d + Contract address is invalid + Derivation path is invalid + Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing. + This token/network has already been added to your list + Decimals + Network + Not selected + E.g. USD Coin + Name + E.g. USDC + Token symbol + BIP44 coin type + Default The server is not available, please try again later Total balance The amount does not include some of your funds + Tokens Manage tokens No rate + Network is unreachable Hide token Hide %s Hide You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page. Unable to hide %s The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list. - %s network not found. Please, add it first and try again. - This network is not supported. Please select another network. - %s network Your wallet has not been backed up To protect your assets, we advise you to carry out this procedure - Remove token - Russian bank cards are not accepted at the moment - Do you have a bank card of another country or a UnionPay card? + Réessayer + Chat + %s network + I understand Yes No - Chat - Tangem Bot + Russian bank cards are not accepted at the moment + Do you have a bank card of another country or a UnionPay card? + This network is not supported. Please select another network. Card Settings Security Mode Change access code Access code will be changed on this card only + Continue + Tangem Bot Get your card ready! Scan the card to change its settings. The changes will impact only the card you\'ve scanned and will not affect other cards tied to your wallet. Scan Card @@ -79,9 +99,6 @@ This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code. WalletConnect Connect to Dapps - Link More Cards - Privacy policy - Reset to factory settings This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. I understand that after performing this action, I will no longer have access to the current wallet Reset the card @@ -90,12 +107,26 @@ Select network Scan your card To access all the networks you need to scan the card - Failed to establish WalletConnect session - Memo - Tag - Invalid Memo. It won\'t be added to the transaction. - Invalid Tag. It won\'t be added to the transaction. Connection with this Dapp cannot be established due to its technical implementation. + Welcome back! + Use %s or scan a card to access the app + Log in with %s + Scannez la carte + Save your Wallet + Note that making a transaction with your funds will still require your card + Allow to use %s + New feature + My Wallets + Multi-currency + Single-currency + Add new wallet + Rename Wallet + Wallet name + Unlock all with %s + Invalid Tag. It won\'t be added to the transaction. + Invalid Memo. It won\'t be added to the transaction. + Tag + Memo Attention Tap the card with the visa logo No funds for activation @@ -128,7 +159,6 @@ Tap the SaltPay card Tap the Tangem card Support - Getting started Claim %s To get started, simply claim wxDAI to your wallet Claim @@ -140,4 +170,53 @@ Do you want to exit the activation process? In this case, you will need to start from the beginning. You have used a card from another wallet. Tap the card associated with this wallet - \ No newline at end of file + Referral program + Refer your friends to Tangem + You + Will get + for each wallet bought by your friend on your %s network address%s + Your friend + Will get a + %s discount + when buying a card on tangem.com + Your friends bought + Your personal code + Participate + terms and conditions + By tapping this button you accept + You\'ve accepted + of the referral program + Internal error: wallet manager not found + Solde : %s + Share + Copy + Avec succès + Give Permission + To continue you need to allow 1inch smart contracts to use your %s + Amount %s + Your Wallet + Spender + Approve + Swap of %s to + Swap + Insufficient funds + Give Permission + Permit and Swap + Failed to load the information about the referral program. Please try again later. + Failed to load the information about the referral program. Reason: %s. Please try again later. + Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support. + Personal code copied! + Buy Tangem Wallet with discount!\n%s + %s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed. + Adresse incorrecte + This wallet has already been saved, you can add another one + Supprimer + Privacy policy + Enable biometric authorization + It looks like you have biometric authorization disabled, it is necessary to save wallets + Enable + Save your Wallet feature allows you to use your wallet with biometric auth without tapping your card to the phone to gain access. + %d selected + biometric authentication + biometrics + diff --git a/core/ui/src/main/res/values-it/strings_plurals_final.xml b/core/res/src/main/res/values-fr/strings_plurals_final.xml similarity index 65% rename from core/ui/src/main/res/values-it/strings_plurals_final.xml rename to core/res/src/main/res/values-fr/strings_plurals_final.xml index e79bd3f0cd..622131bdfd 100644 --- a/core/ui/src/main/res/values-it/strings_plurals_final.xml +++ b/core/res/src/main/res/values-fr/strings_plurals_final.xml @@ -10,4 +10,10 @@ %d tokens %d tokens + + + %d wallet + %d wallets + %d wallets + diff --git a/core/ui/src/main/res/values-de/strings_final.xml b/core/res/src/main/res/values-it/strings_final.xml similarity index 62% rename from core/ui/src/main/res/values-de/strings_final.xml rename to core/res/src/main/res/values-it/strings_final.xml index ca07d2b5c7..b284d9eb91 100644 --- a/core/ui/src/main/res/values-de/strings_final.xml +++ b/core/res/src/main/res/values-it/strings_final.xml @@ -5,7 +5,7 @@ 2 cards Shipping Free - I have a promo code... + I have a promo code… Total Other payment methods Buy now @@ -35,38 +35,58 @@ This feature is disabled in Demo mode Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first. Available networks + %s network not found. Please, add it first and try again. + Attention Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds. Tokens in Solana network are not supported by this card due to firmware limitation. Contract address copied! - If you chose the wrong network during your crypto transfer from the exchange, this guide will help you recover your funds - Attention + Contract address + Required field + Please select the network + Decimal number must be a valid integer, no higher than %d + Contract address is invalid + Derivation path is invalid + Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing. + This token/network has already been added to your list + Decimals + Network + Not selected + E.g. USD Coin + Name + E.g. USDC + Token symbol + BIP44 coin type + Default The server is not available, please try again later Total balance The amount does not include some of your funds + Tokens Manage tokens No rate + Network is unreachable Hide token Hide %s Hide You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page. Unable to hide %s The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list. - %s network not found. Please, add it first and try again. - This network is not supported. Please select another network. - %s network Your wallet has not been backed up To protect your assets, we advise you to carry out this procedure - Remove token - Russian bank cards are not accepted at the moment - Do you have a bank card of another country or a UnionPay card? + Riprova + Chat + %s network + I understand Yes No - Chat - Tangem Bot + Russian bank cards are not accepted at the moment + Do you have a bank card of another country or a UnionPay card? + This network is not supported. Please select another network. Card Settings Security Mode Change access code Access code will be changed on this card only + Continue + Tangem Bot Get your card ready! Scan the card to change its settings. The changes will impact only the card you\'ve scanned and will not affect other cards tied to your wallet. Scan Card @@ -79,9 +99,6 @@ This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code. WalletConnect Connect to Dapps - Link More Cards - Privacy policy - Reset to factory settings This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. I understand that after performing this action, I will no longer have access to the current wallet Reset the card @@ -90,12 +107,26 @@ Select network Scan your card To access all the networks you need to scan the card - Failed to establish WalletConnect session - Memo - Tag - Invalid Memo. It won\'t be added to the transaction. - Invalid Tag. It won\'t be added to the transaction. Connection with this Dapp cannot be established due to its technical implementation. + Welcome back! + Use %s or scan a card to access the app + Log in with %s + Scansiona carta + Save your Wallet + Note that making a transaction with your funds will still require your card + Allow to use %s + New feature + My Wallets + Multi-currency + Single-currency + Add new wallet + Rename Wallet + Wallet name + Unlock all with %s + Invalid Tag. It won\'t be added to the transaction. + Invalid Memo. It won\'t be added to the transaction. + Tag + Memo Attention Tap the card with the visa logo No funds for activation @@ -128,7 +159,6 @@ Tap the SaltPay card Tap the Tangem card Support - Getting started Claim %s To get started, simply claim wxDAI to your wallet Claim @@ -140,4 +170,53 @@ Do you want to exit the activation process? In this case, you will need to start from the beginning. You have used a card from another wallet. Tap the card associated with this wallet - \ No newline at end of file + Referral program + Refer your friends to Tangem + You + Will get + for each wallet bought by your friend on your %s network address%s + Your friend + Will get a + %s discount + when buying a card on tangem.com + Your friends bought + Your personal code + Participate + terms and conditions + By tapping this button you accept + You\'ve accepted + of the referral program + Internal error: wallet manager not found + Saldo: %s + Share + Copy + Con successo + Give Permission + To continue you need to allow 1inch smart contracts to use your %s + Amount %s + Your Wallet + Spender + Approve + Swap of %s to + Swap + Insufficient funds + Give Permission + Permit and Swap + Failed to load the information about the referral program. Please try again later. + Failed to load the information about the referral program. Reason: %s. Please try again later. + Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support. + Personal code copied! + Buy Tangem Wallet with discount!\n%s + %s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed. + Indirizzo non valido + This wallet has already been saved, you can add another one + Rimuovere + Privacy policy + Enable biometric authorization + It looks like you have biometric authorization disabled, it is necessary to save wallets + Enable + Save your Wallet feature allows you to use your wallet with biometric auth without tapping your card to the phone to gain access. + %d selected + biometric authentication + biometrics + diff --git a/core/ui/src/main/res/values-fr/strings_plurals_final.xml b/core/res/src/main/res/values-it/strings_plurals_final.xml similarity index 65% rename from core/ui/src/main/res/values-fr/strings_plurals_final.xml rename to core/res/src/main/res/values-it/strings_plurals_final.xml index e79bd3f0cd..0d9fa7c350 100644 --- a/core/ui/src/main/res/values-fr/strings_plurals_final.xml +++ b/core/res/src/main/res/values-it/strings_plurals_final.xml @@ -1,13 +1,16 @@ %d card - %d cards %d cards %d token - %d tokens %d tokens + + + %d wallet + %d wallets + diff --git a/core/ui/src/main/res/values-ru/strings_final.xml b/core/res/src/main/res/values-ru/strings_final.xml similarity index 67% rename from core/ui/src/main/res/values-ru/strings_final.xml rename to core/res/src/main/res/values-ru/strings_final.xml index f111ad038a..a439e2b3e9 100644 --- a/core/ui/src/main/res/values-ru/strings_final.xml +++ b/core/res/src/main/res/values-ru/strings_final.xml @@ -35,52 +35,70 @@ Эта функция недоступна в демонстрационном режиме Недостаточно средств для комиссии на вашем %s кошельке для отправки транзакции. Сначала пополните свой %s кошелек. Доступные сети + Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново. + Внимание Внимание! Валюты на разных сетях имеют разные адреса. Убедитесь, что адрес соответствует сети, в которой вы отправляете средства. Токены в сети Solana не поддерживаются этой картой из-за ограничений прошивки. Адрес контракта скопирован! - Если вы совершили ошибку с выбором сети при переводе средств с биржи, эта инструкция поможет вам восстановить средства - Внимание + Адрес контракта + Обязательное поле + Пожалуйста, выберите сеть + Количество знаков после запятой должно быть корректным числом не больше %d + Адрес контракта некорректен + Путь деривации некорректен + Токены могут быть созданы кем угодно. Остерегайтесь мошеннических токенов, они могут ничего не стоить + Этот токен/сеть уже находится в вашем списке + Знаков после запятой + Сеть + Не выбрано + Например, USD Coin + Название токена + Например, USDC + Символ токена + Деривация по BIP44 + По-умолчанию Сервер недоступен, повторите попытку позднее Баланс В сумме учтены не все монеты + Токены Управление токенами Нет цены + Сеть недоступна Скрыть токен Скрыть %s Скрыть Вы скрываете токен с главного экрана, но в любой момент сможете добавить его обратно через страницу управления токенами. Невозможно скрыть %s Токен %s является основной валютой в сети %s и не может быть скрыт до тех пор, пока у вас в списке есть другие токены этой сети. - Сеть %s не найдена. Пожалуйста, добавьте её и попробуйте заново. - Сеть не поддерживается. Пожалуйста, выберите другую сеть. - Сеть %s Бэкап кошелька не был произведен Чтобы защитить свои активы, мы советуем вам выполнить эту процедуру - Карты банков РФ в данный момент не принимаются - У вас есть карта банка другой страны или платежной системы UnionPay? + Повторить + Чат + Сеть %s + Я понял Да Нет - Чат - Tangem Bot + Карты банков РФ в данный момент не принимаются + У вас есть карта банка другой страны или платежной системы UnionPay? + Сеть не поддерживается. Пожалуйста, выберите другую сеть. Настройки карты Тип безопасности Смена кода доступа Код доступа будет изменен только на данной карте + Продолжить + Tangem Bot Приготовьте свою карту Отсканируйте карту, чтобы изменить ее настройки. Изменения затронут только ту карту, которую вы отсканировали, и не повлияют на другие карты, привязанные к вашему кошельку. Сканировать Настройки приложения Cохранение кошелька - Если эта опция включена, кошельки всех отсканированных карт будут привязываться к приложению и при открытии приложения будет необходимо пройти биометрическую аутентификацию. Подпись транзакций все так же потребует карту. + Подключите функцию привязки карты в приложении, а также возможность биометрической аутентификации. Подпись транзакции все так же потребует карту. Сохранение кода доступа - Если эта опция включена, пароли от карты будут хранится на телефоне в зашифрованном виде и при работе с картой вместо пароля будет запрашиваться биометрическая аутентификация + Подключите функцию хранения кодов доступа от карт на телефоне в зашифрованном виде, и при работе с картой вместо кода доступа будет запрашиваться биометрическая аутентификация. При отключении функции сохранения кошелька все ранее сохраненные кошельки будут удалены. Все сохраненные коды доступа будут удалены. Вам потребуется вводить код доступа при работе с кошельком. WalletConnect Подключение к Dapps - Добавить еще карты - Privacy policy - Сброс к заводским настройкам Это действие приведет к полному удалению кошелька на этой карте. Кошелек невозможно будет восстановить или использовать данную карту для восстановления кода доступа Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку Сбросить карту @@ -89,12 +107,26 @@ Выберите сеть Отсканируйте карту Чтобы получить доступ ко всем сетям, вам необходимо отсканировать карту - Memo - Tag - Недопустимый Memo. Он не будет добавлен в транзакцию. - Недопустимый Tag. Он не будет добавлен в транзакцию. - Не удалось установить сессию WalletConnect Cоединение с этим Dapp сервисом не может быть установлено из-за его технической реализации. + C возвращением! + Используйте %s или код доступа для входа в приложение + Войти с %s + Сканировать карту + Сохраните ваш кошелек + Обратите внимание, что для совершения транзакции с вашими средствами по-прежнему потребуется ваша карта + Использовать %s + Новый функционал + Мои кошельки + Мультивалютные + Одновалютные + Добавить новый кошелек + Переименование кошелька + Имя кошелька + Разблокировать все с %s + Недопустимый Tag. Он не будет добавлен в транзакцию. + Недопустимый Memo. Он не будет добавлен в транзакцию. + Tag + Memo Внимание Приложите карту с логотипом Visa Недостаточно средств для активации @@ -114,7 +146,7 @@ Подтверждение личности в процессе Подключите вашу карту к децентрализованной платежной системе Для начала работы с картой вам необходимо завершить процесс подтверждения личности - Пожалуйста дождитесь завершения процесса подтверждения вашей личности. Как правило, это занимает меньше часа. Вы можете закрыть приложение и вернуться позже. + Пожалуйста дождитесь завершения процесса подтверждения личности. Вы будете уведомлены через e-mail. Обычно это занимает не более часа. Вы можете закрыть приложение и вернуться позже. Код доступа Установите Код доступа для вашей SaltPay карты Чат поддержки @@ -127,7 +159,6 @@ Приложите SaltPay карту Приложите Tangem карту Чат - Начало работы Запросить %s Для начала работы просто запросите начисление wxDai на свой кошелек Запросить @@ -139,27 +170,53 @@ Вы хотите выйти из процесса активации? В этом случае вам будет необходимо начать процесс заново. Вы использовали карту от другого кошелька. Приложите карту, связанную с этим кошельком. + Реферальная программа + Приведи друга в Tangem + Вы + Получите + на ваш адрес в сети %s%s за каждый кошелек, который купит ваш друг + Ваш друг + Получит + %s скидку + при покупке карточки на сайте tangem.com + Ваши друзья купили + Ваш персональный код + Участвовать + условия участия + Нажимая на эту кнопку вы принимаете + Вы приняли + в реферальной программе Внутренняя ошибка: не удается найти менеджер кошельков - C возвращением! - Используйте биометрическую аутентификацию или код доступа для входа в приложение - Войти с биометрией - Сканировать карту - Новый функционал - Сохраните свой кошелек - Функция сохранения кошелька позволяет вам использовать свой кошелек с биометрической авторизацией, не прикладывая карту к телефону для получения доступа. - Разрешить привязку кошелька - Обратите внимание, что для совершения транзакции с вашими средствами по-прежнему потребуется ваша карта - Включите биометрическую авторизацию - Похоже, что у вас отключена биометрическая авторизация, она необходима для сохранения кошельков - Включить - Отмена - Мультивалютные - Одновалютные - Переименование кошелька - Имя кошелька - Разблокировать все с биометрией - Добавить новый кошелек - %d выбрано - Мои кошельки + Баланс: %s + Поделиться + Копировать + Успешно + Дать разрешение + Чтобы продолжить, вам нужно разрешить смарт-контракту 1inch использовать ваш %s + Количество %s + Ваш кошелек + Отправитель + Подтвердить + Обмен %s на + Обмен + Недостаточно средств + Дать разрешение + Разрешить и обменять + Не удалось загрузить информацию по реферальной программе. Пожалуйста, попробуйте позже. + Не удалось загрузить информацию по реферальной программе. Причина: %s. Пожалуйста, попробуйте позже. + Не удалось обработать вашу заявку на участие. Причина: %s. Пожалуйста, попробуйте позже. Если проблема сохранится, вы можете обратиться в техподдержку. + Персональный код скопирован! + Купи Tangem Wallet со скидкой!\n%s + Сеть %s использует концепцию экзистенциального депозита. Если баланс вашего счета опустится ниже %s, он будет деактивирован, а все оставшиеся средства будут уничтожены. + Неверный адрес Этот кошелек уже был сохранен, вы можете добавить другой + Удалить + Privacy policy + Включите биометрическую аутентификацию + Похоже, что у вас отключена биометрическая аутентификация, она необходима для сохранения кошельков + Включить + Функция сохранения кошелька позволяет вам использовать свой кошелек с биометрической аутентификацией, не прикладывая карту к телефону для получения доступа. + %d выбрано + биометрическую аутентификацию + биометрией diff --git a/core/ui/src/main/res/values-ru/strings_plurals_final.xml b/core/res/src/main/res/values-ru/strings_plurals_final.xml similarity index 64% rename from core/ui/src/main/res/values-ru/strings_plurals_final.xml rename to core/res/src/main/res/values-ru/strings_plurals_final.xml index 35486659e4..ae295e5b79 100644 --- a/core/ui/src/main/res/values-ru/strings_plurals_final.xml +++ b/core/res/src/main/res/values-ru/strings_plurals_final.xml @@ -12,4 +12,11 @@ %d токенов %d токенов + + + %d кошелек + %d кошелька + %d кошельков + %d кошельков + diff --git a/core/ui/src/main/res/values-fr/strings_final.xml b/core/res/src/main/res/values/strings_final.xml similarity index 61% rename from core/ui/src/main/res/values-fr/strings_final.xml rename to core/res/src/main/res/values/strings_final.xml index ca07d2b5c7..8c80f1aeab 100644 --- a/core/ui/src/main/res/values-fr/strings_final.xml +++ b/core/res/src/main/res/values/strings_final.xml @@ -5,7 +5,7 @@ 2 cards Shipping Free - I have a promo code... + I have a promo code… Total Other payment methods Buy now @@ -35,38 +35,58 @@ This feature is disabled in Demo mode Not enough funds for fee on your %s wallet to send a transaction. Top up your %s wallet first. Available networks + %s network not found. Please, add it first and try again. + Attention Note that tokens on different networks have different addresses. Double check that your address matches the network when you transfer funds. Tokens in Solana network are not supported by this card due to firmware limitation. Contract address copied! - If you chose the wrong network during your crypto transfer from the exchange, this guide will help you recover your funds - Attention + Contract address + Required field + Please select the network + Decimal number must be a valid integer, no higher than %d + Contract address is invalid + Derivation path is invalid + Note that tokens can be created by anyone. Be aware of adding scam tokens, they can cost nothing. + This token/network has already been added to your list + Decimals + Network + Not selected + E.g. USD Coin + Name + E.g. USDC + Token symbol + BIP44 coin type + Default The server is not available, please try again later Total balance The amount does not include some of your funds + Tokens Manage tokens No rate + Network is unreachable Hide token Hide %s Hide You are about to hide this token from the main screen. You can add it back anytime through the manage tokens page. Unable to hide %s The %s token is the main currency on the %s network and cannot be hidden as long as you have other tokens on this network in the list. - %s network not found. Please, add it first and try again. - This network is not supported. Please select another network. - %s network Your wallet has not been backed up To protect your assets, we advise you to carry out this procedure - Remove token - Russian bank cards are not accepted at the moment - Do you have a bank card of another country or a UnionPay card? + Retry + Chat + %s network + I understand Yes No - Chat - Tangem Bot + Russian bank cards are not accepted at the moment + Do you have a bank card of another country or a UnionPay card? + This network is not supported. Please select another network. Card Settings Security Mode - Change access code + Change Access Code Access code will be changed on this card only + Continue + Tangem Bot Get your card ready! Scan the card to change its settings. The changes will impact only the card you\'ve scanned and will not affect other cards tied to your wallet. Scan Card @@ -79,23 +99,34 @@ This will delete all the saved wallet access codes. Any further operation with the wallet will require submitting the access code. WalletConnect Connect to Dapps - Link More Cards - Privacy policy - Reset to factory settings This action will completely remove the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. I understand that after performing this action, I will no longer have access to the current wallet - Reset the card + Reset the Card Reset to Factory Settings Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. Select network Scan your card To access all the networks you need to scan the card - Failed to establish WalletConnect session - Memo - Tag - Invalid Memo. It won\'t be added to the transaction. - Invalid Tag. It won\'t be added to the transaction. Connection with this Dapp cannot be established due to its technical implementation. + Welcome back! + Use %s or scan a card to access the app + Log in with %s + Scan card + Save your wallet + Note that making a transaction with your funds will still require your card + Allow to use %s + New feature + My Wallets + Multi-currency + Single-currency + Add new wallet + Rename Wallet + Wallet name + Unlock all with %s + Invalid Tag. It won\'t be added to the transaction. + Invalid Memo. It won\'t be added to the transaction. + Tag + Memo Attention Tap the card with the visa logo No funds for activation @@ -128,7 +159,6 @@ Tap the SaltPay card Tap the Tangem card Support - Getting started Claim %s To get started, simply claim wxDAI to your wallet Claim @@ -136,8 +166,57 @@ Claiming It will take a few seconds Something went wrong - Please check you email for further instructions + Please check your email for further instructions Do you want to exit the activation process? In this case, you will need to start from the beginning. You have used a card from another wallet. Tap the card associated with this wallet - \ No newline at end of file + Referral program + Refer your friends to Tangem + You + Will get + for each wallet bought by your friend on your %s network address%s + Your friend + Will get a + %s discount + when buying a card on tangem.com + Your friends bought + Your personal code + Participate + terms and conditions + By tapping this button you accept + You\'ve accepted + of the referral program + Internal error: wallet manager not found + Balance: %s + Share + Copy + Success + Give Permission + To continue you need to allow 1inch smart contracts to use your %s + Amount %s + Your Wallet + Spender + Approve + Swap of %s to + Swap + Insufficient funds + Give Permission + Permit and Swap + Failed to load the information about the referral program. Please try again later. + Failed to load the information about the referral program. Reason: %s. Please try again later. + Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support. + Personal code copied! + Buy Tangem Wallet with discount!\n%s + %s network has a concept of Existential Deposit. If your account drops below %s it will be deactivated and any remaining funds will be destroyed. + Invalid address + This wallet has already been saved, you can add another one + Delete + Privacy policy + Enable biometric authorization + It looks like you have biometric authorization disabled, it is necessary to save wallets + Enable + Save your Wallet feature allows you to use your wallet with biometric auth without tapping your card to the phone to gain access. + %d selected + biometric authentication + biometrics + diff --git a/core/ui/src/main/res/values/strings_plurals_final.xml b/core/res/src/main/res/values/strings_plurals_final.xml similarity index 75% rename from core/ui/src/main/res/values/strings_plurals_final.xml rename to core/res/src/main/res/values/strings_plurals_final.xml index 9fa94fe676..72449e9325 100644 --- a/core/ui/src/main/res/values/strings_plurals_final.xml +++ b/core/res/src/main/res/values/strings_plurals_final.xml @@ -12,4 +12,9 @@ %d tokens %d tokens + + + %d wallets + %d wallet + diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index 929960a637..2ab555ec1d 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -55,4 +55,6 @@ dependencies { /** Other libraries */ implementation(Library.accompanistSystemUiController) implementation(Library.materialComponent) + + implementation(project(":core:res")) } \ No newline at end of file diff --git a/core/ui/src/main/res/values-de/strings-app.xml b/core/ui/src/main/res/values-de/strings-app.xml new file mode 100644 index 0000000000..234b37a13d --- /dev/null +++ b/core/ui/src/main/res/values-de/strings-app.xml @@ -0,0 +1,6 @@ + + + Failed to establish WalletConnect session + Link More Cards + Abbrechen + \ No newline at end of file diff --git a/core/ui/src/main/res/values-fr/strings-app.xml b/core/ui/src/main/res/values-fr/strings-app.xml new file mode 100644 index 0000000000..e148949c0d --- /dev/null +++ b/core/ui/src/main/res/values-fr/strings-app.xml @@ -0,0 +1,6 @@ + + + Failed to establish WalletConnect session + Link More Cards + Annuler + \ No newline at end of file diff --git a/core/ui/src/main/res/values-it/strings-app.xml b/core/ui/src/main/res/values-it/strings-app.xml new file mode 100644 index 0000000000..fc516e10a2 --- /dev/null +++ b/core/ui/src/main/res/values-it/strings-app.xml @@ -0,0 +1,6 @@ + + + Failed to establish WalletConnect session + Link More Cards + Annulla + \ No newline at end of file diff --git a/core/ui/src/main/res/values-ru/string_common.xml b/core/ui/src/main/res/values-ru/string_common.xml deleted file mode 100644 index 7df281b0b0..0000000000 --- a/core/ui/src/main/res/values-ru/string_common.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Поделиться - Копировать - условия участия - \ No newline at end of file diff --git a/core/ui/src/main/res/values-ru/strings-app.xml b/core/ui/src/main/res/values-ru/strings-app.xml new file mode 100644 index 0000000000..b085fe9843 --- /dev/null +++ b/core/ui/src/main/res/values-ru/strings-app.xml @@ -0,0 +1,6 @@ + + + Не удалось установить сессию WalletConnect + Добавить еще карты + Отмена + \ No newline at end of file diff --git a/core/ui/src/main/res/values/string_common.xml b/core/ui/src/main/res/values/string_common.xml deleted file mode 100644 index b7a15f7fb0..0000000000 --- a/core/ui/src/main/res/values/string_common.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - Share - Copy - terms and conditions - \ No newline at end of file diff --git a/core/ui/src/main/res/values/strings-app.xml b/core/ui/src/main/res/values/strings-app.xml new file mode 100644 index 0000000000..73745abf84 --- /dev/null +++ b/core/ui/src/main/res/values/strings-app.xml @@ -0,0 +1,6 @@ + + + Failed to establish WalletConnect session + Link More Cards + Cancel + \ No newline at end of file diff --git a/features/referral/presentation/build.gradle.kts b/features/referral/presentation/build.gradle.kts index 19a4cc8c13..a94eecb86b 100644 --- a/features/referral/presentation/build.gradle.kts +++ b/features/referral/presentation/build.gradle.kts @@ -48,6 +48,7 @@ android { dependencies { /** Core modules */ + implementation(project(":core:res")) implementation(project(":core:utils")) implementation(project(":core:ui")) diff --git a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt index a1de2d981f..0027b80634 100644 --- a/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt +++ b/features/referral/presentation/src/main/java/com/tangem/feature/referral/ui/ParticipateBottomBlock.kt @@ -13,12 +13,14 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment +import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.draw.shadow import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalHapticFeedback +import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.tooling.preview.Preview @@ -30,6 +32,7 @@ import com.tangem.core.ui.res.TextColorType import com.tangem.core.ui.res.textColor import com.tangem.feature.referral.presentation.R +@OptIn(ExperimentalComposeUiApi::class) @Composable internal fun ParticipateBottomBlock( purchasedWalletCount: Int, @@ -49,9 +52,10 @@ internal fun ParticipateBottomBlock( ) { SmallInfoCard( startText = stringResource(id = R.string.referral_friends_bought_title), - endText = String.format( - stringResource(id = R.string.referral_wallets_purchased_count), - purchasedWalletCount, + endText = pluralStringResource( + id = R.plurals.referral_wallets_purchased_count, + count = purchasedWalletCount, + purchasedWalletCount ), ) PersonalCodeCard(code = code) diff --git a/features/referral/presentation/src/main/res/values-ru/string.xml b/features/referral/presentation/src/main/res/values-ru/string.xml deleted file mode 100644 index 523d489aee..0000000000 --- a/features/referral/presentation/src/main/res/values-ru/string.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - Реферальная программа - Приведи друга в Tangem - Вы - Получите - на ваш адрес в сети %s%s за каждый кошелек, который купит ваш друг - Ваш друг - Получит - %s скидку - при покупке карточки на сайте tangem.com - Нажимая на эту кнопку вы принимаете - условия участия - в реферальной программе - Участвовать - Вы приняли - Ваш персональный код - %d кошельков - Ваши друзья купили - Не удалось загрузить информацию по реферальной программе. Пожалуйста, попробуйте позже. - Не удалось загрузить информацию по реферальной программе. Причина: %s. Пожалуйста, попробуйте позже. - Не удалось обработать вашу заявку на участие. Причина: %s. Пожалуйста, попробуйте позже. Если проблема сохранится, вы можете обратиться в техподдержку. - Персональный код скопирован! - Купи Tangem Wallet со скидкой!\n%s - \ No newline at end of file diff --git a/features/referral/presentation/src/main/res/values/strings.xml b/features/referral/presentation/src/main/res/values/strings.xml deleted file mode 100644 index dfac4843e0..0000000000 --- a/features/referral/presentation/src/main/res/values/strings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - Referral program - Refer your friends to Tangem - You - Will get - for each wallet bought by your friend on your %s network address%s - Your friend - Will get a - %s discount - when buying a card on tangem.com - By tapping this button you accept - terms and conditions - of the referral program - Participate - You\'ve accepted - Your personal code - %d wallets - Your friends bought - Failed to load the information about the referral program. Please try again later. - Failed to load the information about the referral program. Reason: %s. Please try again later. - Your participation request could not be processed. Reason: %s. Please try again later. If the problem persists — feel free to contact our support. - Personal code copied! - Buy Tangem Wallet with discount!\n%s - \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 76949019de..013139ff41 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,6 +5,7 @@ include(":common") // region Core modules include(":core:datasource") +include(":core:res") include(":core:utils") include(":core:ui") // endregion Core modules