Merge pull request #447 from xanoni/harmonize-bitcoin-word-usage

Harmonize linguistic usage of the word "Bitcoin"

_data/fr.yml

@@ -99,7 +99,7 @@ dao_page_text:
   whatText: " <p>Le DAO de Bisq permet le transfert de valeur des traders vers les contributeurs. Le jeton BSQ rend cela possible de manière décentralisée.</p> <p>Les frais de trading sont distribués aux contributeurs sans les restrictions d'une société ou d'une autre entité légale, gardant Bisq apatride et souverain.</p> "
   whatLinkText: En savoir plus sur la DAO
   howTitle: "Comment ça fonctionne?"
-  howText: " <div class=\"subtitle pt-4\"> Répartition des revenus </div>\n<div class=\"small\"> <p> Pour répartir les revenus provenant des frais de trading aux contributeurs, Bisq utilise BSQ - une jeton de couleur basé sur le protocole bitcoin. Les contributeurs reçoivent des BSQ lorsque les parties prenantes approuvent leurs demandes de rémunération par le biais d'un vote, et les BSQ deviennent \" incolore \" lorsque les traders l'utilisent pour payer les frais de trading. </p> <p> Il n'existe pas de structure centralisée de collecte ou de création de BSQ—Les stakeholders de BSQ sont collectivement en charge du processus d'émission.. </p> <p class=\"disclaimer\"> Ce n'est pas une ICO. Aucun BSQ n'est vendu pour lever des fonds. </p> </div>\n\n<div class=\"subtitle pt-3\"> Prise de décision </div>\n<div class=\"small\"> <p> Sans PDG ni équipe de direction centrale,  Les stakeholders de Bisq —traders et contributeurs—sont les propriétaires des Bisq. </p> <p> Au travers d'un consensus social (par le vote), ils déterminent la stratégie de projet de Bisq. </p>\n</div> "
+  howText: " <div class=\"subtitle pt-4\"> Répartition des revenus </div>\n<div class=\"small\"> <p> Pour répartir les revenus provenant des frais de trading aux contributeurs, Bisq utilise BSQ - une jeton de couleur basé sur le protocole Bitcoin. Les contributeurs reçoivent des BSQ lorsque les parties prenantes approuvent leurs demandes de rémunération par le biais d'un vote, et les BSQ deviennent \" incolore \" lorsque les traders l'utilisent pour payer les frais de trading. </p> <p> Il n'existe pas de structure centralisée de collecte ou de création de BSQ—Les stakeholders de BSQ sont collectivement en charge du processus d'émission.. </p> <p class=\"disclaimer\"> Ce n'est pas une ICO. Aucun BSQ n'est vendu pour lever des fonds. </p> </div>\n\n<div class=\"subtitle pt-3\"> Prise de décision </div>\n<div class=\"small\"> <p> Sans PDG ni équipe de direction centrale,  Les stakeholders de Bisq —traders et contributeurs—sont les propriétaires des Bisq. </p> <p> Au travers d'un consensus social (par le vote), ils déterminent la stratégie de projet de Bisq. </p>\n</div> "
   howLinkText: Pour en savoir plus sur la DAO
   benefitsTitle: "Avantages"
   benefitsText: " <div class=\"subtitle\">Traders: Rendez Bisq durable</div> <ul class=\"small pb-5\"> <li>Aidez Bisq à réaliser un développement professionnel et apportez un soutien constant en achetant des BSQ à des contributeurs.</li> <li>Aidez à faire de Bisq une plateforme de référence pour des échanges bitcoin contre fiat et bitcoin contre crypto résistants à la censure</li> <li>Profitez de réductions si vous utilisez des BSQ pour payer vos frais de transaction.</li> <li>Vous pouvez toujours payer les frais de trading simplement en BTC si vous le souhaitez.</li> </ul> <div class=\"subtitle\">Contributeurs: Obtenez des BSQ</div> <ul class=\"small pb-5\"> <li>Effectuez une tâche utile, demander une compensation, obtenez des BSQ</li> <li>Vendre des BSQ sur Bisq contre des BTC</li> <li>Votez pour des demandes de compensation des autres contributeurs</li> <li>Travailler sur une technologie de pointe dans un environnement culturel à la pointe—La collaboration sur Bisq est sans demande de permission, non hiérarchique et fluide</li> </ul>"

_data/languages.yml

@@ -3,28 +3,28 @@
   enabled: No
   accept_languages: ["en", "en-us", "en-au", "en-nz", "en-za", "en-bz", "en-tt"]
   site_name: "Bisq - A decentralized bitcoin exchange network"
-  site_desc: "Bisq is an open-source desktop application that allows you to buy and sell bitcoins in exchange for national currencies, or alternative cryptocurrencies."
+  site_desc: "Bisq is an open-source desktop application that allows you to buy and sell bitcoin in exchange for national currencies, or alternative cryptocurrencies."
   telegram_link: https://t.me/bisq_p2p
 - name: "Deutsch"
   tag: "de"
   enabled: Yes
   accept_languages: ["de"]
   site_name: "Bisq - Der dezentrale Bitcoin Exchange"
-  site_desc: "Bisq ist eine Open-Source-Desktop-Anwendung, die es Ihnen ermöglicht, Bitcoins im Austausch gegen nationale Währungen oder alternative Krypto-Währungen zu kaufen und zu verkaufen."
+  site_desc: "Bisq ist eine Open-Source-Desktop-Anwendung, die es Ihnen ermöglicht, Bitcoin im Austausch gegen nationale Währungen oder alternative Krypto-Währungen zu kaufen und zu verkaufen."
   telegram_link: https://t.me/bisq_p2p
 - name: "Español"
   tag: "es"
   enabled: Yes
   accept_languages: ["es", "es-mx", "es-gt", "es-cr", "es-pa", "es-do", "es-ve", "es-co", "es-pe", "es-ar", "es-ec", "es-cl", "es-uy", "es-py", "es-bo", "es-sv", "es-hn", "es-ni", "es-pr"]
   site_name: "Bisq - A decentralized bitcoin exchange network"
-  site_desc: "Bisq is an open-source desktop application that allows you to buy and sell bitcoins in exchange for national currencies, or alternative cryptocurrencies."
+  site_desc: "Bisq is an open-source desktop application that allows you to buy and sell bitcoin in exchange for national currencies, or alternative cryptocurrencies."
   telegram_link: https://t.me/bisqes
 - name: "Français"
   tag: "fr"
   enabled: Yes
   accept_languages: ["fr", "fr-FR"]
-  site_name: "Bisq - La plateforme d'échange de Bitcoin décentralis"
-  site_desc: "Bisq est une application desktop open-source qui vous permet d'acheter et de vendre des bitcoins contre des devises nationales ou des altcoins."
+  site_name: "Bisq - La plateforme d'échange de bitcoin décentralis"
+  site_desc: "Bisq est une application desktop open-source qui vous permet d'acheter et de vendre des bitcoin contre des devises nationales ou des altcoins."
   telegram_link: https://t.me/bisq_p2p
 - name: "日本語"
   tag: "ja"
@@ -37,8 +37,8 @@
   tag: "pt-PT"
   enabled: Yes
   accept_languages: ["pt", "pt-PT"]
-  site_name: "Bisq - A exchange de Bitcoin descentralizada"
-  site_desc: "Bisq é uma aplicação de desktop open-source que lhe permite comprar e vender bitcoins em troca de moedas nacionais ou altcoin."
+  site_name: "Bisq - A exchange de bitcoin descentralizada"
+  site_desc: "Bisq é uma aplicação de desktop open-source que lhe permite comprar e vender bitcoin em troca de moedas nacionais ou altcoin."
   telegram_link: https://t.me/bisq_p2p
 - name: "简体中文"
   tag: "zh-CN"
@@ -51,8 +51,8 @@
   tag: "pt-BR"
   enabled: Yes
   accept_languages: ["pt-BR"]
-  site_name: "Bisq - A exchange de Bitcoin descentralizada"
-  site_desc: "Bisq é uma aplicação de desktop open-source que lhe permite comprar e vender bitcoins em troca de moedas nacionais ou altcoin."
+  site_name: "Bisq - A exchange de bitcoin descentralizada"
+  site_desc: "Bisq é uma aplicação de desktop open-source que lhe permite comprar e vender bitcoin em troca de moedas nacionais ou altcoin."
   telegram_link: https://t.me/bisqbrasil
 - name: "Русский"
   tag: "ru"

_includes/how_to_update.md

@@ -7,7 +7,7 @@ Example using `pt-BR`
 download translated files
 ----
 go to transifex, get your language and download the files:
-https://www.transifex.com/bisq/bisq-website/ 
+https://www.transifex.com/bisq/bisq-website/
 
 You should end up with 6 files:
 1. `for_use_bisq-website_community_pt_BR.md`
@@ -34,7 +34,7 @@ i.e. copying `pt-PT` as `pt-BR`
 Adapt the headers
 ----
 
-Within the folder you just created, in the markdown files (.md) 
+Within the folder you just created, in the markdown files (.md)
 edit the parts that need changing.
 
 ```
@@ -63,7 +63,7 @@ these are the strings/parameters:
   enabled: No
   accept_languages: ["en", "en-us", "en-au", "en-nz", "en-za", "en-bz", "en-tt"]
   site_name: "Bisq - A decentralized bitcoin exchange network"
-  site_desc: "Bisq is an open-source desktop application that allows you to buy and sell bitcoins in exchange for national currencies, or alternative cryptocurrencies."
+  site_desc: "Bisq is an open-source desktop application that allows you to buy and sell bitcoin in exchange for national currencies, or alternative cryptocurrencies."
 ```
 
 

_posts/2014-12-16-bitsquare-now-in-alpha.md

@@ -12,19 +12,19 @@ If you're reading this, you've probably gathered that Bitsquare is a _decentrali
 
  1. the Bitsquare client: a cross-platform, open source, JVM-based desktop application;
  2. the Bitsquare network: a distributed hash table (DHT) loosely similar to that used in BitTorrent;
- 3. the Bitsquare protocol: a secure approach to trading and arbitration using bitcoin's built-in multi-signature transaction capabilities.
+ 3. the Bitsquare protocol: a secure approach to trading and arbitration using Bitcoin's built-in multi-signature transaction capabilities.
 
-Together, these components form a peer-to-peer system without centralized control and without single points of failure. That's what _decentralized_ means to us, and if that description reminds you of bitcoin itself, that's good, because Bitsquare was designed to reflect bitcoin's own principles and philosophy. Simply put, Bitsquare is built on the idea that individuals should be free to engage in mutually beneficial exchange without sacrificing the privacy of their personal information or the security of the funds being traded.
+Together, these components form a peer-to-peer system without centralized control and without single points of failure. That's what _decentralized_ means to us, and if that description reminds you of Bitcoin itself, that's good, because Bitsquare was designed to reflect Bitcoin's own principles and philosophy. Simply put, Bitsquare is built on the idea that individuals should be free to engage in mutually beneficial exchange without sacrificing the privacy of their personal information or the security of the funds being traded.
 
 One way to think about Bitsquare is to imagine what a [Satoshi Square][3] meeting might look like if it were held online—in fact, that's where the _square_ in Bit_square_ comes from. Satoshi Squares happen all over the world, and they're all about regular people getting together to buy and sell bitcoin in a safe space. And that's what Bitsquare is about too. Our primary goal is not to build a highly sophisticated platform for day traders—it's to build a secure, privacy-respecting, and user-friendly way for everyday people to buy and sell bitcoin from anywhere in the world.
 
-In short, we think the bitcoin ecosystem deserves an exchange option that is as decentralized and robust as bitcoin itself. We hope you do too—and if you do, you probably have many questions about how it all works. The [white paper][4] and [FAQ][5] are great places to start getting those questions answered. We look forward to diving into all the specifics in future blog posts and videos, but don't hesitate to reach out and ask questions directly in the meantime.
+In short, we think the Bitcoin ecosystem deserves an exchange option that is as decentralized and robust as Bitcoin itself. We hope you do too—and if you do, you probably have many questions about how it all works. The [white paper][4] and [FAQ][5] are great places to start getting those questions answered. We look forward to diving into all the specifics in future blog posts and videos, but don't hesitate to reach out and ask questions directly in the meantime.
 
 ### Who is Bitsquare?
 
 The Bitsquare core team is Manfred Karrer, Chris Beams, Steve Myers, Richard Myers and Lloyd Johnson. We've been fortunate to have the help of many other contributors along the way, and we're on the lookout for additional developers and security experts to join us.
 
-Our team members live in the US, Europe and Australia, and have come together to work on Bitsquare out of mutual passion for bitcoin's potential and the belief that decentralized exchanges are a critical infrastructural element currently missing from the bitcoin ecosystem.
+Our team members live in the US, Europe and Australia, and have come together to work on Bitsquare out of mutual passion for Bitcoin's potential and the belief that decentralized exchanges are a critical infrastructural element currently missing from the Bitcoin ecosystem.
 
 We are not—and do not intend to become—incorporated as a business of any kind in any jurisdiction. We're a global group of developers and technologists committed to making Bitsquare's decentralized exchange a reality—nothing more, nothing less. To sustain and accelerate our development efforts, we'll raise money through crowdfunding on a per-milestone basis, starting with our next milestone (v0.2). We'll be announcing complete details soon; in the meantime, feel free to take a look at our [crowdfunding][8] and [governance][9] docs.
 
@@ -36,14 +36,14 @@ As mentioned above, Bitsquare is now in _alpha_ with today's release of version
 
 Sounds pretty good so far, right? Well, here's the _alpha_ part:
 
- - All bitcoin operations take place on the bitcoin [testnet][10] during the alpha phase. This means you can't trade "real" (mainnet) bitcoins yet, and you'll need to get test coins from a [testnet][11] [faucet][12].
+ - All Bitcoin operations take place on the Bitcoin [testnet][10] during the alpha phase. This means you can't trade "real" (mainnet) bitcoin yet, and you'll need to get test coins from a [testnet][11] [faucet][12].
  - Because real bitcoins aren't being traded, no real national currency is traded either. We recommend "simulating" this step of the protocol with your trading partner via chat or email.
  - Because the project is still young, Bitsquare's offer book may be empty at any given time, meaning you may need to seek out a trading partner. You might want to ask a friend or find someone in the [#bitsquare-trading][14] IRC channel.
  - Depending on your network configuration and router equipment, you may have issues connecting to the Bitsquare network. For example, you may need to [configure manual port forwarding][15] on your home router.
 
 There are other limitations as well, but hopefully you get the idea—Bitsquare is working software, but it's _alpha-quality_ working software. You should expect a few bumps, but we hope you'll join us for the ride anyway.
 
-We've published a [roadmap][16] detailing a series of nine milestones on the way to Bitsquare v1.0. Today we're releasing v0.1. The next milestone release will (unsurprisingly) be v0.2, and so on. Bitsquare will keep its _alpha_ designation for as many milestones as necessary until it becomes reasonable to begin testing small trades on the bitcoin mainnet. At that point, we'll announce that Bitsquare is in _beta_, and of course this will mean the start of real national currency trading as well.
+We've published a [roadmap][16] detailing a series of nine milestones on the way to Bitsquare v1.0. Today we're releasing v0.1. The next milestone release will (unsurprisingly) be v0.2, and so on. Bitsquare will keep its _alpha_ designation for as many milestones as necessary until it becomes reasonable to begin testing small trades on the Bitcoin mainnet. At that point, we'll announce that Bitsquare is in _beta_, and of course this will mean the start of real national currency trading as well.
 
 Bitsquare will exit _beta_ with the release of v1.0, which we're setting a high bar for. To us, v1.0 means that users must be able to expect with a high degree of certainty that their information and funds are safe under any condition or failure mode, and that in the case of a dispute or misunderstanding, Bitsquare's decentralized arbitration system is standing by to help. The release of v1.0 will also carry with it [certain guarantees][17] about interoperability and compatibility with subsequent versions of the software.