Merge branch 'portuguese-translation' into portuguese-translation

Author: KoreaComK

05_2_Resending_a_Transaction_with_RBF.md

@@ -2,7 +2,7 @@
 
 If your Bitcoin transaction is stuck, and you're the sender, you can resend it using RBF (replace-by-fee). However, that's not all that RBF can do: it's generally a powerful and multipurpose feature that allows Bitcoin senders to recreate transactions for a variety of reasons.
 
-> :warning: **VERSION WARNING:** This is an innovation from Bitcoin Core v 0.12.0,that reached full maturity in the Bitcoin Core wallet with Bitcoin Core v 0.14.0. Obviously, most people should be using it by now.
+> :warning: **VERSION WARNING:** This is an innovation from Bitcoin Core v 0.12.0, that reached full maturity in the Bitcoin Core wallet with Bitcoin Core v 0.14.0. Obviously, most people should be using it by now.
 
 ## Opt-In for RBF
 

09_2_Running_a_Bitcoin_Script.md

@@ -12,7 +12,7 @@ Bitcoin Scripts are run from left to right. That sounds easy enough, because it'
 
 For example, if you were adding together "1" and "2", your Bitcoin Script for that would be `1 2 OP_ADD`, _not_ "1 + 2". Since we know that OP_ADD operator takes two inputs, we know that the two inputs before it are its operands.
 
-> :warning: **WARNING:** Technically, everything in Bitcoin Script is an opcode, thus it would be most appropriate to record the above example as `OP_1 OP_2 OP_ADD`. In our examples, we don't worry about how the constants will be evaluated, as that's a topic of translation, as is explained in [§8.2: Building the Structure of P2SH](08_2_Building_the_Structure_of_P2SH.md). Some writers prefer to also leave the "OP" prefix off all operators, but we have opted not to.
+> :warning: **WARNING:** Technically, everything in Bitcoin Script is an opcode, thus it would be most appropriate to record the above example as `OP_1 OP_2 OP_ADD`. In our examples, we don't worry about how the constants will be evaluated, as that's a topic of translation, as is explained in [§8.2: Building the Structure of P2SH](10_2_Building_the_Structure_of_P2SH.md). Some writers prefer to also leave the "OP" prefix off all operators, but we have opted not to.
 
 ### Understand the Stack
 

17_2_Accessing_Bitcoind_with_Java.md

@@ -273,7 +273,7 @@ You now can sign transaction with the method `signRawTransactionWithKey`. This m
 Finally, sending requires the `sendRawTransaction` command:
 ```java
 String sentRawTransactionID = rpcClient.sendRawTransaction(srTx.hex());
-System.out.println("Sent signedRawTx (txID): " + sentRawTransactionID);```
+System.out.println("Sent signedRawTx (txID): " + sentRawTransactionID);
 ```
 
 ### Run Your Code

Chapter_word_counts.ipynb

@@ -0,0 +1,109 @@
+## Translatable word counts by chapter
+
+Ignores code blocks and other non-translatable characters
+
+Chapter|Word Count
+---|---
+01_0_Introduction.md|1144
+01_1_Introducing_Bitcoin.md|2735
+02_0_Setting_Up_a_Bitcoin-Core_VPS.md|226
+02_1_Setting_Up_a_Bitcoin-Core_VPS_with_StackScript.md|2746
+02_2_Setting_Up_Bitcoin_Core_Other.md|254
+03_0_Understanding_Your_Bitcoin_Setup.md|248
+03_1_Verifying_Your_Bitcoin_Setup.md|773
+03_2_Knowing_Your_Bitcoin_Setup.md|517
+03_3_Setting_Up_Your_Wallet.md|1699
+03_3__Interlude_Using_Command-Line_Variables.md|347
+03_4_Receiving_a_Transaction.md|1479
+03_5_Understanding_the_Descriptor.md|1349
+04_0_Sending_Bitcoin_Transactions.md|176
+04_1_Sending_Coins_The_Easy_Way.md|1195
+04_2_Creating_a_Raw_Transaction.md|1720
+04_2__Interlude_Using_JQ.md|1956
+04_3_Creating_a_Raw_Transaction_with_Named_Arguments.md|413
+04_4_Sending_Coins_with_a_Raw_Transaction.md|1024
+04_4__Interlude_Using_Curl.md|1643
+04_5_Sending_Coins_with_Automated_Raw_Transactions.md|614
+04_6_Creating_a_Segwit_Transaction.md|1172
+05_0_Controlling_Bitcoin_Transactions.md|149
+05_1_Watching_for_Stuck_Transactions.md|595
+05_2_Resending_a_Transaction_with_RBF.md|1372
+05_3_Funding_a_Transaction_with_CPFP.md|827
+06_0_Expanding_Bitcoin_Transactions_Multisigs.md|155
+06_1_Sending_a_Transaction_to_a_Multisig.md|1764
+06_2_Spending_a_Transaction_to_a_Multisig.md|1079
+06_3_Sending_an_Automated_Multisig.md|613
+07_0_Expanding_Bitcoin_Transactions_PSBTs.md|169
+07_1_Creating_a_Partially_Signed_Bitcoin_Transaction.md|1470
+07_2_Using_a_Partially_Signed_Bitcoin_Transaction.md|1393
+07_3_Integrating_with_Hardware_Wallets.md|2150
+08_0_Expanding_Bitcoin_Transactions_Other.md|139
+08_1_Sending_a_Transaction_with_a_Locktime.md|1483
+08_2_Sending_a_Transaction_with_Data.md|580
+09_0_Introducing_Bitcoin_Scripts.md|196
+09_1_Understanding_the_Foundation_of_Transactions.md|989
+09_2_Running_a_Bitcoin_Script.md|863
+09_3_Testing_a_Bitcoin_Script.md|1000
+09_4_Scripting_a_P2PKH.md|838
+09_5_Scripting_a_P2WPKH.md|845
+10_0_Embedding_Bitcoin_Scripts_in_P2SH_Transactions.md|170
+10_1_Understanding_the_Foundation_of_P2SH.md|1164
+10_2_Building_the_Structure_of_P2SH.md|1284
+10_3_Running_a_Bitcoin_Script_with_P2SH.md|323
+10_4_Scripting_a_Multisig.md|1016
+10_5_Scripting_a_Segwit_Script.md|750
+10_6_Spending_a_P2SH_Transaction.md|384
+11_0_Empowering_Timelock_with_Bitcoin_Scripts.md|108
+11_1_Understanding_Timelock_Options.md|557
+11_2_Using_CLTV_in_Scripts.md|1197
+11_3_Using_CSV_in_Scripts.md|1470
+12_0_Expanding_Bitcoin_Scripts.md|99
+12_1_Using_Script_Conditionals.md|1120
+12_2_Using_Other_Script_Commands.md|407
+13_0_Designing_Real_Bitcoin_Scripts.md|116
+13_1_Writing_Puzzle_Scripts.md|998
+13_2_Writing_Complex_Multisig_Scripts.md|996
+13_3_Empowering_Bitcoin_with_Scripts.md|1467
+14_0_Using_Tor.md|116
+14_1_Verifying_Your_Tor_Setup.md|1568
+14_2_Changing_Your_Bitcoin_Hidden_Services.md|434
+14_3_Adding_SSH_Hidden_Services.md|330
+15_0_Talking_to_Bitcoind.md|254
+15_1_Accessing_Bitcoind_with_C.md|1238
+15_2_Programming_Bitcoind_with_C.md|1427
+15_3_Receiving_Bitcoind_Notifications_with_C.md|650
+16_0_Programming_with_Libwally.md|333
+16_1_Setting_Up_Libwally.md|559
+16_2_Using_BIP39_in_Libwally.md|939
+16_3_Using_BIP32_in_Libwally.md|959
+16_4_Using_PSBTs_in_Libwally.md|989
+16_5_Using_Scripts_in_Libwally.md|785
+16_6_Using_Other_Functions_in_Libwally.md|655
+16_7_Integrating_Libwally_and_Bitcoin-CLI.md|1380
+17_0_Talking_to_Bitcoind_Other.md|286
+17_1_Accessing_Bitcoind_with_Go.md|547
+17_2_Accessing_Bitcoind_with_Java.md|821
+17_3_Accessing_Bitcoind_with_NodeJS.md|393
+17_4_Accessing_Bitcoind_with_Python.md|1158
+17_5_Accessing_Bitcoind_with_Rust.md|829
+17_6_Accessing_Bitcoind_with_Swift.md|1503
+18_0_Understanding_Your_Lightning_Setup.md|192
+18_1_Verifying_Your_Lightning_Setup.md|1294
+18_2_Knowing_Your_lightning_Setup.md|399
+18_2__Interlude_Accessing_a_Second_Lightning_Node.md|886
+18_3_Setting_Up_a_Channel.md|1173
+19_0_Using_Lightning.md|146
+19_1_Generate_a_Payment_Request.md|968
+19_2_Paying_a_Invoice.md|604
+19_3_Closing_a_Channel.md|848
+19_4_Lightning_Network_Review.md|626
+A0_Appendices.md|112
+A1_0_Understanding_Bitcoin_Standup.md|420
+A2_0_Compiling_Bitcoin_from_Source.md|412
+A3_0_Using_Bitcoin_Regtest.md|980
+CLA.md|495
+CONTRIBUTING.md|529
+LICENSE-CC-BY-4.0.md|2716
+README.md|1705
+TRANSLATING.md|686
+TOTAL|89069

Chapter_word_counts.md

@@ -9,6 +9,13 @@ Learning Bitcoin from the Command Line is a tutorial for working with Bitcoin (a
 
 _This tutorial assumes that you have some minimal background of how to use the command line interface. If not, there are many tutorials available, and I have one for Mac users at https://github.com/ChristopherA/intro-mac-command-line._
 
+## Translations
+
+* [Portuguese](https://github.com/BlockchainCommons/Learning-Bitcoin-from-the-Command-Line/tree/portuguese-translation/pt) — in process
+* [Spanish](https://github.com/BlockchainCommons/Learning-Bitcoin-from-the-Command-Line/tree/spanish-translation/es) - in process
+
+If you'd like to make your own translation, please see [Contributing](https://github.com/BlockchainCommons/Learning-Bitcoin-from-the-Command-Line/tree/master#contributing), below.
+
 ## Table of Contents
 
 ### PART ONE: PREPARING FOR BITCOIN

README.md

@@ -9,21 +9,28 @@ Thank you for your interest in translating Learning Bitcoin from the Command Lin
    * Choose a [Release](https://github.com/BlockchainCommons/Learning-Bitcoin-from-the-Command-Line/releases) as the basis of your translation. We generally suggest the latest release. This will ensure the consistency of all the files in your translation, will insulate you from any changes we make, and will make it easy to see what has changed when we create a new release. 
    * If it looks like there hasn't been a new Release in a while, file an Issue saying you're interested in starting a new translation, and asking if it would make sense for there to be a new Release milestone before you do so. If there's been anything notable, and we're not in the middle of things, we'll likely create a new patch or minor version. If we're in the middle of things, we'll just suggest you use the previous Release.
    * Label your table of contents and each chapter or section with the release used.
-1. **Create a Branch.**
-   * All work should be done in a branch, with work being submitted to the `master` branch as PRs.
-1. **Create a Directory.**
-   * Create a top-level directory for your complete translation using the [ISO 639-1 language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes), for example `es` (Spanish), `fr` (French), or `pt` (Portuguese).
+1. **Request a Branch.**
+   * File an [Issue](https://github.com/BlockchainCommons/Learning-Bitcoin-from-the-Command-Line/issues) requesting a new branch for your translation
+   * This will be the master place for us to collect work on the translation over time.
+   * We will create a top-level directory for your complete translation using the [ISO 639-1 language code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes), for example `es` (Spanish), `fr` (French), or `pt` (Portuguese). Work should be done in that directory.
+1. **Fork the Branch.**
+   * Once we've created a translation branch, you'll then want to fork that into your own GitHub account.
+   * Generally, we suggest that you create one working fork for each separate chapter. This will allow you to work through the process of write/review/revise for each individual chapter without it getting tangled up with your new content for future chapters, and will allow us to merge the chapters as they're completed, which is our preference, and will help everyone to keep track of where things our.
 1. **Submit PRs a Chapter at a Time.**
-   * Submit your PRs for the translation in batches of no more than a single chapter at a time.
+   * Submit your PRs for the translation from your working fork to our translation branch in batches of no more than a single chapter at a time.
    * Submit in smaller batches if it makes sense, for example because different people are writing different sections.
+   * Again, we suggest that there be a fork for each chapter, so when you submit your PR for one chapter, you'll usually then create a fork for the next chapter.
 1. **Request Approval from a Native Speaker.**
    * No one can ever do a great edit of their own work, so we require each section to be approved by someone other than the original translator.
    * This fundamentally means that any translation team _should_ contain at least two members, either one translator and one editor or else two people who trade off roles of translator and editor. If your team doesn't have a second member, we can put out a call for an editor/approver when you submit a PR, but it's possible that we won't be able to find one, and your hard work will languish, so it's s better to have one up front.
 1. **Request Approval from the Blockchain Commons Team.**
    * Once a chapter or section has been approved by a native speaker, request approval from someone on the Blockchain Commons team: currently [@shannona](https://github.com/shannona).
 1. **Continue!**
    * Continue through the process, no more than one chapter at a time, until you have a full book.
-   * Be aware of the scope of the overall project. As of v2.01, Learning Bitcoin from the Command Line is 120,000 words in length. As a book, that'd be 250-400 pages, depending on the format and layout. (About 80,000 words of that is text to translate, with the remainder being code.) You want to make sure you have the time for that level of commitment before getting started.
+   * Be aware of the scope of the overall project. As of v2.01, Learning Bitcoin from the Command Line is 120,000 words in length. As a book, that'd be 250-400 pages, depending on the format and layout. (About 90,000 words of that is text to translate, with the remainder being code.) You want to make sure you have the time for that level of commitment before getting started.
+1. **Let Us Know When You're Done.**
+   * When you've completed your translation, file an issue to let us know that the translation branch is ready to be merged into the master.
+   * This will also let us know to announce the completed translation and link it into the master README
 1. **Update Your Translation with New Releases**
    * It is our hope that translations will stay up to day with new releases, particularly major and minor releases, which are likely to include new content and updates. Currently, these only occur ever few years
    * If you have decided to stop updating a translation, please let us know in an Issue, so that we can let the community know that we are looking for a new translator to continue updating a translation.