From 96371fa28fbfb2dddb621716afe6af3c01882e6c Mon Sep 17 00:00:00 2001
From: HostFat <hostfat@gmail.com>
Date: Sat, 26 Nov 2016 05:56:22 +0100
Subject: [PATCH 01/16] Adding italian language translation

---
 .../i18n/in_dev/displayStrings_it.properties  | 378 +++++++++---------
 1 file changed, 189 insertions(+), 189 deletions(-)

diff --git a/gui/src/main/resources/i18n/in_dev/displayStrings_it.properties b/gui/src/main/resources/i18n/in_dev/displayStrings_it.properties
index 6c94d104247..111aa421df0 100644
--- a/gui/src/main/resources/i18n/in_dev/displayStrings_it.properties
+++ b/gui/src/main/resources/i18n/in_dev/displayStrings_it.properties
@@ -1,227 +1,227 @@
-# Used by gui/components/infoDisplay.java
+# Used by gui/components/infoDisplay.java
 
 # shared
 shared.readMore=Leggi di più
-shared.openHelp=Open Help
-shared.warning=Warning
-shared.error=Error
-shared.close=Close
-shared.cancel=Cancel
+shared.openHelp=Apri Aiuto
+shared.warning=Attenzione
+shared.error=Errore
+shared.close=Chiudi
+shared.cancel=Cancella
 shared.ok=OK
-shared.yes=Yes
+shared.yes=Si
 shared.no=No
 
-shared.openSettings=Open settings for editing
-shared.buyBitcoin=Buy bitcoin
-shared.sellBitcoin=Sell bitcoin
-shared.buy=buy
-shared.sell=sell
-shared.spend=spend
+shared.openSettings=Apri impostazioni per modificare
+shared.buyBitcoin=Comprare bitcoin
+shared.sellBitcoin=Vendere bitcoin
+shared.buy=compra
+shared.sell=vendi
+shared.spend=spendi
 
 # 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.
+app.version=Hai probabilmente la versione sbagliata di Bitsquare su questo computer.\nL'architettura el tuo computer è: {0}.\nL'eseguibile di Bitsquare che hai installato è: {1}.\nSi prega di chiudere e reinstallare la versione corretta ( {3} ).
+app.shutdown.headline=Spegnimento in corso ...
+app.shutdown.text=Lo spegnimento dell'applicazione può richiedere un po' di secondi.\nSi prega di non interrompere il processo.
 
 # 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.account.no=Account n.:
+payment.currency=Moneta:
+payment.account.name=Nome account:
+payment.payment.method=Metodo pagamento:
+payment.account.owner=Nome del titolare:
+payment.bank.country=Paese della banca:
+payment.account.name.email=Nome del titolare / email
+payment.bank.name=Nome banca:
+payment.select.account=Seleziona tipo di conto
+payment.select.currency=Seleziona moneta
+payment.select.region=Seleziona regione
+payment.select.country=Seleziona paese
+payment.select.bank.country=Seleziona paese della banca
+payment.foreign.currency=Sei sicuro di voler scegliere una moneta diversa dalla moneta di default del paese?
+payment.restore.default=No, ripristina moneta di default
 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/ATM Deposit\" instead.
-payment.email.mobile=Email or mobile no.:
-payment.altcoin.address=Altcoin address:
-payment.address=address:
+payment.country=Paese:
+payment.owner.email=Email del titolare:
+payment.extras=Ulteriori requisiti:
+payment.us.info=Il bonifico con WIRE o ACH non è supportato per gli US perchè WIRE è troppo costoso e ACH ha un alto rischio di chargeback.\n\nSi prega di usare invece i metodi di pagamento \"ClearXchange\", \"US Postal Money Order\" or \"Deposito contanti/ATM\".
+payment.email.mobile=Email o n. cellulare:
+payment.altcoin.address=Indirizzo altcoin:
+payment.address=indirizzo:
 payment.altcoin=Altcoin:
-payment.select.altcoin=Select or search altcoin
+payment.select.altcoin=Seleziona o cerca 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.secret=Domanda segreta:
+payment.answer=Risposta:
+payment.wallet=ID portamonete:
+payment.supported.okpay=Monete OKPay supportate:
+payment.max.allowed=Massimo periodo / data consentiti:
+payment.hours=ore
+payment.days=giorni
+payment.1hour=1 ora
+payment.1day=1 giorno
+payment.max.duration=Durata massima scambio:
+payment.max.limit=Limite massimo scambio:
+payment.limitations=Limitazioni:
 payment.iban=IBAN:
 payment.bic=BIC:
-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:
+payment.accept.euro=Accetta scambi da paesi Euro:
+payment.accept.noneuro=Accetta scambi da questi paesi non-Euro:
+payment.all.euro=Tutti i paesi Euro
+payment.accepted.countries=Paesi accettati:
+payment.accepted.banks=Banche accettate:
+payment.mobile=N. cellulare:
+payment.postal.address=Indirizzo postale:
 
 
 
 # Validation
-validation.empty=Empty input is not allowed.
-validation.NaN=Input is not a valid number.
-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.toSmall=Input results in a bitcoin value with a fraction of the smallest unit (Satoshi).
-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.empty=Un valore vuoto non è permesso.
+validation.NaN=Il valore inserito non è un numero valido.
+validation.zero=Valore di 0 non è permesso.
+validation.negative=Un valore negativo non è permesso.
+validation.fiat.toSmall=Un valore inserito più piccolo dell'importo minimo possibile non è consentito.
+validation.fiat.toLarge=Un valore inserito più grande dell'importo massimo possibile non è consentito.
+validation.btc.toSmall=Il valore inserito risulta essere un valore bitcoin con una frazione dell'unità più piccola (Satoshi).Input  in a bitcoin value with a fraction of the smallest unit (Satoshi).
+validation.btc.toLarge=Un valore inserito più grande dell'importo massimo scambiabile di {0} non è consentito.
+validation.passwordTooShort=La password che hai inserito è trippo corda. Deve avere min. 8 caratteri.
+validation.passwordTooLong=La password che hai inserito è troppo lunga. Non può essere più lunga di 50 caratteri.
+validation.sortCodeNumber={0} deve consistere in {1} numeri.
+validation.sortCodeChars={0} deve consistere in {1} caratteri.
+validation.bankIdNumber={0} deve consistere in {1} numeri.
+validation.accountNr=Il numero dell'account deve consistere in {0} numeri.
+validation.accountNrChars=Il numero dell'account deve consistere in {0} caratteri.
 
 # Create offer
-createOffer.amount.prompt=Enter amount in BTC
-createOffer.price.prompt=Enter price
-createOffer.volume.prompt=Enter amount in {0}
-createOffer.minAmount.prompt=Enter min. amount
-
-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 bitcoin
-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.
-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.
-createOffer.amountPriceBox.next=Next step
-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.
-createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces=The amount you have entered exceeds the number of allowed decimal places.\nThe amount has been adjusted.
-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 offer:\n\n{0}
-createOffer.validation.amountSmallerThanMinAmount=Amount cannot be smaller than minimum amount.
-createOffer.validation.minAmountLargerThanAmount=Minimum amount cannot be larger than amount.
-
-createOffer.fundsBox.title=Fund your offer
-createOffer.fundsBox.totalsNeeded=Funds needed:
+createOffer.amount.prompt=Inserire l'importo in BTC
+createOffer.price.prompt=Inserire prezzo
+createOffer.volume.prompt=Inserire prezzo in {0}
+createOffer.minAmount.prompt=Inserire importo min.
+
+createOffer.amountPriceBox.title=Crea nuova offerta
+createOffer.amountPriceBox.amountDescription=Importo di bitcoin a {0}
+createOffer.amountPriceBox.priceDescriptionFiat=Prezzo fisso per {0}
+createOffer.amountPriceBox.buy.volumeDescription=Importo in {0} da spendere
+createOffer.amountPriceBox.sell.volumeDescription=Imoorto in {0} da ricevere
+createOffer.amountPriceBox.minAmountDescription=Minimo importo di bitcoin
+createOffer.amountPriceBox.buy.info=Definisci un prezzo per il quale vuoi comprare bitcoin e immettere la quantità o il volume di scambio. Con una quantità minima puoi attrarre più potenziali trader dando loro maggiore flessibilità. Ma da notare però che non c'è una creazione automatica di una nuova offerta per la quantità rimanente nel caso in cui un trader prenda la tua offerta con per un importo minore rispetto a quello definito nel campo dell'importo. La tua offerta sarà rimossa dalla lista delle offerte una volta che il trader avrà preso la tua offerta.
+createOffer.amountPriceBox.sell.info=Definisci un prezzo per il quale vuoi vendere bitcoin e immettere la quantità o il volume di scambio. Con una quantità minima puoi attrarre più potenziali trader dando loro maggiore flessibilità. Ma da notare però che non c'è una creazione automatica di una nuova offerta per la quantità rimanente nel caso in cui un trader prenda la tua offerta con per un importo minore rispetto a quello definito nel campo dell'importo. La tua offerta sarà rimossa dalla lista delle offerte una volta che il trader avrà preso la tua offerta.
+createOffer.amountPriceBox.next=Prossimo passo
+createOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=L'importo che hai inserito supera il numero di spazi di decimali permessi.\nL'importo è stato regolato a 4 spazi di decimali.
+createOffer.amountPriceBox.warning.invalidFiatDecimalPlaces=L'importo che hai inserito supera il numero di spazi di decimali permessi.\nL'importo è stato regolato.
+createOffer.amountPriceBox.warning.adjustedVolume=Il volume totale che hai inseirito porta ad importi frazionari non validi. L'importo è stato regolato e un nuovo volume totale è stato calcolato da esso.
+createOffer.amountPriceBox.error.message=Si è verificato un errore durante l'immissione dell'offerta:\n\n{0}
+createOffer.validation.amountSmallerThanMinAmount=L'importo non può essere più piccolo dell'importo minimo.
+createOffer.validation.minAmountLargerThanAmount=L'importo minimo non può essere più grande dell'importo.
+
+createOffer.fundsBox.title=Finanzia il tuo offerta
+createOffer.fundsBox.totalsNeeded=Fondi richiesti:
 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:
-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://bitsquare.io/faq/#6
-createOffer.fundsBox.tradeAmount=Trade amount:
-createOffer.fundsBox.securityDeposit=Security deposit:
-createOffer.fundsBox.offerFee=Create offer fee:
-createOffer.fundsBox.networkFee=Mining fee:
-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.paymentLabel=Bitsquare trade with ID {0}
-
-createOffer.advancedBox.title=Advanced settings
-createOffer.advancedBox.countries=Accepted countries:
-createOffer.advancedBox.languages=Accepted languages:
-createOffer.advancedBox.arbitrators=Accepted arbitrators:
-createOffer.advancedBox.txType=Payments method:
-createOffer.advancedBox.currency=Currency:
-createOffer.advancedBox.county=Payments account country:
-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 offer has been published
-createOffer.success.info=You can manage your open offers in the \"Portfolio\" screen under \"My open offers\".
+createOffer.fundsBox.address=Indirizzo portafoglio per lo scambio:
+createOffer.fundsBox.balance=Saldo portafoglio per lo scambio:
+createOffer.fundsBox.info=Per ogni offerta c'è un portamonete di scambio dedicato. Devi finanziare il portamonete di scambio con la quantità di bitcoin necessaria. Questi fondi sono riservati e saranno utilizzati nel caso in cui la tua offerta venga eseguita. Se cancelli la tua offerta puoi ritirare i fondi da quel portamonete di scambio. L'unico pagamento eseguito quando disponi un'offerta è la commissione di pagamento per offerta. https://bitsquare.io/faq/#6
+createOffer.fundsBox.tradeAmount=Importo per lo scambio:
+createOffer.fundsBox.securityDeposit=Deposito di sicurezza:
+createOffer.fundsBox.offerFee=Crea commissione di offerta:
+createOffer.fundsBox.networkFee=Commissione mining:
+createOffer.fundsBox.total=Totale:
+createOffer.fundsBox.showAdvanced=Mostra impostazioni avanzate
+createOffer.fundsBox.hideAdvanced=Nascondi impostazioni avanzate
+createOffer.fundsBox.placeOffer=Posiziona offerta
+createOffer.fundsBox.placeOfferSpinnerInfo=Pubblicazione dell'offerta in corso ...
+createOffer.fundsBox.paymentLabel=Scambi Bitsquare con ID {0}
+
+createOffer.advancedBox.title=Impostazioni avanzate
+createOffer.advancedBox.countries=Paesi accettati:
+createOffer.advancedBox.languages=Lingue accettate:
+createOffer.advancedBox.arbitrators=Arbitri accettati:
+createOffer.advancedBox.txType=Metodi di pagamento:
+createOffer.advancedBox.currency=Moneta:
+createOffer.advancedBox.county=Paese conto pagamenti:
+createOffer.advancedBox.info=I tuoi partner di compravendita devono soddisfare le ristrizzioni della tua offerta. Nelle impostazioni puoi modificare i paesi accettati, lingue e arbitri. I dettagli usati per account di pagamenti provengono dai tuoi attuali account di pagamenti selezionati (se hai più account di pagamenti).
+
+createOffer.success.headline=La tua offerta è stata pubblicata
+createOffer.success.info=Puoi gestire le tue offerte perte nella schermata \"Portfolio\" sotto a \"My open offers\".
    
-createOffer.error.message=An error occurred when placing the offer.\n\n{0}
+createOffer.error.message=Si è verificato un errore durante l'immissione dell'offerta.\n\n{0}
 
 # Take offer
-takeOffer.amount.prompt=Enter amount in BTC
-takeOffer.price.prompt=Enter price
-takeOffer.volume.prompt=Enter amount in {0}
-takeOffer.minAmount.prompt=Enter min. amount
-
-takeOffer.amountPriceBox.title=Take offer
-takeOffer.amountPriceBox.subTitle=Buy bitcoin
-takeOffer.amountPriceBox.buy.amountDescription=Amount of bitcoin to sell
-takeOffer.amountPriceBox.sell.amountDescription=Amount of bitcoin to buy
-takeOffer.amountPriceBox.priceDescription=Price per bitcoin in {0}
-takeOffer.amountPriceBox.buy.volumeDescription=Receiving amount in {0}
-takeOffer.amountPriceBox.sell.volumeDescription=Amount in {0} to spend
-takeOffer.amountPriceBox.amountRangeDescription=Possible amount range
-takeOffer.amountPriceBox.buy.info=Enter the amount of bitcoin you want to sell. You can choose an amount between the minimum amount and the amount.
-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.
-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 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 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:
-takeOffer.fundsBox.balance=Trade wallet balance:
-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.
-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 offer fee:
-takeOffer.fundsBox.networkFee=Mining fee:
-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.paymentLabel=Bitsquare trade with ID {0}
-
-takeOffer.advancedBox.title=Advanced settings
-takeOffer.advancedBox.countries=Accepted countries:
-takeOffer.advancedBox.languages=Accepted languages:
-takeOffer.advancedBox.arbitrators=Accepted arbitrators:
-takeOffer.advancedBox.txType=Payments method:
-takeOffer.advancedBox.currency=Currency:
-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.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}
+takeOffer.amount.prompt=Inserire importo in BTC
+takeOffer.price.prompt=Inserire prezzo
+takeOffer.volume.prompt=Inserire importo in {0}
+takeOffer.minAmount.prompt=Inserire importo min.
+
+takeOffer.amountPriceBox.title=Prendere offerta
+takeOffer.amountPriceBox.subTitle=Compra bitcoin
+takeOffer.amountPriceBox.buy.amountDescription=Importo di bitcoin da vendere
+takeOffer.amountPriceBox.sell.amountDescription=Importo di bitcoin da comprare
+takeOffer.amountPriceBox.priceDescription=Prezzo per bitcoin in {0}
+takeOffer.amountPriceBox.buy.volumeDescription=Ricezione importo in {0}
+takeOffer.amountPriceBox.sell.volumeDescription=Importo in {0} da spendere
+takeOffer.amountPriceBox.amountRangeDescription=Raggio di importo possibile
+takeOffer.amountPriceBox.buy.info=Inserire l'importo di bitcoin che vuoi vendere. Puoi scegliere un importo fra il minimo importo e l'importo.
+takeOffer.amountPriceBox.sell.info=Inserire l'importo di bitcoin che vuoi comprare. Puoi scegliere un importo fra il minimo importo e l'importo.
+takeOffer.amountPriceBox.next=Prossimo passo
+takeOffer.amountPriceBox.warning.invalidBtcDecimalPlaces=L'importo che hai inserito supera il numero di spazio di decimali permesso.\nL'importo è stato regolato a 4 decimali.
+takeOffer.validation.amountSmallerThanMinAmount=L'importo non può essere più piccola dell'importo minimo definito nell'offerta.
+takeOffer.validation.amountLargerThanOfferAmount=L'importo inserito non può essere più alto dell'importo definito nell'offerta.
+takeOffer.validation.amountLargerThanOfferAmountMinusFee=Questo importo inserto andrà a creare un resto di polvere per il venditore di BTC.
+
+takeOffer.fundsBox.title=Finanzia il tuo scambio
+takeOffer.fundsBox.isOfferAvailable=Controllare se l'offerta è disponibile ...
+takeOffer.fundsBox.totalsNeeded=Fondi richiesti:
+takeOffer.fundsBox.totalsNeeded.prompt=Sarà calcolato dall'importo in bitcoin inserto sopra
+takeOffer.fundsBox.address=Indirizzo portafoglio per lo scambio::
+takeOffer.fundsBox.balance=Saldo portafoglio per lo scambio:
+takeOffer.fundsBox.buy.info=Per ogni offerta c'è un portamonete di scambio dedicato. Devi finanziare il portamonete di scambio con la quantità di bitcoin necessaria. \
+  Questi fondi saranno versati in un indirizzo di deposito bloccato. Alla fine di una compravendita avvenuta con successo riavrai indietro il tuo deposito di sicurezza e la quantità di bitcoin che hai venduto sarà trasferita \
+  al compratore di BTC.
+takeOffer.fundsBox.sell.info=Per ogni offerta c'è un portamonete di scambio dedicato. Devi finanziare il portamonete di scambio con la quantità di bitcoin necessaria. \
+  Questi fondi saranno versati in un indirizzo di deposito bloccato. Alla fine di una compravendita avvenuta con successo riavrai indietro il tuo deposito di sicurezza.
+takeOffer.fundsBox.tradeAmount=Importo da vendere:
+takeOffer.fundsBox.securityDeposit=Deposito di sicurezza:
+takeOffer.fundsBox.offerFee=Commissione prendere offerta:
+takeOffer.fundsBox.networkFee=Commissione mining:
+takeOffer.fundsBox.total=Totale:
+takeOffer.fundsBox.showAdvanced=Mostra impostazioni avanzate
+takeOffer.fundsBox.hideAdvanced=Nascondi impostazioni avanzate
+takeOffer.fundsBox.takeOffer=Prendere offerta
+takeOffer.fundsBox.takeOfferSpinnerInfo=Raccolta dell'offerta in corso ...
+takeOffer.fundsBox.paymentLabel=Scambio Bitsquare con ID {0}
+
+takeOffer.advancedBox.title=Impostazioni avanzate
+takeOffer.advancedBox.countries=Paesi accettati:
+takeOffer.advancedBox.languages=Lingue accettate:
+takeOffer.advancedBox.arbitrators=Arbitri accettati:
+takeOffer.advancedBox.txType=Metodi di pagamento:
+takeOffer.advancedBox.currency=Moneta:
+takeOffer.advancedBox.county=Paese conto pagamenti:
+takeOffer.advancedBox.info=Queste sono le reistrizioni di offerta che il tuo partner di compravendita ha definito nella sua offerta. \
+  Le tue impostazioni combaciano quei vincoli e si abilitato a commerciare con lui.
+
+takeOffer.success.headline=Hai partecipato con successo ad un'offerta.
+takeOffer.success.info=Puoi vedere lo stato della tua trattativa nella schermata \"Portfolio\" sotto a \"Open trades\".
+takeOffer.error.message=Si è verificato un errore prendendo l'offerta.\n\n{0}
 
 # Payment methods
-N/A=Not available
+N/A=Non disponibile
 OK_PAY=OKPay
 PERFECT_MONEY=Perfect Money
 ALI_PAY=AliPay
 SEPA=SEPA
 FASTER_PAYMENTS=Faster Payments
-NATIONAL_BANK=National bank transfer
-SAME_BANK=Transfer with same bank
-SPECIFIC_BANKS=Transfers with specific banks
+NATIONAL_BANK=Bonifico bancario nazionale
+SAME_BANK=Bonifico con la stessa banca
+SPECIFIC_BANKS=Bonifici con banche specifiche
 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/ATM deposit
+CASH_DEPOSIT=Deposito contanti/ATM
 
-BLOCK_CHAINS=Altcoins
+BLOCK_CHAINS=Altcoin
 
 N/A_SHORT=N/A
 OK_PAY_SHORT=OKPay
@@ -229,15 +229,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
-SPECIFIC_BANKS_SHORT=Specific banks
+NATIONAL_BANK_SHORT=Banche nazionali
+SAME_BANK_SHORT=Stessa banca
+SPECIFIC_BANKS_SHORT=Banche specifiche
 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/ATM deposit
+CASH_DEPOSIT_SHORT=Deposito contanti/ATM
 
-BLOCK_CHAINS_SHORT=Altcoins
+BLOCK_CHAINS_SHORT=Altcoin

From 59294427b87e1e4bbcbe15176521b95878c5dced Mon Sep 17 00:00:00 2001
From: DevAlexey <DevAlexey@users.noreply.github.com>
Date: Mon, 19 Dec 2016 16:53:34 +0300
Subject: [PATCH 02/16] + Byteball address validation

---
 .../validation/AltCoinAddressValidator.java   |   2 +
 .../validation/ByteballAddressValidator.java  | 160 ++++++++++++++++++
 .../AltCoinAddressValidatorTest.java          |  13 ++
 3 files changed, 175 insertions(+)
 create mode 100644 gui/src/main/java/io/bitsquare/gui/util/validation/ByteballAddressValidator.java

diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
index f1f87fc717b..66d561da7ee 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
@@ -92,6 +92,8 @@ public ValidationResult validate(String input) {
                         return validationResult;
                     else
                         return new ValidationResult(false, "ZEC address need to start with t. Addresses starting with z are not supported.");
+                case "GBYTE":
+                    return ByteballAddressValidator.validate(input);
                 default:
                     log.debug("Validation for AltCoinAddress not implemented yet. currencyCode:" + currencyCode);
                     return validationResult;
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/ByteballAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/ByteballAddressValidator.java
new file mode 100644
index 00000000000..4e8c5d25c85
--- /dev/null
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/ByteballAddressValidator.java
@@ -0,0 +1,160 @@
+package io.bitsquare.gui.util.validation;
+
+import org.apache.commons.codec.binary.Base32;
+import org.apache.commons.codec.binary.Base64;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by DevAlexey on 19.12.2016.
+ */
+public class ByteballAddressValidator {
+  private static final Base32 base32 = new Base32();
+  private static final Base64 base64 = new Base64();
+  private static final String PI = "14159265358979323846264338327950288419716939937510";
+  private static final String[] arrRelativeOffsets = PI.split("");
+  private static Integer[] arrOffsets160, arrOffsets288;
+
+  static {
+    try {
+      arrOffsets160 = calcOffsets(160);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    try {
+      arrOffsets288 = calcOffsets(288);
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  public static InputValidator.ValidationResult validate(String input) {
+    return new InputValidator.ValidationResult(isValidAddress(input));
+  }
+
+  private static boolean isValidAddress(String address) {
+    return isValidChash(address, 32);
+  }
+
+  private static boolean isValidChash(String str, int len) {
+    return (isStringOfLength(str, len) && isChashValid(str));
+  }
+
+  private static boolean isStringOfLength(String str, int len) {
+    return str.length() == len;
+  }
+
+  private static void checkLength(int chash_length) throws Exception {
+    if (chash_length != 160 && chash_length != 288)
+      throw new Exception("unsupported c-hash length: " + chash_length);
+  }
+
+  private static Integer[] calcOffsets(int chash_length) throws Exception {
+    checkLength(chash_length);
+    List<Integer> arrOffsets = new ArrayList<>(chash_length);
+    int offset = 0;
+    int index = 0;
+
+    for (int i = 0; offset < chash_length; i++) {
+      int relative_offset = Integer.parseInt(arrRelativeOffsets[i]);
+      if (relative_offset == 0)
+        continue;
+      offset += relative_offset;
+      if (chash_length == 288)
+        offset += 4;
+      if (offset >= chash_length)
+        break;
+      arrOffsets.add(offset);
+      //console.log("index="+index+", offset="+offset);
+      index++;
+    }
+
+    if (index != 32)
+      throw new Exception("wrong number of checksum bits");
+
+    return arrOffsets.toArray(new Integer[0]);
+  }
+
+  private static SeparatedData separateIntoCleanDataAndChecksum(String bin) throws Exception {
+    int len = bin.length();
+    Integer[] arrOffsets;
+    if (len == 160)
+      arrOffsets = arrOffsets160;
+    else if (len == 288)
+      arrOffsets = arrOffsets288;
+    else
+      throw new Exception("bad length");
+    StringBuilder arrFrags = new StringBuilder();
+    StringBuilder arrChecksumBits = new StringBuilder();
+    int start = 0;
+    for (int i = 0; i < arrOffsets.length; i++) {
+      arrFrags.append(bin.substring(start, arrOffsets[i]));
+      arrChecksumBits.append(bin.substring(arrOffsets[i], arrOffsets[i] + 1));
+      start = arrOffsets[i] + 1;
+    }
+    // add last frag
+    if (start < bin.length())
+      arrFrags.append(bin.substring(start));
+    String binCleanData = arrFrags.toString();
+    String binChecksum = arrChecksumBits.toString();
+    return new SeparatedData(binCleanData, binChecksum);
+  }
+
+  private static String buffer2bin(byte[] buf) {
+    StringBuffer bytes = new StringBuffer();
+    for (int i = 0; i < buf.length; i++) {
+      String bin = String.format("%8s", Integer.toBinaryString(buf[i] & 0xFF)).replace(' ', '0');
+      bytes.append(bin);
+    }
+    return bytes.toString();
+  }
+
+  private static byte[] bin2buffer(String bin) {
+    int len = bin.length() / 8;
+    byte[] buf = new byte[len];
+    for (int i = 0; i < len; i++)
+      buf[i] = (byte) Integer.parseInt(bin.substring(i * 8, (i + 1) * 8), 2);
+    return buf;
+  }
+
+  private static boolean isChashValid(String encoded) {
+    int encoded_len = encoded.length();
+    if (encoded_len != 32 && encoded_len != 48) // 160/5 = 32, 288/6 = 48
+      return false;
+    byte[] chash = (encoded_len == 32) ? base32.decode(encoded) : base64.decode(encoded);
+    String binChash = buffer2bin(chash);
+    SeparatedData separated = null;
+    try {
+      separated = separateIntoCleanDataAndChecksum(binChash);
+    } catch (Exception e) {
+      return false;
+    }
+    byte[] clean_data = bin2buffer(separated.clean_data);
+    byte[] checksum = bin2buffer(separated.checksum);
+    return Arrays.equals(getChecksum(clean_data), checksum);
+  }
+
+  private static byte[] getChecksum(byte[] clean_data) {
+
+    try {
+      byte[] full_checksum = MessageDigest.getInstance("SHA-256").digest(clean_data);
+      byte[] checksum = {full_checksum[5], full_checksum[13], full_checksum[21], full_checksum[29]};
+      return checksum;
+    } catch (NoSuchAlgorithmException e) {
+      return null;
+    }
+  }
+
+  private static class SeparatedData {
+    String clean_data, checksum;
+
+    public SeparatedData(String clean_data, String checksum) {
+      this.clean_data = clean_data;
+      this.checksum = checksum;
+    }
+  }
+}
diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java b/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
index e2a1d7abf59..3744ad351c6 100644
--- a/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
+++ b/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
@@ -50,4 +50,17 @@ public void testIOP() {
         assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem").isValid);
     }
 
+    @Test
+    public void testGBYTE() {
+        AltCoinAddressValidator validator = new AltCoinAddressValidator();
+        validator.setCurrencyCode("GBYTE");
+
+        assertTrue(validator.validate("BN7JXKXWEG4BVJ7NW6Q3Z7SMJNZJYM3G").isValid);
+        assertTrue(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634DE").isValid);
+
+        assertFalse(validator.validate("XGKZODTGTRXIUA75TKONWHFDCU6634DE").isValid);
+        assertFalse(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634D").isValid);
+        assertFalse(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634DZ").isValid);
+    }
+
 }

From 6fbe2d358c42d978ed3e907616c08a465dc4bc86 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Mon, 19 Dec 2016 19:08:02 +0100
Subject: [PATCH 03/16] Move to altcoin package, add license

---
 .../validation/AltCoinAddressValidator.java   |  1 +
 .../ByteballAddressValidator.java             | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 rename gui/src/main/java/io/bitsquare/gui/util/validation/{ => altcoins}/ByteballAddressValidator.java (86%)

diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
index 66d561da7ee..a68ff1cbd9a 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
@@ -18,6 +18,7 @@
 package io.bitsquare.gui.util.validation;
 
 
+import io.bitsquare.gui.util.validation.altcoins.ByteballAddressValidator;
 import io.bitsquare.gui.util.validation.params.IOPParams;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.AddressFormatException;
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/ByteballAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/altcoins/ByteballAddressValidator.java
similarity index 86%
rename from gui/src/main/java/io/bitsquare/gui/util/validation/ByteballAddressValidator.java
rename to gui/src/main/java/io/bitsquare/gui/util/validation/altcoins/ByteballAddressValidator.java
index 4e8c5d25c85..9771c0a569d 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/ByteballAddressValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/altcoins/ByteballAddressValidator.java
@@ -1,5 +1,23 @@
-package io.bitsquare.gui.util.validation;
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.util.validation.altcoins;
 
+import io.bitsquare.gui.util.validation.InputValidator;
 import org.apache.commons.codec.binary.Base32;
 import org.apache.commons.codec.binary.Base64;
 

From 6b1dd041b679623b1aeb4c684a1066dd06e07eaf Mon Sep 17 00:00:00 2001
From: HostFat <hostfat@gmail.com>
Date: Thu, 29 Dec 2016 09:23:51 +0100
Subject: [PATCH 04/16] Adding Bitaps block explorer

---
 core/src/main/java/io/bitsquare/user/Preferences.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java
index 19132c53fd0..427d1afcaf9 100644
--- a/core/src/main/java/io/bitsquare/user/Preferences.java
+++ b/core/src/main/java/io/bitsquare/user/Preferences.java
@@ -76,7 +76,8 @@ public final class Preferences implements Persistable {
             new BlockChainExplorer("Blockonomics", "https://www.blockonomics.co/api/tx?txid=", "https://www.blockonomics.co/#/search?q="),
             new BlockChainExplorer("Chainflyer", "http://chainflyer.bitflyer.jp/Transaction/", "http://chainflyer.bitflyer.jp/Address/"),
             new BlockChainExplorer("Smartbit", "https://www.smartbit.com.au/tx/", "https://www.smartbit.com.au/address/"),
-            new BlockChainExplorer("SoChain. Wow.", "https://chain.so/tx/BTC/", "https://chain.so/address/BTC/")
+            new BlockChainExplorer("SoChain. Wow.", "https://chain.so/tx/BTC/", "https://chain.so/address/BTC/"),
+            new BlockChainExplorer("Bitaps", "https://bitaps.com/", "https://bitaps.com/")
     ));
 
     public static List<String> getBtcDenominations() {

From 0b3528cb1f1a978d574e1b2d3c1a0422db9a8113 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 3 Jan 2017 12:15:05 +0100
Subject: [PATCH 05/16] Resolve Git merge conflict

---
 doc/install_tor_java_debian.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100755 doc/install_tor_java_debian.sh

diff --git a/doc/install_tor_java_debian.sh b/doc/install_tor_java_debian.sh
new file mode 100755
index 00000000000..8371f3a2d6f
--- /dev/null
+++ b/doc/install_tor_java_debian.sh
@@ -0,0 +1 @@
+//todo
\ No newline at end of file

From 47ca4ec98708f6830a6c1b26938c768d124f63ef Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 3 Jan 2017 12:16:18 +0100
Subject: [PATCH 06/16] Merges master

---
 doc/install_tor_java_debian.sh | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100755 doc/install_tor_java_debian.sh

diff --git a/doc/install_tor_java_debian.sh b/doc/install_tor_java_debian.sh
deleted file mode 100755
index 8371f3a2d6f..00000000000
--- a/doc/install_tor_java_debian.sh
+++ /dev/null
@@ -1 +0,0 @@
-//todo
\ No newline at end of file

From 7f978832feb303f24896454a352d4fb8d8c6c3fe Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 3 Jan 2017 12:29:18 +0100
Subject: [PATCH 07/16] Add Contributing notes

---
 doc/CONTRIBUTING.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 doc/CONTRIBUTING.md

diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md
new file mode 100644
index 00000000000..ae47f770333
--- /dev/null
+++ b/doc/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+Contributing to Bitsquare
+============================
+
+Pull requests
+--------------------
+
+To contribute a patch, the workflow is as follows:
+
+  - Fork repository
+  - Create topic branch from Development branch
+  - Commit patches
+  
+Please do not make pull requests to the Master branch but always use the Development branch!
+
+
+Copyright
+---------
+
+We are aiming to follow the principles and establish the workflow used at the Bitcoin Core project. 
+Please check out the [Bitcoin Core documentation](https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md) for more info.
+The full workflow is not used yet as there are not enough dedicated developers, but as soon that situation changes we will move 
+to a model with ACK/NACK, code reviews and maintainer roles.
+
+Copyright
+---------
+
+By contributing to this repository, you agree to license your work under the AGPL license. 
+Please include the license header into your files.

From 60880639d3059534351be837b920fcc55639ad91 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 3 Jan 2017 22:31:19 +0100
Subject: [PATCH 08/16] Add logs for price providers

---
 .../src/main/java/io/bitsquare/pricefeed/PriceData.java   | 8 ++++----
 .../main/java/io/bitsquare/pricefeed/PriceFeedMain.java   | 5 +++++
 .../java/io/bitsquare/pricefeed/PriceRequestService.java  | 4 ++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceData.java b/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceData.java
index af08896ddb3..486e6bdeb7a 100644
--- a/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceData.java
+++ b/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceData.java
@@ -19,10 +19,10 @@
 
 @SuppressWarnings("FieldCanBeLocal")
 public class PriceData {
-    private final String c; // currencyCode
-    private final double a; // ask;
-    private final double b; // bid
-    private final double l; // last
+    public final String c; // currencyCode
+    public final double a; // ask;
+    public final double b; // bid
+    public final double l; // last
 
     public PriceData(String currencyCode, double ask, double bid, double last) {
         this.c = currencyCode;
diff --git a/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceFeedMain.java b/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceFeedMain.java
index 42ed66517f2..5b572bdf217 100644
--- a/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceFeedMain.java
+++ b/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceFeedMain.java
@@ -17,10 +17,13 @@
 
 package io.bitsquare.pricefeed;
 
+import ch.qos.logback.classic.Level;
+import io.bitsquare.app.Log;
 import io.bitsquare.http.HttpException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -34,6 +37,8 @@ public class PriceFeedMain {
     private static final Logger log = LoggerFactory.getLogger(PriceFeedMain.class);
 
     public static void main(String[] args) throws IOException, NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException, InvalidKeyException, HttpException {
+        Log.setup(System.getProperty("user.home") + File.separator + "priceFeedProvider");
+        Log.setLevel(Level.INFO);
         if (args.length == 2) {
             String bitcoinAveragePrivKey = args[0];
             String bitcoinAveragePubKey = args[1];
diff --git a/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceRequestService.java b/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceRequestService.java
index 94274e40886..03330e8ddd5 100644
--- a/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceRequestService.java
+++ b/pricefeed/src/main/java/io/bitsquare/pricefeed/PriceRequestService.java
@@ -149,6 +149,7 @@ private void requestCoinmarketcapPrices() throws IOException, HttpException {
                 .filter(e -> poloniexMap == null || !poloniexMap.containsKey(e.getKey()))
                 .forEach(e -> allPricesMap.put(e.getKey(), e.getValue()));
         coinmarketcapTs = Instant.now().getEpochSecond();
+        log.info("Coinmarketcap LTC (last): " + map.get("LTC").l);
         writeToJson();
     }
 
@@ -157,11 +158,13 @@ private void requestPoloniexPrices() throws IOException, HttpException {
         poloniexMap = poloniexProvider.request();
         allPricesMap.putAll(poloniexMap);
         poloniexTs = Instant.now().getEpochSecond();
+        log.info("Poloniex LTC (last): " + poloniexMap.get("LTC").l);
         writeToJson();
     }
 
     private void requestBtcAverageLocalPrices() throws NoSuchAlgorithmException, InvalidKeyException, IOException, HttpException {
         btcAverageLocalMap = btcAverageProvider.getLocal();
+        log.info("BTCAverage local USD (last):" + btcAverageLocalMap.get("USD").l);
         allPricesMap.putAll(btcAverageLocalMap);
         btcAverageTs = Instant.now().getEpochSecond();
         writeToJson();
@@ -169,6 +172,7 @@ private void requestBtcAverageLocalPrices() throws NoSuchAlgorithmException, Inv
 
     private void requestBtcAverageGlobalPrices() throws NoSuchAlgorithmException, InvalidKeyException, IOException, HttpException {
         Map<String, PriceData> map = btcAverageProvider.getGlobal();
+        log.info("BTCAverage global USD (last):" + map.get("USD").l);
         // we don't replace prices which we got form the local request, just in case the global data are received 
         // earlier at startup we allow them but the local request will overwrite them.
         map.entrySet().stream()

From deb8a1ba12ed64d849262800a57304102da84f6d Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 4 Jan 2017 14:02:43 +0100
Subject: [PATCH 09/16] Add notes to emergency payout tool, update logs

---
 .../io/bitsquare/btc/TradeWalletService.java     |  6 +++---
 .../windows/SpendFromDepositTxWindow.java        | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
index 1f2a571cd0a..7e766323cb5 100644
--- a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
+++ b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
@@ -857,9 +857,9 @@ public Transaction emergencySignAndPublishPayoutTx(String depositTxHex,
         log.info("buyerAddressString " + buyerAddressString);
         log.info("sellerAddressString " + sellerAddressString);
         log.info("arbitratorAddressString " + arbitratorAddressString);
-        log.info("buyerPrivateKeyAsHex " + buyerPrivateKeyAsHex);
-        log.info("sellerPrivateKeyAsHex " + sellerPrivateKeyAsHex);
-        log.info("arbitratorPrivateKeyAsHex " + arbitratorPrivateKeyAsHex);
+        log.info("buyerPrivateKeyAsHex (not displayed for security reasons)");
+        log.info("sellerPrivateKeyAsHex (not displayed for security reasons)");
+        log.info("arbitratorPrivateKeyAsHex (not displayed for security reasons)");
         log.info("buyerPubKeyAsHex " + buyerPubKeyAsHex);
         log.info("sellerPubKeyAsHex " + sellerPubKeyAsHex);
         log.info("arbitratorPubKeyAsHex " + arbitratorPubKeyAsHex);
diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SpendFromDepositTxWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SpendFromDepositTxWindow.java
index c5f7d8b72fc..48030add575 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SpendFromDepositTxWindow.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SpendFromDepositTxWindow.java
@@ -110,11 +110,19 @@ private void addContent() {
         List<String> buyerPubKeys = !buyerPubKeysInputTextField.getText().isEmpty() ? Arrays.asList(buyerPubKeysInputTextField.getText().split(",")) : new ArrayList<>();
         List<String> sellerPubKeys = !sellerPubKeysInputTextField.getText().isEmpty() ? Arrays.asList(sellerPubKeysInputTextField.getText().split(",")) : new ArrayList<>();
 
-
-        /* 
+        
+        // Notes: 
+        // Open with alt+g and enable DEV mode
+        // Priv key is only visible if pw protection is removed (wallet details data (alt+j))
+        // Take P2SHMultiSigOutputScript from depositTx in blockexplorer 
+        // Take missing buyerPubKeyAsHex and sellerPubKeyAsHex from contract data!
+        // Lookup sellerPrivateKeyAsHex associated with sellerPubKeyAsHex (or buyers) in wallet details data 
+        // sellerPubKeys/buyerPubKeys are auto generated if used the fields below
+        // Never set the priv arbitr. key here!
+        
         depositTxHex.setText("");
 
-        buyerPayoutAmount.setText("0.01");
+        buyerPayoutAmount.setText("0.51");
         sellerPayoutAmount.setText("0.01");
         arbitratorPayoutAmount.setText("0");
 
@@ -139,7 +147,7 @@ private void addContent() {
         sellerPubKeys = Arrays.asList();
                 
         buyerPubKeys = Arrays.asList();
-        */
+
 
         actionButtonText("Sign and publish transaction");
 

From 1b58b4c54e035dc9df40dc6fc589d2e0c3b41b5a Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 4 Jan 2017 14:28:28 +0100
Subject: [PATCH 10/16] Rename lists

---
 .../main/java/io/bitsquare/trade/TradeManager.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
index 212fe8baa9a..34d523f9016 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -195,8 +195,8 @@ public void shutDown() {
     private void initPendingTrades() {
         Log.traceCall();
 
-        List<Trade> toAdd = new ArrayList<>();
-        List<Trade> toRemove = new ArrayList<>();
+        List<Trade> addTradeToFailedTradesList = new ArrayList<>();
+        List<Trade> removePreparedTradeList = new ArrayList<>();
         tradesForStatistics = new ArrayList<>();
         for (Trade trade : trades) {
             trade.setStorage(tradableListStorage);
@@ -206,16 +206,16 @@ private void initPendingTrades() {
                 trade.updateDepositTxFromWallet();
                 tradesForStatistics.add(trade);
             } else if (trade.isTakerFeePaid()) {
-                toAdd.add(trade);
+                addTradeToFailedTradesList.add(trade);
             } else {
-                toRemove.add(trade);
+                removePreparedTradeList.add(trade);
             }
         }
 
-        for (Trade trade : toAdd)
+        for (Trade trade : addTradeToFailedTradesList)
             addTradeToFailedTrades(trade);
 
-        for (Trade trade : toRemove)
+        for (Trade trade : removePreparedTradeList)
             removePreparedTrade(trade);
 
         for (Tradable tradable : closedTradableManager.getClosedTrades()) {

From 10a5e84a4a567b867360e4d80bfcca497df07844 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 6 Jan 2017 00:35:12 +0100
Subject: [PATCH 11/16] Add Byte

---
 core/src/main/java/io/bitsquare/locale/CurrencyUtil.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
index 5bae7d4eaca..ef0f6bbcf06 100644
--- a/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
+++ b/core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
@@ -92,6 +92,7 @@ public static List<CryptoCurrency> createAllSortedCryptoCurrenciesList() {
         result.add(new CryptoCurrency("BITNZD", "BitNZD", true));
         result.add(new CryptoCurrency("BITSEK", "BitSEK", true));
         result.add(new CryptoCurrency("BITSGD", "BitSGD", true));
+        result.add(new CryptoCurrency("GBYTE", "Byte"));
         result.add(new CryptoCurrency("SYNQ", "BitSYNQ"));
         result.add(new CryptoCurrency("BTS", "BitShares"));
         result.add(new CryptoCurrency("BITUSD", "BitUSD", true));

From 8bae2e2675507572657386c4877e3ab12656075d Mon Sep 17 00:00:00 2001
From: Bryce Weiner <bryce@altsystem.io>
Date: Tue, 17 Jan 2017 00:18:51 -0600
Subject: [PATCH 12/16] Address validator for XTO

---
 .../validation/AltCoinAddressValidator.java   | 14 ++++
 .../AltCoinAddressValidatorTest.java          | 79 +++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java

diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
index a68ff1cbd9a..d054fc150d8 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
@@ -93,6 +93,20 @@ public ValidationResult validate(String input) {
                         return validationResult;
                     else
                         return new ValidationResult(false, "ZEC address need to start with t. Addresses starting with z are not supported.");
+                case "XTO":
+                    if (input.matches("^[T2][a-km-zA-HJ-NP-Z1-9]{25,34}$")) {
+                        if (verifyChecksum(input))
+                            try {
+                                new Address(MainNetParams.get(), input);
+                                return new ValidationResult(true);
+                            } catch (AddressFormatException e) {
+                                return new ValidationResult(false, getErrorMessage(e));
+                            }
+                        else
+                            return wrongChecksum;
+                    } else {
+                        return regexTestFailed;
+                    }
                 case "GBYTE":
                     return ByteballAddressValidator.validate(input);
                 default:
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
new file mode 100644
index 00000000000..705e31e0217
--- /dev/null
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
@@ -0,0 +1,79 @@
+/*
+ * This file is part of Bitsquare.
+ *
+ * Bitsquare is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.bitsquare.gui.util.validation;
+
+import org.junit.Test;
+
+import static junit.framework.TestCase.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class AltCoinAddressValidatorTest {
+
+    @Test
+    public void testBTC() {
+        AltCoinAddressValidator validator = new AltCoinAddressValidator();
+        validator.setCurrencyCode("BTC");
+
+        assertTrue(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem").isValid);
+        assertTrue(validator.validate("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX").isValid);
+        assertTrue(validator.validate("1111111111111111111114oLvT2").isValid);
+        assertTrue(validator.validate("1BitcoinEaterAddressDontSendf59kuE").isValid);
+
+        assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq").isValid);
+        assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYheO").isValid);
+        assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#").isValid);
+    }
+
+    @Test
+    public void testXTO() {
+        AltCoinAddressValidator validator = new AltCoinAddressValidator();
+        validator.setCurrencyCode("XTO");
+
+        assertTrue(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRT").isValid);
+        assertTrue(validator.validate("2USHRW8UcSAAnHxWnPe4yX2BV5K3dbWss9").isValid);
+
+        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRTT").isValid);
+        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaTo").isValid);
+        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRt#").isValid);
+    }
+
+    @Test
+    public void testIOP() {
+        AltCoinAddressValidator validator = new AltCoinAddressValidator();
+        validator.setCurrencyCode("IOP");
+
+        assertTrue(validator.validate("pKbz7iRUSiUaTgh4UuwQCnc6pWZnyCGWxM").isValid);
+        assertTrue(validator.validate("pAubDQFjUMaR93V4RjHYFh1YW1dzJ9YPW1").isValid);
+
+        assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem").isValid);
+    }
+
+    @Test
+    public void testGBYTE() {
+        AltCoinAddressValidator validator = new AltCoinAddressValidator();
+        validator.setCurrencyCode("GBYTE");
+
+        assertTrue(validator.validate("BN7JXKXWEG4BVJ7NW6Q3Z7SMJNZJYM3G").isValid);
+        assertTrue(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634DE").isValid);
+
+        assertFalse(validator.validate("XGKZODTGTRXIUA75TKONWHFDCU6634DE").isValid);
+        assertFalse(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634D").isValid);
+        assertFalse(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634DZ").isValid);
+    }
+
+}
\ No newline at end of file

From 1bd73afa55442b5b1008b55000a42c141248a22a Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 17 Jan 2017 12:25:56 +0100
Subject: [PATCH 13/16] Test from XTO merge failed. Commented out XTO test and
 swithc case

---
 .../validation/AltCoinAddressValidator.java   |  6 +-
 .../AltCoinAddressValidatorTest.java          | 79 -------------------
 .../AltCoinAddressValidatorTest.java          | 14 ++++
 3 files changed, 18 insertions(+), 81 deletions(-)
 delete mode 100644 gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java

diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
index d054fc150d8..1c9e9cae6fc 100644
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
+++ b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidator.java
@@ -93,7 +93,9 @@ public ValidationResult validate(String input) {
                         return validationResult;
                     else
                         return new ValidationResult(false, "ZEC address need to start with t. Addresses starting with z are not supported.");
-                case "XTO":
+
+                    // TODO test not successful
+                /*case "XTO":
                     if (input.matches("^[T2][a-km-zA-HJ-NP-Z1-9]{25,34}$")) {
                         if (verifyChecksum(input))
                             try {
@@ -106,7 +108,7 @@ public ValidationResult validate(String input) {
                             return wrongChecksum;
                     } else {
                         return regexTestFailed;
-                    }
+                    }*/
                 case "GBYTE":
                     return ByteballAddressValidator.validate(input);
                 default:
diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java b/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
deleted file mode 100644
index 705e31e0217..00000000000
--- a/gui/src/main/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is part of Bitsquare.
- *
- * Bitsquare is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * Bitsquare is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.bitsquare.gui.util.validation;
-
-import org.junit.Test;
-
-import static junit.framework.TestCase.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class AltCoinAddressValidatorTest {
-
-    @Test
-    public void testBTC() {
-        AltCoinAddressValidator validator = new AltCoinAddressValidator();
-        validator.setCurrencyCode("BTC");
-
-        assertTrue(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem").isValid);
-        assertTrue(validator.validate("3EktnHQD7RiAE6uzMj2ZifT9YgRrkSgzQX").isValid);
-        assertTrue(validator.validate("1111111111111111111114oLvT2").isValid);
-        assertTrue(validator.validate("1BitcoinEaterAddressDontSendf59kuE").isValid);
-
-        assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhemqq").isValid);
-        assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYheO").isValid);
-        assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#").isValid);
-    }
-
-    @Test
-    public void testXTO() {
-        AltCoinAddressValidator validator = new AltCoinAddressValidator();
-        validator.setCurrencyCode("XTO");
-
-        assertTrue(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRT").isValid);
-        assertTrue(validator.validate("2USHRW8UcSAAnHxWnPe4yX2BV5K3dbWss9").isValid);
-
-        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRTT").isValid);
-        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaTo").isValid);
-        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRt#").isValid);
-    }
-
-    @Test
-    public void testIOP() {
-        AltCoinAddressValidator validator = new AltCoinAddressValidator();
-        validator.setCurrencyCode("IOP");
-
-        assertTrue(validator.validate("pKbz7iRUSiUaTgh4UuwQCnc6pWZnyCGWxM").isValid);
-        assertTrue(validator.validate("pAubDQFjUMaR93V4RjHYFh1YW1dzJ9YPW1").isValid);
-
-        assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhem").isValid);
-    }
-
-    @Test
-    public void testGBYTE() {
-        AltCoinAddressValidator validator = new AltCoinAddressValidator();
-        validator.setCurrencyCode("GBYTE");
-
-        assertTrue(validator.validate("BN7JXKXWEG4BVJ7NW6Q3Z7SMJNZJYM3G").isValid);
-        assertTrue(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634DE").isValid);
-
-        assertFalse(validator.validate("XGKZODTGTRXIUA75TKONWHFDCU6634DE").isValid);
-        assertFalse(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634D").isValid);
-        assertFalse(validator.validate("XGKZODTTTRXIUA75TKONWHFDCU6634DZ").isValid);
-    }
-
-}
\ No newline at end of file
diff --git a/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java b/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
index 3744ad351c6..a032d10ebe3 100644
--- a/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
+++ b/gui/src/test/java/io/bitsquare/gui/util/validation/AltCoinAddressValidatorTest.java
@@ -39,6 +39,20 @@ public void testBTC() {
         assertFalse(validator.validate("17VZNX1SN5NtKa8UQFxwQbFeFc3iqRYhek#").isValid);
     }
 
+    // TODO test not successful
+   /* @Test
+    public void testXTO() {
+        AltCoinAddressValidator validator = new AltCoinAddressValidator();
+        validator.setCurrencyCode("XTO");
+
+        assertTrue(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRT").isValid);
+        assertTrue(validator.validate("2USHRW8UcSAAnHxWnPe4yX2BV5K3dbWss9").isValid);
+
+        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRTT").isValid);
+        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaTo").isValid);
+        assertFalse(validator.validate("TddV2k4mbm6tkUYbv3zoEoiB3kDUFBdaRt#").isValid);
+    }*/
+    
     @Test
     public void testIOP() {
         AltCoinAddressValidator validator = new AltCoinAddressValidator();

From 051c5259b02f84678f81f1f7f5343060b8e70db7 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sat, 28 Jan 2017 17:09:37 +0100
Subject: [PATCH 14/16] Adjust fields for Chile

---
 core/src/main/java/io/bitsquare/locale/BankUtil.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/src/main/java/io/bitsquare/locale/BankUtil.java b/core/src/main/java/io/bitsquare/locale/BankUtil.java
index cbb8fb0d2c0..4cd3a336fba 100644
--- a/core/src/main/java/io/bitsquare/locale/BankUtil.java
+++ b/core/src/main/java/io/bitsquare/locale/BankUtil.java
@@ -68,6 +68,7 @@ public static boolean isBankIdRequired(String countryCode) {
             case "NZ":
             case "AU":
             case "SE":
+            case "CL":
                 return false;
             case "CA":
             case "MX":
@@ -150,6 +151,8 @@ public static String getAccountNrLabel(String countryCode) {
                 return "Bankgiro number:";
             case "MX":
                 return "CLABE:";
+            case "CL":
+                return "Cuenta:";
             default:
                 return "Account no. (IBAN):";
         }

From 3d60ad4d76e10e6b7b46b0d784d480b4c07b71a2 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sat, 28 Jan 2017 17:12:06 +0100
Subject: [PATCH 15/16] Improve logs

---
 core/src/main/java/io/bitsquare/btc/TradeWalletService.java | 6 +++---
 gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
index 7e766323cb5..74bc6ab5ce8 100644
--- a/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
+++ b/core/src/main/java/io/bitsquare/btc/TradeWalletService.java
@@ -1122,12 +1122,12 @@ private Transaction createPayoutTx(Transaction depositTx,
     }
 
     private static void printTxWithInputs(String tracePrefix, Transaction tx) {
-        log.trace(tracePrefix + ": " + tx.toString());
+        log.info(tracePrefix + ": " + tx.toString());
         for (TransactionInput input : tx.getInputs()) {
             if (input.getConnectedOutput() != null)
-                log.trace(tracePrefix + " input value: " + input.getConnectedOutput().getValue().toFriendlyString());
+                log.info(tracePrefix + " input value: " + input.getConnectedOutput().getValue().toFriendlyString());
             else
-                log.trace(tracePrefix + ": Transaction already has inputs but we don't have the connected outputs, so we don't know the value.");
+                log.info(tracePrefix + ": Transaction already has inputs but we don't have the connected outputs, so we don't know the value.");
         }
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index d10793cfa8f..75756723007 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -238,7 +238,6 @@ public void start() {
 
     private void initializeAllServices() {*/
         
-        log.error("initializeAllServices");
         Log.traceCall();
 
         UserThread.runAfter(tacWindow::showIfNeeded, 2);

From ad4e1a88d18d1c25ff579f447beb00fd8051b5b7 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sat, 28 Jan 2017 19:20:46 +0100
Subject: [PATCH 16/16] Add filter for arbitrators dispute list

---
 .../arbitrator/ArbitratorDisputeView.java     | 21 ++++++++--
 .../disputes/trader/TraderDisputeView.java    | 42 ++++++++++++++-----
 .../createoffer/CreateOfferViewModel.java     |  2 +-
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java b/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
index 4238a91fbff..d8a735ed41b 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/disputes/arbitrator/ArbitratorDisputeView.java
@@ -18,7 +18,6 @@
 package io.bitsquare.gui.main.disputes.arbitrator;
 
 import io.bitsquare.alert.PrivateNotificationManager;
-import io.bitsquare.arbitration.Dispute;
 import io.bitsquare.arbitration.DisputeManager;
 import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.gui.common.view.FxmlView;
@@ -29,7 +28,6 @@
 import io.bitsquare.gui.util.BSFormatter;
 import io.bitsquare.p2p.P2PService;
 import io.bitsquare.trade.TradeManager;
-import javafx.collections.transformation.FilteredList;
 import javafx.stage.Stage;
 
 import javax.inject.Inject;
@@ -47,9 +45,24 @@ public ArbitratorDisputeView(DisputeManager disputeManager, KeyRing keyRing, Tra
     }
 
     @Override
-    protected void setFilteredListPredicate(FilteredList<Dispute> filteredList) {
-        filteredList.setPredicate(dispute -> dispute.getArbitratorPubKeyRing().equals(keyRing.getPubKeyRing()));
+    public void initialize() {
+        super.initialize();
+
+        filterBox.setVisible(true);
+        filterBox.setManaged(true);
     }
+
+    @Override
+    protected void applyFilteredListPredicate(String filterString) {
+        // If in arbitrator view we must only display disputes where we are selected as arbitrator (must not receive others anyway)
+        filteredList.setPredicate(dispute ->
+                dispute.getArbitratorPubKeyRing().equals(keyRing.getPubKeyRing()) &&
+                        (filterString.isEmpty() ||
+                                (dispute.getId().contains(filterString) ||
+                                        formatter.formatDate(dispute.getOpeningDate()).contains(filterString))
+                        ));
+    }
+
 }
 
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java b/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
index 957d09de763..ca90c8484cc 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
@@ -34,6 +34,7 @@
 import io.bitsquare.gui.common.view.FxmlView;
 import io.bitsquare.gui.components.BusyAnimation;
 import io.bitsquare.gui.components.HyperlinkWithIcon;
+import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.components.TableGroupHeadline;
 import io.bitsquare.gui.main.overlays.popups.Popup;
 import io.bitsquare.gui.main.overlays.windows.ContractWindow;
@@ -92,7 +93,7 @@ public class TraderDisputeView extends ActivatableView<VBox, Void> {
     protected final KeyRing keyRing;
     private final TradeManager tradeManager;
     private final Stage stage;
-    private final BSFormatter formatter;
+    protected final BSFormatter formatter;
     private final DisputeSummaryWindow disputeSummaryWindow;
     private PrivateNotificationManager privateNotificationManager;
     private final ContractWindow contractWindow;
@@ -124,6 +125,10 @@ public class TraderDisputeView extends ActivatableView<VBox, Void> {
     private Subscription inputTextAreaTextSubscription;
     private EventHandler<KeyEvent> keyEventEventHandler;
     private Scene scene;
+    protected FilteredList<Dispute> filteredList;
+    private InputTextField filterTextField;
+    private ChangeListener<String> filterTextFieldListener;
+    protected HBox filterBox;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -148,10 +153,24 @@ public TraderDisputeView(DisputeManager disputeManager, KeyRing keyRing, TradeMa
 
     @Override
     public void initialize() {
+        Label label = new Label("Filter list:");
+        HBox.setMargin(label, new Insets(5, 0, 0, 0));
+        filterTextField = new InputTextField();
+        filterTextFieldListener = (observable, oldValue, newValue) -> applyFilteredListPredicate(filterTextField.getText());
+
+        filterBox = new HBox();
+        filterBox.setSpacing(5);
+        filterBox.getChildren().addAll(label, filterTextField);
+        VBox.setVgrow(filterBox, Priority.NEVER);
+        filterBox.setVisible(false);
+        filterBox.setManaged(false);
+
         tableView = new TableView<>();
         VBox.setVgrow(tableView, Priority.SOMETIMES);
         tableView.setMinHeight(150);
-        root.getChildren().add(tableView);
+
+        root.getChildren().addAll(filterBox, tableView);
+
         tableView.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY);
         Label placeholder = new Label("There are no open tickets");
         placeholder.setWrapText(true);
@@ -295,10 +314,11 @@ public void initialize() {
 
     @Override
     protected void activate() {
+        filterTextField.textProperty().addListener(filterTextFieldListener);
         disputeManager.cleanupDisputes();
 
-        FilteredList<Dispute> filteredList = new FilteredList<>(disputeManager.getDisputesAsObservableList());
-        setFilteredListPredicate(filteredList);
+        filteredList = new FilteredList<>(disputeManager.getDisputesAsObservableList());
+        applyFilteredListPredicate(filterTextField.getText());
 
         sortedList = new SortedList<>(filteredList);
         sortedList.comparatorProperty().bind(tableView.comparatorProperty());
@@ -320,6 +340,7 @@ protected void activate() {
 
     @Override
     protected void deactivate() {
+        filterTextField.textProperty().removeListener(filterTextFieldListener);
         sortedList.comparatorProperty().unbind();
         selectedDisputeSubscription.unsubscribe();
         removeListenersOnSelectDispute();
@@ -328,7 +349,8 @@ protected void deactivate() {
             scene.removeEventHandler(KeyEvent.KEY_RELEASED, keyEventEventHandler);
     }
 
-    protected void setFilteredListPredicate(FilteredList<Dispute> filteredList) {
+    protected void applyFilteredListPredicate(String filterString) {
+        // If in trader view we must not display arbitrators own disputes as trader (must not happen anyway)
         filteredList.setPredicate(dispute -> !dispute.getArbitratorPubKeyRing().equals(keyRing.getPubKeyRing()));
     }
 
@@ -497,8 +519,8 @@ private void addListenersOnSelectDispute() {
     private void onSelectDispute(Dispute dispute) {
         removeListenersOnSelectDispute();
         if (dispute == null) {
-            if (root.getChildren().size() > 1)
-                root.getChildren().remove(1);
+            if (root.getChildren().size() > 2)
+                root.getChildren().remove(2);
 
             selectedDispute = null;
         } else if (selectedDispute != dispute) {
@@ -805,9 +827,9 @@ private void showArrivedIcon() {
                 }
             });
 
-            if (root.getChildren().size() > 1)
-                root.getChildren().remove(1);
-            root.getChildren().add(1, messagesAnchorPane);
+            if (root.getChildren().size() > 2)
+                root.getChildren().remove(2);
+            root.getChildren().add(2, messagesAnchorPane);
 
             scrollToBottom();
         }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
index 92fa962ca59..959b82a858a 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
@@ -160,7 +160,7 @@ protected void activate() {
             UserThread.runAfter(() -> {
                 amount.set("1");
                 minAmount.set(amount.get());
-                price.set("700");
+                price.set("900");
 
                 setAmountToModel();
                 setMinAmountToModel();