From 3a1396641e986a7c678c8c03d49f197b4a7a7ed6 Mon Sep 17 00:00:00 2001 From: Bayer Date: Tue, 20 Oct 2020 08:38:24 -0500 Subject: [PATCH 1/3] Fix display strings lines 2968-3437 --- .../resources/i18n/displayStrings.properties | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 78859db8fe0..e027f6be837 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3006,12 +3006,12 @@ password.deriveKey=Derive key from password password.walletDecrypted=Wallet successfully decrypted and password protection removed. password.wrongPw=You entered the wrong password.\n\nPlease try entering your password again, carefully checking for typos or spelling errors. password.walletEncrypted=Wallet successfully encrypted and password protection enabled. -password.walletEncryptionFailed=Wallet password could not be set. You might have imported seed words which are not matching the wallet database. Please contact the developers on the Bisq Forum. +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase - 'https://keybase.io/team/bisq' . password.passwordsDoNotMatch=The 2 passwords you entered don't match. password.forgotPassword=Forgot password? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\n\ - It is highly recommended to make a backup of the application directory and write down your seed words before setting a password! -password.backupWasDone=I have already done a backup + It is highly recommended that you make a backup of the application directory and to write down your seed words before setting a password! +password.backupWasDone=I have already made a backup seed.seedWords=Wallet seed words seed.enterSeedWords=Enter wallet seed words @@ -3024,7 +3024,7 @@ You must empty this wallet before attempting to restore an older one, as mixing together can lead to invalidated backups.\n\n\ Please finalize your trades, close all your open offers and go to the Funds section to withdraw your bitcoin.\n\ In case you cannot access your bitcoin you can use the emergency tool to empty the wallet.\n\ -To open that emergency tool press \"alt + e\" or \"option + e\" . +To open that emergency tool press \"Alt + e\" or \"Ctrl + e\" or \"Cmd + e\" . seed.warn.walletNotEmpty.restore=I want to restore anyway seed.warn.walletNotEmpty.emptyWallet=I will empty my wallets first seed.warn.notEncryptedAnymore=Your wallets are encrypted.\n\n\ @@ -3072,7 +3072,7 @@ payment.altcoin.tradeInstant.popup=For instant trading it is required that both If you have offers open and you are not available please disable \ those offers under the 'Portfolio' screen. payment.altcoin=Altcoin -payment.select.altcoin=Select or search altcoin +payment.select.altcoin=Select or search Altcoin payment.secret=Secret question payment.answer=Answer payment.wallet=Wallet ID @@ -3085,7 +3085,7 @@ payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no. payment.supportedCurrencies=Supported currencies payment.limitations=Limitations payment.salt=Salt for account age verification -payment.error.noHexSalt=The salt need to be in HEX format.\n\ +payment.error.noHexSalt=The salt needs to be in HEX format.\n\ It is only recommended to edit the salt field if you want to transfer the salt from an old account to keep your account age. \ The account age is verified by using the account salt and the identifying account data (e.g. IBAN). payment.accept.euro=Accept trades from these Euro countries @@ -3101,7 +3101,7 @@ shared.accountSigningState=Account signing status payment.altcoin.address.dyn={0} address payment.altcoin.receiver.address=Receiver's altcoin address payment.accountNr=Account number -payment.emailOrMobile=Email or mobile nr +payment.emailOrMobile=Email or mobile no. payment.useCustomAccountName=Use custom account name payment.maxPeriod=Max. allowed trade period payment.maxPeriodAndLimit=Max. trade duration: {0} / Max. buy: {1} / Max. sell: {2} / Account age: {3} @@ -3136,9 +3136,9 @@ payment.fasterPayments.newRequirements.info=Some banks have started verifying th salt values from your old account to your new account. This will ensure your existing account''s age and signing \ status are preserved. payment.moneyGram.info=When using MoneyGram the BTC buyer has to send the Authorisation number and a photo of the receipt by email to the BTC seller. \ - The receipt must clearly show the seller's full name, country, state and the amount. The buyer will get displayed the seller's email in the trade process. + The receipt must clearly show the seller's full name, country, state and the amount. The seller's email will be displayed to the buyer during the trade process. payment.westernUnion.info=When using Western Union the BTC buyer has to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller. \ - The receipt must clearly show the seller's full name, city, country and the amount. The buyer will get displayed the seller's email in the trade process. + The receipt must clearly show the seller's full name, city, country and the amount. The seller's email will be displayed to the buyer during the trade process. payment.halCash.info=When using HalCash the BTC buyer needs to send the BTC seller the HalCash code via a text message from their mobile phone.\n\n\ Please make sure to not exceed the maximum amount your bank allows you to send with HalCash. \ The min. amount per withdrawal is 10 EUR and the max. amount is 600 EUR. For repeated withdrawals it is \ @@ -3186,7 +3186,7 @@ payment.cashDeposit.info=Please confirm your bank allows you to send cash deposi payment.revolut.info=Revolut requires the 'User name' as account ID not the phone number or email as it was the case in the past. payment.account.revolut.addUserNameInfo={0}\n\ - Your existing Revolut account ({1}) does not has set the ''User name''.\n\ + Your existing Revolut account ({1}) does not have a ''User name''.\n\ Please enter your Revolut ''User name'' to update your account data.\n\ This will not affect your account age signing status. payment.revolut.addUserNameInfo.headLine=Update Revolut account @@ -3202,7 +3202,7 @@ In all dispute cases, the USPMO sender bears 100% of the burden of responsibilit If you do not understand these requirements, do not trade using USPMO on Bisq. payment.f2f.contact=Contact info -payment.f2f.contact.prompt=How you want to get contacted by the trading peer? (email address, phone number,...) +payment.f2f.contact.prompt=How would you like to be contacted by the trading peer? (email address, phone number,...) payment.f2f.city=City for 'Face to face' meeting payment.f2f.city.prompt=The city will be displayed with the offer payment.f2f.optionalExtra=Optional additional information @@ -3215,8 +3215,8 @@ payment.f2f.info='Face to Face' trades have different rules and come with differ ● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n\ ● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n\ ● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n\ - ● In case of a dispute the mediator or arbitrator cannot help much as it is usually hard to get tamper proof evidence of what \ - happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to \ + ● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper proof evidence \ + of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to \ an agreement.\n\n\ To be sure you fully understand the differences with 'Face to Face' trades please read the instructions and \ recommendations at: 'https://docs.bisq.network/trading-rules.html#f2f-trading' @@ -3370,11 +3370,11 @@ validation.zero=Input of 0 is not allowed. validation.negative=A negative value is not allowed. validation.fiat.toSmall=Input smaller than minimum possible amount is not allowed. validation.fiat.toLarge=Input larger than maximum possible amount is not allowed. -validation.btc.fraction=Input results in a bitcoin value with a fraction of the smallest unit (satoshi). +validation.btc.fraction=Input will result in a bitcoin value of less than 1 satoshi validation.btc.toLarge=Input larger than {0} is not allowed. validation.btc.toSmall=Input smaller than {0} is not allowed. validation.securityDeposit.toSmall=Input smaller than {0} is not allowed. -validation.passwordTooShort=The password you entered is too short. It needs to have min. 8 characters. +validation.passwordTooShort=The password you entered is too short. It needs to have a min. of 8 characters. validation.passwordTooLong=The password you entered is too long. It cannot be longer than 50 characters. validation.sortCodeNumber={0} must consist of {1} numbers. validation.sortCodeChars={0} must consist of {1} characters. @@ -3393,31 +3393,31 @@ validation.nationalAccountId={0} must consist of {1} numbers. validation.invalidInput=Invalid input: {0} validation.accountNrFormat=Account number must be of format: {0} validation.altcoin.wrongStructure=Address validation failed because it does not match the structure of a {0} address. -validation.altcoin.ltz.zAddressesNotSupported=LTZ address need to start with L. Addresses starting with z are not supported. -validation.altcoin.zAddressesNotSupported=ZEC address need to start with t. Addresses starting with z are not supported. +validation.altcoin.ltz.zAddressesNotSupported=LTZ address must start with L. Addresses starting with z are not supported. +validation.altcoin.zAddressesNotSupported=ZEC addresses must start with t. Addresses starting with z are not supported. validation.altcoin.invalidAddress=Address is not a valid {0} address! {1} validation.altcoin.liquidBitcoin.invalidAddress=Native segwit addresses (those starting with 'lq') are not supported. -validation.bic.invalidLength=Input length is neither 8 nor 11 +validation.bic.invalidLength=Input length must be 8 or 11 validation.bic.letters=Bank and Country code must be letters validation.bic.invalidLocationCode=BIC contains invalid location code validation.bic.invalidBranchCode=BIC contains invalid branch code validation.bic.sepaRevolutBic=Revolut Sepa accounts are not supported. -validation.btc.invalidFormat=Invalid format of the Bitcoin address. -validation.bsq.invalidFormat=Invalid format of the BSQ address. +validation.btc.invalidFormat=Invalid format for a Bitcoin address. +validation.bsq.invalidFormat=Invalid format for a BSQ address. validation.email.invalidAddress=Invalid address validation.iban.invalidCountryCode=Country code invalid validation.iban.checkSumNotNumeric=Checksum must be numeric validation.iban.nonNumericChars=Non-alphanumeric character detected validation.iban.checkSumInvalid=IBAN checksum is invalid -validation.iban.invalidLength=Number must have length 15 to 34 chars. +validation.iban.invalidLength=Number must have a length of 15 to 34 chars. validation.interacETransfer.invalidAreaCode=Non-Canadian area code -validation.interacETransfer.invalidPhone=Invalid phone number format and not an email address +validation.interacETransfer.invalidPhone=Please enter a valid 11 digit phone number (ex: 1-123-456-7890) or an email address validation.interacETransfer.invalidQuestion=Must contain only letters, numbers, spaces and/or the symbols ' _ , . ? - validation.interacETransfer.invalidAnswer=Must be one word and contain only letters, numbers, and/or the symbol - validation.inputTooLarge=Input must not be larger than {0} validation.inputTooSmall=Input has to be larger than {0} validation.inputToBeAtLeast=Input has to be at least {0} -validation.amountBelowDust=The amount below the dust limit of {0} satoshi is not allowed. +validation.amountBelowDust=An amount below the dust limit of {0} satoshi is not allowed. validation.length=Length must be between {0} and {1} validation.pattern=Input must be of format: {0} validation.noHexString=The input is not in HEX format. @@ -3429,8 +3429,8 @@ validation.numberFormatException=Number format exception {0} validation.mustNotBeNegative=Input must not be negative validation.phone.missingCountryCode=Need two letter country code to validate phone number validation.phone.invalidCharacters=Phone number {0} contains invalid characters -validation.phone.insufficientDigits=Not enough digits in {0} for a valid phone number -validation.phone.tooManyDigits=Too many digits in {0} to be a valid phone number -validation.phone.invalidDialingCode=Country dialing code in number {0} is invalid for country {1}. \ +validation.phone.insufficientDigits=There are not enough digits in {0} to be a valid phone number +validation.phone.tooManyDigits=There are too many digits in {0} to be a valid phone number +validation.phone.invalidDialingCode=Country dialing code for number {0} is invalid for country {1}. \ The correct dialing code is {2}. validation.invalidAddressList=Must be comma separated list of valid addresses From def42713a2cfdc44a00d46b8eac9a49bf98a8a02 Mon Sep 17 00:00:00 2001 From: Bayer <55212954+Bayernatoor@users.noreply.github.com> Date: Mon, 26 Oct 2020 11:20:39 -0500 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: m52go --- 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 e027f6be837..81fa5af4fb7 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3006,11 +3006,11 @@ password.deriveKey=Derive key from password password.walletDecrypted=Wallet successfully decrypted and password protection removed. password.wrongPw=You entered the wrong password.\n\nPlease try entering your password again, carefully checking for typos or spelling errors. password.walletEncrypted=Wallet successfully encrypted and password protection enabled. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase - 'https://keybase.io/team/bisq' . +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase (https://keybase.io/team/bisq). password.passwordsDoNotMatch=The 2 passwords you entered don't match. password.forgotPassword=Forgot password? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\n\ - It is highly recommended that you make a backup of the application directory and to write down your seed words before setting a password! + It is highly recommended that you make a backup of the application directory and write down your seed words before setting a password! password.backupWasDone=I have already made a backup seed.seedWords=Wallet seed words @@ -3024,7 +3024,7 @@ You must empty this wallet before attempting to restore an older one, as mixing together can lead to invalidated backups.\n\n\ Please finalize your trades, close all your open offers and go to the Funds section to withdraw your bitcoin.\n\ In case you cannot access your bitcoin you can use the emergency tool to empty the wallet.\n\ -To open that emergency tool press \"Alt + e\" or \"Ctrl + e\" or \"Cmd + e\" . +To open the emergency tool press \"Alt+e\" or \"Cmd/Ctrl+e\". seed.warn.walletNotEmpty.restore=I want to restore anyway seed.warn.walletNotEmpty.emptyWallet=I will empty my wallets first seed.warn.notEncryptedAnymore=Your wallets are encrypted.\n\n\ @@ -3215,7 +3215,7 @@ payment.f2f.info='Face to Face' trades have different rules and come with differ ● The trading peers need to bring their laptops and do the confirmation of 'payment sent' and 'payment received' at the meeting place.\n\ ● If a maker has special 'terms and conditions' they must state those in the 'Additional information' text field in the account.\n\ ● By taking an offer the taker agrees to the maker's stated 'terms and conditions'.\n\ - ● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper proof evidence \ + ● In case of a dispute the mediator or arbitrator cannot be of much assistance as it is usually difficult to get tamper-proof evidence \ of what happened at the meeting. In such cases the BTC funds might get locked indefinitely or until the trading peers come to \ an agreement.\n\n\ To be sure you fully understand the differences with 'Face to Face' trades please read the instructions and \ From 2ce0a93ed35f30c3bd8e645df3bb65aae7c0a85a Mon Sep 17 00:00:00 2001 From: Bayer <55212954+Bayernatoor@users.noreply.github.com> Date: Mon, 26 Oct 2020 11:24:49 -0500 Subject: [PATCH 3/3] Update core/src/main/resources/i18n/displayStrings.properties Co-authored-by: m52go --- 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 81fa5af4fb7..6338829f0d6 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -3006,7 +3006,7 @@ password.deriveKey=Derive key from password password.walletDecrypted=Wallet successfully decrypted and password protection removed. password.wrongPw=You entered the wrong password.\n\nPlease try entering your password again, carefully checking for typos or spelling errors. password.walletEncrypted=Wallet successfully encrypted and password protection enabled. -password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase (https://keybase.io/team/bisq). +password.walletEncryptionFailed=Wallet password could not be set. You may have imported seed words which do not match the wallet database. Please contact the developers on Keybase ([HYPERLINK:https://keybase.io/team/bisq]). password.passwordsDoNotMatch=The 2 passwords you entered don't match. password.forgotPassword=Forgot password? password.backupReminder=Please note that when setting a wallet password all automatically created backups from the unencrypted wallet will be deleted.\n\n\