diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 02569dae..68fea4a0 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -540,7 +540,7 @@ takeOffer.fundsBox.isOfferAvailable=Checking if the offer is still available ... takeOffer.fundsBox.tradeAmount=Amount to sell takeOffer.fundsBox.offerFee=Trade fee takeOffer.fundsBox.networkFee=Total mining fees -takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ... +takeOffer.fundsBox.takeOfferSpinnerInfo=Taking offer: {0} takeOffer.fundsBox.paymentLabel=Haveno trade with ID {0} takeOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee) takeOffer.success.headline=You have successfully taken an offer. diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index d8619031..f9dbbcde 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=Kontroluje se, zda je nabídka k dispozici . takeOffer.fundsBox.tradeAmount=Částka k prodeji takeOffer.fundsBox.offerFee=Obchodní poplatek takeOffer.fundsBox.networkFee=Celkové poplatky za těžbu -takeOffer.fundsBox.takeOfferSpinnerInfo=Probíhá využití nabídky... +takeOffer.fundsBox.takeOfferSpinnerInfo=Přijímám nabídku: {0} takeOffer.fundsBox.paymentLabel=Haveno obchod s ID {0} takeOffer.fundsBox.fundsStructure=(kauce {0}, obchodní poplatek {1}, poplatek za těžbu {2}) takeOffer.success.headline=Úspěšně jste přijali nabídku. diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 81d6f5fe..75dc2625 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=Verfügbarkeit des Angebots wird überprüft takeOffer.fundsBox.tradeAmount=Zu verkaufender Betrag takeOffer.fundsBox.offerFee=Handelsgebühr takeOffer.fundsBox.networkFee=Gesamte Mining-Gebühr -takeOffer.fundsBox.takeOfferSpinnerInfo=Angebot wird angenommen ... +takeOffer.fundsBox.takeOfferSpinnerInfo=Angebot annehmen: {0} takeOffer.fundsBox.paymentLabel=Haveno-Handel mit der ID {0} takeOffer.fundsBox.fundsStructure=({0} Kaution, {1} Handelsgebühr, {2} Mining-Gebühr) takeOffer.success.headline=Sie haben erfolgreich ein Angebot angenommen. diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index ea3fb344..6532d36f 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=Comprobar si la oferta está disponible... takeOffer.fundsBox.tradeAmount=Cantidad a vender takeOffer.fundsBox.offerFee=Comisión de transacción takeOffer.fundsBox.networkFee=Comisiones de minado totales -takeOffer.fundsBox.takeOfferSpinnerInfo=Aceptación de oferta en espera... +takeOffer.fundsBox.takeOfferSpinnerInfo=Aceptando oferta: {0} takeOffer.fundsBox.paymentLabel=Intercambio Haveno con ID {0} takeOffer.fundsBox.fundsStructure=({0} depósito de seguridad {1} tasa de intercambio, {2} tarifa de minado) takeOffer.success.headline=Ha aceptado la oferta con éxito. diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 74860e52..973869ee 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=بررسی کنید آیا پیشنهاد د takeOffer.fundsBox.tradeAmount=مبلغ فروش takeOffer.fundsBox.offerFee=کارمزد معامله takeOffer.fundsBox.networkFee=کل کارمزد استخراج -takeOffer.fundsBox.takeOfferSpinnerInfo=برداشتن پیشنهاد در حال انجام است... +takeOffer.fundsBox.takeOfferSpinnerInfo=پذیرفتن پیشنهاد: {0} takeOffer.fundsBox.paymentLabel=معامله Haveno با شناسه‌ی {0} takeOffer.fundsBox.fundsStructure=({0} سپرده‌ی اطمینان، {1} هزینه‌ی معامله، {2} هزینه تراکنش شبکه) takeOffer.success.headline=با موفقیت یک پیشنهاد را قبول کرده‌اید. diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index 9d7f528f..4aa44809 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=Vérifiez si l'ordre est disponible... takeOffer.fundsBox.tradeAmount=Montant à vendre takeOffer.fundsBox.offerFee=Frais de transaction du trade takeOffer.fundsBox.networkFee=Total des frais de minage -takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ... +takeOffer.fundsBox.takeOfferSpinnerInfo=Acceptation de l'offre : {0} takeOffer.fundsBox.paymentLabel=Transaction Haveno avec l''ID {0} takeOffer.fundsBox.fundsStructure=({0} dépôt de garantie, {1} frais de transaction, {2} frais de minage) takeOffer.success.headline=Vous avez accepté un ordre avec succès. diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index 29b6b0fa..53e1eb3f 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=Controlla se l'offerta è disponibile ... takeOffer.fundsBox.tradeAmount=Importo da vendere takeOffer.fundsBox.offerFee=Commissione di scambio takeOffer.fundsBox.networkFee=Totale commissioni di mining -takeOffer.fundsBox.takeOfferSpinnerInfo=Accettazione dell'offerta in corso ... +takeOffer.fundsBox.takeOfferSpinnerInfo=Accettare l'offerta: {0} takeOffer.fundsBox.paymentLabel=Scambia Haveno con ID {0} takeOffer.fundsBox.fundsStructure=({0} deposito cauzionale, {1} commissione commerciale, {2} commissione mineraria) takeOffer.success.headline=Hai accettato con successo un'offerta. diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index c4ca9f92..a401b3c2 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=オファーが有効か確認中... takeOffer.fundsBox.tradeAmount=売却額 takeOffer.fundsBox.offerFee=取引手数料 takeOffer.fundsBox.networkFee=合計マイニング手数料 -takeOffer.fundsBox.takeOfferSpinnerInfo=オファー受け入れ処理中 ... +takeOffer.fundsBox.takeOfferSpinnerInfo=オファーを受け入れる: {0} takeOffer.fundsBox.paymentLabel=次のIDとのHavenoトレード: {0} takeOffer.fundsBox.fundsStructure=({0} セキュリティデポジット, {1} 取引手数料, {2}マイニング手数料) takeOffer.success.headline=オファー受け入れに成功しました diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 7b0883ad..36fec1a6 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -497,7 +497,7 @@ takeOffer.fundsBox.isOfferAvailable=Verificando se a oferta está disponível .. takeOffer.fundsBox.tradeAmount=Quantia a ser vendida takeOffer.fundsBox.offerFee=Taxa de negociação takeOffer.fundsBox.networkFee=Total em taxas de mineração -takeOffer.fundsBox.takeOfferSpinnerInfo=Aceitação da oferta em progresso ... +takeOffer.fundsBox.takeOfferSpinnerInfo=Aceitando a oferta: {0} takeOffer.fundsBox.paymentLabel=negociação Haveno com ID {0} takeOffer.fundsBox.fundsStructure=({0} depósito de segurança, {1} taxa de transação, {2} taxa de mineração) takeOffer.success.headline=Você aceitou uma oferta com sucesso. diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index e80c379b..431dc06a 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=Verificar se a oferta está disponível ... takeOffer.fundsBox.tradeAmount=Quantia para vender takeOffer.fundsBox.offerFee=Taxa de negócio takeOffer.fundsBox.networkFee=Total de taxas de mineração -takeOffer.fundsBox.takeOfferSpinnerInfo=Aceitação da oferta em progresso ... +takeOffer.fundsBox.takeOfferSpinnerInfo=Aceitando a oferta: {0} takeOffer.fundsBox.paymentLabel=negócio do Haveno com ID {0} takeOffer.fundsBox.fundsStructure=({0} depósito de segurança, {1} taxa de negócio, {2} taxa de mineração) takeOffer.success.headline=Você aceitou uma oferta com sucesso. diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 2069740c..cce928fa 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=Проверка доступности пр takeOffer.fundsBox.tradeAmount=Сумма для продажи takeOffer.fundsBox.offerFee=Комиссия за сделку takeOffer.fundsBox.networkFee=Oбщая комиссия майнера -takeOffer.fundsBox.takeOfferSpinnerInfo=Принятие предложения... +takeOffer.fundsBox.takeOfferSpinnerInfo=Принятие предложения: {0} takeOffer.fundsBox.paymentLabel=Сделка в Haveno с идентификатором {0} takeOffer.fundsBox.fundsStructure=({0} — залог, {1} — комиссия за сделку, {2} — комиссия майнера) takeOffer.success.headline=Вы успешно приняли предложение. diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index 6902f5da..bbd6365e 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=ตรวจสอบว่ามีข้ takeOffer.fundsBox.tradeAmount=จำนวนที่จะขาย takeOffer.fundsBox.offerFee=ค่าธรรมเนียมการซื้อขาย takeOffer.fundsBox.networkFee=ยอดรวมค่าธรรมเนียมการขุด -takeOffer.fundsBox.takeOfferSpinnerInfo=การรับข้อเสนออยู่ระหว่างการดำเนินการ... +takeOffer.fundsBox.takeOfferSpinnerInfo=ยอมรับข้อเสนอ: {0} takeOffer.fundsBox.paymentLabel=การซื้อขาย Haveno ด้วย ID {0} takeOffer.fundsBox.fundsStructure=({0} เงินประกัน {1} ค่าธรรมเนียมการซื้อขาย {2} ค่าธรรมเนียมการขุด) takeOffer.success.headline=คุณได้รับข้อเสนอเป็นที่เรีบยร้อยแล้ว diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index 5d14d427..0e2fa10a 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=Kiểm tra xem có chào giá không ... takeOffer.fundsBox.tradeAmount=Số tiền để bán takeOffer.fundsBox.offerFee=Phí giao dịch takeOffer.fundsBox.networkFee=Tổng phí đào -takeOffer.fundsBox.takeOfferSpinnerInfo=Đang nhận chào giá ... +takeOffer.fundsBox.takeOfferSpinnerInfo=Chấp nhận đề xuất: {0} takeOffer.fundsBox.paymentLabel=giao dịch Haveno có ID {0} takeOffer.fundsBox.fundsStructure=({0} tiền gửi đại lý, {1} phí giao dịch, {2} phí đào) takeOffer.success.headline=Bạn đã nhận báo giá thành công. diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 4b280fe7..4bd1fb56 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=检查报价是否有效... takeOffer.fundsBox.tradeAmount=卖出数量 takeOffer.fundsBox.offerFee=挂单费 takeOffer.fundsBox.networkFee=总共挖矿手续费 -takeOffer.fundsBox.takeOfferSpinnerInfo=正在下单... +takeOffer.fundsBox.takeOfferSpinnerInfo=接受报价:{0} takeOffer.fundsBox.paymentLabel=Haveno 交易 ID {0} takeOffer.fundsBox.fundsStructure=({0} 保证金,{1} 交易费,{2} 采矿费) takeOffer.success.headline=你已成功下单一个报价。 diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index 2a9df2ef..8189003d 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -494,7 +494,7 @@ takeOffer.fundsBox.isOfferAvailable=檢查報價是否有效... takeOffer.fundsBox.tradeAmount=賣出數量 takeOffer.fundsBox.offerFee=掛單費 takeOffer.fundsBox.networkFee=總共挖礦手續費 -takeOffer.fundsBox.takeOfferSpinnerInfo=正在下單... +takeOffer.fundsBox.takeOfferSpinnerInfo=接受報價:{0} takeOffer.fundsBox.paymentLabel=Haveno 交易 ID {0} takeOffer.fundsBox.fundsStructure=({0} 保證金,{1} 交易費,{2} 採礦費) takeOffer.success.headline=你已成功下單一個報價。 diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java index a8bb9461..3ea75a5b 100644 --- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java @@ -420,7 +420,7 @@ public class OfferDetailsWindow extends Overlay { } else { // subscribe to trade progress - spinnerInfoLabel.setText(Res.get("takeOffer.fundsBox.takeOfferSpinnerInfo") + " 0%"); + spinnerInfoLabel.setText(Res.get("takeOffer.fundsBox.takeOfferSpinnerInfo", "0%")); numTradesSubscription = EasyBind.subscribe(tradeManager.getNumPendingTrades(), newNum -> { subscribeToProgress(spinnerInfoLabel); }); @@ -436,7 +436,7 @@ public class OfferDetailsWindow extends Overlay { if (trade == null || initProgressSubscription != null) return; initProgressSubscription = EasyBind.subscribe(trade.initProgressProperty(), newProgress -> { String progress = (int) (newProgress.doubleValue() * 100.0) + "%"; - UserThread.execute(() -> spinnerInfoLabel.setText(Res.get("takeOffer.fundsBox.takeOfferSpinnerInfo") + " " + progress)); + UserThread.execute(() -> spinnerInfoLabel.setText(Res.get("takeOffer.fundsBox.takeOfferSpinnerInfo", progress))); }); } }