Merge pull request #2 from bisq-network/master

Sync branch with master fork.

common/src/main/java/io/bisq/common/GlobalSettings.java

@@ -26,7 +26,7 @@
 
 public class GlobalSettings {
     private static boolean useAnimations = true;
-    private static Locale locale = new Locale("en", "US");
+    private static Locale locale = Locale.getDefault();
     private static final ObjectProperty<Locale> localeProperty = new SimpleObjectProperty<>(locale);
     private static TradeCurrency defaultTradeCurrency;
     private static String btcDenomination;

common/src/main/java/io/bisq/common/locale/CurrencyUtil.java

@@ -96,12 +96,14 @@ public static List<CryptoCurrency> createAllSortedCryptoCurrenciesList() {
         result.add(new CryptoCurrency("BCH", "Bitcoin Cash"));
         result.add(new CryptoCurrency("BCHC", "Bitcoin Clashic"));
         result.add(new CryptoCurrency("BTG", "Bitcoin Gold"));
+        result.add(new CryptoCurrency("DARX", "BitDaric"));
         result.add(new CryptoCurrency("BURST", "Burstcoin"));
         result.add(new CryptoCurrency("GBYTE", "Byte"));
         result.add(new CryptoCurrency("CAGE", "Cagecoin"));
         result.add(new CryptoCurrency("XCP", "Counterparty"));
         result.add(new CryptoCurrency("CREA", "Creativecoin"));
         result.add(new CryptoCurrency("XCN", "Cryptonite"));
+        result.add(new CryptoCurrency("DAI", "Dai Stablecoin", true));
         result.add(new CryptoCurrency("DNET", "DarkNet"));
         if (!baseCurrencyCode.equals("DASH"))
             result.add(new CryptoCurrency("DASH", "Dash"));
@@ -131,6 +133,7 @@ public static List<CryptoCurrency> createAllSortedCryptoCurrenciesList() {
         result.add(new CryptoCurrency("NMC", "Namecoin"));
         result.add(new CryptoCurrency("NBT", "NuBits"));
         result.add(new CryptoCurrency("NXT", "Nxt"));
+        result.add(new CryptoCurrency("ODN", "Obsidian"));
         result.add(new CryptoCurrency("888", "OctoCoin"));
         result.add(new CryptoCurrency("PART", "Particl"));
         result.add(new CryptoCurrency("PASC", "Pascal Coin", true));
@@ -146,14 +149,15 @@ public static List<CryptoCurrency> createAllSortedCryptoCurrenciesList() {
         result.add(new CryptoCurrency("SIB", "Sibcoin"));
         result.add(new CryptoCurrency("XSPEC", "Spectrecoin"));
         result.add(new CryptoCurrency("STEEM", "STEEM"));
-	    result.add(new CryptoCurrency("STL", "Stellite"));
-	    result.add(new CryptoCurrency("TRC", "Terracoin"));
+        result.add(new CryptoCurrency("STL", "Stellite"));
+        result.add(new CryptoCurrency("TRC", "Terracoin"));
         result.add(new CryptoCurrency("MVT", "The Movement", true));
 
         result.add(new CryptoCurrency("UNO", "Unobtanium"));
         result.add(new CryptoCurrency("CRED", "Verify", true));
         result.add(new CryptoCurrency("WAC", "WACoins"));
         result.add(new CryptoCurrency("WILD", "WILD Token", true));
+        result.add(new CryptoCurrency("YTN", "Yenten"));
         result.add(new CryptoCurrency("XZC", "Zcoin"));
         result.add(new CryptoCurrency("ZEC", "Zcash"));
         result.add(new CryptoCurrency("ZEN", "ZenCash"));

common/src/main/resources/i18n/displayStrings.properties

@@ -266,8 +266,8 @@ market.offerBook.leftButtonAltcoin=I want to buy {0} (sell {1})
 market.offerBook.rightButtonAltcoin=I want to sell {0} (buy {1})
 market.offerBook.leftButtonFiat=I want to buy {0} with {1}
 market.offerBook.rightButtonFiat=I want to sell {0} for {1}
-market.offerBook.leftHeaderLabel=Offers to sell {0} for {1}
-market.offerBook.rightHeaderLabel=Offers to buy {0} with {1}
+market.offerBook.sellOffersHeaderLabel=Sell {0} to
+market.offerBook.buyOffersHeaderLabel=Buy {0} from
 market.offerBook.buy=I want to buy bitcoin
 market.offerBook.sell=I want to sell bitcoin
 
@@ -353,7 +353,7 @@ createOffer.fundsBox.offerFee=Trade fee:
 createOffer.fundsBox.networkFee=Mining fee:
 createOffer.fundsBox.placeOfferSpinnerInfo=Offer publishing is in progress ...
 createOffer.fundsBox.paymentLabel=Bisq trade with ID {0}
-createOffer.fundsBox.fundsStructure=({0} deposit, {1} trade fee, {2} mining fee)
+createOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee, {2} mining fee)
 createOffer.success.headline=Your offer has been published
 createOffer.success.info=You can manage your open offers at \"Portfolio/My open offers\".
 
@@ -411,7 +411,7 @@ takeOffer.fundsBox.offerFee=Trade fee:
 takeOffer.fundsBox.networkFee=Total mining fees:
 takeOffer.fundsBox.takeOfferSpinnerInfo=Take offer in progress ...
 takeOffer.fundsBox.paymentLabel=Bisq trade with ID {0}
-takeOffer.fundsBox.fundsStructure=({0} deposit, {1} trade fee, {2} mining fee)
+takeOffer.fundsBox.fundsStructure=({0} security deposit, {1} trade fee, {2} mining fee)
 takeOffer.success.headline=You have successfully taken an offer.
 takeOffer.success.info=You can see the status of your trade at \"Portfolio/Open trades\".
 takeOffer.error.message=An error occurred when taking the offer.\n\n{0}
@@ -533,7 +533,7 @@ The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"
 portfolio.pending.step3_seller.cash=\n\nBecause the payment is done via Cash Deposit the BTC buyer has to write \"NO REFUND\" on the paper receipt, tear it in 2 parts and send you a photo by email.\n\n\
 To avoid chargeback risk, only confirm if you received the email and if you are sure the paper receipt is valid.\n\
 If you are not sure, {0}
-portfolio.pending.step3_seller.westernUnion=The buyer has to sent you the MTCN (tracking number) and a photo of the receipt by email.\n\
+portfolio.pending.step3_seller.westernUnion=The buyer has to send you the MTCN (tracking number) and a photo of the receipt by email.\n\
   The receipt must clearly show your full name, city, country and the amount. Please check your email if you received the MTCN.\n\n\
   After closing that popup you will see the BTC buyer's name and address for picking up the money from Western Union.\n\n\
   Only confirm receipt after you have successfully picked up the money!
@@ -589,6 +589,10 @@ portfolio.pending.step5_seller.received=You have received:
 portfolio.pending.role=My role
 portfolio.pending.tradeInformation=Trade information
 portfolio.pending.remainingTime=Remaining time
+portfolio.pending.remainingTimeDetail={0} (until {1})
+portfolio.pending.tradePeriodInfo=After the first blockchain confirmation, the trade period starts. Based on the payment method used, a different maximum allowed trade period is applied.
+portfolio.pending.tradePeriodWarning=If the period is exceeded both trades can open a dispute.
+portfolio.pending.tradeNotCompleted=Trade not completed in time (until {0})
 portfolio.pending.tradeProcess=Trade process
 portfolio.pending.openAgainDispute.msg=If you are not sure that the message to the arbitrator arrived (e.g. if you did not got a response after 1 day) feel free to open a dispute again.
 portfolio.pending.openAgainDispute.button=Open dispute again
@@ -963,7 +967,7 @@ account.seed.warn.noPw.msg=You have not setup a wallet password which would prot
 Do you want to display the seed words?
 account.seed.warn.noPw.yes=Yes, and don't ask me again
 account.seed.enterPw=Enter password to view seed words
-account.seed.restore.info=Please note that you cannot import a wallet from an old bisq version (any version before 0.5.0), \
+account.seed.restore.info=Please note that you cannot import a wallet from an old Bisq version (any version before 0.5.0), \
   because the wallet format has changed!\n\n\
   If you want to move the funds from the old version to the new Bisq application send it with a Bitcoin transaction.\n\n\
   Also be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database.\n\
@@ -1290,7 +1294,7 @@ torNetworkSettingWindow.deleteFiles.button=Delete outdated Tor files and shut do
 torNetworkSettingWindow.deleteFiles.progress=Shut down Tor in progress
 torNetworkSettingWindow.deleteFiles.success=Outdated Tor files deleted successfully. Please restart.
 torNetworkSettingWindow.bridges.header=Is Tor blocked?
-torNetworkSettingWindow.bridges.info=If Tor is blocked by your internet provider or in your country you can try to use Tor bridges.\n\
+torNetworkSettingWindow.bridges.info=If Tor is blocked by your internet provider or by your country you can try to use Tor bridges.\n\
   Visit the Tor web page at: https://bridges.torproject.org/bridges to learn more about \
   bridges and pluggable transports.
 
@@ -1514,6 +1518,7 @@ navigation.arbitratorSelection=\"Arbitrator selection\"
 navigation.funds.availableForWithdrawal=\"Fund/Send funds\"
 navigation.portfolio.myOpenOffers=\"Portfolio/My open offers\"
 navigation.portfolio.pending=\"Portfolio/Open trades\"
+navigation.portfolio.closedTrades=\"Portfolio/History\"
 navigation.funds.depositFunds=\"Funds/Receive funds\"
 navigation.settings.preferences=\"Settings/Preferences\"
 navigation.funds.transactions=\"Funds/Transactions\"
@@ -1526,7 +1531,6 @@ navigation.dao.wallet.receive=\"DAO/BSQ Wallet/Receive\"
 ####################################################################
 
 formatter.formatVolumeLabel={0} amount{1}
-formatter.tradePeriodOver=Trade period is over
 formatter.makerTaker=Maker as {0} {1} / Taker as {2} {3}
 formatter.youAreAsMaker=You are {0} {1} as maker / Taker is {2} {3}
 formatter.youAreAsTaker=You are {0} {1} as taker / Maker is {2} {3}
@@ -1672,7 +1676,7 @@ payment.altcoin.address.dyn={0} address:
 payment.accountNr=Account number:
 payment.emailOrMobile=Email or mobile nr:
 payment.useCustomAccountName=Use custom account name
-payment.maxPeriod=Max. allowed trade period / date:
+payment.maxPeriod=Max. allowed trade period:
 payment.maxPeriodAndLimit=Max. trade duration: {0} / Max. trade limit: {1} / Account age: {2}
 payment.currencyWithSymbol=Currency: {0}
 payment.nameOfAcceptedBank=Name of accepted bank

common/src/main/resources/i18n/displayStrings_de.properties

@@ -166,6 +166,7 @@ shared.viewContractAsJson=Vertrag im JSON-Format ansehen
 shared.contract.title=Vertrag für den Handel mit der ID: {0}
 shared.paymentDetails=Zahlungsdetails des BTC-{0}:
 shared.securityDeposit=Kaution
+shared.yourSecurityDeposit=Deine Kaution
 shared.contract=Vertrag
 shared.messageArrived=Nachricht angekommen.
 shared.messageStoredInMailbox=Nachricht in Postfach gespeichert.
@@ -258,8 +259,8 @@ market.offerBook.leftButtonAltcoin=Ich möchte {0} kaufen ({1} verkaufen)
 market.offerBook.rightButtonAltcoin=Ich möchte {0} verkaufen ({1} kaufen)
 market.offerBook.leftButtonFiat=Ich möchte {0} mit {1} kaufen
 market.offerBook.rightButtonFiat=Ich möchte {0} für {1} verkaufen
-market.offerBook.leftHeaderLabel=Angebote {0} für {1} zu verkaufen
-market.offerBook.rightHeaderLabel=Angebote {0} für {1} zu kaufen
+market.offerBook.sellOffersHeaderLabel=Verkaufe {0} an
+market.offerBook.buyOffersHeaderLabel=Kaufe {0} von 
 market.offerBook.buy=Ich möchte Bitcoins kaufen
 market.offerBook.sell=Ich möchte Bitcoins verkaufen
 
@@ -341,6 +342,7 @@ createOffer.fundsBox.offerFee=Erstellergebühr:
 createOffer.fundsBox.networkFee=Mining-Gebühr:
 createOffer.fundsBox.placeOfferSpinnerInfo=Das Angebot wird veröffentlicht ...
 createOffer.fundsBox.paymentLabel=Bisq-Handel mit der ID {0}
+createOffer.fundsBox.fundsStructure=({0} Kaution, {1} Erstellergebühr, {2} Mining-Gebühr)
 createOffer.success.headline=Ihr Angebot wurde veröffentlicht
 createOffer.success.info=Sie können Ihre offenen Angebote unter \"Portfolio/Meine offenen Angebote\" verwalten.
 
@@ -393,6 +395,7 @@ takeOffer.fundsBox.offerFee=Abnehmergebühr:
 takeOffer.fundsBox.networkFee=Mining-Gebühren (3x):
 takeOffer.fundsBox.takeOfferSpinnerInfo=Angebot wird angenommen ...
 takeOffer.fundsBox.paymentLabel=Bisq-Handel mit der ID {0}
+takeOffer.fundsBox.fundsStructure=({0} Kaution, {1} Abnehmergebühr, {2} Mining-Gebühr)
 takeOffer.success.headline=Sie haben erfolgreich ein Angebot angenommen.
 takeOffer.success.info=Sie können den Status Ihres Angebots unter \"Portfolio/Offene Angebote\" einsehen.
 takeOffer.error.message=Bei der Angebotsannahme trat ein Fehler auf.\n\n{0}
@@ -543,6 +546,10 @@ portfolio.pending.step5_seller.received=Sie haben erhalten:
 portfolio.pending.role=Meine Rolle
 portfolio.pending.tradeInformation=Handelsinformationen
 portfolio.pending.remainingTime=Verbleibende Zeit
+portfolio.pending.remainingTimeDetail={0} (bis {1})
+portfolio.pending.tradePeriodInfo=Die Handelsdauer beginnt mit der ersten Blockchain-Bestätigung. Abhängig von der Zahlungart, wird eine maximale Handesldauer gesetzt. 
+portfolio.pending.tradePeriodWarning=Beim Überschreiten der Handelsdauer kann eine Anfrage auf Konfliktlösung geöffnet werden.
+portfolio.pending.tradeNotCompleted=Maximale Handelsdauer wurde überschritten (bis {0})
 portfolio.pending.tradeProcess=Handelsprozess
 portfolio.pending.openAgainDispute.msg=Falls Sie nicht sicher sind, ob Ihre Nachricht den Vermittler erreicht hat (z.B. wenn Sie nach einem Tag noch keine Rückmeldung erhalten haben) können Sie gerne erneut einen Konflikt öffnen.
 portfolio.pending.openAgainDispute.button=Konflikt erneut öffnen
@@ -1275,6 +1282,7 @@ navigation.arbitratorSelection=\"Vermittlerauswahl\"
 navigation.funds.availableForWithdrawal=\"Gelder/Gelder senden\"
 navigation.portfolio.myOpenOffers=\"Portfolio/Meine offenen Angebote\"
 navigation.portfolio.pending=\"Portfolio/Offene Händel\"
+navigation.portfolio.closedTrades=\"Portfolio/Verlauf\"
 navigation.funds.depositFunds=\"Gelder/Gelder erhalten\"
 navigation.settings.preferences=\"Einstellungen/Voreinstellungen\"
 navigation.funds.transactions=\"Gelder/Transaktionen\"
@@ -1287,7 +1295,6 @@ navigation.dao.wallet.receive=\"DAO/BSQ-Wallet/Erhalten\"
 ####################################################################
 
 formatter.formatVolumeLabel={0} Betrag{1}
-formatter.tradePeriodOver=Die Handelsdauer ist abgelaufen
 formatter.makerTaker=Ersteller als {0} {1} / Abnehmer als {2} {3}
 formatter.youAreAsMaker=Sie {0} {1} als Ersteller / Abnehmer wird {3} {2}
 formatter.youAreAsTaker=Sie {0} {1} als Abnehmer / Ersteller wird {3} {2}
@@ -1415,8 +1422,8 @@ payment.altcoin.address.dyn={0} Adresse:
 payment.accountNr=Kontonummer:
 payment.emailOrMobile=E-Mail oder Mobil:
 payment.useCustomAccountName=Spezifischen Kontonamen nutzen
-payment.maxPeriod=Max. erlaubte Handelsdauer / -datum:
-payment.maxPeriodAndLimit=Max. Handelsdauer: {0} / Max. Handelsgrenze: {1}
+payment.maxPeriod=Max. erlaubte Handelsdauer:
+payment.maxPeriodAndLimit=Max. Handelsdauer: {0} / Max. Handelsgrenze: {1} / Alter des Kontos: {2}
 payment.currencyWithSymbol=Währung: {0}
 payment.nameOfAcceptedBank=Name der akzeptierten Bank
 payment.addAcceptedBank=Akzeptierte Bank hinzufügen

common/src/main/resources/i18n/displayStrings_el.properties

@@ -258,8 +258,8 @@ market.offerBook.leftButtonAltcoin=Θέλω να αγοράσω {0} (πώλησ
 market.offerBook.rightButtonAltcoin=Θέλω να πουλήσω {0} (αγορά {1})
 market.offerBook.leftButtonFiat=Θέλω να αγοράσω {0} με {1}
 market.offerBook.rightButtonFiat=Θέλω να πουλήσω {0} με {1}
-market.offerBook.leftHeaderLabel=Προσφορές πώλησης {0} έναντι {1}
-market.offerBook.rightHeaderLabel=Προσφορές αγοράς {0} έναντι {1}
+market.offerBook.sellOffersHeaderLabel=Πουλήστε το {0} στο
+market.offerBook.buyOffersHeaderLabel=Αγοράστε {0} από
 market.offerBook.buy=Θέλω να αγοράσω bitcoin
 market.offerBook.sell=Θέλω να πουλήσω bitcoin
 
@@ -1250,7 +1250,6 @@ navigation.dao.wallet.receive=\"DAO/πορτοφόλι BSQ/Λήψη\"
 ####################################################################
 
 formatter.formatVolumeLabel={0} ποσό{1}
-formatter.tradePeriodOver=Λήξη περιόδου συναλλαγής
 formatter.makerTaker=Maker ως {0} {1} / Taker ως {2} {3}
 formatter.youAreAsMaker=Είσαι {0} {1} ως maker / Taker είναι {2} {3{}
 formatter.youAreAsTaker=Είσαι {0} {1} ως taker / Maker είναι {2} {3}
@@ -1378,7 +1377,7 @@ payment.altcoin.address.dyn={0} διεύθυνση:
 payment.accountNr=Αριθμός λογαριασμού:
 payment.emailOrMobile=Email ή αριθμός κινητού:
 payment.useCustomAccountName=Χρήση προεπιλεγμένου ονόματος λογαριασμού
-payment.maxPeriod=Μέγιστη επιτρεπόμενη χρονική περίοδος συναλλαγής / ημερομηνία:
+payment.maxPeriod=Μέγιστη επιτρεπόμενη χρονική περίοδος συναλλαγής:
 payment.maxPeriodAndLimit=Μέγιστη διάρκεια συναλλαγής: {0} / Μέγιστο όριο συναλλαγής: {1}
 payment.currencyWithSymbol=Νόμισμα: {0}
 payment.nameOfAcceptedBank=Όνομα αποδεκτής τράπεζας

common/src/main/resources/i18n/displayStrings_es.properties

@@ -258,8 +258,8 @@ market.offerBook.leftButtonAltcoin=Quiero comprar {0} (vender {1})
 market.offerBook.rightButtonAltcoin=Quiero vender {0} (comprar {1})
 market.offerBook.leftButtonFiat=Quiero comprar {0} con {1}
 market.offerBook.rightButtonFiat=Quiero vender {0} por {1}
-market.offerBook.leftHeaderLabel=Ofrece vender {0} por {1}
-market.offerBook.rightHeaderLabel=Ofrece comrpar {0} con {1}
+market.offerBook.sellOffersHeaderLabel=Vender {0} a
+market.offerBook.buyOffersHeaderLabel=Compre {0} desde
 market.offerBook.buy=Quiero comprar bitcoin
 market.offerBook.sell=Quiero vender bitcoin
 
@@ -1250,7 +1250,6 @@ navigation.dao.wallet.receive=\"DAO/Monedero BSQ/Recibir\"
 ####################################################################
 
 formatter.formatVolumeLabel={0} cantidad{1}
-formatter.tradePeriodOver=El periodo de intercambio se acabó
 formatter.makerTaker=Creador como {0} {1} / Tomador como {2} {3}
 formatter.youAreAsMaker=Usted es {0} {1} como creador / Tomador es {2} {3}
 formatter.youAreAsTaker=Usted es {0} {1} como tomador / Creador es {2} {3}
@@ -1378,7 +1377,7 @@ payment.altcoin.address.dyn=Su dirección {0}:
 payment.accountNr=Número de cuenta:
 payment.emailOrMobile=Email o número de móvil:
 payment.useCustomAccountName=Utilizar nombre de cuenta personalizado
-payment.maxPeriod=Periodo / fecha máximo de intercambio permitido:
+payment.maxPeriod=Periodo máximo de intercambio permitido:
 payment.maxPeriodAndLimit=Duración máxima de intercambio: {0} / Límite máximo de intercambio: {1}
 payment.currencyWithSymbol=Moneda: {0}
 payment.nameOfAcceptedBank=Nombre de banco aceptado

common/src/main/resources/i18n/displayStrings_hu.properties

@@ -258,8 +258,8 @@ market.offerBook.leftButtonAltcoin=Vásárolni szeretnék {0} (eladni való {1})
 market.offerBook.rightButtonAltcoin=Eladni szeretnék {0} ({1} vétel)
 market.offerBook.leftButtonFiat=Vásárolni szeretnék {0}-ot {1}-ért
 market.offerBook.rightButtonFiat=Eladni szeretnék {0} cserébe {1}-ért
-market.offerBook.leftHeaderLabel=Eladási ajánlatok {0} cserében {1}
-market.offerBook.rightHeaderLabel=Vételi ajánlatok {0} cserében {1}
+market.offerBook.sellOffersHeaderLabel={0} eladni
+market.offerBook.buyOffersHeaderLabel=Vásároljon {0} -tól
 market.offerBook.buy=Vásárolni szeretnék bitcoinot
 market.offerBook.sell=Eladni szeretnék bitcoinot
 
@@ -1250,7 +1250,6 @@ navigation.dao.wallet.receive=\"DAO/BSQ Pénztárca/Fogadás\"
 ####################################################################
 
 formatter.formatVolumeLabel={0} összeg{1}
-formatter.tradePeriodOver=Tranzakció időszak véget ért
 formatter.makerTaker=Ajánló mint {0} {1} / Vevő mint {2} {3}
 formatter.youAreAsMaker=Ön {0} {1} mint ajánló / A vevő {2} {3}
 formatter.youAreAsTaker=Ön {0} {1} mint vevő / Az ajánló {2} {3}
@@ -1378,7 +1377,7 @@ payment.altcoin.address.dyn={0} cím:
 payment.accountNr=Fiókszám:
 payment.emailOrMobile=E-mail vagy mobil:
 payment.useCustomAccountName=Használj egyéni fióknevet
-payment.maxPeriod=Max. megengedett tranzakció időszak / dátum:
+payment.maxPeriod=Max. megengedett tranzakció időszak:
 payment.maxPeriodAndLimit=Max. tranzakció időtartama: {0} / Max. tranzakció korlátozás: {1}
 payment.currencyWithSymbol=Valuta: {0}
 payment.nameOfAcceptedBank=Elfogadott bank neve