mirror of
https://github.com/bisq-network/bisq.git
synced 2024-11-19 09:52:23 +01:00
Merge branch 'master' into Development
Merge master to Development
This commit is contained in:
Manfred Karrer
commit
50106990ba
@ -18,7 +18,7 @@ Status
|
||||
------
|
||||
Bisq has released the beta version on the 27th of April 2016. It is operational since that time without any major incident.
|
||||
Please follow the current development state at our [road map]( https://bisq.io/roadmap).
|
||||
For the latest version checkout our [releases page](https://github.com/bitsquare/bitsquare/releases) at Github.
|
||||
For the latest version checkout our [releases page](https://github.com/bisq-network/exchange/releases) at Github.
|
||||
|
||||
Building from source
|
||||
--------------------
|
||||
@ -34,9 +34,9 @@ Staying in Touch
|
||||
Contact the team and keep up to date using any of the following:
|
||||
|
||||
- The [Bisq Website](https://bisq.io)
|
||||
- GitHub [Issues](https://github.com/bitsquare/bitsquare/issues)
|
||||
- GitHub [Issues](https://github.com/bisq-network/exchange/issues)
|
||||
- The [Bisq Forum]( https://forum.bisq.io)
|
||||
- The [#Bisq](https://webchat.freenode.net/?channels=bitsquare) IRC channel on Freenode ([logs](https://botbot.me/freenode/bitsquare))
|
||||
- The [#bitsquare](https://webchat.freenode.net/?channels=bitsquare) IRC channel on Freenode ([logs](https://botbot.me/freenode/bitsquare))
|
||||
- Our [mailing list](https://groups.google.com/forum/#!forum/bitsquare)
|
||||
- [@Bitsquare_](https://twitter.com/bitsquare_) on Twitter
|
||||
|
||||
|
||||
@ -358,7 +358,7 @@ createOffer.warnCancelOffer=You have already funded that offer.\nIf you cancel n
|
||||
createOffer.fixed=Fixed
|
||||
createOffer.percentage=Percentage
|
||||
createOffer.timeoutAtPublishing=A timeout occurred at publishing the offer.
|
||||
createOffer.errorInfo=\n\nThe maker fee is already paid. In the worst case you have lost that fee. We are sorry about that but keep in mind it is a very small amount.\nPlease try to restart you application and check your network connection to see if you can resolve the issue.
|
||||
createOffer.errorInfo=\n\nThe maker fee is already paid. In the worst case you have lost that fee. We are sorry about that but keep in mind it is a very small amount.\nPlease try to restart your application and check your network connection to see if you can resolve the issue.
|
||||
createOffer.tooLowSecDeposit.warning=You have set the security deposit to a lower value than the recommended default value of {0}.\n\
|
||||
Are you sure you want to use a lower security deposit?
|
||||
createOffer.tooLowSecDeposit.makerIsSeller=It gives you less protection in case the trading peer does not follow the trade protocol.
|
||||
@ -505,7 +505,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.bankCheck=\n\nPlease also verify that the senders name in your bank statement matches that one from the trade contract:\nSenders name: {0}\n\n\
|
||||
portfolio.pending.step3_seller.bankCheck=\n\nPlease also verify that the sender's name in your bank statement matches that one from the trade contract:\nSender's name: {0}\n\n\
|
||||
If the name is not the same as the one displayed here, {1}
|
||||
portfolio.pending.step3_seller.openDispute=please don't confirm but open a dispute by entering \"alt + o\" or \"option + o\".
|
||||
portfolio.pending.step3_seller.confirmPaymentReceipt=Confirm payment receipt
|
||||
@ -527,7 +527,7 @@ portfolio.pending.step3_seller.onPaymentReceived.part1=Have you received the {0}
|
||||
# suppress inspection "TrailingSpacesInProperty"
|
||||
portfolio.pending.step3_seller.onPaymentReceived.fiat=The trade ID (\"reason for payment\" text) of the transaction is: \"{0}\"\n\n
|
||||
# suppress inspection "TrailingSpacesInProperty"
|
||||
portfolio.pending.step3_seller.onPaymentReceived.name=Please also verify that the senders name in your bank statement matches that one from the trade contract:\nSenders name: {0}\n\nIf the name is not the same as the one displayed here, please don't confirm but open a dispute by entering \"alt + o\" or \"option + o\".\n\n
|
||||
portfolio.pending.step3_seller.onPaymentReceived.name=Please also verify that the sender's name in your bank statement matches that one from the trade contract:\nSender's name: {0}\n\nIf the name is not the same as the one displayed here, please don't confirm but open a dispute by entering \"alt + o\" or \"option + o\".\n\n
|
||||
portfolio.pending.step3_seller.onPaymentReceived.note=Please note, that as soon you have confirmed the receipt, the locked trade amount will be released to the BTC buyer and the security deposit will be refunded.
|
||||
portfolio.pending.step3_seller.onPaymentReceived.confirm.headline=Confirm that you have received the payment
|
||||
portfolio.pending.step3_seller.onPaymentReceived.confirm.yes=Yes, I have received the payment
|
||||
@ -693,12 +693,12 @@ bisq.io web page or post in the Bisq forum at the support section.\n\n\
|
||||
If you are sure that you want to open a support ticket please select the trade which causes the problem \
|
||||
under \"Portfolio/Open trades\" and type the key combination \"alt + o\" or \"option + o\" to open \
|
||||
the support ticket.
|
||||
support.initialInfo="Please note the basic rules for the dispute process:\n\
|
||||
support.initialInfo=Please note the basic rules for the dispute process:\n\
|
||||
1. You need to respond to the arbitrators requests in between 2 days.\n\
|
||||
2. The maximum period for the dispute is 14 days.\n\
|
||||
3. You need to fulfill what the arbitrator is requesting from you to deliver evidence for your case.\n\
|
||||
4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\n\
|
||||
Please read more in detail about the dispute process in our wiki:\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
|
||||
Please read more in detail about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
|
||||
support.systemMsg=System message: {0}
|
||||
support.youOpenedTicket=You opened a request for support.
|
||||
support.youOpenedDispute=You opened a request for a dispute.\n\n{0}
|
||||
@ -894,7 +894,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 Bitsquare 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.
|
||||
@ -1104,7 +1104,7 @@ You can find the correct transaction by opening the trade details window (click
|
||||
and following the trading fee payment transaction output to the next transaction where you see \
|
||||
the Multisig deposit transaction (the address starts with 3). That transaction ID should be \
|
||||
visible in the list presented here. Once you found the correct transaction select that transaction here and continue.\n\n\
|
||||
Sorry for the inconvenience but that error case should be happen very rare and in future we will try \
|
||||
Sorry for the inconvenience but that error case should happen very rarely and in future we will try \
|
||||
to find better ways to resolve it.
|
||||
selectDepositTxWindow.select=Select deposit transaction
|
||||
|
||||
@ -1193,7 +1193,7 @@ popup.warning.cannotConnectAtStartup=You still did not get connected to the {0}
|
||||
popup.warning.unknownProblemAtStartup=There is an unknown problem at startup.\nPlease restart and if the problem continues file a bug report.
|
||||
popup.warning.startupFailed.timeout=The application could not startup after 4 minutes.\n\n{0}
|
||||
popup.warning.startupFailed.twoInstances=Bisq is already running. You cannot run two instances of Bisq.
|
||||
popup.warning.cryptoTestFailed=Seems that you use a self compiled binary and have not following the build instructions in https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nIf that is not the case and you use the official Bisq binary, please file a bug report to the Github page.\nError={0}
|
||||
popup.warning.cryptoTestFailed=Seems that you use a self compiled binary and have not following the build instructions in https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nIf that is not the case and you use the official Bisq binary, please file a bug report to the Github page.\nError={0}
|
||||
popup.warning.oldOffers.msg=You have open offers which have been created with an older version of Bisq.\nPlease remove those offers as they are not valid anymore.\n\nOffers (ID): {0}
|
||||
popup.warning.oldOffers.buttonText=Remove outdated offer(s)
|
||||
popup.warning.tradePeriod.halfReached=Your trade with ID {0} has reached the half of the max. allowed trading period and is still not completed.\n\nThe trade period ends on {1}\n\nPlease check your trade state at \"Portfolio/Open trades\" for further information.
|
||||
@ -1513,7 +1513,7 @@ payment.checking=Checking
|
||||
payment.savings=Savings
|
||||
payment.personalId=Personal ID:
|
||||
payment.clearXchange.info=Please be sure that you fulfill the requirements for the usage of Zelle (ClearXchange).\n\n\
|
||||
1. You need to have your Zelle (ClearXchange) account verified at their platform \
|
||||
1. You need to have your Zelle (ClearXchange) account verified on their platform \
|
||||
before starting a trade or creating an offer.\n\n\
|
||||
2. You need to have a bank account at one of the following member banks:\n\
|
||||
\t● Bank of America\n\
|
||||
@ -1526,8 +1526,8 @@ before starting a trade or creating an offer.\n\n\
|
||||
3. You need to be sure to not exceed the daily or monthly Zelle (ClearXchange) transfer limits.\n\n\
|
||||
Please use Zelle (ClearXchange) only if you fulfill all those requirements, \
|
||||
otherwise it is very likely that the Zelle (ClearXchange) transfer fails and the trade ends up in a dispute.\n\
|
||||
If you have not fulfilled the above requirements you would lose your security deposit in such a case.\n\n\
|
||||
Please be also aware of a higher chargeback risk when using Zelle (ClearXchange).\n\
|
||||
If you have not fulfilled the above requirements you will lose your security deposit.\n\n\
|
||||
Please also be aware of a higher chargeback risk when using Zelle (ClearXchange).\n\
|
||||
For the {0} seller it is highly recommended \
|
||||
to get in contact with the {1} buyer by using the provided email address or mobile number to verify that he or she \
|
||||
is really the owner of the Zelle (ClearXchange) account.
|
||||
|
||||
@ -661,7 +661,7 @@ support.sellerOfferer=BTC Verkäufer/Ersteller
|
||||
support.buyerTaker=BTC Käufer/Abnehmer
|
||||
support.sellerTaker=BTC Verkäufer/Abnehmer
|
||||
support.backgroundInfo=Bisq ist keine Firma und betreibt keine Form von Kundendienst.\n\nGibt es Konflikte während des Handelsprozess (z.B. ein Händler befolgt nicht das Handelsprotokoll), wird die Anwendung nach der Handelsdauer eine \"Konflikt öffnen\" Schaltfläche anzeigen, um den Vermittler zu kontaktieren.\nIm Falle von Softwarefehlern oder anderen Problemen, die von der Anwendung entdeckt werden, wird eine \"Unterstützungsticket öffnen\" Schaltfläche angezeigt, um den Vermittler zu kontaktieren, der die Probleme an die Entwickler weiterleitet.\n\nIm Falle, dass ein Nutzer durch einen Fehler fest hängt, ohne dass die \"Unterstützungsticket öffnen\" Schaltfläche angezeigt wird, können Sie ein Unterstützungsticket mit einer speziellen Tastenkombination manuell öffnen.\n\nBitte nutzen Sie diese nur, wenn Sie sicher sind, dass die Software sich nicht wie erwartet verhält. Falls Sie Probleme wie man Bisq verwendet oder andere Fragen haben, überprüfen Sie bitte das FAQ auf der bisq.io Website oder posten Sie in das Bisq Forum in die Unterstützungsabteilung.\n\nFalls Sie sicher sind, dass Sie ein Unterstützungsticket öffnen wollen, wählen Sie bitte den Handel, der Probleme bereitet, unter \"Mappe/Offene Händel\" und drücken Sie die Tastenkombination \"alt + o\" oder \"option + o\" um das Unterstützungsticket zu öffnen.
|
||||
support.initialInfo="Bitte beachten Sie die grundlegenen Regeln für den Konfliktprozess:\n1. Sie müssen innerhalb von 2 Tagen auf die Anfrage des Vermittlers reagieren.\n2. Die maximale Dauer des Konflikts ist 14 Tage.\n3. Sie müssen erfüllen, was der Vermittler von ihnen verlangt, um Beweise für ihren Fall zu liefern.\n4. Sie akzeptieren die Regeln, die im Wiki im Nutzungsvereinbarung umrissen wurden, als Sie das erste Mal die Anwendung gestartet haben.\n\nErfahren Sie mehr über den Konfliktprozess in unserem Wiki:\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
|
||||
support.initialInfo=Bitte beachten Sie die grundlegenen Regeln für den Konfliktprozess:\n1. Sie müssen innerhalb von 2 Tagen auf die Anfrage des Vermittlers reagieren.\n2. Die maximale Dauer des Konflikts ist 14 Tage.\n3. Sie müssen erfüllen, was der Vermittler von ihnen verlangt, um Beweise für ihren Fall zu liefern.\n4. Sie akzeptieren die Regeln, die im Wiki im Nutzungsvereinbarung umrissen wurden, als Sie das erste Mal die Anwendung gestartet haben.\n\nErfahren Sie mehr über den Konfliktprozess in unserem Wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
|
||||
support.systemMsg=Systemnachricht: {0}
|
||||
support.youOpenedTicket=Sie haben eine Anfrage auf Unterstützung geöffnet.
|
||||
support.youOpenedDispute=Sie haben eine Anfrage für einen Konflikt geöffnet.\n\n{0}
|
||||
@ -1069,7 +1069,7 @@ popup.warning.cannotConnectAtStartup=Sie wurden immer noch nicht mit dem {0} Net
|
||||
popup.warning.unknownProblemAtStartup=Es gibt ein unbekanntes Problem beim Starten.\nBitte starten Sie neu und wenn das Problem besteht, füllen Sie eine Bugmeldung aus.
|
||||
popup.warning.startupFailed.timeout=Die Anwendung konnte nicht nach 4 Minuten starten.\n\n{0}
|
||||
popup.warning.startupFailed.twoInstances=Bisq läuft bereits. Sie können nicht zwei Instanzen von Bisq laufen lassen.
|
||||
popup.warning.cryptoTestFailed=Scheint so als nützen Sie selbst kompilierte Binärdateien und haben nicht den Anweisung aus https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys gefolgt.\n\nWenn dies nicht der Fall ist und Sie die offiziellen Bisq Binärdateien genutzt haben, füllen Sie bitte eine Bugmeldung auf der Githubseite aus.\nFehler={0}
|
||||
popup.warning.cryptoTestFailed=Scheint so als nützen Sie selbst kompilierte Binärdateien und haben nicht den Anweisung aus https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys gefolgt.\n\nWenn dies nicht der Fall ist und Sie die offiziellen Bisq Binärdateien genutzt haben, füllen Sie bitte eine Bugmeldung auf der Githubseite aus.\nFehler={0}
|
||||
popup.warning.oldOffers.msg=Sie haben offene Angebote, die mit einer älteren Version von Bisq erstellt wurden.\nBitte entfernen Sie diese Angebote, da Sie nicht mehr gültig sind.\n\nAngebote (Kennung): {0}
|
||||
popup.warning.oldOffers.buttonText=Veraltete Angebot(e) entfernen
|
||||
popup.warning.tradePeriod.halfReached=Ihr Handel mit Kennung {0} hat die Hälfte der maximal erlaubten Handelsdauer erreicht und ist immer noch nicht abgeschlossen.\n\nDie Handelsdauer endet am {1}\n\nBitte überprüfen Sie den Status ihres Handels unter \"Mappe/Offene Händel\" für weitere Informationen.
|
||||
|
||||
@ -661,7 +661,7 @@ support.sellerOfferer=Πωλητής/Maker BTC
|
||||
support.buyerTaker=Αγοραστής/Taker BTC
|
||||
support.sellerTaker=Πωλητής/Taker BTC
|
||||
support.backgroundInfo=Bisq is not a company and not operating any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display a \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIn cases of software bugs or other problems, which are detected by the application there will be displayed a \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIn cases where a user got stuck by a bug without getting displayed that \"Open support ticket\" button, you can open a support ticket manually with a special short cut.\n\nPlease use that only if you are sure that the software is not working like expected. If you have problems how to use Bisq or any questions please review the FAQ at the bisq.io web page or post in the Bisq forum at the support section.\n\nIf you are sure that you want to open a support ticket please select the trade which causes the problem under \"Portfolio/Open trades\" and type the key combination \"alt + o\" or \"option + o\" to open the support ticket.
|
||||
support.initialInfo="Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrators requests in between 2 days.\n2. The maximum period for the dispute is 14 days.\n3. You need to fulfill what the arbitrator is requesting from you to deliver evidence for your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more in detail about the dispute process in our wiki:\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
|
||||
support.initialInfo=Please note the basic rules for the dispute process:\n1. You need to respond to the arbitrators requests in between 2 days.\n2. The maximum period for the dispute is 14 days.\n3. You need to fulfill what the arbitrator is requesting from you to deliver evidence for your case.\n4. You accepted the rules outlined in the wiki in the user agreement when you first started the application.\n\nPlease read more in detail about the dispute process in our wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
|
||||
support.systemMsg=Μήνυμα συστήματος: {0}
|
||||
support.youOpenedTicket=Άνοιξες ένα αίτημα υποστήριξης.
|
||||
support.youOpenedDispute=Άνοιξες ένα αίτημα για επίλυση διένεξης.\n\n{0}
|
||||
@ -1071,7 +1071,7 @@ popup.warning.cannotConnectAtStartup=Παραμένεις αποσυνδεδεμ
|
||||
popup.warning.unknownProblemAtStartup=Υπάρχει άγνωστο πρόβλημα κατά την εκκίνηση.\nΕπανεκκίνησε την εφαρμογή και αν το πρόβλημα επιμείνει, κατάθεσε μια αναφορά σφάλματος.
|
||||
popup.warning.startupFailed.timeout=Η εφαρμογή δεν μπόρεσε να εκκινήσει εντός 4 λεπτών.\n\n{0}
|
||||
popup.warning.startupFailed.twoInstances=Το Bisq λειτουργεί ήδη. Δεν μπορεί να τρέχει δύο φορές.
|
||||
popup.warning.cryptoTestFailed=Seems that you use a self compiled binary and have not following the build instructions in https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nIf that is not the case and you use the official Bisq binary, please file a bug report to the Github page.\nError={0}
|
||||
popup.warning.cryptoTestFailed=Seems that you use a self compiled binary and have not following the build instructions in https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nIf that is not the case and you use the official Bisq binary, please file a bug report to the Github page.\nError={0}
|
||||
popup.warning.oldOffers.msg=You have open offers which have been created with an older version of Bisq.\nPlease remove those offers as they are not valid anymore.\n\nOffers (ID): {0}
|
||||
popup.warning.oldOffers.buttonText=Ακύρωσε παρωχημένες προσφορές
|
||||
popup.warning.tradePeriod.halfReached=Η συναλλαγή σου με ταυτότητα {0} έφτασε το μισό της επιτρεπόμενης χρονικής περιόδου και δεν έχει ολοκληρωθεί ακόμα.\n\nΗ περίοδος συναλλαγής κλείνει στις {1}\n\nΈλεγξε την κατάσταση της συναλλαγής στο \"Χαρτοφυλάκιο/Ανοιχτές συναλλαγές\" για περαιτέρω πληροφορίες.
|
||||
|
||||
@ -336,7 +336,7 @@ createOffer.fundsBox.totalsNeeded.prompt=Será calculada de la cantidada de bitc
|
||||
createOffer.fundsBox.offerFee=Tasa del creador de mercado.
|
||||
createOffer.fundsBox.networkFee=Tasa de minado:
|
||||
createOffer.fundsBox.placeOfferSpinnerInfo=Publicación de oferta en curso...
|
||||
createOffer.fundsBox.paymentLabel=Intercambio en Bitsquare con ID {0}
|
||||
createOffer.fundsBox.paymentLabel=Intercambio en bisq con ID {0}
|
||||
createOffer.success.headline=Su oferta ha sido publicada.
|
||||
createOffer.success.info=Puede gestionar sus ofertas abiertas en \"Portafolio/Mis ofertas abiertas\".
|
||||
|
||||
@ -661,7 +661,7 @@ support.sellerOfferer=vendedor/creador BTC
|
||||
support.buyerTaker=comprador/Tomador BTC
|
||||
support.sellerTaker=vendedor/Tomador BTC
|
||||
support.backgroundInfo=Bisq is not a company and not operating any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display a \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIn cases of software bugs or other problems, which are detected by the application there will be displayed a \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIn cases where a user got stuck by a bug without getting displayed that \"Open support ticket\" button, you can open a support ticket manually with a special short cut.\n\nPlease use that only if you are sure that the software is not working like expected. If you have problems how to use Bisq or any questions please review the FAQ at the bisq.io web page or post in the Bisq forum at the support section.\n\nIf you are sure that you want to open a support ticket please select the trade which causes the problem under \"Portfolio/Open trades\" and type the key combination \"alt + o\" or \"option + o\" to open the support ticket.
|
||||
support.initialInfo="Por favor, tenga en cuenta las reglas básicas para el proceso de disputa:\n1. Necesita responder a las peticiones de los árbitros en menos de 2 días.\n2. El periodo máximo total de la disputa es de 14 días.\n3. Necesitará completar todas las peticiones del árbitro para entregar evidencia de su caso.\n4. Acepta las reglas destacadas en la wiki de acuerdo de usuario al comenzar la aplicación.\n\nPor favor lea en más detalle acerca del proceso de disputa en nuestra wiki:\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
|
||||
support.initialInfo=Por favor, tenga en cuenta las reglas básicas para el proceso de disputa:\n1. Necesita responder a las peticiones de los árbitros en menos de 2 días.\n2. El periodo máximo total de la disputa es de 14 días.\n3. Necesitará completar todas las peticiones del árbitro para entregar evidencia de su caso.\n4. Acepta las reglas destacadas en la wiki de acuerdo de usuario al comenzar la aplicación.\n\nPor favor lea en más detalle acerca del proceso de disputa en nuestra wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
|
||||
support.systemMsg=Mensaje de sistema: {0}
|
||||
support.youOpenedTicket=Ha abierto una solicitud de soporte.
|
||||
support.youOpenedDispute=Ha abierto una solicitud de disputa.\n\n{0}
|
||||
@ -1069,7 +1069,7 @@ popup.warning.cannotConnectAtStartup=Aún no se ha conecta a la red {0}.\nSi usa
|
||||
popup.warning.unknownProblemAtStartup=Hay un problema desconocido al inicio.\nPor favor, reinicia y si el problema continua realice un reporte de error.
|
||||
popup.warning.startupFailed.timeout=La aplicación no se pudo iniciar después de 4 minutos.\n\n{0}
|
||||
popup.warning.startupFailed.twoInstances=Ya está ejecutando Bisq. No puede ejecutar dos instancias de Bisq.
|
||||
popup.warning.cryptoTestFailed=Al parecer está utilizando un binario que ha compilado usted mismo siguiendo las instrucciones en https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nSi no es el caso y está utilizando el binario oficial de Bisq, por favor informe del error en la página de Github.\nError={0}
|
||||
popup.warning.cryptoTestFailed=Al parecer está utilizando un binario que ha compilado usted mismo siguiendo las instrucciones en https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nSi no es el caso y está utilizando el binario oficial de Bisq, por favor informe del error en la página de Github.\nError={0}
|
||||
popup.warning.oldOffers.msg=Tiene ofertas abiertas que han sido creadas con una versión antigua de Bisq.\nPor favor, elimine esas ofertas puesto que ya no son válidas.\n\nOfertas (ID): {0}
|
||||
popup.warning.oldOffers.buttonText=Eliminar oferta/s anticuada/s
|
||||
popup.warning.tradePeriod.halfReached=Su intercambio con ID {0} ha alcanzado la mitad de el periodo máximo permitido de intercambio y aún no está completada.\n\nEl periodo de intercambio termina el {1}\n\nPor favor, compruebe su estado de intercambio en \"Portafolio/Intercambios abiertos\" para más información.
|
||||
|
||||
@ -661,7 +661,7 @@ support.sellerOfferer=Vendedor de BTC / Ofertante
|
||||
support.buyerTaker=Comprador de BTC / Aceitador da oferta
|
||||
support.sellerTaker=Vendedor de BTC / Aceitador da oferta
|
||||
support.backgroundInfo=Bisq is not a company and not operating any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display a \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIn cases of software bugs or other problems, which are detected by the application there will be displayed a \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIn cases where a user got stuck by a bug without getting displayed that \"Open support ticket\" button, you can open a support ticket manually with a special short cut.\n\nPlease use that only if you are sure that the software is not working like expected. If you have problems how to use Bisq or any questions please review the FAQ at the bisq.io web page or post in the Bisq forum at the support section.\n\nIf you are sure that you want to open a support ticket please select the trade which causes the problem under \"Portfolio/Open trades\" and type the key combination \"alt + o\" or \"option + o\" to open the support ticket.
|
||||
support.initialInfo="Favor note as regras básicas para o processo de disputa:\n1. Você precisa responder aos pedidos de árbitros em até 2 dias.\n2. O período máximo de uma disputa é 14 dias.\n3. Você precisa atender ao que o árbitro está pedindo e fornecer evidências necessárias para seu caso.\n4. Você aceitou as regras delineadas na wiki no acordo de usuário quando você iniciou o programa.\n\nMais detalhes sobre o processo de disputa se encontram na wiki:\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
|
||||
support.initialInfo=Favor note as regras básicas para o processo de disputa:\n1. Você precisa responder aos pedidos de árbitros em até 2 dias.\n2. O período máximo de uma disputa é 14 dias.\n3. Você precisa atender ao que o árbitro está pedindo e fornecer evidências necessárias para seu caso.\n4. Você aceitou as regras delineadas na wiki no acordo de usuário quando você iniciou o programa.\n\nMais detalhes sobre o processo de disputa se encontram na wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
|
||||
support.systemMsg=Mensagem do sistema: {0}
|
||||
support.youOpenedTicket=Você abriu uma solicitação para suporte.
|
||||
support.youOpenedDispute=Você abriu uma solicitação para disputa.\n\n{0}
|
||||
@ -1071,7 +1071,7 @@ popup.warning.cannotConnectAtStartup=Você ainda não foi conectado à rede {0}.
|
||||
popup.warning.unknownProblemAtStartup=Houve um problema desconhecido ao iniciar.\nFavor reiniciar e se o problema persistir abrir um bug report (informe de problema).
|
||||
popup.warning.startupFailed.timeout=Falha ao iniciar aplicativo após 4 minutos.\n\n{0}
|
||||
popup.warning.startupFailed.twoInstances=Bisq is already running. You cannot run two instances of Bisq.
|
||||
popup.warning.cryptoTestFailed=Seems that you use a self compiled binary and have not following the build instructions in https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nIf that is not the case and you use the official Bisq binary, please file a bug report to the Github page.\nError={0}
|
||||
popup.warning.cryptoTestFailed=Seems that you use a self compiled binary and have not following the build instructions in https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nIf that is not the case and you use the official Bisq binary, please file a bug report to the Github page.\nError={0}
|
||||
popup.warning.oldOffers.msg=You have open offers which have been created with an older version of Bisq.\nPlease remove those offers as they are not valid anymore.\n\nOffers (ID): {0}
|
||||
popup.warning.oldOffers.buttonText=Remover oferta(s) ultrapassada(s)
|
||||
popup.warning.tradePeriod.halfReached=Sua negociação com ID {0} atingiu metade do período máximo permitido e ainda não foi concluída.\n\nO período de negociação acaba em {1}\n\nFavor verifique o estado de sua negociação em \"Portfolio/Negociações em aberto\" para mais informações.
|
||||
|
||||
@ -661,7 +661,7 @@ support.sellerOfferer=BTC prodavac/Tvorac
|
||||
support.buyerTaker=BTC kupac/Uzimalac
|
||||
support.sellerTaker=BTC prodavac/Tvorac
|
||||
support.backgroundInfo=Bisq is not a company and not operating any kind of customer support.\n\nIf there are disputes in the trade process (e.g. one trader does not follow the trade protocol) the application will display a \"Open dispute\" button after the trade period is over for contacting the arbitrator.\nIn cases of software bugs or other problems, which are detected by the application there will be displayed a \"Open support ticket\" button to contact the arbitrator who will forward the issue to the developers.\n\nIn cases where a user got stuck by a bug without getting displayed that \"Open support ticket\" button, you can open a support ticket manually with a special short cut.\n\nPlease use that only if you are sure that the software is not working like expected. If you have problems how to use Bisq or any questions please review the FAQ at the bisq.io web page or post in the Bisq forum at the support section.\n\nIf you are sure that you want to open a support ticket please select the trade which causes the problem under \"Portfolio/Open trades\" and type the key combination \"alt + o\" or \"option + o\" to open the support ticket.
|
||||
support.initialInfo="Imajte na umu osnovna pravila za proces rasprave:\n1. Potrebno je da odgovorite zahtevima arbitra u razmaku od 2 dana.\n2. Maksimalni period rasprave je 14 dana.\n3. Morate da ispunite što arbitar zahteva od vas radi dostavljanja dokaza za vaš slučaj.\n4. Prihvatili ste pravila navedena u wiki u korisničkom ugovoru kada ste prvi put pokrenuli aplikaciju.\n\nMolimo pročitajte detaljnije o procesu rasprave u našoj wiki:\nhttps://github.com/bitsquare/bitsquare/wiki/Dispute-process
|
||||
support.initialInfo=Imajte na umu osnovna pravila za proces rasprave:\n1. Potrebno je da odgovorite zahtevima arbitra u razmaku od 2 dana.\n2. Maksimalni period rasprave je 14 dana.\n3. Morate da ispunite što arbitar zahteva od vas radi dostavljanja dokaza za vaš slučaj.\n4. Prihvatili ste pravila navedena u wiki u korisničkom ugovoru kada ste prvi put pokrenuli aplikaciju.\n\nMolimo pročitajte detaljnije o procesu rasprave u našoj wiki:\nhttps://github.com/bisq-network/exchange/wiki/Arbitration-system
|
||||
support.systemMsg=Poruka sistema: {0}
|
||||
support.youOpenedTicket=Otvorili ste zahtev za podršku.
|
||||
support.youOpenedDispute=Otvorili ste zahtev za raspravu.\n\n{0}
|
||||
@ -1069,7 +1069,7 @@ popup.warning.cannotConnectAtStartup=Još uvek niste povezani na {0} mrežu.\nAk
|
||||
popup.warning.unknownProblemAtStartup=Postoji nepoznat problem pri pokretanju.\nMolimo pokrenite ponovo i ako se problem nastavi podnesite prijavu o grešci.
|
||||
popup.warning.startupFailed.timeout=Aplikacija nije mogla da se pokrene nakon 4 minuta.\n\n{0}
|
||||
popup.warning.startupFailed.twoInstances=Bisq je već pokrenut. Ne možete pokrenuti dve instance Bisq.
|
||||
popup.warning.cryptoTestFailed=Izgleda da koristite samo kompajlirani izvršni fajl i niste pratili build instrukcije u https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nAko to nije slučaj i koristite zvaničnu bisq izvršnu datoteku, molimo podnesite prijavu o grešci na Github stranici.\nGreška={0}
|
||||
popup.warning.cryptoTestFailed=Izgleda da koristite samo kompajlirani izvršni fajl i niste pratili build instrukcije u https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys.\n\nAko to nije slučaj i koristite zvaničnu bisq izvršnu datoteku, molimo podnesite prijavu o grešci na Github stranici.\nGreška={0}
|
||||
popup.warning.oldOffers.msg=Imate otvorene ponude koje su napravljene sa starijom verzijom Bisq.\nMolimo uklonite te ponude pošto nisu više važeće.\n\nPonude (ID): {0}
|
||||
popup.warning.oldOffers.buttonText=Ukloni zastarele ponde
|
||||
popup.warning.tradePeriod.halfReached=Vaša trgovina sa ID {0} je dostigla polovinu od maks. dozvoljenog perioda trgovine i još uvek nije završena.\n\nPeriod trgovine se završava {1}\n\nMolimo proverite stanje vaše trgovine u \"Portfolio/Otvorene trgovine\" za više informacija.
|
||||
|
||||
@ -726,7 +726,7 @@ support.sellerOfferer=Vendeur BTC / Créateur
|
||||
support.buyerTaker=Acheteur BTC / Preneur
|
||||
support.sellerTaker=vendeur BTC / Preneur
|
||||
support.backgroundInfo=Bisq n'est pas une entreprise et ne gère aucun type de support client. \n\nS'il y a des conflits dans le processus commercial (par exemple, un commerçant ne suit pas le protocole commercial) L'application affichera un bouton "conflit ouvert" après la fin de la période d'échange Pour contacter l'arbitre. \nEn cas de bogues logiciels ou d'autres problèmes, qui sont détectés par l'application, Afficher un bouton "Open support ticket" pour contacter l'arbitre qui transmettra le problème Aux développeurs. \n\nDans les cas où un utilisateur a été bloqué par un bugsans afficher le bouton "Ouvrir le ticket de support" Vous pouvez ouvrir manuellement un ticket de support avec un raccourci spécial. \n\nUtilisez-le uniquement si vous êtes sûr que le logiciel ne fonctionne pas comme prévu.Si vous avez des problèmes sur l'utilisation de Bisq ou des questions, veuillez consulter les FAQ au Bisq.io ou publiez-vous dans le forum Bisq à la section support.\n\ni vous êtes sûr de vouloir ouvrir un ticket de support, sélectionnez le commerce qui cause le problème Sous "Portfolio / Open trades" et tapez la combinaison de touches "alt + o" ou "option + o" pour ouvrir Le ticket de support.
|
||||
support.initialInfo="Veuillez noter les règles de base pour le processus de litige: \n1. Vous devez répondre aux demandes des arbitres en moins de 2 jours. \n2. La période maximale pour le litige est de 14 jours. \n3. Vous devez répondre aux demandes de l'arbitre et fournir des preuves appuyant votre cas. \n4. Vous avez accepté les règles décrites dans le wiki dans l'accord utilisateur lorsque vous avez commencé la demande. \n \nVeuillez lire plus en détail le processus de litige dans notre wiki: \nhttps: //github.com/bitsquare/bitsquare/wiki/Dispute-process
|
||||
support.initialInfo=Veuillez noter les règles de base pour le processus de litige: \n1. Vous devez répondre aux demandes des arbitres en moins de 2 jours. \n2. La période maximale pour le litige est de 14 jours. \n3. Vous devez répondre aux demandes de l'arbitre et fournir des preuves appuyant votre cas. \n4. Vous avez accepté les règles décrites dans le wiki dans l'accord utilisateur lorsque vous avez commencé la demande. \n \nVeuillez lire plus en détail le processus de litige dans notre wiki: \nhttps: //github.com/bisq-network/exchange/wiki/Arbitration-system
|
||||
support.systemMsg=Message système: {0}
|
||||
support.youOpenedTicket=Vous avez ouvert une demande de support.
|
||||
support.youOpenedDispute=Vous avez ouvert une demande de littige. \n\n {0}
|
||||
@ -1086,7 +1086,7 @@ popup.warning.cannotConnectAtStartup=Vous ne vous êtes toujours pas connecté a
|
||||
popup.warning.unknownProblemAtStartup=Il y a un problème inconnu lors du démarrage.\nVeuillez redémarrer et si le problème continue de déposer un rapport de bogue.
|
||||
popup.warning.startupFailed.timeout=L'application n'a pas pu démarrer après 4 minutes. \n \n {0}\
|
||||
popup.warning.startupFailed.twoInstances=Bisq est déjà en cours d'exécution. Vous ne pouvez pas exécuter deux instances de Bisq.
|
||||
popup.warning.cryptoTestFailed=Il semble que vous utilisez un binaire auto compilé et que vous n'avez pas suivi les instructions de construction dans https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic- Clés. \n \nSi ce n'est pas le cas et vous utilisez le bin bin Bisq officiel, veuillez déposer un rapport de bogue sur la page Github. \n Error = {0}
|
||||
popup.warning.cryptoTestFailed=Il semble que vous utilisez un binaire auto compilé et que vous n'avez pas suivi les instructions de construction dans https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic- Clés. \n \nSi ce n'est pas le cas et vous utilisez le bin bin Bisq officiel, veuillez déposer un rapport de bogue sur la page Github. \n Error = {0}
|
||||
popup.warning.oldOffers.msg=Vous avez des offres ouvertes qui ont été créées avec une ancienne version de Bisq. \nVeuillez supprimer les offres telles qui ne sont plus valides. \n\nOffres (ID): {0}
|
||||
popup.warning.oldOffers.buttonText=Supprimer les offres périmées
|
||||
popup.warning.tradePeriod.halfReached=Votre commerce avec ID {0} a atteint la moitié du maximum. Période de négociation autorisée et n'est toujours pas terminée. \n \nLa période d'échanges se termine sur {1} \n \nVeuillez vérifier votre état d'échange sur "Portfolio / Opérations ouverte" pour plus d'informations.
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.github.bitsquare.btcd-cli4j</groupId>
|
||||
<groupId>com.github.bisq-network.btcd-cli4j</groupId>
|
||||
<artifactId>btcd-cli4j-core</artifactId>
|
||||
<version>29f99be</version>
|
||||
<exclusions>
|
||||
@ -62,7 +62,7 @@
|
||||
</exclusions>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.bitsquare.btcd-cli4j</groupId>
|
||||
<groupId>com.github.bisq-network.btcd-cli4j</groupId>
|
||||
<artifactId>btcd-cli4j-daemon</artifactId>
|
||||
<version>29f99be</version>
|
||||
<exclusions>
|
||||
|
||||
@ -39,7 +39,7 @@ public class SetupUtils {
|
||||
// and if the unlimited Strength for cryptographic keys is set.
|
||||
// If users compile themselves they might miss that step and then would get an exception in the trade.
|
||||
// To avoid that we add here at startup a sample encryption and signing to see if it don't causes an exception.
|
||||
// See: https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys
|
||||
// See: https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys
|
||||
Thread checkCryptoThread = new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
@ -60,7 +60,6 @@ public class MakerProcessDepositTxPublishedMessage extends TradeTask {
|
||||
processModel.removeMailboxMessageAfterProcessing(trade);
|
||||
|
||||
trade.setState(Trade.State.MAKER_RECEIVED_DEPOSIT_TX_PUBLISHED_MSG);
|
||||
log.error("MakerProcessDepositTxPublishedMessage, offerid={}, RESERVED_FOR_TRADE", trade.getId());
|
||||
processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(), AddressEntry.Context.RESERVED_FOR_TRADE);
|
||||
|
||||
complete();
|
||||
|
||||
10
doc/build.md
10
doc/build.md
@ -3,7 +3,7 @@
|
||||
|
||||
This guide will walk you through the process of building bisq from source.
|
||||
|
||||
> _**NOTE:** For most users, building from source is not necessary. See the [releases page](https://github.com/bitsquare/bitsquare/releases), where you'll find installers for Windows, Linux and Mac OS X._
|
||||
> _**NOTE:** For most users, building from source is not necessary. See the [releases page](https://github.com/bisq-network/exchange/releases), where you'll find installers for Windows, Linux and Mac OS X._
|
||||
|
||||
There is an install script (2 parts) for setup (JDK, git, maven, Bitcoinj, bisq) on Linux in that directory (install_on_unix.sh, install_on_unix_fin.sh).
|
||||
|
||||
@ -113,14 +113,14 @@ DAO full node
|
||||
-----------------
|
||||
If you want to run your own BSQ transaction verification node you have to run Bitcoin Core with RPC enabled and
|
||||
use dedicated program arguments for the bisq node.
|
||||
See https://github.com/bitsquare/bitsquare/blob/master/doc/rpc.md for more details.
|
||||
See https://github.com/bisq-network/exchange/blob/master/doc/rpc.md for more details.
|
||||
|
||||
|
||||
Development mode
|
||||
-----------------
|
||||
|
||||
Please check out our wiki for more information about [testing](https://github.com/bitsquare/bitsquare/wiki/Testing-bisq-with-Mainnet)
|
||||
and how to use [regtest](https://github.com/bitsquare/bitsquare/wiki/How-to-use-bisq-with-regtest-%28advanced%29)
|
||||
Please check out our wiki for more information about [testing](https://github.com/bisq-network/exchange/wiki/Testing-bisq-with-Mainnet)
|
||||
and how to use [regtest](https://github.com/bisq-network/exchange/wiki/How-to-use-bisq-with-regtest-%28advanced%29)
|
||||
|
||||
Here are example program arguments for using regtest with localhost environment (not using Tor):
|
||||
|
||||
@ -163,4 +163,4 @@ Here are example program arguments for using regtest and using the Tor network (
|
||||
Problems?
|
||||
---------
|
||||
|
||||
If the instructions above don't work for you, please [raise an issue](https://github.com/bitsquare/bitsquare/issues/new?labels=%5Bbuild%5D). Thanks!
|
||||
If the instructions above don't work for you, please [raise an issue](https://github.com/bisq-network/exchange/issues/new?labels=%5Bbuild%5D). Thanks!
|
||||
|
||||
@ -51,7 +51,7 @@ rm -r UnlimitedJCEPolicyJDK8 jce_policy-8.zip
|
||||
|
||||
echo "Install and resolve dependencies for bisq"
|
||||
cd ~
|
||||
git clone -b DAO https://github.com/bitsquare/bitsquare.git
|
||||
git clone -b DAO https://github.com/bisq-network/exchange.git
|
||||
cd bisq
|
||||
mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true
|
||||
|
||||
|
||||
@ -780,7 +780,7 @@ public class MainViewModel implements ViewModel {
|
||||
// and if the unlimited Strength for cryptographic keys is set.
|
||||
// If users compile themselves they might miss that step and then would get an exception in the trade.
|
||||
// To avoid that we add here at startup a sample encryption and signing to see if it don't causes an exception.
|
||||
// See: https://github.com/bitsquare/bitsquare/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys
|
||||
// See: https://github.com/bisq-network/exchange/blob/master/doc/build.md#7-enable-unlimited-strength-for-cryptographic-keys
|
||||
Thread checkCryptoThread = new Thread() {
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
@ -335,7 +335,7 @@ public abstract class Overlay<T extends Overlay> {
|
||||
|
||||
public T useReportBugButton() {
|
||||
this.closeButtonText = Res.get("shared.reportBug");
|
||||
this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bitsquare/bitsquare/issues"));
|
||||
this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bisq-network/exchange/issues"));
|
||||
//noinspection unchecked
|
||||
return (T) this;
|
||||
}
|
||||
@ -734,7 +734,7 @@ public abstract class Overlay<T extends Overlay> {
|
||||
gitHubButton.setOnAction(event -> {
|
||||
if (message != null)
|
||||
Utilities.copyToClipboard(message);
|
||||
GUIUtil.openWebPage("https://github.com/bitsquare/bitsquare/issues");
|
||||
GUIUtil.openWebPage("https://github.com/bisq-network/exchange/issues");
|
||||
});
|
||||
|
||||
Button forumButton = new Button(Res.get("popup.reportError.forum"));
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
/*
|
||||
* This file is part of Bitsquare.
|
||||
* This file is part of Bisq.
|
||||
*
|
||||
* Bitsquare is free software: you can redistribute it and/or modify it
|
||||
* Bisq 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
|
||||
* Bisq 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/>.
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.main.overlays.windows.downloadupdate;
|
||||
@ -45,7 +45,7 @@ public class BisqInstaller {
|
||||
}
|
||||
|
||||
public Optional<DownloadTask> download(String version) {
|
||||
String partialUrl = "https://github.com/bitsquare/bitsquare/releases/download/v" + version + "/";
|
||||
String partialUrl = "https://github.com/bisq-network/exchange/releases/download/v" + version + "/";
|
||||
|
||||
// Get installer filename on all platforms
|
||||
FileDescriptor installerFileDescriptor = getInstallerDescriptor(version, partialUrl);
|
||||
@ -171,7 +171,7 @@ public class BisqInstaller {
|
||||
public FileDescriptor getInstallerDescriptor(String version, String partialUrl) {
|
||||
String fileName;
|
||||
String prefix = "Bisq-";
|
||||
// https://github.com/bitsquare/bitsquare/releases/download/v0.5.1/Bisq-0.5.1.dmg
|
||||
// https://github.com/bisq-network/exchange/releases/download/v0.5.1/Bisq-0.5.1.dmg
|
||||
if (Utilities.isOSX())
|
||||
fileName = prefix + version + ".dmg";
|
||||
else if (Utilities.isWindows())
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
/*
|
||||
* This file is part of Bitsquare.
|
||||
* This file is part of Bisq.
|
||||
*
|
||||
* Bitsquare is free software: you can redistribute it and/or modify it
|
||||
* Bisq 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
|
||||
* Bisq 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/>.
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.main.overlays.windows.downloadupdate;
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
/*
|
||||
* This file is part of Bitsquare.
|
||||
* This file is part of Bisq.
|
||||
*
|
||||
* Bitsquare is free software: you can redistribute it and/or modify it
|
||||
* Bisq 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
|
||||
* Bisq 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/>.
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.main.overlays.windows.downloadupdate;
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
/*
|
||||
* This file is part of Bitsquare.
|
||||
* This file is part of Bisq.
|
||||
*
|
||||
* Bitsquare is free software: you can redistribute it and/or modify it
|
||||
* Bisq 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
|
||||
* Bisq 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/>.
|
||||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package io.bisq.gui.main.overlays.windows.downloadupdate;
|
||||
|
||||
@ -53,9 +53,9 @@ public class AboutView extends ActivatableViewAndModel<GridPane, Activatable> {
|
||||
GridPane.setHalignment(label, HPos.LEFT);
|
||||
HyperlinkWithIcon hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.web"), "https://bisq.io");
|
||||
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.code"), "https://github.com/bitsquare/bitsquare");
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.code"), "https://github.com/bisq-network/exchange");
|
||||
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://github.com/bitsquare/bitsquare/blob/master/LICENSE");
|
||||
hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://github.com/bisq-network/exchange/blob/master/LICENSE");
|
||||
GridPane.setColumnSpan(hyperlinkWithIcon, 2);
|
||||
|
||||
titledGroupBg = addTitledGroupBg(root, ++gridRow, 3, Res.get("setting.about.support"), Layout.GROUP_DISTANCE);
|
||||
|
||||
@ -80,7 +80,7 @@ public final class AccountNrValidator extends BankValidator {
|
||||
if (input != null) {
|
||||
length = 11;
|
||||
// Provided by sturles:
|
||||
// https://github.com/bitsquare/bitsquare/pull/707
|
||||
// https://github.com/bisq-network/exchange/pull/707
|
||||
|
||||
// https://no.wikipedia.org/wiki/MOD11#Implementasjoner_i_forskjellige_programmeringspr.C3.A5k
|
||||
// https://en.wikipedia.org/wiki/International_Bank_Account_Number#Generating_IBAN_check_digits6
|
||||
|
||||
Binary file not shown.
@ -42,7 +42,7 @@ $JAVA_HOME/bin/javapackager \
|
||||
|
||||
# sudo alien -r -c -k gui/deploy/bundles/bisq-$version.deb
|
||||
|
||||
cp "gui/deploy/bundles/bisq-$version.deb" "/home/bitsquare/Desktop/Bisq-32bit-$version.deb"
|
||||
cp "gui/deploy/bundles/bisq-$version.deb" "/home/bisq-network/Desktop/Bisq-32bit-$version.deb"
|
||||
mv "gui/deploy/bundles/bisq-$version.deb" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.deb"
|
||||
|
||||
# mv "bisq-$version-1.i386.rpm" "/media/sf_vm_shared_ubuntu14_32bit/Bisq-32bit-$version.rpm"
|
||||
|
||||
12
pom.xml
12
pom.xml
@ -24,13 +24,13 @@
|
||||
|
||||
<issueManagement>
|
||||
<system>GitHub</system>
|
||||
<url>https://github.com/bitsquare/bitsquare/issues</url>
|
||||
<url>https://github.com/bisq-network/exchange/issues</url>
|
||||
</issueManagement>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://github.com/bitsquare/bitsquare</connection>
|
||||
<developerConnection>scm:git:https://github.com/bitsquare/bitsquare</developerConnection>
|
||||
<url>scm:git:https://github.com/bitsquare/bitsquare</url>
|
||||
<connection>scm:git:https://github.com/bisq-network/exchange</connection>
|
||||
<developerConnection>scm:git:https://github.com/bisq-network/exchange</developerConnection>
|
||||
<url>scm:git:https://github.com/bisq-network/exchange</url>
|
||||
</scm>
|
||||
|
||||
<properties>
|
||||
@ -99,9 +99,9 @@
|
||||
<!-- NOTE: our custom bitcoinj dependency is resolved transitively
|
||||
via the libdohj dependency below -->
|
||||
<dependency>
|
||||
<groupId>com.github.bitsquare.libdohj</groupId>
|
||||
<groupId>com.github.bisq-network.libdohj</groupId>
|
||||
<artifactId>libdohj-core</artifactId>
|
||||
<version>aa0729e5</version>
|
||||
<version>b5c2f768</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.google.code.findbugs</groupId>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user