From 39c75cd71b2123509db8b12fe1aa5ceed05f9e8c Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Thu, 3 Apr 2025 18:26:14 -0400
Subject: [PATCH] update withdraw confirmation wording with translations

---
 core/src/main/resources/i18n/displayStrings.properties       | 2 +-
 core/src/main/resources/i18n/displayStrings_cs.properties    | 2 +-
 core/src/main/resources/i18n/displayStrings_de.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_es.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_fa.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_fr.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_it.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_ja.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_pt-br.properties | 1 +
 core/src/main/resources/i18n/displayStrings_pt.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_ru.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_th.properties    | 1 +
 core/src/main/resources/i18n/displayStrings_tr.properties    | 2 +-
 core/src/main/resources/i18n/displayStrings_vi.properties    | 1 +
 .../main/resources/i18n/displayStrings_zh-hans.properties    | 1 +
 .../main/resources/i18n/displayStrings_zh-hant.properties    | 1 +
 .../haveno/desktop/main/funds/withdrawal/WithdrawalView.java | 5 ++---
 17 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 90993c8b27..3a6b666102 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -134,7 +134,7 @@ shared.noDateAvailable=No date available
 shared.noDetailsAvailable=No details available
 shared.notUsedYet=Not used yet
 shared.date=Date
-shared.sendFundsDetailsWithFee=Sending: {0}\nTo receiving address: {1}.\nRequired mining fee is: {2}\n\nThe recipient will receive: {3}\n\nAre you sure you want to withdraw this amount?
+shared.sendFundsDetailsWithFee=Sending: {0}\n\nTo receiving address: {1}\n\nAdditional miner fee: {2}\n\nAre you sure you want to send this amount?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Monero consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n
 shared.copyToClipboard=Copy to clipboard
diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties
index 85b6d8ca87..bc1841259c 100644
--- a/core/src/main/resources/i18n/displayStrings_cs.properties
+++ b/core/src/main/resources/i18n/displayStrings_cs.properties
@@ -134,7 +134,7 @@ shared.noDateAvailable=Žádné datum není k dispozici
 shared.noDetailsAvailable=Detaily nejsou k dispozici
 shared.notUsedYet=Ještě nepoužito
 shared.date=Datum
-shared.sendFundsDetailsWithFee=Odesílání: {0}nNa přijímací adresu: {1}.nPožadován těžební poplatek: {2}\n\nPříjemce dostane: {3}\n\nJste si jisti, že chcete vyplatit tuto částku?
+shared.sendFundsDetailsWithFee=Odesílání: {0}\n\nNa přijímací adresu: {1}\n\nDalší poplatek pro těžaře: {2}\n\nJste si jisti, že chcete vyplatit tuto částku?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno zjistil, že tato transakce by vytvořila drobné mince, které jsou pod limitem drobných mincí (a není to povoleno pravidly pro konsenzus Monero). Místo toho budou tyto drobné mince ({0} satoshi {1}) přidány k poplatku za těžbu.\n\n\n
 shared.copyToClipboard=Kopírovat do schránky
diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties
index 47c06e75a4..ce1d2c2a2a 100644
--- a/core/src/main/resources/i18n/displayStrings_de.properties
+++ b/core/src/main/resources/i18n/displayStrings_de.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=Kein Datum verfügbar
 shared.noDetailsAvailable=Keine Details vorhanden
 shared.notUsedYet=Noch ungenutzt
 shared.date=Datum
+shared.sendFundsDetailsWithFee=Senden: {0}\n\nAn die Empfangsadresse: {1}\n\nZusätzliche Miner-Gebühr: {2}\n\nSind Sie sicher, dass Sie diesen Betrag senden möchten?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Diese Transaktion würde ein Wechselgeld erzeugen das unterhalb des Dust-Grenzwerts liegt (und daher von den Monero-Konsensregeln nicht erlaubt wäre). Stattdessen wird dieser Dust ({0} Satoshi{1}) der Mining-Gebühr hinzugefügt.\n\n\n
 shared.copyToClipboard=In Zwischenablage kopieren
diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties
index 49539c0457..a8fe7a8fa0 100644
--- a/core/src/main/resources/i18n/displayStrings_es.properties
+++ b/core/src/main/resources/i18n/displayStrings_es.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=Sin fecha disponible
 shared.noDetailsAvailable=Sin detalles disponibles
 shared.notUsedYet=Sin usar aún
 shared.date=Fecha
+shared.sendFundsDetailsWithFee=Enviando: {0}\n\nA la dirección receptora: {1}\n\nTarifa adicional para el minero: {2}\n\n¿Estás seguro de que deseas enviar esta cantidad?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detectó que esta transacción crearía una salida que está por debajo del umbral mínimo considerada polvo (y no está permitida por las reglas de consenso en Monero). En cambio, esta transacción polvo ({0} satoshi {1}) se agregará a la tarifa de minería.\n\n\n
 shared.copyToClipboard=Copiar al portapapeles
diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties
index 6a2ae3ed32..53bd2363ce 100644
--- a/core/src/main/resources/i18n/displayStrings_fa.properties
+++ b/core/src/main/resources/i18n/displayStrings_fa.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=تاریخ موجود نیست
 shared.noDetailsAvailable=جزئیاتی در دسترس نیست
 shared.notUsedYet=هنوز مورد استفاده قرار نگرفته
 shared.date=تاریخ
+shared.sendFundsDetailsWithFee=ارسال: {0}\n\nبه آدرس گیرنده: {1}\n\nهزینه اضافی ماینر: {2}\n\nآیا مطمئن هستید که می‌خواهید این مبلغ را ارسال کنید؟
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Monero consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n
 shared.copyToClipboard=کپی در کلیپ‌بورد
diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties
index 97513efd0a..900e829baa 100644
--- a/core/src/main/resources/i18n/displayStrings_fr.properties
+++ b/core/src/main/resources/i18n/displayStrings_fr.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=Pas de date disponible
 shared.noDetailsAvailable=Pas de détails disponibles
 shared.notUsedYet=Pas encore utilisé
 shared.date=Date
+shared.sendFundsDetailsWithFee=Envoyer : {0}\n\nÀ l'adresse de réception : {1}\n\nFrais supplémentaires pour le mineur : {2}\n\nÊtes-vous sûr de vouloir envoyer ce montant ?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno détecte que la transaction produira une sortie inférieure au seuil de fraction minimum (non autorisé par les règles de consensus Monero). Au lieu de cela, ces fractions ({0} satoshi {1}) seront ajoutées aux frais de traitement minier.\n\n\n
 shared.copyToClipboard=Copier dans le presse-papiers
diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties
index a1d3868897..cbc56c5f5d 100644
--- a/core/src/main/resources/i18n/displayStrings_it.properties
+++ b/core/src/main/resources/i18n/displayStrings_it.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=Nessuna data disponibile
 shared.noDetailsAvailable=Dettagli non disponibili
 shared.notUsedYet=Non ancora usato
 shared.date=Data
+shared.sendFundsDetailsWithFee=Invio: {0}\n\nAll'indirizzo di ricezione: {1}\n\nCommissione mineraria aggiuntiva: {2}\n\nSei sicuro di voler inviare questa somma?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Monero consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n
 shared.copyToClipboard=Copia negli appunti
diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties
index 521200928d..c1d2281373 100644
--- a/core/src/main/resources/i18n/displayStrings_ja.properties
+++ b/core/src/main/resources/i18n/displayStrings_ja.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=日付がありません
 shared.noDetailsAvailable=詳細不明
 shared.notUsedYet=未使用
 shared.date=日付
+shared.sendFundsDetailsWithFee=送信中: {0}\n\n受取アドレス: {1}\n\n追加のマイナー手数料: {2}\n\nこの金額を送信してもよろしいですか?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Havenoがこのトランザクションはダストの最小閾値以下のおつりアウトプットを生じることを検出しました(それにしたがって、ビットコインのコンセンサス・ルールによって許されない)。代わりに、その ({0} satoshi{1}) のダストはマイニング手数料に追加されます。\n\n\n
 shared.copyToClipboard=クリップボードにコピー
diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties
index f9ce2ea82a..d7463aacb4 100644
--- a/core/src/main/resources/i18n/displayStrings_pt-br.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=Sem data disponível
 shared.noDetailsAvailable=Sem detalhes disponíveis
 shared.notUsedYet=Ainda não usado
 shared.date=Data
+shared.sendFundsDetailsWithFee=Enviando: {0}\n\nPara o endereço de recebimento: {1}\n\nTaxa adicional do minerador: {2}\n\nTem certeza de que deseja enviar esse valor?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Monero consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n
 shared.copyToClipboard=Copiar para área de transferência
diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties
index 373e07fdeb..b6456daf42 100644
--- a/core/src/main/resources/i18n/displayStrings_pt.properties
+++ b/core/src/main/resources/i18n/displayStrings_pt.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=Sem dada disponível
 shared.noDetailsAvailable=Sem detalhes disponíveis
 shared.notUsedYet=Ainda não usado
 shared.date=Data
+shared.sendFundsDetailsWithFee=Enviando: {0}\n\nPara o endereço de recebimento: {1}\n\nTaxa adicional do minerador: {2}\n\nTem certeza de que deseja enviar este valor?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Monero consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n
 shared.copyToClipboard=Copiar para área de transferência
diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties
index 054e625da2..3c66af61fe 100644
--- a/core/src/main/resources/i18n/displayStrings_ru.properties
+++ b/core/src/main/resources/i18n/displayStrings_ru.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=Дата не указана
 shared.noDetailsAvailable=Подробности не указаны
 shared.notUsedYet=Ещё не использовано
 shared.date=Дата
+shared.sendFundsDetailsWithFee=Отправка: {0}\n\nНа получающий адрес: {1}\n\nДополнительная комиссия майнера: {2}\n\nВы уверены, что хотите отправить эту сумму?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Monero consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n
 shared.copyToClipboard=Скопировать в буфер
diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties
index e2377b330e..8b675222fb 100644
--- a/core/src/main/resources/i18n/displayStrings_th.properties
+++ b/core/src/main/resources/i18n/displayStrings_th.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=ไม่มีวันที่ให้แสดง
 shared.noDetailsAvailable=ไม่มีรายละเอียด
 shared.notUsedYet=ยังไม่ได้ใช้งาน
 shared.date=วันที่
+shared.sendFundsDetailsWithFee=กำลังส่ง: {0}\n\nไปยังที่อยู่ผู้รับ: {1}\n\nค่าธรรมเนียมเหมืองเพิ่มเติม: {2}\n\nคุณแน่ใจหรือไม่ว่าต้องการส่งจำนวนนี้?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Monero consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n
 shared.copyToClipboard=คัดลอกไปที่คลิปบอร์ด
diff --git a/core/src/main/resources/i18n/displayStrings_tr.properties b/core/src/main/resources/i18n/displayStrings_tr.properties
index 9f393b9697..eafef04dfc 100644
--- a/core/src/main/resources/i18n/displayStrings_tr.properties
+++ b/core/src/main/resources/i18n/displayStrings_tr.properties
@@ -134,7 +134,7 @@ shared.noDateAvailable=Geçerli tarih yok
 shared.noDetailsAvailable=Geçerli detay yok
 shared.notUsedYet=Henüz kullanılmadı
 shared.date=Tarih
-shared.sendFundsDetailsWithFee=Gönderiliyor: {0}\nAlıcı adresine: {1}.\nGerekli madencilik ücreti: {2}\n\nAlıcı alacak: {3}\n\nBu miktarı çekmek istediğinizden emin misiniz?
+shared.sendFundsDetailsWithFee=Gönderilen: {0}\n\nAlıcı adresi: {1}\n\nEk madenci ücreti: {2}\n\nBu tutarı göndermek istediğinizden emin misiniz?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno, bu işlemin minimum toz eşiğinin altında bir değişim çıktısı oluşturacağını (ve bu nedenle Monero konsensüs kuralları tarafından izin verilmediğini) tespit etti. Bunun yerine, bu toz ({0} satoshi{1}) madencilik ücretine eklenecektir.\n\n\n
 shared.copyToClipboard=Panoya kopyala
diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties
index 8390ad6834..aeab1530a7 100644
--- a/core/src/main/resources/i18n/displayStrings_vi.properties
+++ b/core/src/main/resources/i18n/displayStrings_vi.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=Ngày tháng không hiển thị
 shared.noDetailsAvailable=Không có thông tin
 shared.notUsedYet=Chưa được sử dụng
 shared.date=Ngày
+shared.sendFundsDetailsWithFee=Đang gửi: {0}\n\nĐến địa chỉ nhận: {1}\n\nPhí thợ đào bổ sung: {2}\n\nBạn có chắc chắn muốn gửi số tiền này không?
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno detected that this transaction would create a change output which is below the minimum dust threshold (and therefore not allowed by Monero consensus rules). Instead, this dust ({0} satoshi{1}) will be added to the mining fee.\n\n\n
 shared.copyToClipboard=Sao chép đến clipboard
diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
index 9586f74c99..a783f387e6 100644
--- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=没有可用数据
 shared.noDetailsAvailable=没有可用详细
 shared.notUsedYet=尚未使用
 shared.date=日期
+shared.sendFundsDetailsWithFee=TOD发送：{0}\n\n接收地址：{1}\n\n额外矿工费：{2}\n\n您确定要发送此金额吗？O
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno 检测到，该交易将产生一个低于最低零头阈值的输出（不被比特币共识规则所允许）。相反，这些零头（{0}satoshi{1}）将被添加到挖矿手续费中。
 shared.copyToClipboard=复制到剪贴板
diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
index ff998576d0..e3344d1fea 100644
--- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties
+++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties
@@ -125,6 +125,7 @@ shared.noDateAvailable=沒有可用數據
 shared.noDetailsAvailable=沒有可用詳細
 shared.notUsedYet=尚未使用
 shared.date=日期
+shared.sendFundsDetailsWithFee=發送中：{0}\n\n至接收地址：{1}\n\n額外礦工費：{2}\n\n您確定要發送此金額嗎？
 # suppress inspection "TrailingSpacesInProperty"
 shared.sendFundsDetailsDust=Haveno 檢測到，該交易將產生一個低於最低零頭閾值的輸出（不被比特幣共識規則所允許）。相反，這些零頭（{0}satoshi{1}）將被添加到挖礦手續費中。
 shared.copyToClipboard=複製到剪貼板
diff --git a/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java b/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java
index 53b3d70bbf..730b47adf6 100644
--- a/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java
+++ b/desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java
@@ -302,10 +302,9 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
         BigInteger receiverAmount = tx.getOutgoingTransfer().getDestinations().get(0).getAmount();
         BigInteger fee = tx.getFee();
         String messageText = Res.get("shared.sendFundsDetailsWithFee",
-                HavenoUtils.formatXmr(receiverAmount.add(fee), true),
+                HavenoUtils.formatXmr(receiverAmount, true),
                 withdrawToAddress,
-                HavenoUtils.formatXmr(fee, true),
-                HavenoUtils.formatXmr(receiverAmount, true));
+                HavenoUtils.formatXmr(fee, true));
 
         // popup confirmation message
         Popup popup = new Popup();