From dff043d8c45023b701215ceb536f693ef0e2366c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 16 Oct 2021 22:53:36 +0200 Subject: [PATCH 1/5] Fix typo (SHA) --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 0202d306380..fc2fdcbeb1e 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3460,7 +3460,7 @@ payment.swift.info.buyer=To buy bitcoin with SWIFT, you must:\n\ \n\ Please review further guidance on the wiki to avoid penalties and ensure smooth trades [HYPERLINK:https://bisq.wiki/SWIFT]. -payment.swift.info.seller=SWIFT senders are required to use the shared payment model (SHA) to send payments.\n\ +payment.swift.info.seller=SWIFT senders are required to use the shared fee model (SHA) to send payments.\n\ \n\ If you receive a SWIFT payment that does not use SHA, open a mediation ticket.\n\ \n\ From bd27b45abedff841bc91bff62a0e966c516032b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 16 Oct 2021 23:25:11 +0200 Subject: [PATCH 2/5] Fix sentence about Strike --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index fc2fdcbeb1e..72d20cd56ca 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3649,7 +3649,7 @@ Users who have registered with only their email, name, and phone number have the ● $100 maximum per deposit\n\ ● $1,000 maximum total deposits per week\n\ ● $100 maximum per payment\n\n\ -Users can increase their limits by providing Strike more information have the following limits:\n\n\ +Users can increase their limits by providing Strike with more information. These users have the following limits:\n\n\ ● $1,000 maximum per deposit\n\ ● $1,000 maximum total deposits per week\n\ ● $1,000 maximum per payment\n\n\ From 69c563e3d45478b01833d8bf8aca2b881237f439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 16 Oct 2021 23:32:51 +0200 Subject: [PATCH 3/5] Fix typo in Pix info --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 72d20cd56ca..20569fce5ef 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3599,7 +3599,7 @@ If you trade over the above limits your trade might be cancelled and there could payment.pix.info.account=Please make sure to include your chosen Pix Key. There are four types of keys: \ CPF (Natural Persons Register) or CNPJ (National Registry of Legal Entities), e-mail address, telephone number or a \ random key generated by the system called a universally unique identifier (UUID). A different key must be used for \ - each Pix account your have. Individuals can create up to five keys for each account they own.\n\n\ + each Pix account you have. Individuals can create up to five keys for each account they own.\n\n\ When trading on Bisq, BTC Buyers should use their Pix Keys as the payment description so that it is easy for the BTC Sellers to identify the payment as coming from themselves. payment.pix.info.buyer=Please send payment only the Pix Key provided in the BTC Seller's Bisq account.\n\n\ Please use your Pix Key as the payment reference so that it is easy for the BTC Seller to identify the payment as coming from yourself. From b84df6ec2b2faa5b2cc0834e675124c52378f692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 16 Oct 2021 23:39:23 +0200 Subject: [PATCH 4/5] Fix typo --- core/src/main/resources/i18n/displayStrings.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 20569fce5ef..fa9bfb97ab9 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -955,7 +955,7 @@ portfolio.pending.failedTrade.buyer.existingDepositTxButMissingDelayedPayoutTx=T but funds have been locked in the deposit transaction.\n\n\ Please do NOT send the fiat or altcoin payment to the BTC seller, because without the delayed payout tx, arbitration \ cannot be opened. Instead, open a mediation ticket with Cmd/Ctrl+o. \ - The mediator should suggest that both peers each get back the the full amount of their security deposits \ + The mediator should suggest that both peers each get back the full amount of their security deposits \ (with seller receiving full trade amount back as well). \ This way, there is no security risk, and only trade fees are lost. \n\n\ You can request a reimbursement for lost trade fees here: \ From adf0562152def9eb1948f9f46bb512d49f3b9282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Louck=C3=BD?= Date: Sat, 16 Oct 2021 23:45:38 +0200 Subject: [PATCH 5/5] Remove duplicate "maximum" in payment descriptions --- core/src/main/resources/i18n/displayStrings.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index fa9bfb97ab9..d6106e5559e 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3590,10 +3590,10 @@ Bizum users can have a maximum of 150 operations per month.\n\n\ Each bank however may establish its own limits, within the above limits, for its clients.\n\n\ Traders on Bisq should be aware of their limits. If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.bizum.info.buyer=Please send payment only to the BTC Seller's mobile phone number as provided in Bisq.\n\n\ -The maximum trade size is €1,000 maximum per payment. The maximum amount of transactions you can send using Bizum is €2,000 Euros per day.\n\n\ +The maximum trade size is €1,000 per payment. The maximum amount of transactions you can send using Bizum is €2,000 Euros per day.\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.bizum.info.seller=Please make sure your payment is received from the BTC Buyer's mobile phone number as provided in Bisq.\n\n\ -The maximum trade size is €1,000 maximum per payment. The maximum amount of transactions you can receive using Bizum is €2,000 Euros per day.\n\n\ +The maximum trade size is €1,000 per payment. The maximum amount of transactions you can receive using Bizum is €2,000 Euros per day.\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.pix.info.account=Please make sure to include your chosen Pix Key. There are four types of keys: \ @@ -3655,10 +3655,10 @@ Users can increase their limits by providing Strike with more information. These ● $1,000 maximum per payment\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.strike.info.buyer=Please send payment only to the BTC Seller's Strike username as provided in Bisq.\n\n\ -The maximum trade size is $1,000 maximum per payment.\n\n\ +The maximum trade size is $1,000 per payment.\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.strike.info.seller=Please make sure your payment is received from the BTC Buyer's Strike username as provided in Bisq.\n\n\ -The maximum trade size is $1,000 maximum per payment.\n\n\ +The maximum trade size is $1,000 per payment.\n\n\ If you trade over the above limits your trade might be cancelled and there could be a penalty. payment.usPostalMoneyOrder.info=Trading using US Postal Money Orders (USPMO) on Bisq requires that you understand the following:\n\