diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt index ab95ef6ef8..f0917ecf17 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ApproveWcSessionDialog.kt @@ -12,9 +12,11 @@ import com.tangem.wallet.R class ApproveWcSessionDialog { companion object { fun create(session: WalletConnectSession, networks: List, context: Context): AlertDialog { + val sessionBlockchain = requireNotNull(session.wallet.blockchain) { "session network is null" } val message = context.getString( R.string.wallet_connect_request_session_start, session.peerMeta.name, + sessionBlockchain.fullName, session.peerMeta.url, ) return AlertDialog.Builder(context).apply { @@ -22,7 +24,7 @@ class ApproveWcSessionDialog { setMessage(message) setPositiveButton(context.getText(R.string.common_start)) { _, _ -> store.dispatch(GlobalAction.HideDialog) - store.dispatch(WalletConnectAction.ChooseNetwork(session.wallet.blockchain!!)) + store.dispatch(WalletConnectAction.ChooseNetwork(sessionBlockchain)) } if (networks.size > 1) { setNeutralButton(context.getText(R.string.wallet_connect_select_network)) { _, _ -> diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt index 669ec571f0..353989e76c 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/dialogs/RequestFeeErrorDialog.kt @@ -18,7 +18,7 @@ class RequestFeeErrorDialog { val errorMessage = dialog.error.customMessage return AlertDialog.Builder(context).apply { - setTitle(R.string.send_error_fee_request_failed) + setTitle(R.string.common_fee_error) setMessage(context.getString(R.string.alert_failed_to_send_transaction_message, errorMessage)) setNegativeButton(R.string.alert_button_send_feedback) { _, _ -> store.dispatch(GlobalAction.SendEmail(SendTransactionFailedEmail(errorMessage))) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt index 34ca1f10c1..4b9b5cb18e 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt @@ -128,7 +128,7 @@ class BalanceWidget( tvErrorTitle.text = fragment.getText(R.string.wallet_error_no_account) tvErrorDescriptions.text = fragment.getString( - R.string.wallet_error_no_account_subtitle_format, + R.string.no_account_generic, data.amountToCreateAccount, data.currencySymbol ) } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt index f40bf97ea5..d938b8966d 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt @@ -340,7 +340,7 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), lBalanceError.tvErrorTitle.text = getText(R.string.wallet_error_no_account) lBalanceError.tvErrorDescriptions.text = getString( - R.string.wallet_error_no_account_subtitle_format, + R.string.no_account_generic, data.amountToCreateAccount, data.currencySymbol, ) } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt index 609537bbaf..c8db3c3d23 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt @@ -14,7 +14,7 @@ class SignedHashesWarningDialog { return AlertDialog.Builder(context).apply { setTitle(context.getString(R.string.warning_important_security_info)) setMessage(R.string.alert_signed_hashes_message) - setPositiveButton(R.string.alert_button_i_understand) { _, _ -> + setPositiveButton(R.string.common_understand) { _, _ -> store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId) store.dispatch( GlobalAction.HideWarningMessage( diff --git a/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml b/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml index b14f8571de..e0f2965300 100644 --- a/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml +++ b/app/src/main/res/layout-h680dp/layout_onboarding_container_bottom.xml @@ -51,7 +51,7 @@ android:id="@+id/chb_understand" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/alert_button_i_understand" + android:text="@string/common_understand" android:textStyle="bold" android:visibility="gone" app:buttonTint="@color/accent" diff --git a/app/src/main/res/layout/layout_address.xml b/app/src/main/res/layout/layout_address.xml index abf039bab7..79341aa867 100644 --- a/app/src/main/res/layout/layout_address.xml +++ b/app/src/main/res/layout/layout_address.xml @@ -43,14 +43,14 @@ style="@style/TapChip" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/wallet_address_chip_default" /> + android:text="@string/address_type_default" /> + android:text="@string/address_type_legacy" /> diff --git a/app/src/main/res/layout/layout_onboarding_container_bottom.xml b/app/src/main/res/layout/layout_onboarding_container_bottom.xml index 9ee7ea6489..6cbb49b0fa 100644 --- a/app/src/main/res/layout/layout_onboarding_container_bottom.xml +++ b/app/src/main/res/layout/layout_onboarding_container_bottom.xml @@ -51,7 +51,7 @@ android:id="@+id/chb_understand" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/alert_button_i_understand" + android:text="@string/common_understand" android:textStyle="bold" android:visibility="gone" app:buttonTint="@color/accent" diff --git a/app/src/main/res/layout/layout_wallet_details.xml b/app/src/main/res/layout/layout_wallet_details.xml index 8e33a5cead..85cb90977c 100644 --- a/app/src/main/res/layout/layout_wallet_details.xml +++ b/app/src/main/res/layout/layout_wallet_details.xml @@ -60,14 +60,14 @@ style="@style/TapChip" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/wallet_address_chip_default" /> + android:text="@string/address_type_default" /> + android:text="@string/address_type_legacy" /> @@ -127,7 +127,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="4dp" android:src="@drawable/ic_inactive" - android:text="@string/wallet_address_button_copy" + android:text="@string/common_copy" android:textAlignment="center" android:textColor="@color/colorSecondary" app:chipBackgroundColor="@color/blue_pale" @@ -148,7 +148,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:src="@drawable/ic_inactive" - android:text="@string/wallet_address_button_share" + android:text="@string/common_share" android:textAlignment="center" android:textColor="@color/colorSecondary" app:chipBackgroundColor="@color/blue_pale" diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 967b2ab32f..82b5ef487f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -18,7 +18,7 @@ Die Bilanz wird aufgeladen… Blockchain ist nicht erreichbar Das Konto ist nicht erstellt - %s+ %s aufladen um ein Konto zu erstellen + Laden Sie %s+ %s auf um ein Konto zu erstellen Leere Karte Erstellen Sie ein Wallet um die Tangem-Karte verwenden zu können Diese Karte wird nicht unterstützt diff --git a/app/src/main/res/values-de/strings_blockchain.xml b/app/src/main/res/values-de/strings_blockchain.xml index 8b9715a9e6..910ae90ce2 100644 --- a/app/src/main/res/values-de/strings_blockchain.xml +++ b/app/src/main/res/values-de/strings_blockchain.xml @@ -6,7 +6,7 @@ Minimaler Betrag ist %s Restbestand zu klein Das Zielkonto ist nicht erstellt. Der abzusendende Betrag soll %s + Gebühr oder mehr sein - Erhalt der Gebühr fehlgeschlagen + Erhalt der Gebühr fehlgeschlagen Unbekannter Fehler 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 diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0694d102a5..8ec21b0632 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -19,7 +19,7 @@ Solde est en cours de téléchargement … Blockchain est inaccessible Compte n\'est pas créé - Téléchargez %s +%s pour créer un compte + Pour créer un compte, téléchargez %s+ %s Carte vide Créez un portefeuille pour commencer à utiliser votre carte Tangem Cette carte n\'est pas prise en charge diff --git a/app/src/main/res/values-fr/strings_blockchain.xml b/app/src/main/res/values-fr/strings_blockchain.xml index 380232b81b..60b04a9489 100644 --- a/app/src/main/res/values-fr/strings_blockchain.xml +++ b/app/src/main/res/values-fr/strings_blockchain.xml @@ -6,7 +6,7 @@ Le montant minimal est de %s Le reste est trop petit Le compte cible n\'a pas été créé. Le montant à envoyer doit être de %s + commissions ou plus - Échec de réception des commissions + Échec de réception des commissions Erreur inconnue Adresse incorrecte Somme incorrecte diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 28789234b2..ba083b4b39 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -17,7 +17,7 @@ Il saldo sta per essere caricato… Blockchain non raggiungibile Conto non creato - Carica %s+ %s per creare un conto + Scarica %s+ %s per creare un account Carta vuota Crea un portafoglio per iniziare ad utilizzare la tua carta Tangem Questa carta non è supportata diff --git a/app/src/main/res/values-it/strings_blockchain.xml b/app/src/main/res/values-it/strings_blockchain.xml index c9842eb6dd..d51ca39197 100644 --- a/app/src/main/res/values-it/strings_blockchain.xml +++ b/app/src/main/res/values-it/strings_blockchain.xml @@ -8,7 +8,7 @@ Errore sconosciuto 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 + Impossibile ottenere la commissione Indirizzo non valido Importo non valido Il totale supera il saldo diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 172380e133..a709a41b26 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,7 +19,7 @@ Загрузка баланса… Блокчейн недоступен Аккаунт не создан - Загрузите %s+ %s для создания учетной записи + Пополните счет на %s+ %s, чтобы создать аккаунт Карта пуста Создайте кошелек, чтобы начать пользоваться картой Tangem Эта карта не поддерживается @@ -89,8 +89,8 @@ Купить Продать Торговать - По умолчанию - Устаревший + По умолчанию + Устаревший Создать кошелек Сгенерируйте ключи кошелька на обеих картах, чтобы начать использовать свои Twin карты Один кошелек. Две карты. @@ -139,15 +139,13 @@ Символ токена Деривация по BIP44 По-умолчанию - Копировать - Поделиться Пожалуйста, дождитесь завершения транзакции %s, чтобы иметь возможность отправить средства Проверка подлинности не удалась Эта карта может быть производственным образцом или подделкой Важная информация о безопасности \u26A0 Эта карта ранее подписывала транзакции Узнать подробнее - Я понял + Я понял На этой карте доступно только %s подписей. Вы должны вывести все свои средства. Отключить Подписать diff --git a/app/src/main/res/values-ru/strings_blockchain.xml b/app/src/main/res/values-ru/strings_blockchain.xml index f3be360857..ee2464671d 100644 --- a/app/src/main/res/values-ru/strings_blockchain.xml +++ b/app/src/main/res/values-ru/strings_blockchain.xml @@ -5,7 +5,7 @@ Неверная комиссия Минимальная сумма: %s Сдача слишком мала - Не удалось получить комиссию + Не удалось получить комиссию Аккаунт получателя не создан. Сумма для отправки должна быть %s + комиссия или больше Неизвестная ошибка Неверный адрес diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index af231b0713..ab83f1c625 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,7 +25,7 @@ Blockchain is unreachable Account is not created - Load %s+ %s to create account + Load %s+ %s to create account Empty card Create wallet to start using Tangem card This card is not supported diff --git a/app/src/main/res/values/strings_blockchain.xml b/app/src/main/res/values/strings_blockchain.xml index b2ebd2e2d9..a286c1a5f8 100644 --- a/app/src/main/res/values/strings_blockchain.xml +++ b/app/src/main/res/values/strings_blockchain.xml @@ -5,7 +5,7 @@ Invalid Fee Minimum amount is %s Change is too small - Failed to get fee + Failed to get fee Target account is not created. Amount to send should be %s + fee or more Unknown error Invalid address diff --git a/app/src/main/res/values/strings_untranslated.xml b/app/src/main/res/values/strings_untranslated.xml index f82c05ea0e..59a680c908 100644 --- a/app/src/main/res/values/strings_untranslated.xml +++ b/app/src/main/res/values/strings_untranslated.xml @@ -4,8 +4,8 @@ Buy Sell Trade - Default - Legacy + Default + Legacy Create twin wallet Generate wallet keys on both cards to start using your Twins @@ -69,8 +69,6 @@ //Details %s tokens - Copy - Share Please wait for %s transaction to complete to be able to send funds Authenticity check failed @@ -84,7 +82,7 @@ \n\nDo not accept this card as physical payment from someone you don\'t trust. \n\nIt\'s perfectly safe in all other respects. \n\nTangem is the only hardware wallet to offer signature count protection. - I understand + I understand There are only %s signatures available on this card. You must withdraw all of your funds. @@ -251,6 +249,6 @@ Amount to pay: %s Please tell us what card do you have? Please tell us more about your issue. Every small detail can help. Hi support team, - Following information is optional. You can erase it if you don’t want to share it. + Following information is optional. You can erase it if you don\'t want to share it. diff --git a/core/ui/src/main/res/values-de/strings_final.xml b/core/ui/src/main/res/values-de/strings_final.xml index 665f17302a..99b3e6b5b6 100644 --- a/core/ui/src/main/res/values-de/strings_final.xml +++ b/core/ui/src/main/res/values-de/strings_final.xml @@ -26,7 +26,7 @@ Thousands of Currencies A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card DeFi Compatible - Exchange, buy NFT’s, make loans and deposits in more than 100 different decentralized services + Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services The Wallet for Everyone Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto. Order @@ -68,7 +68,7 @@ Change access code Access code will be changed on this card only 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 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 App settings Keep the wallet in the app diff --git a/core/ui/src/main/res/values-fr/strings_final.xml b/core/ui/src/main/res/values-fr/strings_final.xml index 665f17302a..99b3e6b5b6 100644 --- a/core/ui/src/main/res/values-fr/strings_final.xml +++ b/core/ui/src/main/res/values-fr/strings_final.xml @@ -26,7 +26,7 @@ Thousands of Currencies A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card DeFi Compatible - Exchange, buy NFT’s, make loans and deposits in more than 100 different decentralized services + Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services The Wallet for Everyone Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto. Order @@ -68,7 +68,7 @@ Change access code Access code will be changed on this card only 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 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 App settings Keep the wallet in the app diff --git a/core/ui/src/main/res/values-it/strings_final.xml b/core/ui/src/main/res/values-it/strings_final.xml index 665f17302a..99b3e6b5b6 100644 --- a/core/ui/src/main/res/values-it/strings_final.xml +++ b/core/ui/src/main/res/values-it/strings_final.xml @@ -26,7 +26,7 @@ Thousands of Currencies A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card DeFi Compatible - Exchange, buy NFT’s, make loans and deposits in more than 100 different decentralized services + Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services The Wallet for Everyone Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto. Order @@ -68,7 +68,7 @@ Change access code Access code will be changed on this card only 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 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 App settings Keep the wallet in the app diff --git a/core/ui/src/main/res/values/string_common.xml b/core/ui/src/main/res/values/string_common.xml index ad2cf0d79f..85e2e9ef97 100644 --- a/core/ui/src/main/res/values/string_common.xml +++ b/core/ui/src/main/res/values/string_common.xml @@ -1,5 +1,5 @@ - Share - Copy + Share + Copy \ No newline at end of file diff --git a/core/ui/src/main/res/values/strings_final.xml b/core/ui/src/main/res/values/strings_final.xml index 8b0c3fcc01..3460b046ce 100644 --- a/core/ui/src/main/res/values/strings_final.xml +++ b/core/ui/src/main/res/values/strings_final.xml @@ -26,7 +26,7 @@ Thousands of Currencies A hardware wallet for your Bitcoin, Ethereum and many more currencies simultaneously – all in one card DeFi Compatible - Exchange, buy NFT’s, make loans and deposits in more than 100 different decentralized services + Exchange, buy NFT\'s, make loans and deposits in more than 100 different decentralized services The Wallet for Everyone Use it on the go, anywhere, anytime. No wires or batteries. Just tap the card to your phone when you need your crypto. Order @@ -60,7 +60,7 @@ Russian bank cards are not accepted at the moment Do you have a bank card of another country or a UnionPay card? Yes - No + No Chat Tangem Bot Card Settings @@ -68,7 +68,7 @@ Change access code Access code will be changed on this card only 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 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 App settings Keep the wallet in the app