diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt index dab175e0e7..1aae515b7c 100644 --- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt @@ -83,9 +83,9 @@ class MainFragment : BaseFragment(), NavigationResultListener, NfcAdapter.Reader // set phone name if (nfcDeviceAntenna.fullName != "") - tvNFCHint.text = String.format(getString(R.string.main_screen_scan_banknote), nfcDeviceAntenna.fullName) + tvNFCHint.text = String.format(getString(R.string.main_screen_scan_card), nfcDeviceAntenna.fullName) else - tvNFCHint.text = String.format(getString(R.string.main_screen_scan_banknote), getString(R.string.main_screen_phone)) + tvNFCHint.text = String.format(getString(R.string.main_screen_scan_card), getString(R.string.main_screen_phone)) // set listeners fab.setOnClickListener { showMenu(it) } diff --git a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt index e7543ce473..fd36a67a2e 100644 --- a/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt +++ b/app/src/main/java/com/tangem/ui/fragment/VerifyCardFragment.kt @@ -283,7 +283,7 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. if (ctx.card!!.isReusable!!) tvReusable.setText(R.string.details_reusable) else - tvReusable.setText(R.string.details_one_off_banknote) + tvReusable.setText(R.string.details_one_off_card) var s = "" for (signingM in ctx.card!!.allowedSigningMethod) { @@ -397,7 +397,7 @@ class VerifyCardFragment : BaseFragment(), NavigationResultListener, NfcAdapter. if (ctx.card!!.useDevelopersFirmware()!!) { imgDeveloperVersion.setImageResource(R.drawable.ic_developer_version) imgDeveloperVersion.visibility = View.VISIBLE - imgDeveloperVersion.setOnClickListener { Toast.makeText(context, R.string.details_unlocked_banknote, Toast.LENGTH_LONG).show() } + imgDeveloperVersion.setOnClickListener { Toast.makeText(context, R.string.details_unlocked_card, Toast.LENGTH_LONG).show() } } else imgDeveloperVersion.visibility = View.INVISIBLE diff --git a/app/src/main/res/layout/dialog_wait_pin2.xml b/app/src/main/res/layout/dialog_wait_pin2.xml index 82e34a2349..05cb39e224 100644 --- a/app/src/main/res/layout/dialog_wait_pin2.xml +++ b/app/src/main/res/layout/dialog_wait_pin2.xml @@ -13,7 +13,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="16dp" android:fontFamily="@font/maax" - android:text="@string/dialog_this_banknote_has_enforced_security_delay" + android:text="@string/dialog_this_card_has_enforced_security_delay" android:textAlignment="center" android:textColor="@color/primary" android:textSize="@dimen/text_size_1_small" @@ -29,7 +29,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="16dp" android:fontFamily="@font/maax" - android:text="@string/dialog_hold_banknote" + android:text="@string/dialog_hold_card" android:textAlignment="center" android:textColor="@color/black" android:textSize="@dimen/text_size_medium" diff --git a/app/src/main/res/layout/fragment_create_new_wallet.xml b/app/src/main/res/layout/fragment_create_new_wallet.xml index ac59e814c9..362caf9714 100644 --- a/app/src/main/res/layout/fragment_create_new_wallet.xml +++ b/app/src/main/res/layout/fragment_create_new_wallet.xml @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/now_touch_the_banknote_with_id" + android:text="@string/now_touch_the_card_with_id" android:textAlignment="center" android:textSize="@dimen/text_size_medium" /> diff --git a/app/src/main/res/layout/fragment_pin_swap.xml b/app/src/main/res/layout/fragment_pin_swap.xml index f9549271f9..edb6688f60 100644 --- a/app/src/main/res/layout/fragment_pin_swap.xml +++ b/app/src/main/res/layout/fragment_pin_swap.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/now_touch_the_banknote_with_id" + android:text="@string/now_touch_the_card_with_id" android:textAlignment="center" android:textSize="@dimen/text_size_medium" /> diff --git a/app/src/main/res/layout/fragment_prepare_cryptonit_other_api_withdrawal.xml b/app/src/main/res/layout/fragment_prepare_cryptonit_other_api_withdrawal.xml index 753a820f38..95f1b5319a 100644 --- a/app/src/main/res/layout/fragment_prepare_cryptonit_other_api_withdrawal.xml +++ b/app/src/main/res/layout/fragment_prepare_cryptonit_other_api_withdrawal.xml @@ -269,7 +269,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="4dp" android:fontFamily="@font/maax" - android:text="@string/general_on_banknote" + android:text="@string/general_on_card" android:textColor="@color/primary" android:textSize="@dimen/text_size_medium" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_prepare_cryptonit_withdrawal.xml b/app/src/main/res/layout/fragment_prepare_cryptonit_withdrawal.xml index 231371efab..3cd7b64989 100644 --- a/app/src/main/res/layout/fragment_prepare_cryptonit_withdrawal.xml +++ b/app/src/main/res/layout/fragment_prepare_cryptonit_withdrawal.xml @@ -262,7 +262,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="4dp" android:fontFamily="@font/maax" - android:text="@string/general_on_banknote" + android:text="@string/general_on_card" android:textColor="@color/primary" android:textSize="@dimen/text_size_medium" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_prepare_kraken_withdrawal.xml b/app/src/main/res/layout/fragment_prepare_kraken_withdrawal.xml index eefffbc720..457742bfa5 100644 --- a/app/src/main/res/layout/fragment_prepare_kraken_withdrawal.xml +++ b/app/src/main/res/layout/fragment_prepare_kraken_withdrawal.xml @@ -227,7 +227,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="4dp" android:fontFamily="@font/maax" - android:text="@string/general_on_banknote" + android:text="@string/general_on_card" android:textColor="@color/primary" android:textSize="@dimen/text_size_medium" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_purge.xml b/app/src/main/res/layout/fragment_purge.xml index 523bf00460..02a3122cc6 100644 --- a/app/src/main/res/layout/fragment_purge.xml +++ b/app/src/main/res/layout/fragment_purge.xml @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/now_touch_the_banknote_with_id" + android:text="@string/now_touch_the_card_with_id" android:textAlignment="center" android:textSize="@dimen/text_size_medium" /> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e6a0bbf4ff..0bd711498a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -12,8 +12,8 @@ Réessayez de numériser Impossible d\'effacer le porte-monnaie avec un solde différent de zéro Envoyer le paiement - Depuis la carte - sur la carte + Depuis la carte + sur la carte avec solde Envoyer au porte-monnaie Montant @@ -49,8 +49,8 @@ Oups .. Il semble que votre smartphone ne supporte pas de tels paquets NFC. Essayez d\'envoyer une quantité inférieure ou utilisez un smartphone avec prise en charge complète de NFC. Votre argent est en jeu! - Cette carte a imposé un délai de sécurité - Veuillez tenir la carte fermement \ n jusqu\'à ce que l\'opération soit terminée… + Cette carte a imposé un délai de sécurité + Veuillez tenir la carte fermement \ n jusqu\'à ce que l\'opération soit terminée… Vous devrez peut-être répéter cette opération plusieurs fois en fonction des performances NFC de votre smartphone. \ n Ceci est fait pour sécuriser vos fonds. @@ -74,7 +74,7 @@ Mettez en contact la carte avec votre smartphone - Scanner une carte avec votre \n %1$s \n comme indiqué ci-dessus + Scanner une carte avec votre \n %1$s \n comme indiqué ci-dessus phone Le porte-monnaie a été effacé Non personnalisé @@ -146,7 +146,7 @@ L\'authenticité ne peut pas être vérifiée. Balayez vers le bas pour actualiser.      - Maintenant, touchez la carte avec l\'ID + Maintenant, touchez la carte avec l\'ID pour créer le porte-monnaie pour effacer le porte-monnaie pour signer le paiement @@ -229,7 +229,7 @@ None Le dernier! Unlimited - Carte ponctuelle + Carte ponctuelle Micrologiciel Date d\'enregistrement Possession prouvée @@ -243,7 +243,7 @@ Cette carte est protégée par le code PIN1 de l’utilisateur Cette carte est protégée par le code PIN2 par défaut Cette carte est protégée par le code PIN2 de l’utilisateur - Carte débloquée, uniquement à des fins de développement + Carte débloquée, uniquement à des fins de développement Cette carte appliquera un délai de sécurité de %.0f secondes pour toutes les opérations nécessitant un code PIN2 Permet de changer les codes PIN1 et PIN2\n Permet de changer PIN1\n diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1dad9a7498..3e91f7a8bf 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -30,7 +30,7 @@ #bbd9e6 #bbbbcc #4f98c0 - #ffffff + #ffffff #ffffff #66000000 #00A818 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2e11cc16e4..ebf79111a2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -11,8 +11,8 @@ Try to scan again Cannot erase wallet with non-zero balance Send payment - From banknote - on banknote + From card + on card with balance Send to wallet Amount @@ -49,8 +49,8 @@ Oops.. It seems your smartphone does not support such long NFC packets. Try sending smaller amount or use a smartphone with full NFC support. Your money is at risk! - This banknote has enforced security delay - Please hold the banknote firmly\n until the operation is completed… + This card has enforced security delay + Please hold the card firmly\n until the operation is completed… You may be required to repeat this operation a few times depending on the NFC performance of your smartphone.\n This is made for safety of your funds. This is a genuine Tangem card. Please follow instructions written on the card to install the official app. @@ -75,7 +75,7 @@ Tap Tangem card with your smartphone - Scan a banknote with your \n %1$s \n as shown above + Scan a card with your \n %1$s \n as shown above phone Wallet was erased Not personalized @@ -123,7 +123,7 @@ Empty wallet Verification failed Pending transaction… - Not genuine banknote + Not genuine card Locked with PIN2 Verified note identity. No account or network error @@ -139,7 +139,7 @@ Can\'t obtain balance from blockchain. Restore internet connection to be more confident. Swipe down to refresh Wallet verification failed. Tap again. - Tangem Attestation service says the banknote is not genuine. + Tangem Attestation service says the card is not genuine. Firmware binary code verification failed Ask the holder to disable PIN2 before accepting Card identity was not verified. Cannot reach Tangem attestation service. @@ -149,7 +149,7 @@ Authenticity cannot be verified. Swipe down to refresh. - Now touch the banknote with ID + Now touch the card with ID to create the wallet to erase the wallet to sign the payment @@ -234,7 +234,7 @@ None Last one! Unlimited - One-off banknote + One-off card Firmware Registration date Possession proved @@ -244,12 +244,12 @@ Private key Validation node Unspents - This banknote is protected by default PIN1 code - This banknote is protected by user\'s PIN1 code - This banknote is protected by default PIN2 code - This banknote is protected by user\'s PIN2 code - Unlocked banknote, only for development use - This banknote will enforce %.0f seconds security delay for all operations requiring PIN2 code + This card is protected by default PIN1 code + This card is protected by user\'s PIN1 code + This card is protected by default PIN2 code + This card is protected by user\'s PIN2 code + Unlocked card, only for development use + This card will enforce %.0f seconds security delay for all operations requiring PIN2 code Allows to change PIN1 and PIN2\n Allows to change PIN1\n Allows to change PIN2\n diff --git a/app/src/tangemAccess/res/layout/fragment_confirm_transaction.xml b/app/src/tangemAccess/res/layout/fragment_confirm_transaction.xml index 79f0567f68..6bb5f43dda 100644 --- a/app/src/tangemAccess/res/layout/fragment_confirm_transaction.xml +++ b/app/src/tangemAccess/res/layout/fragment_confirm_transaction.xml @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/general_from_banknote" + android:text="@string/general_from_card" android:textColor="@color/primary" android:textSize="@dimen/text_size_medium" /> diff --git a/app/src/tangemAccess/res/layout/fragment_prepare_transaction.xml b/app/src/tangemAccess/res/layout/fragment_prepare_transaction.xml index 327ffe7956..7f675df2a3 100644 --- a/app/src/tangemAccess/res/layout/fragment_prepare_transaction.xml +++ b/app/src/tangemAccess/res/layout/fragment_prepare_transaction.xml @@ -43,7 +43,7 @@ android:layout_marginStart="7dp" android:layout_marginTop="8dp" android:fontFamily="@font/maax" - android:text="@string/general_from_banknote" + android:text="@string/general_from_card" android:textColor="@color/primary" android:textSize="@dimen/text_size_medium" /> diff --git a/app/src/tangemAccess/res/layout/fragment_sign_transaction.xml b/app/src/tangemAccess/res/layout/fragment_sign_transaction.xml index 40ed387af9..19125f6911 100644 --- a/app/src/tangemAccess/res/layout/fragment_sign_transaction.xml +++ b/app/src/tangemAccess/res/layout/fragment_sign_transaction.xml @@ -30,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/now_touch_the_banknote_with_id" + android:text="@string/now_touch_the_card_with_id" android:textAlignment="center" android:textSize="@dimen/text_size_medium" /> diff --git a/app/src/tangemCardano/res/values/strings.xml b/app/src/tangemCardano/res/values/strings.xml index 302a42869a..6dcda8119b 100644 --- a/app/src/tangemCardano/res/values/strings.xml +++ b/app/src/tangemCardano/res/values/strings.xml @@ -5,6 +5,6 @@ Confirm Checkout - Now touch the banknote + Now touch the card \ No newline at end of file diff --git a/tangem-sdk/src/main/res/values/strings.xml b/tangem-sdk/src/main/res/values/strings.xml index 9b9abdadb8..1b84a3024b 100644 --- a/tangem-sdk/src/main/res/values/strings.xml +++ b/tangem-sdk/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ Enable NFC? This app is useless when NFC is disabled. Reader mode depends on it. Hit OK to go to Settings, where you can enable NFC. Security delay - This banknote has enforced security delay. Please hold the banknote firmly until the operation is completed… + This card has enforced security delay. Please hold the card firmly until the operation is completed… Error Ready to Scan Scan card with your phone as shown above