IOS-2592 wording conflicts card

TangemSdk/TangemSdk/Common/Core/CardSession.swift

@@ -482,7 +482,7 @@ public class CardSession {
             func continueRunnable(code: String) {
                 self.updateEnvironment(with: type, code: code)
                 self.viewDelegate.setState(.default)
-                self.viewDelegate.showAlertMessage("nfc_alert_default".localized)
+                self.viewDelegate.showAlertMessage("view_delegate_scan_description".localized)
                 completion(.success(()))
             }
 

TangemSdk/TangemSdk/Common/Core/TangemSdkError.swift

@@ -488,7 +488,7 @@ public enum TangemSdkError: Error, LocalizedError, Encodable {
         case .passcodeRequired: return "error_pin_required_format".localized(UserCodeType.passcode.name)
         case .underlying(let error): return error.localizedDescription
         case .fileNotFound: return "error_file_not_found".localized
-        case .notSupportedFirmwareVersion: return "error_not_supported_firmware_version".localized
+        case .notSupportedFirmwareVersion: return "error_old_firmware".localized
         case .walletNotFound: return "wallet_not_found".localized
         case .walletCannotBeCreated: return "Failed to create wallet. AllowSelectBlockchain flag must be set to true"
         case .wrongAccessCode: return "error_wrong_pin_format".localized(UserCodeType.accessCode.name)

TangemSdk/TangemSdk/Common/Localization/de.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-"nfc_alert_default" = "Connect your phone and the card exactly as it shown above";
+"view_delegate_scan_description" = "Connect your phone and the card exactly as it shown above";
 "nfc_alert_default_done" = "Erledigt";
 "view_delegate_security_delay_description" = "To ensure security please hold the card until the operation complete";
 "cid_format" = "Card #%@";
@@ -14,10 +14,10 @@
 "pin2" = "Passcode";
 "pin_enter" = "Anmelden %@";
 "pin_confirm_error_format" = "Die Codes stimmen nicht überein";
-"pin_change_code_format" = "Ändern %@";
+"pin_set_code_format" = "Ändern %@";
 "pin_change_new_code_format" = "Neu %@";
 "pin_set_code_confirm_format" = "Bestätigen %@";
-"enter_user_code_button_title_forgot" = "Forgot your code?";
+"reset_codes_btn_forgot_your_code" = "Forgot your code?";
 "pin_reset_code_format" = "Reset %@";
 "generic_error_code" = "Während des Vorgangs ist ein Fehler aufgetreten. Code: %@.";
 "nfc_session_timeout" = "Die Sitzung ist abgelaufen. Bitte versuchen Sie es erneut.";
@@ -36,13 +36,13 @@
 "error_wrong_card_number_without_card_id" = "You tapped a different card";
 "error_wrong_card_type" = "Diese Karte ist für eine andere App konfiguriert. Sehen Sie sich die Informationen auf Ihrer Karte an und laden Sie die entsprechende App herunter.";
 "error_file_not_found" = "File not found";
-"error_not_supported_firmware_version" = "The command requires a card with a different firmware version";
+"error_old_firmware" = "The command requires a card with a different firmware version";
 "wallet_not_found" = "This card does not contain the current wallet";
 "error_old_card" = "Tangem cards issued before September 2019 cannot sign data using an iPhone due to iOS restrictions";
-"error_backup_card_already_added" = "This card has already been added to the list.";
+"error_backup_card_already_added" = "This card has already been added to the list";
 "error_backup_not_empty_wallets" = "This card already has a wallet. If you want to proceed you have to reset it to factory settings first.";
-"error_backup_wrong_card" = "This card can’t be used as a backup card. Error code: %@.";
-"error_reset_wrong_card" = "This card can’t be used for code recovery. Error code: %@.";
+"error_backup_wrong_card" = "This card can't be used as a backup card. Error code: %@.";
+"error_reset_wrong_card" = "This card can't be used for code recovery. Error code: %@.";
 "backup_prepare_primary_card_message" = "Connect your phone and the primary card exactly as it shown above.";
 "backup_prepare_primary_card_message_format" = "Connect your phone and the primary card with number %@ exactly as it shown above.";
 "backup_add_backup_card_message" = "Connect your phone and the card you want to use as a backup exactly as it shown above.";

TangemSdk/TangemSdk/Common/Localization/en.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-"nfc_alert_default" = "Connect your phone and the card exactly as it shown above";
+"view_delegate_scan_description" = "Connect your phone and the card exactly as it shown above";
 "nfc_alert_default_done" = "Done";
 "view_delegate_security_delay_description" = "To ensure security please hold the card until the operation complete";
 "cid_format" = "Card #%@";
@@ -14,16 +14,16 @@
 "pin2" = "Passcode";
 "pin_enter" = "Enter %@";
 "pin_confirm_error_format" = "Codes do not match";
-"pin_change_code_format" = "Set %@";
+"pin_set_code_format" = "Set %@";
 "pin_change_new_code_format" = "New %@";
 "pin_set_code_confirm_format" = "Confirm %@";
-"enter_user_code_button_title_forgot" = "Forgot your code?";
+"reset_codes_btn_forgot_your_code" = "Forgot your code?";
 "pin_reset_code_format" = "Reset %@";
 "generic_error_code" = "An error occurred during the operation. Code: %@.";
 "nfc_session_timeout" = "Session timeout. Please, try again.";
 "nfc_stuck_error" = "It seems that NFC does not work properly on your iPhone";
 "error_already_created" = "A wallet has already been created";
-"error_purge_prohibited" = "This card’s configuration does not allow you to erase the wallet";
+"error_purge_prohibited" = "This card's configuration does not allow you to erase the wallet";
 "error_pin_cannot_be_changed_format" = "%@ cannot be changed";
 "error_pin_cannot_be_default_format" = "%@ cannot be changed to this value. Please, enter another one.";
 "error_pin_too_short_format" = "%@ must be at least %d characters long";
@@ -36,13 +36,13 @@
 "error_wrong_card_number_without_card_id" = "You tapped a different card";
 "error_wrong_card_type" = "This card is not designed to work with this app";
 "error_file_not_found" = "File not found";
-"error_not_supported_firmware_version" = "The command requires a card with a different firmware version";
+"error_old_firmware" = "The command requires a card with a different firmware version";
 "wallet_not_found" = "This card does not contain the current wallet";
 "error_old_card" = "Tangem cards issued before September 2019 cannot sign data using an iPhone due to iOS restrictions";
-"error_backup_card_already_added" = "This card has already been added to the list.";
+"error_backup_card_already_added" = "This card has already been added to the list";
 "error_backup_not_empty_wallets" = "This card already has a wallet. If you want to proceed you have to reset it to factory settings first.";
-"error_backup_wrong_card" = "This card can’t be used as a backup card. Error code: %@.";
-"error_reset_wrong_card" = "This card can’t be used for code recovery. Error code: %@.";
+"error_backup_wrong_card" = "This card can't be used as a backup card. Error code: %@.";
+"error_reset_wrong_card" = "This card can't be used for code recovery. Error code: %@.";
 "backup_prepare_primary_card_message" = "Connect your phone and the primary card exactly as it shown above.";
 "backup_prepare_primary_card_message_format" = "Connect your phone and the primary card with number %@ exactly as it shown above.";
 "backup_add_backup_card_message" = "Connect your phone and the card you want to use as a backup exactly as it shown above.";

TangemSdk/TangemSdk/Common/Localization/fr.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-"nfc_alert_default" = "Connect your phone and the card exactly as it shown above";
+"view_delegate_scan_description" = "Connect your phone and the card exactly as it shown above";
 "nfc_alert_default_done" = "Exécuté";
 "view_delegate_security_delay_description" = "To ensure security please hold the card until the operation complete";
 "cid_format" = "Card #%@";
@@ -10,14 +10,14 @@
 "common_warning" = "Warning";
 "common_retry" = "Retry";
 "common_understand" = "I understand";
-"pin1" = "Code d’accès";
+"pin1" = "Code d'accès";
 "pin2" = "Mot de passe";
 "pin_enter" = "Saisir %@";
 "pin_confirm_error_format" = "Codes ne correspondent pas";
-"pin_change_code_format" = "Modifier %@";
+"pin_set_code_format" = "Modifier %@";
 "pin_change_new_code_format" = "Nouveau %@";
 "pin_set_code_confirm_format" = "Confirmer %@";
-"enter_user_code_button_title_forgot" = "Forgot your code?";
+"reset_codes_btn_forgot_your_code" = "Forgot your code?";
 "pin_reset_code_format" = "Reset %@";
 "generic_error_code" = "Une erreur s'est produite lors de l'opération. Code : %@.";
 "nfc_session_timeout" = "Dépassement de temps imparti de la séance. Essayez encore une fois";
@@ -36,13 +36,13 @@
 "error_wrong_card_number_without_card_id" = "You tapped a different card";
 "error_wrong_card_type" = "Cette carte est personnalisée pour une autre application. Veuillez lire les informations sur votre carte et télécharger l'application correspondante.";
 "error_file_not_found" = "File not found";
-"error_not_supported_firmware_version" = "The command requires a card with a different firmware version";
+"error_old_firmware" = "The command requires a card with a different firmware version";
 "wallet_not_found" = "This card does not contain the current wallet";
 "error_old_card" = "Tangem cards issued before September 2019 cannot sign data using an iPhone due to iOS restrictions";
-"error_backup_card_already_added" = "This card has already been added to the list.";
+"error_backup_card_already_added" = "This card has already been added to the list";
 "error_backup_not_empty_wallets" = "This card already has a wallet. If you want to proceed you have to reset it to factory settings first.";
-"error_backup_wrong_card" = "This card can’t be used as a backup card. Error code: %@.";
-"error_reset_wrong_card" = "This card can’t be used for code recovery. Error code: %@.";
+"error_backup_wrong_card" = "This card can't be used as a backup card. Error code: %@.";
+"error_reset_wrong_card" = "This card can't be used for code recovery. Error code: %@.";
 "backup_prepare_primary_card_message" = "Connect your phone and the primary card exactly as it shown above.";
 "backup_prepare_primary_card_message_format" = "Connect your phone and the primary card with number %@ exactly as it shown above.";
 "backup_add_backup_card_message" = "Connect your phone and the card you want to use as a backup exactly as it shown above.";

TangemSdk/TangemSdk/Common/Localization/it.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-"nfc_alert_default" = "Connect your phone and the card exactly as it shown above";
+"view_delegate_scan_description" = "Connect your phone and the card exactly as it shown above";
 "nfc_alert_default_done" = "Fatto";
 "view_delegate_security_delay_description" = "To ensure security please hold the card until the operation complete";
 "cid_format" = "Card #%@";
@@ -14,10 +14,10 @@
 "pin2" = "Password";
 "pin_enter" = "Inserire %@";
 "pin_confirm_error_format" = "I codici non corrispondono";
-"pin_change_code_format" = "Modifica %@";
+"pin_set_code_format" = "Modifica %@";
 "pin_change_new_code_format" = "Nuovo %@";
 "pin_set_code_confirm_format" = "Conferma %@";
-"enter_user_code_button_title_forgot" = "Forgot your code?";
+"reset_codes_btn_forgot_your_code" = "Forgot your code?";
 "pin_reset_code_format" = "Reset %@";
 "generic_error_code" = "Si è verificato un errore durante l'operazione. Codice: %@.";
 "nfc_session_timeout" = "Sessione scaduta. Riprova.";
@@ -36,13 +36,13 @@
 "error_wrong_card_number_without_card_id" = "You tapped a different card";
 "error_wrong_card_type" = "Questa carta è creata per un'altra applicazione. Controlla le informazioni sulla mappa e scarica l'apposita applicazione.";
 "error_file_not_found" = "File not found";
-"error_not_supported_firmware_version" = "The command requires a card with a different firmware version";
+"error_old_firmware" = "The command requires a card with a different firmware version";
 "wallet_not_found" = "This card does not contain the current wallet";
 "error_old_card" = "Tangem cards issued before September 2019 cannot sign data using an iPhone due to iOS restrictions";
-"error_backup_card_already_added" = "This card has already been added to the list.";
+"error_backup_card_already_added" = "This card has already been added to the list";
 "error_backup_not_empty_wallets" = "This card already has a wallet. If you want to proceed you have to reset it to factory settings first.";
-"error_backup_wrong_card" = "This card can’t be used as a backup card. Error code: %@.";
-"error_reset_wrong_card" = "This card can’t be used for code recovery. Error code: %@.";
+"error_backup_wrong_card" = "This card can't be used as a backup card. Error code: %@.";
+"error_reset_wrong_card" = "This card can't be used for code recovery. Error code: %@.";
 "backup_prepare_primary_card_message" = "Connect your phone and the primary card exactly as it shown above.";
 "backup_prepare_primary_card_message_format" = "Connect your phone and the primary card with number %@ exactly as it shown above.";
 "backup_add_backup_card_message" = "Connect your phone and the card you want to use as a backup exactly as it shown above.";

TangemSdk/TangemSdk/Common/Localization/ru.lproj/Localizable.strings

@@ -1,4 +1,4 @@
-"nfc_alert_default" = "Поднесите карту к телефону в точности, как показано выше";
+"view_delegate_scan_description" = "Поднесите карту к телефону в точности, как показано выше";
 "nfc_alert_default_done" = "Готово";
 "view_delegate_security_delay_description" = "Пожалуйста, удерживайте карту до завершения операции";
 "cid_format" = "Карта #%@";
@@ -14,17 +14,17 @@
 "pin2" = "Пароль";
 "pin_enter" = "Введите %@";
 "pin_confirm_error_format" = "Коды не совпадают";
-"pin_change_code_format" = "Установить %@";
+"pin_set_code_format" = "Установить %@";
 "pin_change_new_code_format" = "Новый %@";
 "pin_set_code_confirm_format" = "Подтвердить %@";
-"enter_user_code_button_title_forgot" = "Забыли код?";
+"reset_codes_btn_forgot_your_code" = "Забыли код?";
 "pin_reset_code_format" = "Сбросить %@";
 "generic_error_code" = "Во время операции произошла ошибка. Код: %@.";
 "nfc_session_timeout" = "Время сессии истекло. Пожалуйста, попробуйте еще раз.";
 "nfc_stuck_error" = "Судя по всему, NFC не работает должным образом на вашем iPhone";
 "error_already_created" = "Кошелек уже создан";
 "error_purge_prohibited" = "Конфигурация этой карты не позволяет удалить кошелек";
-"error_pin_cannot_be_changed_format" = "Код доступа не может быть изменен";
+"error_pin_cannot_be_changed_format" = "%@ не может быть изменен";
 "error_pin_cannot_be_default_format" = "%@ нельзя изменить на это значение. Пожалуйста, введите другое";
 "error_pin_too_short_format" = "%@ должен состоять не менее чем из %d символов.";
 "error_pin_required_format" = "Введите %@";
@@ -36,10 +36,10 @@
 "error_wrong_card_number_without_card_id" = "Вы коснулись другой картой";
 "error_wrong_card_type" = "Данная карта не предназначена для работы с этим приложением";
 "error_file_not_found" = "Файл не найден";
-"error_not_supported_firmware_version" = "Эта команда не поддерживается данной картой";
+"error_old_firmware" = "Эта команда не поддерживается данной картой";
 "wallet_not_found" = "Эта карта не содержит текущий кошелек";
 "error_old_card" = "Карты Tangem, выпущенные до сентября 2019 года, не могут подписывать данные с помощью iPhone из-за ограничений iOS.";
-"error_backup_card_already_added" = "Эта карта уже добавлена в список ";
+"error_backup_card_already_added" = "Эта карта уже добавлена в список";
 "error_backup_not_empty_wallets" = "На этой карте уже создан кошелёк. Если вы хотите продолжить, сбросьте карту к заводским настройкам.";
 "error_backup_wrong_card" = "Эту карту нельзя использовать для резервного копирования. Код ошибки: %@.";
 "error_reset_wrong_card" = "Эту карту нельзя использовать для восстановления кода. Код ошибки: %@.";

TangemSdk/TangemSdk/Common/NFC/NFCReader.swift

@@ -110,7 +110,7 @@ extension NFCReader: CardReader {
         cancelled = false
         connectedTag = nil
 
-        let alertMessage = message ?? "nfc_alert_default".localized
+        let alertMessage = message ?? "view_delegate_scan_description".localized
         _alertMessage = alertMessage
 
         let isExistingSessionActive = readerSession?.isReady ?? false

TangemSdk/TangemSdk/Common/UserCode.swift

@@ -72,7 +72,7 @@ extension UserCodeType {
     }
 
     var changeCodeTitle: String {
-        "pin_change_code_format".localized(name.lowercasingFirst())
+        "pin_set_code_format".localized(name.lowercasingFirst())
     }
 
     var confirmCodeTitle: String {

TangemSdk/TangemSdk/UI/Main/DefaultSessionViewDelegate.swift

@@ -69,7 +69,7 @@ extension DefaultSessionViewDelegate: SessionViewDelegate {
         if pinnedMessage == nil {
             pinnedMessage = reader.alertMessage
         }
-        showAlertMessage("nfc_alert_default".localized)
+        showAlertMessage("view_delegate_scan_description".localized)
     }
 
     func wrongCard(message: String) {

TangemSdk/TangemSdk/UI/Views/UserCodes/EnterUserCodeView.swift

@@ -43,7 +43,7 @@ struct EnterUserCodeView: View {
                 Spacer()
 
                 if showForgotButton {
-                    Button("enter_user_code_button_title_forgot".localized, action: onForgot)
+                    Button("reset_codes_btn_forgot_your_code".localized, action: onForgot)
                         .buttonStyle(RoundedButton(colors: style.colors.secondaryButtonColors))
                 }