Merge branch 'master' of https://github.com/palmd/silkcoin

Conflicts:
	src/qt/bitcoin.qrc
	src/qt/locale/bitcoin_af_ZA.ts
	src/qt/locale/bitcoin_ar.ts
	src/qt/locale/bitcoin_be_BY.ts
	src/qt/locale/bitcoin_bg.ts
	src/qt/locale/bitcoin_bs.ts
	src/qt/locale/bitcoin_ca.ts
	src/qt/locale/bitcoin_ca@valencia.ts
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_cy.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_el_GR.ts
	src/qt/locale/bitcoin_eo.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_es_DO.ts
	src/qt/locale/bitcoin_es_MX.ts
	src/qt/locale/bitcoin_es_UY.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.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_gl.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hi_IN.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_id_ID.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_ja.ts
	src/qt/locale/bitcoin_ka.ts
	src/qt/locale/bitcoin_kk_KZ.ts
	src/qt/locale/bitcoin_ko_KR.ts
	src/qt/locale/bitcoin_ky.ts
	src/qt/locale/bitcoin_la.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_lv_LV.ts
	src/qt/locale/bitcoin_ms_MY.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pam.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_pt_PT.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sah.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sl_SI.ts
	src/qt/locale/bitcoin_sq.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_th_TH.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_ur_PK.ts
	src/qt/locale/bitcoin_vi.ts
	src/qt/locale/bitcoin_vi_VN.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts

src/alert.cpp

@@ -19,7 +19,7 @@ using namespace std;
 map<uint256, CAlert> mapAlerts;
 CCriticalSection cs_mapAlerts;
 
-static const char* pszMainKey = "0486bce1bac0d543f104cbff2bd23680056a3b9ea05e1137d2ff90eeb5e08472eb500322593a2cb06fbf8297d7beb6cd30cb90f98153b5b7cce1493749e41e0284";
+static const char* pszMainKey = "04fd68d08745edbcefb89d5517f123f16a150a73e10e678ed16ae9eb04754fb50686e44e353155c19cfef7c156ac381f071a27630274b26f74a41db9aae378eda5";
 
 // TestNet alerts pubKey
 static const char* pszTestKey = "0471dc165db490094d35cde15b1f5d755fa6ad6f2b5ed0f340e3f17f57389c3c2af113a8cbcc885bde73305a553b5640c83021128008ddf882e856336269080496";

src/net.cpp

@@ -32,7 +32,7 @@
 using namespace std;
 using namespace boost;
 
-static const int MAX_OUTBOUND_CONNECTIONS = 16;
+static const int MAX_OUTBOUND_CONNECTIONS = 20;
 
 void ThreadMessageHandler2(void* parg);
 void ThreadSocketHandler2(void* parg);

src/qt/bitcoin.qrc

@@ -100,7 +100,6 @@
     </qresource>
     <qresource prefix="/movies">
         <file alias="camel">res/movies/camel.gif</file>
-        <file>res/movies/update_spinner.gif</file>
         <file alias="camelpurple">res/movies/camel_walkcycle.gif</file>
         <file alias="camelgreen">res/movies/camel_walkcycle2.gif</file>
         <file alias="update_spinner">res/movies/update_spinner.mng</file>