[DDW-596] fix merge conflicts

DominikGuzei · DominikGuzei · commit 80722457d423 · 2022-05-13T13:18:13.000+02:00
diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json
@@ -936,6 +936,11 @@
         "description": "\"Exporting public key failed\" device state",
         "id": "wallet.hardware.deviceStatus.exporting_public_key_failed"
       },
+      {
+        "defaultMessage": "!!!We do not recognize this wallet on your device. Please ensure that you are using the same device that you selected for pairing {walletName} and that you have entered the correct passphrase.",
+        "description": "\"Unrecognized wallet\" device state",
+        "id": "wallet.hardware.deviceStatus.unrecognized_wallet"
+      },
       {
         "defaultMessage": "!!!Disconnect and reconnect your device to restart the process.",
         "description": "\"Disconnect and reconnect your device to start the process again\" device state",
diff --git a/translations/messages.json b/translations/messages.json
@@ -936,6 +936,11 @@
         "description": "\"Exporting public key failed\" device state",
         "id": "wallet.hardware.deviceStatus.exporting_public_key_failed"
       },
+      {
+        "defaultMessage": "!!!We do not recognize this wallet on your device. Please ensure that you are using the same device that you selected for pairing {walletName} and that you have entered the correct passphrase.",
+        "description": "\"Unrecognized wallet\" device state",
+        "id": "wallet.hardware.deviceStatus.unrecognized_wallet"
+      },
       {
         "defaultMessage": "!!!Disconnect and reconnect your device to restart the process.",
         "description": "\"Disconnect and reconnect your device to start the process again\" device state",
