Merge remote-tracking branch 'origin/master' into bounties

data/i18n/en.yaml

@@ -72,6 +72,7 @@ learn:
   art: Art in the Internet Age
   essay: Read the Essay
   exchange: Bittrex Exchange
+  exchange2: Poloniex Exchange
   explore: Explore
   explorer: Block Explorer
   how: Learn how LBRY will forever improve how we create and share with one another.
@@ -231,4 +232,4 @@ title:
   learn: Learn About LBRY
   publish: Publish
   refer: Share and Earn
-  what: "Art in the Internet Age: An Introduction to LBRY"
+  what: "Art in the Internet Age: An Introduction to LBRY"

posts/faq/claimtrie-implementation.md

@@ -15,9 +15,10 @@ Bids to claim a name must win out against other claims for the same name, before
 4. *Claim Id* : A unique ID used to identify the bid. 
 
 There are also three different bid types : claim, update, and support.
+
 1. *Claim*: A claim represent new bids for a name. If a user want to make a claim to a brand new name, or submit a competing claim to an existing name, this bid type is used.
 2. *Support*: A support adds to the total quantity of credits assigned to any bid by referring to a bid's Claim Id. A support bid can be made by anyone on any bid. It does not have its own Value or its own Claim Id, but it does contain the Claim Id of the bid that it is supporting. 
-3. *Update*:  An update modifies the value and the quantity for a pre-existing claim without changing the Claim Id or the name that it is bidding on. Since the Claim Id of the original bid is not changed, an updated bid will still retain all the supports attached to the original bid. 
+3. *Update*:  An update can modify the value and the quantity for a pre-existing claim without changing the Claim Id or the name that it is bidding on. Since the Claim Id of the original bid is not changed, an updated bid will still retain all the supports attached to the original bid. 
 
 
 ## ClaimTrie Bid States
@@ -36,14 +37,13 @@ This section describes how bids are processed by the ClaimTrie in order to deter
     * The bid’s Claim Id matches the Claim Id of the bid which was the controlling bid immediately before the block containing this bid was included in the blockchain. In other words, it is either an update to the previous controlling bid, or an update to an update to the previous controlling bid if the bid was updated twice in this block, etc
 
 4. *Controlling*: This bid currently controls the name. When clients ask which bid controls the name as of the current block, this is the bid that will be returned. Must be in the “active” state and only one bid for any name may be in this state. A support can not be in the “controlling” state. To determine which “active” bid is the “controlling” bid for each name:
-    * Add the value of each ‘active’ bid to the value of all ‘active’ supports for that bid, and take whichever is greatest.
+    * Add the quantity of each ‘active’ bid to the quantity of all ‘active’ supports for that bid, and take whichever is greatest. If two bids have the same quantity, older bids take precedence over newer bids.
 	
     * If the bid with the greatest amount does not have the same claimID as the bid which was ‘controlling’ prior to including the current block, change the delay for the name as of the current block to 0, redetermine which bids and supports should be active, and then perform the previous calculation again.
 
     * At this point, the bid calculated to have the greatest amount behind it is the ‘controlling’ bid as of this block
-5. *Spent*: A transaction has been included in the blockchain which spends the txout which contains the bid
-	Must be in the ‘accepted’ state
-6. *Expired*: All bids ‘expire’ regardless of what state they are in when the current block height exceeds the height of the block at which the bid was accepted plus 52416 blocks, or 91 days ( currently this is set to 262974 blocks, or 456 days, which will be fixed in a future hard fork ).
+5. *Spent*: A transaction has been included in the blockchain which spends the txout which contains the bid. Must be in the ‘accepted’ state.
+6. *Expired*: All bids ‘expire’ regardless of what state they are in when the current block height exceeds the height of the block at which the bid was accepted plus 52416 blocks, or 91 days ( currently this is set to 262974 blocks, or 456 days, which will be fixed in a future hard fork ). Updated claims will restart the expiration timer at the block height of the update.  
 
 
 ## ClaimTrie Transaction Implementation 

posts/news/45-lbry-blockchain-live-mine-lbc-now.md

@@ -13,7 +13,8 @@ LBRY’s genesis block contains 400 million LBC that are reserved for LBRY devel
 * 10% for organizations, charities, and other strategic partners. Organizations like the EFF, ACLU, and others that have fought for digital rights and the security and freedom of the internet.
 * 20% for adoption programs. We’ll be giving out lots of bonus credits, especially in the early days of LBRY, in order to encourage participation. We will also look to award credits broadly, ensuring the marketplace is egalitarian.
 * 10% for LBRY, for operational costs as well as profit.
-* 60% for YOU! These remaining LBC are for the LBRY community to mine!
+
+The final 60% is waiting for YOU! These remaining LBC don't yet exist and can be mined by anyone. You can see [how much has already been mined here](https://explorer.lbry.io/).
 
 Eventually 1,000,000,000 LBC will exist, according to a defined schedule over 20 years. The schedule decays exponentially, with around 100,000,000 mineable in the first year.
 

posts/news/53-publish-tools-live-earn-1000-dollars.md

@@ -0,0 +1,34 @@
+---
+author: lbry
+title: 'You Can Now Publish on LBRY (& Earn $1,000)'
+date: '2016-08-04 00:09:00'
+---
+**Today, we released a new version of LBRY beta with tools to publish your own original content!**
+
+![LBRY’s content publishing tools](/img/news/publish.png)
+
+Now anyone with access to LBRY beta can reserve [LBRY names](https://lbry.io/what#naming) and publish their own original, digital content. 
+
+We’ve *finally* come around and have to admit that LBRY has the potential to be much more than the world’s most efficient [media player of *It’s a Wonderful Life*](https://lbry.io/news/our-christmas-surprise).
+
+First, we launched with [*It’s a Disaster*](lbry://itsadisaster) and [*Fight of the Century: Keynes vs. Hayek Rap Battle*](lbry://keynesvhayek). That was pretty cool, and we’re stoked to be the first protocol in the world to stream a Hollywood feature film via blockchain.
+
+Then July happened.
+
+The whirlwind of growth over the past few weeks has left our team floored by the response to our [beta release](https://lbry.io/news/beta-live-declare-independence-big-media). We have a waiting list of over 100,000 future LBRYians standing by for their opportunity tell the mainstream media middlemen to take a hike. 
+
+And now LBRY beta users can do just that…
+
+When you open LBRY, you will also notice 3 areas on the homescreen displaying LBRY’s current featured content. These areas correspond to the LBRY names “One”, “Two”, and “Three” (lbry://one, etc.). Anyone can bid for those names and get your content featured on LBRY’s opening screen!
+
+The true power of LBRY is allowing creators to connect directly to their audience. So what are you waiting for? Go do it!
+
+Oh… you don’t have an invite yet? Avoid waiting longer than you have to by [joining the beta waiting list now](https://lbry.io/get). 
+
+**Plus, we’ve got another little secret…**
+
+If you're a content creator, you can submit your original work to us for a chance to jump the waiting list (100K strong and growing). Our goal is to turn LBRY into a one-stop-shop of the best original content available on the internet. So we want to reward those who are interested in using LBRY as it is meant to be used.
+
+**And we’re serious about the reward part. Accepted partners receive $1,000 in LBC.** 
+
+[Read more about this program and sign up here](https://lbry.io/publish). 

posts/press-kit.md

@@ -7,7 +7,7 @@ Mike Vine, LBRY Evangelist<br/>
 
 LBRY’s goal: Every film, song, book & game ever made – accessible anywhere.
 
-LBRY uses blockchain technology to provide a new way for people to publish and share content with each other – with no corporate middleman. It is a decentralized, censorship-resistant, open-source, peer-to-peer information marketplace and discovery protocol. LBRY was incorporated in 2015 by Jeremy Kauffman, and the team has expanded steadily since then. An alpha client was released in late October 2015, and an invite-only beta client will be released imminently. LBRY is powered by its own cryptocoin, LBRY Credits (similar to Bitcoin), which began being mined on June 27th, 2016.
+LBRY uses blockchain technology to provide a new way for people to publish and share content with each other – with no corporate middleman. It is a decentralized, censorship-resistant, open-source, peer-to-peer information marketplace and discovery protocol. LBRY was incorporated in 2015 by Jeremy Kauffman, and the team has expanded steadily since then. An alpha client was released in late October 2015, and an invite-only beta client was released on July 4th, 2016. LBRY is powered by its own cryptocoin, LBRY Credits (similar to Bitcoin), which began being mined on June 27th, 2016.
 
 ###FAQ
 
@@ -17,7 +17,7 @@ LBRY uses blockchain technology to provide a new way for people to publish and s
 
 ### Media Mentions
 
-- [LBRY and decentralised apps - an interview with Jeremy Kauffman](http://goodtechnologyproject.org/blog/2016/02/07/lbry-and-decentralised-apps-an-interview-with-jeremy-kauffman/), **Good Technology Project, February 2016]**
+- [LBRY and decentralised apps - an interview with Jeremy Kauffman](http://goodtechnologyproject.org/blog/2016/02/07/lbry-and-decentralised-apps-an-interview-with-jeremy-kauffman/), **Good Technology Project, February 2016**
 - [The Appcoin Revolution: Interview with Mike Vine of LBRY](http://cointelegraph.com/news/the-appcoin-revolution-interview-with-mike-vine-of-lbry), **CoinTelegraph, February 2016**
 - [Alexandria vs LBRY - Which will be the file sharing application of the next generation?](http://bravenewcoin.com/news/alexandria-vs-lbry-which-will-be-the-file-sharing-application-of-the-next-generation/), **BraveNewCoin, December 2015**
 - [LBRY: The Lovechild of Bitcoin, BitTorrent & Storj](http://cointelegraph.com/news/lbry-the-lovechild-of-bitcoin-bittorrent-storj), **CoinTelegraph, October 2015**
@@ -30,3 +30,4 @@ LBRY uses blockchain technology to provide a new way for people to publish and s
 - Twitter: [https://twitter.com/lbryio](https://twitter.com/lbryio)
 - Reddit: [https://www.reddit.com/r/lbry](https://www.reddit.com/r/lbry)
 - Mailing List: [https://lbry.io/join-list](https://lbry.io/join-list) - **Sign up to follow along as we build LBRY**
+- Slack: [https://slack.lbry.io](https://slack.lbry.io) - **Get your questions answered and become a LBRYian**

view/template/mail/_joinList.php

@@ -15,7 +15,7 @@
       <input type="hidden" name="returnUrl" value="<?php echo $returnUrl ?>"/>
       <input type="hidden" name="listId" value="<?php echo $listId ?>"/>
       <input type="hidden" name="listSig" value="<?php echo $listSig ?>"/>
-      <input type="email" value="" name="email" class="required email standard" placeholder= "__('email.placeholder')">
+      <input type="email" value="" name="email" class="required email standard" placeholder= "<?php echo __('email.placeholder') ?>">
       <input type="submit" value="<?php echo isset($submitLabel) ? $submitLabel : __('email.subs') ?>" name="subscribe" id="mc-embedded-subscribe" class="<?php echo $btnClass ?>">
       <?php if (isset($fbEvent)): ?>
         <input type="hidden" name="fbEvent" value="<?php echo $fbEvent ?>" />

view/template/page/learn.php

@@ -32,6 +32,9 @@
               <div class="spacer1">
                 <a href="https://bittrex.com/Market/Index?MarketName=BTC-LBC" class="link-primary">{{learn.exchange}}</a>
               </div>
+              <div class="spacer1">
+                <a href="https://poloniex.com/exchange#btc_lbc" class="link-primary">{{learn.exchange2}}</a>
+              </div>
             </div>
             <div class="span6">
               <h3>{{learn.nerd}}</h3>