From 889c91e585d151673ecbaf6816c6306420eabf65 Mon Sep 17 00:00:00 2001 From: Rob Judd Date: Sat, 22 Oct 2016 21:22:27 +1000 Subject: [PATCH] Save i18n progress --- .../components/paymentmethods/SepaForm.java | 6 +- .../resources/i18n/displayStrings.properties | 85 +++++++++++--- .../i18n/in_dev/displayStrings_en.properties | 107 ++++++++++++++---- 3 files changed, 158 insertions(+), 40 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java index 280611bf7e..b855bbe17c 100644 --- a/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java +++ b/gui/src/main/java/io/bitsquare/gui/components/paymentmethods/SepaForm.java @@ -101,7 +101,7 @@ public class SepaForm extends PaymentMethodForm { }); - addLabel(gridPane, ++gridRow, "Country of your Bank:"); + addLabel(gridPane, ++gridRow, "Country of bank:"); HBox hBox = new HBox(); hBox.setSpacing(10); ComboBox countryComboBox = new ComboBox<>(); @@ -123,7 +123,7 @@ public class SepaForm extends PaymentMethodForm { gridPane.getChildren().add(hBox); - countryComboBox.setPromptText("Select country of your Bank"); + countryComboBox.setPromptText("Select country of bank"); countryComboBox.setConverter(new StringConverter() { @Override public String toString(Country country) { @@ -309,7 +309,7 @@ public class SepaForm extends PaymentMethodForm { addLabelTextField(gridPane, ++gridRow, "Account holder name:", sepaAccount.getHolderName()); addLabelTextField(gridPane, ++gridRow, "IBAN:", sepaAccount.getIban()).second.setMouseTransparent(false); addLabelTextField(gridPane, ++gridRow, "BIC/SWIFT:", sepaAccount.getBic()).second.setMouseTransparent(false); - addLabelTextField(gridPane, ++gridRow, "Location of Bank:", + addLabelTextField(gridPane, ++gridRow, "Country of Bank:", sepaAccount.getCountry() != null ? sepaAccount.getCountry().name : ""); addLabelTextField(gridPane, ++gridRow, "Currency:", sepaAccount.getSingleTradeCurrency().getNameAndCode()); String countries; diff --git a/gui/src/main/resources/i18n/displayStrings.properties b/gui/src/main/resources/i18n/displayStrings.properties index 6c0afb86ef..a9fcd06cfa 100644 --- a/gui/src/main/resources/i18n/displayStrings.properties +++ b/gui/src/main/resources/i18n/displayStrings.properties @@ -1,6 +1,6 @@ -# Used by gui/components/infoDisplay.java +# Used by gui/components/infoDisplay.java -# shared +# Shared shared.readMore=Read more shared.openHelp=Open Help shared.warning=Warning @@ -18,7 +18,65 @@ shared.buy=buy shared.sell=sell shared.spend=spend -# validation +# App + +app.version=You probably have the wrong Bitsquare version for this computer.\nYour computer's architecture is: {0}.\nThe Bitsquare binary you installed is: {1}.\nPlease shut down and re-install the correct version ( {3} ). +app.shutdown.headline=Shutdown in progress ... +app.shutdown.text=Shutting down application can take a few seconds.\nPlease don't interrupt this process. + +# Payment methods + +payment.account.no=Account no.: +payment.currency=Currency: +payment.account.name=Account name: +payment.payment.method=Payment method: +payment.account.owner=Account holder name: +payment.bank.country=Country of bank: +payment.account.name.email=Account holder name / email +payment.bank.name=Bank name: +payment.select.account=Select account type +payment.select.currency=Select currency +payment.select.region=Select region +payment.select.country=Select country +payment.select.bank.country=Select country of bank +payment.foreign.currency=Are you sure you want to choose a currency other than the country's default currency? +payment.restore.default=No, restore default currency +payment.email=Email: +payment.country=Country: +payment.owner.email=Account holder email: +payment.extras=Extra requirements: +payment.us.info=Bank transfer with WIRE or ACH is not supported for the US because WIRE is too expensive and ACH has a high chargeback risk.\n\nPlease use payment methods ClearXchange, US Postal Money Order or Cash Deposit instead. +payment.email.mobile=Email or mobile no.: +payment.altcoin.address=Altcoin address: +payment.address=address: +payment.altcoin=Altcoin: +payment.select.altcoin=Select or search altcoin +payment.uk.sort=UK sort code: +payment.secret=Secret question: +payment.answer=Answer: +payment.wallet=Wallet ID: +payment.supported.okpay=Supported OKPay currencies: +payment.max.allowed=Max. allowed period / date: +payment.hours=hours +payment.days=days +payment.1hour=1 hour +payment.1day=1 day +payment.max.duration=Max. trade duration: +payment.max.limit=Max. trade limit: +payment.limitations=Limitations: +payment.iban=IBAN: +payment.bicswift=BIC/SWIFT: +payment.accept.euro=Accept trades from these Euro countries: +payment.accept.noneuro=Accept trades from these non-Euro countries: +payment.all.euro=All Euro countries +payment.accepted.countries=Accepted countries: +payment.accepted.banks=Accepted banks: +payment.mobile=Mobile no.: +payment.postal.address=Postal address: + + + +# Validation validation.empty=Empty input is not allowed. validation.NaN=Input is not a valid number. validation.zero=Input of 0 is not allowed. @@ -88,7 +146,6 @@ createOffer.success.info=You can manage your open offers in the \"Portfolio\" sc createOffer.error.message=An error occurred when placing the offer.\n\n{0} - # Take offer takeOffer.amount.prompt=Enter amount in BTC takeOffer.price.prompt=Enter price @@ -112,7 +169,7 @@ takeOffer.validation.amountLargerThanOfferAmount=Input amount cannot be higher t takeOffer.validation.amountLargerThanOfferAmountMinusFee=That input amount would create dust change for the BTC seller. takeOffer.fundsBox.title=Fund your trade -takeOffer.fundsBox.isOfferAvailable=Check if offer is available... +takeOffer.fundsBox.isOfferAvailable=Check if offer is available ... takeOffer.fundsBox.totalsNeeded=Funds needed: takeOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the bitcoin amount entered above takeOffer.fundsBox.address=Trade wallet address: @@ -130,7 +187,7 @@ takeOffer.fundsBox.total=Total: takeOffer.fundsBox.showAdvanced=Show advanced settings takeOffer.fundsBox.hideAdvanced=Hide advanced settings takeOffer.fundsBox.takeOffer=Take offer -takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress... +takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ... takeOffer.fundsBox.paymentLabel=Bitsquare trade with ID {0} takeOffer.advancedBox.title=Advanced settings @@ -153,15 +210,15 @@ PERFECT_MONEY=Perfect Money ALI_PAY=AliPay SEPA=SEPA FASTER_PAYMENTS=Faster Payments -NATIONAL_BANK=National Bank transfer -SAME_BANK=Transfer with same Bank +NATIONAL_BANK=National bank transfer +SAME_BANK=Transfer with same bank SPECIFIC_BANKS=Transfers with specific banks SWISH=Swish CLEAR_X_CHANGE=ClearXchange CHASE_QUICK_PAY=Chase QuickPay INTERAC_E_TRANSFER=Interac e-Transfer -US_POSTAL_MONEY_ORDER=US Postal money order -CASH_DEPOSIT=Cash Deposit +US_POSTAL_MONEY_ORDER=US Postal Money Order +CASH_DEPOSIT=Cash deposit BLOCK_CHAINS=Altcoins @@ -171,15 +228,15 @@ PERFECT_MONEY_SHORT=Perfect Money ALI_PAY_SHORT=AliPay SEPA_SHORT=SEPA FASTER_PAYMENTS_SHORT=Faster Payments -NATIONAL_BANK_SHORT=National Banks -SAME_BANK_SHORT=Same Bank +NATIONAL_BANK_SHORT=National banks +SAME_BANK_SHORT=Same bank SPECIFIC_BANKS_SHORT=Specific banks FED_WIRE_SHORT=Fed Wire SWISH_SHORT=Swish CLEAR_X_CHANGE_SHORT=ClearXchange CHASE_QUICK_PAY_SHORT=Chase QuickPay INTERAC_E_TRANSFER_SHORT=Interac e-Transfer -US_POSTAL_MONEY_ORDER_SHORT=US money order -CASH_DEPOSIT_SHORT=Cash Deposit +US_POSTAL_MONEY_ORDER_SHORT=US Money Order +CASH_DEPOSIT_SHORT=Cash deposit BLOCK_CHAINS_SHORT=Altcoins diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_en.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_en.properties index 86b94caccb..a9fcd06cfa 100644 --- a/gui/src/main/resources/i18n/in_dev/displayStrings_en.properties +++ b/gui/src/main/resources/i18n/in_dev/displayStrings_en.properties @@ -1,6 +1,6 @@ -# Used by gui/components/infoDisplay.java +# Used by gui/components/infoDisplay.java -# shared +# Shared shared.readMore=Read more shared.openHelp=Open Help shared.warning=Warning @@ -18,7 +18,65 @@ shared.buy=buy shared.sell=sell shared.spend=spend -# validation +# App + +app.version=You probably have the wrong Bitsquare version for this computer.\nYour computer's architecture is: {0}.\nThe Bitsquare binary you installed is: {1}.\nPlease shut down and re-install the correct version ( {3} ). +app.shutdown.headline=Shutdown in progress ... +app.shutdown.text=Shutting down application can take a few seconds.\nPlease don't interrupt this process. + +# Payment methods + +payment.account.no=Account no.: +payment.currency=Currency: +payment.account.name=Account name: +payment.payment.method=Payment method: +payment.account.owner=Account holder name: +payment.bank.country=Country of bank: +payment.account.name.email=Account holder name / email +payment.bank.name=Bank name: +payment.select.account=Select account type +payment.select.currency=Select currency +payment.select.region=Select region +payment.select.country=Select country +payment.select.bank.country=Select country of bank +payment.foreign.currency=Are you sure you want to choose a currency other than the country's default currency? +payment.restore.default=No, restore default currency +payment.email=Email: +payment.country=Country: +payment.owner.email=Account holder email: +payment.extras=Extra requirements: +payment.us.info=Bank transfer with WIRE or ACH is not supported for the US because WIRE is too expensive and ACH has a high chargeback risk.\n\nPlease use payment methods ClearXchange, US Postal Money Order or Cash Deposit instead. +payment.email.mobile=Email or mobile no.: +payment.altcoin.address=Altcoin address: +payment.address=address: +payment.altcoin=Altcoin: +payment.select.altcoin=Select or search altcoin +payment.uk.sort=UK sort code: +payment.secret=Secret question: +payment.answer=Answer: +payment.wallet=Wallet ID: +payment.supported.okpay=Supported OKPay currencies: +payment.max.allowed=Max. allowed period / date: +payment.hours=hours +payment.days=days +payment.1hour=1 hour +payment.1day=1 day +payment.max.duration=Max. trade duration: +payment.max.limit=Max. trade limit: +payment.limitations=Limitations: +payment.iban=IBAN: +payment.bicswift=BIC/SWIFT: +payment.accept.euro=Accept trades from these Euro countries: +payment.accept.noneuro=Accept trades from these non-Euro countries: +payment.all.euro=All Euro countries +payment.accepted.countries=Accepted countries: +payment.accepted.banks=Accepted banks: +payment.mobile=Mobile no.: +payment.postal.address=Postal address: + + + +# Validation validation.empty=Empty input is not allowed. validation.NaN=Input is not a valid number. validation.zero=Input of 0 is not allowed. @@ -29,11 +87,11 @@ validation.btc.toSmall=Input results in a bitcoin value with a fraction of the s validation.btc.toLarge=Input larger than maximum trading amount of {0} is not allowed. validation.passwordTooShort=The password you entered is too short. It needs to have min. 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 -validation.bankIdNumber={0} must consist of {1} numbers -validation.accountNr=Account number must consist of {0} numbers -validation.accountNrChars=Account number must consist of {0} characters +validation.sortCodeNumber={0} must consist of {1} numbers. +validation.sortCodeChars={0} must consist of {1} characters. +validation.bankIdNumber={0} must consist of {1} numbers. +validation.accountNr=Account number must consist of {0} numbers. +validation.accountNrChars=Account number must consist of {0} characters. # Create offer createOffer.amount.prompt=Enter amount in BTC @@ -71,7 +129,7 @@ createOffer.fundsBox.total=Total: createOffer.fundsBox.showAdvanced=Show advanced settings createOffer.fundsBox.hideAdvanced=Hide advanced settings createOffer.fundsBox.placeOffer=Place offer -createOffer.fundsBox.placeOfferSpinnerInfo=Offer publishing is in progress... +createOffer.fundsBox.placeOfferSpinnerInfo=Offer publishing is in progress ... createOffer.fundsBox.paymentLabel=Bitsquare trade with ID {0} createOffer.advancedBox.title=Advanced settings @@ -88,7 +146,6 @@ createOffer.success.info=You can manage your open offers in the \"Portfolio\" sc createOffer.error.message=An error occurred when placing the offer.\n\n{0} - # Take offer takeOffer.amount.prompt=Enter amount in BTC takeOffer.price.prompt=Enter price @@ -112,7 +169,7 @@ takeOffer.validation.amountLargerThanOfferAmount=Input amount cannot be higher t takeOffer.validation.amountLargerThanOfferAmountMinusFee=That input amount would create dust change for the BTC seller. takeOffer.fundsBox.title=Fund your trade -takeOffer.fundsBox.isOfferAvailable=Check if offer is available... +takeOffer.fundsBox.isOfferAvailable=Check if offer is available ... takeOffer.fundsBox.totalsNeeded=Funds needed: takeOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the bitcoin amount entered above takeOffer.fundsBox.address=Trade wallet address: @@ -130,7 +187,7 @@ takeOffer.fundsBox.total=Total: takeOffer.fundsBox.showAdvanced=Show advanced settings takeOffer.fundsBox.hideAdvanced=Hide advanced settings takeOffer.fundsBox.takeOffer=Take offer -takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress... +takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ... takeOffer.fundsBox.paymentLabel=Bitsquare trade with ID {0} takeOffer.advancedBox.title=Advanced settings @@ -143,7 +200,7 @@ takeOffer.advancedBox.county=Payments account country: takeOffer.advancedBox.info=These are the offer restrictions your trading partner has defined in his offer. \ Your settings match those constraints and you are able to trade with him. -takeOffer.success.headline=You have successfully taken an offer +takeOffer.success.headline=You have successfully taken an offer. takeOffer.success.info=You can see the status of your trade at the \"Portfolio\" screen under \"Open trades\". takeOffer.error.message=An error occurred when taking the offer.\n\n{0} @@ -153,13 +210,15 @@ PERFECT_MONEY=Perfect Money ALI_PAY=AliPay SEPA=SEPA FASTER_PAYMENTS=Faster Payments -NATIONAL_BANK=National Bank transfer -SAME_BANK=Transfer with same Bank +NATIONAL_BANK=National bank transfer +SAME_BANK=Transfer with same bank SPECIFIC_BANKS=Transfers with specific banks -SWISH= Swish +SWISH=Swish CLEAR_X_CHANGE=ClearXchange -US_POSTAL_MONEY_ORDER=US Postal money order -CASH_DEPOSIT=Cash Deposit +CHASE_QUICK_PAY=Chase QuickPay +INTERAC_E_TRANSFER=Interac e-Transfer +US_POSTAL_MONEY_ORDER=US Postal Money Order +CASH_DEPOSIT=Cash deposit BLOCK_CHAINS=Altcoins @@ -169,13 +228,15 @@ PERFECT_MONEY_SHORT=Perfect Money ALI_PAY_SHORT=AliPay SEPA_SHORT=SEPA FASTER_PAYMENTS_SHORT=Faster Payments -NATIONAL_BANK_SHORT=National Banks -SAME_BANK_SHORT=Same Bank +NATIONAL_BANK_SHORT=National banks +SAME_BANK_SHORT=Same bank SPECIFIC_BANKS_SHORT=Specific banks FED_WIRE_SHORT=Fed Wire -SWISH_SHORT= Swish +SWISH_SHORT=Swish CLEAR_X_CHANGE_SHORT=ClearXchange -US_POSTAL_MONEY_ORDER_SHORT=US money order -CASH_DEPOSIT_SHORT=Cash Deposit +CHASE_QUICK_PAY_SHORT=Chase QuickPay +INTERAC_E_TRANSFER_SHORT=Interac e-Transfer +US_POSTAL_MONEY_ORDER_SHORT=US Money Order +CASH_DEPOSIT_SHORT=Cash deposit BLOCK_CHAINS_SHORT=Altcoins