diff --git a/_events.yml b/_events.yml index 12bcf294..be8fcf66 100644 --- a/_events.yml +++ b/_events.yml @@ -1,11 +1,3 @@ -- date: 2015-06-10 - title: "Advapay Events" - venue: "" - address: "Digital October, Bld. 3, 6 Berseniyevskaya naberezhnaya" - city: "Moscow" - country: "Russia" - link: "http://www.advapay.eu/" - - date: 2015-06-20 title: "Bitcoin Development Workshop 2015" venue: "De War" @@ -14,6 +6,54 @@ country: "Netherlands" link: "http://bitcoinmeetup.nl/2015/06-20.html" +- date: 2015-06-24 + title: "London Blockchain Conference" + venue: "The London Escalator" + address: "69-89 Mile End Rd, E1 4TT" + city: "London" + country: "United Kingdom" + link: "http://blockchainlondon.com/" + +- date: 2015-06-24 + title: "Bitcoin Conference Kiev" + venue: "NSC Olimpiyskiy" + address: "Velyka Vasylkivska str., 55" + city: "Kyiv" + country: "Ukraine" + link: "http://bitcoinconf.com.ua/en" + +- date: 2015-06-26 + title: "HVA Blockchain blockstrap course" + venue: "Amsterdam University of Applied Sciences" + address: "Duivendrechtsekade 36-38" + city: "Amsterdam" + country: "Netherlands" + link: "https://bitcoinembassy.nl/hva-blockchain-blockstrap-course-amsterdam-2015-06-26/" + +- date: 2015-06-29 + title: "Blockchain Payments" + venue: "Deloitte Amsterdam" + address: "Gustav Mahlerlaan 2970" + city: "Amsterdam" + country: "The Netherlands" + link: "https://www.about-payments.com/newsroom/events/blockchain-payments-2015-29-june-2015" + +- date: 2015-07-06 + title: "The New Context" + venue: "Toranomon Hills Forum" + address: "23 Toranomon 1 chome, Minato-ku, 105-6305" + city: "Tokyo" + country: "Japan" + link: "http://ncc.garage.co.jp/en/" + +- date: 2015-07-08 + title: "WIRED Money" + venue: "The British Museum" + address: "Great Russell Street, WC1B 3DG" + city: "London" + country: "United Kingdom" + link: "http://www.wiredevent.co.uk/wired-money-2015" + - date: 2015-07-10 title: "Inside Bitcoins Chicago" venue: "Navy Pier" @@ -22,14 +62,38 @@ country: "United States" link: "http://insidebitcoins.com/chicago/2015?utm_source=bitcoinorg&utm_medium=eventlisting&utm_campaign=bitcoinorgeventlistingibchicago" +- date: 2015-07-28 + title: "Digital Currencies + The Blockchain" + venue: "Convene" + address: "730 Third Avenue, 10017" + city: "New York" + country: "United States" + link: "http://www.americanbanker.com/conferences/digitalcurrencies/" + +- date: 2015-08-03 + title: "Keynote" + venue: "Park Plaza Hotel" + address: "607 S Park View St, 90057" + city: "Los Angeles" + country: "United States" + link: "http://www.keynote2015.com/" + - date: 2015-08-13 title: "Coin Congress San Francisco 2015" venue: "Hilton Union Square - San Francisco" address: "333 O'Farrell St" city: "San Francisco" - country: "USA" + country: "United States" link: "http://www.coincongressevents.org" +- date: 2015-08-14 + title: "Cryptolina Bitcoin Expo" + venue: "McGlohon Theatre" + address: "345 N College St, 28202" + city: "Charlotte" + country: "United States" + link: "http://cryptolina.com/" + - date: 2015-09-10 title: "Consensus 2015" venue: "TimesCenter" @@ -38,6 +102,14 @@ country: "United States" link: "http://www.coindesk.com/events/consensus-2015/" +- date: 2015-09-12 + title: "Bitcoinference Summer 2015" + venue: "Amsterdam Science Park" + address: "Science Park 205, 1098 XH" + city: "Amsterdam" + country: "Netherlands" + link: "http://bitcoinference.com/" + - date: 2015-10-08 title: "Alt Convention" venue: "Hilton Batumi, Radisson Blu Batumi, Sheraton Batumi, Divan Suites, Leogrand" @@ -61,3 +133,11 @@ city: "Miami Beach, FL" country: "United States" link: "http://www.imtconferences.com/mtbit/" + +- date: 2016-04-04 + title: "Money 20/20 Europe" + venue: "Bella Center" + address: "Center Boulevard 5" + city: "Copenhagen" + country: "Denmark" + link: "https://www.money2020europe.com/" diff --git a/_posts/2015-06-16-hard-fork-policy.md b/_posts/2015-06-16-hard-fork-policy.md new file mode 100644 index 00000000..81cacae2 --- /dev/null +++ b/_posts/2015-06-16-hard-fork-policy.md @@ -0,0 +1,38 @@ +--- +type: posts +layout: post +lang: en +category: blog + +title: "Bitcoin.org Hard Fork Policy" +permalink: /en/posts/hard-fork-policy.html +date: 2015-06-16 +--- +Contentious hard forks are bad for Bitcoin. At the very best, a +contentious hard fork will leave people who chose the losing side of the +fork feeling disenfranchised. At the very worst, it will make bitcoins +permanently lose their value. In between are many possible outcomes, but +none of them are good. + +The danger of a contentious hard fork is potentially so significant +that Bitcoin.org has decided to adopt a new policy: + +> Bitcoin.org will not promote software or services that will leave the +> previous consensus because of an intentional and contentious hard fork attempt. + +This policy applies to full node software, such as Bitcoin Core, +software forks of Bitcoin Core, and alternative full node +implementations. + +It also applies to wallets and services that have the ability to detect +the contentious hard fork, and which release code or make announcements +indicating that they will cease operating on the side of the previous +consensus. +It does not apply to software that cannot detect the contentious hard +fork and which continues doing whatever it would've done anyway. + +To be clear, we encourage wallet authors and service providers to offer +their opinions on hard fork proposals, and we will not penalize anyone +for contributing to a discussion. We will only stop promoting particular +wallets and services if they plan to move their users onto a +contentious hard fork by default. diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html index 357e79a8..123b95ec 100755 --- a/_templates/choose-your-wallet.html +++ b/_templates/choose-your-wallet.html @@ -31,17 +31,17 @@ wallets: privacyaddressreuse: "checkpassprivacyaddressrotation" privacydisclosure: "checkpassprivacydisclosurefullnode" privacynetwork: "checkpassprivacynetworksupporttorproxy" -- multibit: - title: "MultiBit" - titleshort: "MultiBit" +- multibithd: + title: "MultiBit HD" + titleshort: "MultiBit HD" compat: "desktop windows mac linux" level: 2 platform: desktop: - text: "walletmultibit" + text: "walletmultibithd" link: "https://multibit.org" - source: "https://github.com/jim618/multibit" - screenshot: "multibit.png" + source: "https://github.com/bitcoin-solutions/multibit-hd" + screenshot: "multibithd.png" os: - windows - mac @@ -51,11 +51,11 @@ wallets: validation: "checkpassvalidationspvp2p" transparency: "checkpasstransparencyopensource" environment: "checkfailenvironmentdesktop" - privacy: "checkfailprivacyweak" + privacy: "checkpassprivacybasic" privacycheck: - privacyaddressreuse: "checkfailprivacyaddressrotation" + privacyaddressreuse: "checkpassprivacyaddressrotation" privacydisclosure: "checkfailprivacydisclosurespv" - privacynetwork: "checkfailprivacynetworknosupporttor" + privacynetwork: "checkpassprivacynetworksupporttorproxy" - armory: title: "Armory" titleshort: "Armory" diff --git a/_templates/community.html b/_templates/community.html index c4c1e723..f95059e9 100644 --- a/_templates/community.html +++ b/_templates/community.html @@ -156,7 +156,8 @@ id: community

Dutch flagNetherlands

- Stichting Bitcoin Nederland + Stichting Bitcoin Nederland
+ Bitcoin Embassy Amsterdam

diff --git a/_templates/development.html b/_templates/development.html index 6182b6b6..34242f76 100755 --- a/_templates/development.html +++ b/_templates/development.html @@ -50,7 +50,7 @@ id: development
  • Hive - A fast user-friendly SPV Bitcoin client.
  • libbitcoin - An asynchronous C++ library for Bitcoin.
  • libblkmaker and python-blkmaker - Client side libraries for the getblocktemplate mining protocol.
    • -
  • MultiBit - A thin SPV international Bitcoin client for desktops.
    • +
  • MultiBit HD - A thin SPV international Bitcoin client for desktops.
  • NBitcoin - A cross-platform .NET Bitcoin library. (Mac,IOS,Android,WP,Tablets,Mono,Desktop)
  • obelisk - A libbitcoin-based blockchain query server.
  • picocoin - A tiny bitcoin library, with lightweight client and utils.
    • diff --git a/_templates/press.html b/_templates/press.html index 70eb2ee7..61aacded 100644 --- a/_templates/press.html +++ b/_templates/press.html @@ -225,41 +225,10 @@ What is Bitcoin - Funke
    what is Bitcoin
    What is Bitcoin - Weusecoins
    {{ page.dialogs.materialvideoyoutube }}
    -{{ page.dialogs.materialvideoformat }} -{% endif %} - -
    - -

    {% translate materialpicture %}

    -
    -Bitcoin Kiez sign -Bitcoin logo -Bitcoin Qt logo -3D Bitcoin artwork by Eivind Nag -Bitcoin 3D -Bitcoin 3D -Bitcoin 3D -Bitcoin Casascius holograph coin -Bitcoin Cybrbeast 3D artwork -Bitcoin Cybrbeast 3D artwork -Bitcoin Cybrbeast 3D artwork -Bitcoin Cybrbeast 3D artwork -Bitcoin Cybrbeast 3D artwork -Bitcoin wood artwork -Bitcoin Casascius metal coin -Bitcoin euro -Bitcoin gold -
    -{% translate materialpicturemore %} - -
    - -{% if page.lang == 'en' %} -

    {{ page.dialogs.materialquote }}

    diff --git a/_templates/support-bitcoin.html b/_templates/support-bitcoin.html index 2deb0a79..8bb8185d 100755 --- a/_templates/support-bitcoin.html +++ b/_templates/support-bitcoin.html @@ -19,8 +19,7 @@ id: support-bitcoin

    Icon{% translate translate %}

    {% translate translatetxt %}

    -

    Bitcoin Core - Bitcoin.org - Bitcoin Wiki - Bitcoin Wallet (Android) - MultiBit - Electrum - Hive

    - +

    Bitcoin Core - Bitcoin.org - Bitcoin Wiki - Bitcoin Wallet (Android) - MultiBit HD - Electrum - Hive

    Icon{% translate develop %}

    {% translate developtxt %}

    diff --git a/_translations/en.yml b/_translations/en.yml index ad4231d6..1b730821 100644 --- a/_translations/en.yml +++ b/_translations/en.yml @@ -114,7 +114,7 @@ en: walletcathardware: "Hardware" walletcatweb: "Web" walletbitcoinqt: "Bitcoin Core is a full Bitcoin client and builds the backbone of the network. It offers high levels of security, privacy, and stability. However, it has fewer features and it takes a lot of space and memory." - walletmultibit: "MultiBit is a lightweight client that focuses on being fast and easy to use. It synchronizes with the network and is ready to use in minutes. MultiBit also supports many languages. It is a good choice for non-technical users." + walletmultibithd: "MultiBit HD is a lightweight client that is fast and easy to use. With integrated TREZOR and Tor support, it synchronizes directly with the Bitcoin network. The extensive help makes it an excellent choice for non-technical users." wallethive: "Hive is a fast, integrated, user-friendly Bitcoin wallet for Mac OS X. With a focus on usability, Hive is translated into many languages and has apps, making it easy to interact with your favorite Bitcoin services and merchants." wallethive-web: "Hive is a human-friendly Bitcoin and Litecoin wallet, which features a beautiful, elegant and simple interface. It offers Waggle, a simple way to send & receive tokens with other Hive users near you. Your passphrase generates your wallet, making it portable and backups easy." walletarmory: "Armory is an advanced Bitcoin client that expands its features for Bitcoin power users. It offers many backup and encryption features, and it allows secure cold-storage on offline computers." @@ -514,8 +514,6 @@ en: volunteernonprofit: "Communicate with the Bitcoin Foundation or local non-profit organizations." volunteerpresscenter: "Find more potential press contacts at the independent bitcoinpresscenter.org." faqmore: "To learn more about Bitcoin, please visit the complete FAQ or the Bitcoin Wiki." - materialpicture: "Pictures" - materialpicturemore: "Show more pictures..." privacy: title: "Privacy - Bitcoin" pagetitle: "Privacy" diff --git a/_translations/it.yml b/_translations/it.yml index ef528e91..ce9ead91 100644 --- a/_translations/it.yml +++ b/_translations/it.yml @@ -626,7 +626,7 @@ it: blockchain: "Block Chain" blockchaintxt: "La block chain è un registro pubblico delle transazioni Bitcoin in ordine cronologico. La block chain è condivisa tra tutti gli utenti Bitcoin. È utilizzata per verificare la permanenza delle transazioni Bitcoin e per prevenire double spending." block: "Blocco" - blocktxt: "Un blocco è una parte della blockchain che contiene e conferma molte transazioni in attesa. In media ogni 10 minuti circa un nuovo blocco, che include delle transazioni, viene aggiunto alla blockchain attraverso il processo di mining." + blocktxt: "Un blocco è una parte della blockchain che contiene e conferma molte transazioni in attesa. In media circa ogni 10 minuti un nuovo blocco, che include delle transazioni, viene aggiunto alla blockchain attraverso il processo di mining." btc: "BTC" btctxt: "Il BTC è un'unità comune utilizzata per designare un bitcoin (B⃦)." confirmation: "Conferma" @@ -638,13 +638,13 @@ it: hashrate: "Hash Rate" hashratetxt: "Per hash rate si intende l'unità di misura della potenza di elaborazione della rete Bitcoin. Per fini di sicurezza la rete Bitcoin deve eseguire delle operazioni matematiche intensive. Quando la rete raggiunge un hash rate di 10 Th/s, significa che può realizzare un trilione di calcoli al secondo." mining: "Mining" - miningtxt: "Per mining si intende il processo che fa eseguire all'hardware del computer calcoli matematici al fine di confermare le transazioni ed aumentare la sicurezza della rete Bitcoin. Come ricompensa per il loro servizio, i miner (minatori) di Bitcoin possono incassare delle commissioni sulle le transazioni che confermano insieme ai nuovi bitcoin appena creati. Quello del mining è un mercato specializzato e competitivo dove le ricompense sono divise in base a quanti calcoli sono stati eseguiti. Non tutti gli utenti Bitcoin si cimentano nel mining e non è un modo facile per fare soldi." + miningtxt: "Per mining si intende il processo che fa eseguire all'hardware del computer calcoli matematici al fine di confermare le transazioni ed aumentare la sicurezza della rete Bitcoin. Come ricompensa per il loro servizio, i miner (minatori) di Bitcoin possono incassare delle commissioni sulle transazioni che confermano insieme ai nuovi bitcoin appena creati. Quello del mining è un mercato specializzato e competitivo dove le ricompense sono divise in base a quanti calcoli sono stati eseguiti. Non tutti gli utenti Bitcoin si cimentano nel mining e non è un modo facile per fare soldi." p2p: "P2P" p2ptxt: "Per peer to peer si intendono i sistemi che funzionano come un collettivo organizzato permettendo ad ogni individuo di interagire direttamente con gli altri. Nel caso di Bitcoin, la rete è costruita in modo che ogni utente trasmetta le transazioni degli altri utenti. E, fatto di importanza cruciale, nessuna banca è richiesta come terzi." privatekey: "Chiave Privata" - privatekeytxt: "Una chiave privata è una parte di dati segreti che provano che sei tu ad utilizzare bitcoin da un determinato portafoglio attraverso una firma crittografata . La tua chiave privata (o chiavi private) è conservata nel tuo computer se utilizzi un portafoglio software; invece è conservata nei server se utilizzi un portafoglio web. La chiave privata non deve essere rivelata ad altri in quanto ti permette di utilizzare i fondi dal tuo portafoglio Bitcoin" + privatekeytxt: "Una chiave privata è una parte di dati segreti che provano che sei tu ad utilizzare bitcoin da un determinato portafoglio attraverso una firma crittografata . La tua chiave privata (o chiavi private) è conservata nel tuo computer se utilizzi un portafoglio software; è invece conservata in un server remoto se utilizzi un portafoglio web. La chiave privata non deve essere rivelata ad altri in quanto ti permette di utilizzare i fondi dal tuo portafoglio Bitcoin" signature: "Firma" - signaturetxt: "A la firma criptografica è un meccanismo matematico che consente di provare la proprietà. Nel caso di Bitcoin, un portafoglio Bitcoin e la sua chiave privata(e) sono collegati per mezzo di un vincolo matematico magico. Quando il tuo software Bitcoin segna una transazione con la chiave privata appropriata, l'intera rete può vedere che la firma combacia con i bitcoin spesi. Tuttavia, non c'è alcun modo per il mondo d'indovinare la tua chiave privata, per derubarti dei tuoi bitcoin, ottenuti col sudore della fronte. " + signaturetxt: "La firma criptografica è un meccanismo matematico che consente di provare la proprietà. Nel caso di Bitcoin, un portafoglio Bitcoin e la sua chiave privata(e) sono collegati per mezzo di un vincolo matematico magico. Quando il tuo software Bitcoin segna una transazione con la chiave privata appropriata, l'intera rete può vedere che la firma combacia con i bitcoin spesi. Tuttavia, non c'è alcun modo per il mondo d'indovinare la tua chiave privata, per derubarti dei tuoi bitcoin, ottenuti col sudore della fronte. " wallet: "Portafoglio" wallettxt: "Un portafoglio di Bitcoin è circa l'equivalente di un portafoglio materiale sul network di Bitcoin. In realtà il tuo portafoglio contiene le chiavi private che ti permettono di usare i bitcoin allocati nella block chain. Ogni portafoglio Bitcoin può mostrarti il bilancio totale di tutti i bitcoin che controlla e ti permette di pagare cifre precise ad una persona specifica, come un vero portafoglio. Questo è diverso dalla carte di credito dove ti sono addebitate le spese dal commerciante." you-need-to-know: diff --git a/img/press/picture/bitcoin_casascius_holograph.png b/img/press/picture/bitcoin_casascius_holograph.png deleted file mode 100644 index 89410ffe..00000000 Binary files a/img/press/picture/bitcoin_casascius_holograph.png and /dev/null differ diff --git a/img/press/picture/bitcoin_casascius_metal.png b/img/press/picture/bitcoin_casascius_metal.png deleted file mode 100644 index 2ef22315..00000000 Binary files a/img/press/picture/bitcoin_casascius_metal.png and /dev/null differ diff --git a/img/press/picture/bitcoin_cybrbeast1.png b/img/press/picture/bitcoin_cybrbeast1.png deleted file mode 100644 index 4e9bf868..00000000 Binary files a/img/press/picture/bitcoin_cybrbeast1.png and /dev/null differ diff --git a/img/press/picture/bitcoin_cybrbeast2.png b/img/press/picture/bitcoin_cybrbeast2.png deleted file mode 100644 index 90bfeb85..00000000 Binary files a/img/press/picture/bitcoin_cybrbeast2.png and /dev/null differ diff --git a/img/press/picture/bitcoin_cybrbeast3.png b/img/press/picture/bitcoin_cybrbeast3.png deleted file mode 100644 index 7d367312..00000000 Binary files a/img/press/picture/bitcoin_cybrbeast3.png and /dev/null differ diff --git a/img/press/picture/bitcoin_cybrbeast4.png b/img/press/picture/bitcoin_cybrbeast4.png deleted file mode 100644 index 8a825d78..00000000 Binary files a/img/press/picture/bitcoin_cybrbeast4.png and /dev/null differ diff --git a/img/press/picture/bitcoin_cybrbeast5.png b/img/press/picture/bitcoin_cybrbeast5.png deleted file mode 100644 index 9503b9a7..00000000 Binary files a/img/press/picture/bitcoin_cybrbeast5.png and /dev/null differ diff --git a/img/press/picture/bitcoin_kiez.jpg b/img/press/picture/bitcoin_kiez.jpg deleted file mode 100644 index 441c34a2..00000000 Binary files a/img/press/picture/bitcoin_kiez.jpg and /dev/null differ diff --git a/img/press/picture/bitcoin_logo_3d.png b/img/press/picture/bitcoin_logo_3d.png deleted file mode 100644 index 66057b9e..00000000 Binary files a/img/press/picture/bitcoin_logo_3d.png and /dev/null differ diff --git a/img/press/picture/bitcoin_logo_3d_light.png b/img/press/picture/bitcoin_logo_3d_light.png deleted file mode 100644 index 602dd24c..00000000 Binary files a/img/press/picture/bitcoin_logo_3d_light.png and /dev/null differ diff --git a/img/press/picture/bitcoin_logo_3d_perspective.png b/img/press/picture/bitcoin_logo_3d_perspective.png deleted file mode 100644 index ec4371af..00000000 Binary files a/img/press/picture/bitcoin_logo_3d_perspective.png and /dev/null differ diff --git a/img/press/picture/bitcoin_logo_3d_wood.png b/img/press/picture/bitcoin_logo_3d_wood.png deleted file mode 100644 index 5f978341..00000000 Binary files a/img/press/picture/bitcoin_logo_3d_wood.png and /dev/null differ diff --git a/img/press/picture/bitcoin_logo_euro.png b/img/press/picture/bitcoin_logo_euro.png deleted file mode 100644 index 93f5ba70..00000000 Binary files a/img/press/picture/bitcoin_logo_euro.png and /dev/null differ diff --git a/img/press/picture/bitcoin_logo_gold.png b/img/press/picture/bitcoin_logo_gold.png deleted file mode 100644 index 9f1d794e..00000000 Binary files a/img/press/picture/bitcoin_logo_gold.png and /dev/null differ diff --git a/img/press/picture/bitcoin_logo_plain.png b/img/press/picture/bitcoin_logo_plain.png deleted file mode 100644 index 1d05d69f..00000000 Binary files a/img/press/picture/bitcoin_logo_plain.png and /dev/null differ diff --git a/img/press/picture/bitcoin_logo_qt.png b/img/press/picture/bitcoin_logo_qt.png deleted file mode 100644 index 3debfffe..00000000 Binary files a/img/press/picture/bitcoin_logo_qt.png and /dev/null differ diff --git a/img/press/picture/bitcoin_wood.png b/img/press/picture/bitcoin_wood.png deleted file mode 100644 index 3f3659cd..00000000 Binary files a/img/press/picture/bitcoin_wood.png and /dev/null differ diff --git a/img/screenshots/multibit.png b/img/screenshots/multibit.png deleted file mode 100644 index 9b863bcd..00000000 Binary files a/img/screenshots/multibit.png and /dev/null differ diff --git a/img/screenshots/multibithd.png b/img/screenshots/multibithd.png new file mode 100644 index 00000000..9a3b9a3c Binary files /dev/null and b/img/screenshots/multibithd.png differ diff --git a/img/wallet/multibit.png b/img/wallet/multibit.png deleted file mode 100644 index ab75c420..00000000 Binary files a/img/wallet/multibit.png and /dev/null differ diff --git a/img/wallet/multibithd.png b/img/wallet/multibithd.png new file mode 100644 index 00000000..5a005bde Binary files /dev/null and b/img/wallet/multibithd.png differ