fix bugs and replace errors

LICENSE

@@ -25,7 +25,7 @@ want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
   Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offerPayload
+with two steps: (1) assert copyright on the software, and (2) offer
 you this License which gives you legal permission to copy, distribute
 and/or modify the software.
 
@@ -191,7 +191,7 @@ keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
 
   You may charge any price or no price for each copy that you convey,
-and you may offerPayload support or warranty protection for a fee.
+and you may offer support or warranty protection for a fee.
 
   5. Conveying Modified Source Versions.
 
@@ -244,8 +244,8 @@ in one of these ways:
 
     b) Convey the object code in, or embodied in, a physical product
     (including a physical distribution medium), accompanied by a
-    written offerPayload, valid for at least three years and valid for as
-    long as you offerPayload spare parts or customer support for that product
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
     model, to give anyone who possesses the object code either (1) a
     copy of the Corresponding Source for all the software in the
     product that is covered by this License, on a durable physical
@@ -255,13 +255,13 @@ in one of these ways:
     Corresponding Source from a network server at no charge.
 
     c) Convey individual copies of the object code with a copy of the
-    written offerPayload to provide the Corresponding Source.  This
+    written offer to provide the Corresponding Source.  This
     alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offerPayload, in accord
+    only if you received the object code with such an offer, in accord
     with subsection 6b.
 
     d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offerPayload equivalent access to the
+    place (gratis or for a charge), and offer equivalent access to the
     Corresponding Source in the same way through the same place at no
     further charge.  You need not require recipients to copy the
     Corresponding Source along with the object code.  If the place to
@@ -474,7 +474,7 @@ this License.
 
   Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
-make, use, sell, offerPayload for sale, import and otherwise run, modify and
+make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
 
   In the following three paragraphs, a "patent license" is any express
@@ -540,7 +540,7 @@ License would be to refrain entirely from conveying the Program.
   13. Remote Network Interaction; Use with the GNU General Public License.
 
   Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offerPayload all users
+Program, your modified version must prominently offer all users
 interacting with it remotely through a computer network (if your version
 supports such interaction) an opportunity to receive the Corresponding
 Source of your version by providing access to the Corresponding Source
@@ -651,7 +651,7 @@ Also add information on how to contact you by electronic and paper mail.
 network, you should also make sure that it provides a way for users to
 get its source.  For example, if your program is a web application, its
 interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offerPayload source, and different
+of the code.  There are many ways you could offer source, and different
 solutions will be better for different programs; see section 13 for the
 specific requirements.
 

common/src/main/resources/i18n/in_dev/displayStrings_ae.properties

@@ -93,42 +93,42 @@ 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 offerPayload
+# Create offer
 createOffer.amount.prompt=Enter amount in BTC
 createOffer.price.prompt=Enter price
 createOffer.volume.prompt=Enter amount in {0}
 # TODO remove createOffer.minAmount.prompt=Enter min. amount
 
-# TODO remove createOffer.amountPriceBox.title=Create your offerPayload
+# TODO remove createOffer.amountPriceBox.title=Create your offer
 createOffer.amountPriceBox.amountDescription=Amount of bitcoin to {0}
 createOffer.amountPriceBox.priceDescriptionFiat=Fixed price per {0}
 createOffer.amountPriceBox.buy.volumeDescription=Amount in {0} to spend
 createOffer.amountPriceBox.sell.volumeDescription=Amount in {0} to receive
 createOffer.amountPriceBox.minAmountDescription=Minimum amount of BTC
-# TODO remove createOffer.amountPriceBox.buy.info=Define a price for which you want to buy bitcoin and either enter the amount or the trade volume. With the minimum amount you can attract more potential traders by giving them more flexibility. But note that there is no automatic creation of a new offerPayload for the remaining amount in the case that a trader takes your offerPayload with a lower amount as defined in the amount field. Your offerPayload will be removed from the offerbook once a trader has taken your offerPayload.
-# TODO remove createOffer.amountPriceBox.sell.info=Define a price for which you want to sell bitcoin and either enter the amount or the trade volume. With the minimum  amount you can attract more potential traders by giving them more flexibility. But note that there is no automatic creation of a new offerPayload for the remaining amount in the case that a trader takes your offerPayload with a lower amount as defined in the amount field. Your offerPayload will be removed from the offerbook once a trader has taken your offerPayload.
+# TODO remove createOffer.amountPriceBox.buy.info=Define a price for which you want to buy bitcoin and either enter the amount or the trade volume. With the minimum amount you can attract more potential traders by giving them more flexibility. But note that there is no automatic creation of a new offer for the remaining amount in the case that a trader takes your offer with a lower amount as defined in the amount field. Your offer will be removed from the offerbook once a trader has taken your offer.
+# TODO remove createOffer.amountPriceBox.sell.info=Define a price for which you want to sell bitcoin and either enter the amount or the trade volume. With the minimum  amount you can attract more potential traders by giving them more flexibility. But note that there is no automatic creation of a new offer for the remaining amount in the case that a trader takes your offer with a lower amount as defined in the amount field. Your offer will be removed from the offerbook once a trader has taken your offer.
 # TODO remove  createOffer.amountPriceBox.next=Next step
 # TODO remove createOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted to 4 decimal places.
 # TODO remove createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted.
 # TODO remove createOffer.amountPriceBox.warning.adjustedVolume=The total volume you have entered leads to invalid fractional bitcoin amounts. The amount has been adjusted and a new total volume be calculated from it.
-createOffer.amountPriceBox.error.message=An error occurred when placing the offerPayload:\n\n{0}
+createOffer.amountPriceBox.error.message=An error occurred when placing the offer:\n\n{0}
 # TODO remove createOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount.
 # TODO remove createOffer.validation.minAmountLargerThanAmount=Minimum amount cannot be larger than amount.
 
-createOffer.fundsBox.title=Fund your offerPayload
+createOffer.fundsBox.title=Fund your offer
 createOffer.fundsBox.totalsNeeded=Funds needed:
 createOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the bitcoin amount entered above
 createOffer.fundsBox.address=Trade wallet address:
 createOffer.fundsBox.balance=Trade wallet balance:
-# TODO remove createOffer.fundsBox.info=For every offerPayload there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. Those funds are reserved and will be used in the case that your offerPayload gets executed. If you cancel your offerPayload you can withdraw your funds from that trading wallet. The only payment made when placing an offerPayload is the offerPayload fee payment. https://bisq.io/faq/#6
+# TODO remove createOffer.fundsBox.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. Those funds are reserved and will be used in the case that your offer gets executed. If you cancel your offer you can withdraw your funds from that trading wallet. The only payment made when placing an offer is the offer fee payment. https://bisq.io/faq/#6
 createOffer.fundsBox.tradeAmount=Trade amount:
 createOffer.fundsBox.securityDeposit=Security deposit:
-createOffer.fundsBox.offerFee=Create offerPayload fee:
+createOffer.fundsBox.offerFee=Create offer fee:
 createOffer.fundsBox.networkFee=Mining fee:
 createOffer.fundsBox.total=Total:
 # TODO remove createOffer.fundsBox.showAdvanced=Show advanced settings
 # TODO remove createOffer.fundsBox.hideAdvanced=Hide advanced settings
-# TODO remove createOffer.fundsBox.placeOffer=Place offerPayload
+# TODO remove createOffer.fundsBox.placeOffer=Place offer
 createOffer.fundsBox.placeOfferSpinnerInfo=Offer publishing is in progress ...
 createOffer.fundsBox.paymentLabel=bisq trade with ID {0}
 
@@ -139,20 +139,20 @@ createOffer.fundsBox.paymentLabel=bisq trade with ID {0}
 # TODO remove createOffer.advancedBox.txType=Payments method:
 shared.currency=Currency:
 # TODO remove createOffer.advancedBox.county=Payments account country:
-# TODO remove createOffer.advancedBox.info=Your trading partners must fulfill your offerPayload restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
+# TODO remove createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts).
 
-createOffer.success.headline=Your offerPayload has been published
+createOffer.success.headline=Your offer has been published
 createOffer.success.info=You can manage your open offers in the \"Portfolio\" screen under \"My open offers\".
 
-# TODO remove createOffer.error.message=An error occurred when placing the offerPayload.\n\n{0}
+# TODO remove createOffer.error.message=An error occurred when placing the offer.\n\n{0}
 
-# Take offerPayload
+# Take offer
 takeOffer.amount.prompt=Enter amount in BTC
 # TODO remove  takeOffer.price.prompt=Enter price
 # TODO remove  takeOffer.volume.prompt=Enter amount in {0}
 # TODO remove  takeOffer.minAmount.prompt=Enter min. amount
 
-# TODO remove takeOffer.amountPriceBox.title=Take offerPayload
+# TODO remove takeOffer.amountPriceBox.title=Take offer
 # TODO remove takeOffer.amountPriceBox.subTitle=Buy bitcoin
 takeOffer.amountPriceBox.buy.amountDescription=Amount of bitcoin to sell
 takeOffer.amountPriceBox.sell.amountDescription=Amount of bitcoin to buy
@@ -164,30 +164,30 @@ takeOffer.amountPriceBox.amountRangeDescription=Possible amount range
 # TODO remove takeOffer.amountPriceBox.sell.info=Enter the amount of bitcoin you want to buy. You can choose an amount between the minimum amount and the amount.
 # TODO remove takeOffer.amountPriceBox.next=Next step
 takeOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted to 4 decimal places.
-takeOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount defined in the offerPayload.
-takeOffer.validation.amountLargerThanOfferAmount=Input amount cannot be higher than the amount defined in the offerPayload.
+takeOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount defined in the offer.
+takeOffer.validation.amountLargerThanOfferAmount=Input amount cannot be higher than the amount defined in the offer.
 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 offerPayload is available ...
+takeOffer.fundsBox.isOfferAvailable=Check if offer is available ...
 takeOffer.fundsBox.totalsNeeded=Funds needed:
 # TODO remove takeOffer.fundsBox.totalsNeeded.prompt=Will be calculated from the bitcoin amount entered above
 takeOffer.fundsBox.address=Trade wallet address:
 takeOffer.fundsBox.balance=Trade wallet balance:
-# TODO remove takeOffer.fundsBox.buy.info=For every offerPayload there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. \
+# TODO remove takeOffer.fundsBox.buy.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. \
   Those funds will be paid in to a locked deposit address. At the end of a successful trade you will get back your security deposit and the bitcoin amount you sold will be transferred \
   to the BTC buyer.
-# TODO remove takeOffer.fundsBox.sell.info=For every offerPayload there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. \
+# TODO remove takeOffer.fundsBox.sell.info=For every offer there is a dedicated trade wallet. You need to fund that trade wallet with the necessary bitcoin amount. \
   Those funds will be paid into a locked deposit address. At the end of a successful trade you will get back your security deposit.
 takeOffer.fundsBox.tradeAmount=Amount to sell:
 takeOffer.fundsBox.securityDeposit=Security deposit:
-takeOffer.fundsBox.offerFee=Take offerPayload fee:
+takeOffer.fundsBox.offerFee=Take offer fee:
 takeOffer.fundsBox.networkFee=Mining fee:
 takeOffer.fundsBox.total=Total:
 # TODO remove takeOffer.fundsBox.showAdvanced=Show advanced settings
 # TODO remove takeOffer.fundsBox.hideAdvanced=Hide advanced settings
-# TODO remove takeOffer.fundsBox.takeOffer=Take offerPayload
-takeOffer.fundsBox.takeOfferSpinnerInfo=Take offerPayload in progress ...
+# TODO remove takeOffer.fundsBox.takeOffer=Take offer
+takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ...
 takeOffer.fundsBox.paymentLabel=bisq trade with ID {0}
 
 # TODO remove takeOffer.advancedBox.title=Advanced settings
@@ -197,12 +197,12 @@ takeOffer.fundsBox.paymentLabel=bisq trade with ID {0}
 # TODO remove takeOffer.advancedBox.txType=Payments method:
 shared.currency=Currency:
 # TODO remove takeOffer.advancedBox.county=Payments account country:
-# TODO remove takeOffer.advancedBox.info=These are the offerPayload restrictions your trading partner has defined in his offerPayload. \
+# TODO remove 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 offerPayload.
+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 offerPayload.\n\n{0}
+takeOffer.error.message=An error occurred when taking the offer.\n\n{0}
 
 # Payment methods
 # remove N/A=Not available