github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-31 06:58:41 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,786 Commits 6 Branches 150 Tags
37be168579a9ad1b94d73bc383ba003fe4dbca2d
Commit Graph
566 Commits
Author SHA1 Message Date
Luke Dashjr 37be168579 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-10-15 18:23:33 +00:00
Luke Dashjr 747b688b54 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-10-15 18:18:01 +00:00
Luke Dashjr f9d1d13855 Update supported translations 2012-10-15 18:16:24 +00:00
Luke Dashjr 5dc6be8bba Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-10-09 23:45:19 +00:00
Luke Dashjr 38297ba90a Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-10-09 23:40:25 +00:00
Luke Dashjr 6ec7ac15ff Update supported translations 2012-10-09 23:28:53 +00:00
Luke Dashjr 3241935774 Merge branch '0.6.0.x' into 0.6.x 2012-10-09 23:17:49 +00:00
Luke Dashjr 4cf9b4c6fa Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/transactiondesc.cpp
 2012-10-09 23:17:43 +00:00
Wladimir J. van der LaanandLuke Dashjr 638cecee77 When datadir missing, show messagebox instead of printing error to stderr 2012-10-09 23:01:16 +00:00
Rune K. SvendsenandLuke Dashjr a7642282f6 When encrypting the wallet, warn user that old backups will become useless. 
Don't include HTML in translation strings. Do split the huge message over several lines.

Prettier lines
 2012-10-09 22:57:34 +00:00
xanatosandLuke Dashjr cc57473222 toHTML won't add empty wtx.mapValue elements 
As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness.

Removed a duplicated identical if

There are two equal ifs, one inside another. If the first one is true, then the second one is true.
 2012-10-09 22:52:35 +00:00
Philip KaufmannandLuke Dashjr 207ef3008c additional fix for #1843 
- a shortcut on "receive coins" was used twice
 2012-10-09 22:22:07 +00:00
fanquakeandLuke Dashjr e25f0f0e53 Update Bugreport Links 
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
 2012-10-09 18:18:21 +00:00
fanquakeandLuke Dashjr 599ec1e115 Update Bugreport Links 
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
 2012-10-09 18:17:31 +00:00
Philip KaufmannandLuke Dashjr 9769d14f03 Change hotkey for "Send" button to "e" since "S" is already used for "Settings" menu 
Partial of upstream da9413d913
 2012-10-09 18:13:58 +00:00
Luke Dashjr 6047902934 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-09-11 01:35:36 +00:00
Luke Dashjr be2e2845ec Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-09-11 01:32:18 +00:00
Luke Dashjr ea3e34dc3d Update supported translations 2012-09-11 00:59:16 +00:00
Luke Dashjr 2ff8456c11 Bugfix: Correct doubled-up & in translations and remove extra spaces after ampersand in translations (this fixes hotkeys) 
Partial of upstream 4ee706243c.
 2012-09-10 23:53:28 +00:00
Luke Dashjr 4c1bc22013 Bugfix: Correct doubled-up & in translations and remove extra spaces after ampersand in translations (this fixes hotkeys) 
Partial of upstream 4ee706243c.
 2012-09-10 23:52:27 +00:00
Luke Dashjr 8b11bff10a Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	bitcoin-qt.pro
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-09-07 03:45:21 +00:00
Luke Dashjr 423cece29d Update supported translations 2012-09-07 00:32:15 +00:00
Luke Dashjr 3b5c5b817f Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-09-06 23:14:53 +00:00
Luke Dashjr fc1cd74b86 Update supported translations 2012-09-06 22:49:23 +00:00
Luke Dashjr 367f2873bc Update supported translations 2012-08-28 23:39:17 +00:00
Luke Dashjr 7355f00756 Update supported translations 2012-08-28 21:21:30 +00:00
Luke Dashjr 4c93f17e9e Update supported translations 2012-08-28 07:30:52 +00:00
Luke Dashjr d011dc270a Update supported translations 2012-08-28 03:12:43 +00:00
Luke Dashjr f31f7770d9 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/init.cpp
 2012-08-26 22:22:19 +00:00
Luke Dashjr 12217fb61d Merge branch '0.5.x' into 0.6.0.x 2012-08-26 22:20:34 +00:00
Luke Dashjr 7c08c1a5df Merge commit 'a259baa' into 0.6.0.x 2012-08-26 22:15:56 +00:00
Wladimir J. van der LaanandLuke Dashjr bfe7cc638d Override progress bar on platforms with segmented progress bars 
Windows & WindowsXP style have a problem with displaying the block progress.
Add a custom stylesheet as workaround, but only when one of those renderers is active,
otherwise leave the theme alone (issue #1071).
 2012-08-26 22:13:34 +00:00
Philip KaufmannandLuke Dashjr a259baa955 update some strings used as warning messages in sendcoinsdialog.cpp 2012-08-26 20:33:21 +00:00
Matt CoralloandLuke Dashjr 94db8f97d4 Fix Win32 compiling of qt/test/uritests.cpp 2012-08-12 17:44:52 +00:00
Matt CoralloandLuke Dashjr 4e56a62f72 Return !0 when qt tests fail. 2012-08-12 17:44:48 +00:00
Luke Dashjr 1a85c0f506 Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:37:25 +00:00
Luke Dashjr c195ef0b5c Merge branch '0.6.0.x' into 0.6.x 2012-08-12 17:36:55 +00:00
Luke Dashjr 4fb6e53968 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	doc/unit-tests.txt
 2012-08-12 17:35:44 +00:00
Luke Dashjr 566f556c40 Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:34:23 +00:00
Luke Dashjr 92dfcea0e9 Merge branch '0.6.0.x' into 0.6.x 2012-08-12 17:22:59 +00:00
Luke Dashjr 3171daef6c Bugfix: Fix a variety of misspellings 2012-08-12 17:22:48 +00:00
Luke Dashjr cafa8f2879 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
 2012-08-12 17:19:48 +00:00
Luke Dashjr 89c5c381b7 Merge branch '0.5.x' into 0.6.0.x 2012-08-12 17:14:29 +00:00
Luke Dashjr 982f4fd301 Bugfix: Fix a variety of misspellings 2012-08-12 17:13:48 +00:00
Michael FordandLuke Dashjr 7543a5611b Typo 2012-07-26 03:37:12 +00:00
Stephane GlonduandLuke Dashjr 0a9972bf1b Fix spelling of successfully 2012-07-26 00:41:56 +00:00
fanquakeandLuke Dashjr 895191b9a8 Typo 2012-07-26 00:39:46 +00:00
fanquakeandLuke Dashjr b8dcb38b4e Fix Typo 2012-07-26 00:39:21 +00:00
Luke Dashjr 23cdae18f0 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/init.cpp
	src/util.cpp
 2012-07-22 23:18:27 +00:00
Luke Dashjr ff4be740b5 Merge branch '0.5.x' into 0.6.0.x 2012-07-22 23:15:38 +00:00