mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-01 01:32:17 +01:00
Code Issues Projects Releases Packages Wiki Activity
4807 commits 3 branches 150 tags 4.1 GiB
Commit graph

125 commits

Author SHA1 Message Date
Manfred Karrer
36d4c34891
Rename BtcMainNetParams to BtcMainNetParamsForValidation; cleanup 2017-11-04 14:34:58 -05:00
Manfred Karrer
753b5afe91
Use RegTestHost.NONE as default 2017-11-04 11:10:05 -05:00
Mike Rosseel
0ec4b5edac
Merging and adapting old bridges UI code to new bisq structure 
Had to merge by hand because of the many changes in the new bisq
structure. Also removed the 'default bridges' concept because it's
discouraged to do that.
Open issues: UI screen is still WIP, and bitcoinj SOCKS proxy error
which makes that we can't connect to bitcoin nodes anymore.

Signed-off-by: Mike Rosseel <mike@eon-consult.be>
 2017-11-02 15:50:06 +01:00
Manfred Karrer
01cf823d7a
Prepare merge Dev 2017-10-11 07:21:50 -05:00
Manfred Karrer
71115d46df Update key 2017-07-16 15:32:31 +02:00
Mike Rosseel
95fb2dcebf download update is code complete 2017-07-07 17:37:47 +02:00
Manfred Karrer
35635c7b9d Turn off logs for BlockingClient 2017-06-30 13:10:53 +02:00
Manfred Karrer
f268abe2e1 Merge DAO branch to Development branch 2017-06-27 01:30:24 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
71e8bf524b Update CASH_DEPOSIT_SHORT=Cash Deposit 2017-02-11 16:54:23 -05:00
Manfred Karrer
7825225985 Update string 2017-02-10 19:47:12 -05:00
Manfred Karrer
05bb832487 Merge branch 'master' into Development 2017-02-09 21:34:51 -05:00
wodry
cd3606191e Bugfix 2017-02-08 05:58:16 +01:00
wodry
0e55e50508 Translated outstanding strings 2017-02-07 22:28:48 +01:00
Manfred Karrer
afaa3add89 Rename Cash/ATM deposit to Cash deposit 2017-02-07 10:22:17 -05:00
wodry
ac4263f163 Fix doubled line 
Fix doubled line from copy & paste.
 2017-02-04 11:29:13 +01:00
wodry
bf4142bd3f Added some missing German translations, one Bugfix 
According to the Post of user coinstash: https://forum.bitsquare.io/t/any-cunning-linguists-among-us/721/5
I would be delighted if I could help out with German translations.

There is also one type bugfix.
 2017-02-04 11:23:29 +01:00
HostFat
96371fa28f Adding italian language translation 2016-11-26 05:56:22 +01:00
Manfred Karrer
0eccfb87cc Merge branch 'master' into Development 
# Conflicts:
#	gui/src/main/resources/i18n/in_dev/displayStrings_pt.properties
 2016-11-06 23:23:00 +01:00
riclas
dd0e914715 Add portuguese translation 2016-11-06 19:49:02 +00:00
Rob Judd
2cf4dd0da8 Take out double backslashes added by stupid editor 2016-10-29 03:46:07 +10:00
Rob Judd
58b81327b9 Take out merge crap 2016-10-29 03:43:55 +10:00
Rob Judd
c97b85e2af Re-commit after merge 2016-10-29 03:39:27 +10:00
Rob Judd
0f73fe63c3 Update i18n files already partially done 2016-10-29 01:53:08 +10:00
Rob Judd
8612ac66e5 Update unfinished files to current level 2016-10-29 01:30:28 +10:00
Rob Judd
e025e1d2f8 Minor edit 2016-10-29 01:07:25 +10:00
datsiuk
b4f6c09fe4 Translation displayStrings_es.properties 
I suppose special characters (á, é, í, ó, ú, ñ) are accepted.

Thesaurus:
arbitrator = árbitro 
fee = tasa, comisión
trade = trato, comercio
trader = comerciante
input = entrada, valor introducido
password = clave
 2016-10-28 10:08:54 +02:00
Rob Judd
889c91e585 Save i18n progress 2016-10-22 21:22:27 +10:00
Manfred Karrer
ed72442f5c Move i18n files to in_dev directory 2016-10-19 17:46:07 +02:00
Manfred Karrer
c64dd97749 Move i18n files to in_dev directory, because the currnet translations only include a small subset of all strings and we don't want to mix english with translates version in the UI. 
Once all strings in the app are supported by property files we can use them in the main directory
 2016-10-19 16:56:17 +02:00
Manfred Karrer
020b479c0c Dont translate Faster Payment 2016-10-18 20:54:14 +02:00
layer1gfx
28f09a8d14 Update German translation 
updated the German translation for displayStrings_de.properties
 2016-10-18 10:45:14 +08:00
Rob Judd
9bc4865de2 Croatian translation from Petar 2016-10-17 16:04:46 +10:00
Rob Judd
4ccc5a9cea Minor edit 2016-10-15 10:35:09 +10:00
Rob Judd
32a3debdbb Add missing info header 2016-10-14 05:09:22 +10:00
Rob Judd
ce3cdda19a Add i18n branch with new files 2016-10-14 04:49:35 +10:00
Manfred Karrer
ce250ebd40 Improve wording 2016-10-06 00:10:42 +02:00
Manfred Karrer
a497c73bac Added new payment method: Faster payments 2016-09-04 12:52:36 -05:00
Manfred Karrer
956843ca14 Apply primary market based direction, add BTC if "buyer" or "seller" is used in info text, remove embedded app version in offerID, 2016-08-28 18:01:53 +02:00
Manfred Karrer
54bd05be5f Merge branch 'master' into Development 
Conflicts:
	gui/src/main/resources/i18n/displayStrings.properties
 2016-08-26 15:18:48 +02:00
Manfred Karrer
2f1ea286e0 Add support for not recognized payment methods 2016-08-26 15:05:38 +02:00
Manfred Karrer
f1406b666e Add Payment method: Cash deposit (global) 2016-08-25 19:22:41 +02:00
Manfred Karrer
cd4401a001 Add new payment methods: ClearXExchange, US Postal Money Order and US CashDeposit (WIP). Deactivate bank transfers for US. 2016-08-25 18:25:19 +02:00
Manfred Karrer
a6958b570d Apply inverted price to create offer view 2016-08-20 21:47:59 +02:00
Manfred Karrer
a51fa4850d Invert price in offerbook 2016-08-19 21:01:46 +02:00
Manfred Karrer
1e4b9e820e Add reminder popup for password, seed words and backup. Change term cryptocurrencies to altcoins. Improve wording 2016-08-06 20:51:08 +02:00
Manfred Karrer
e3ce6e9125 Prepare for release 0.4.9.2 2016-07-30 00:32:40 +02:00
Manfred Karrer
3b01caee7b Add error msg when take offer attempt failed, decrease Connection timeout to 60 sec 2016-07-16 02:44:17 +02:00
Manfred Karrer
546737a728 Fix missing handling of mailbox msg 2016-07-15 22:27:00 +02:00
Manfred Karrer
2b524e0e09 Filter logs 2016-07-13 15:07:42 +02:00