Join GitHub today
GitHub is home to over 20 million developers working together to host and review code, manage projects, and build software together.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
Already on GitHub? Sign in to your account
Improve grammar in English translation #1630
Conversation
harding
reviewed
Jun 15, 2017
LGTM. I left a few suggestions, but I don't consider any of them to be blocking.
Strings for two wallets (Bitcoin Core and Airbitz) are changed. I CC'd our Airbitz contact for his review on the change to his wallet text; I suggest we wait for his ACK or at least for a few extra days before scheduling a merge in case he has any comments.
| @@ -169,14 +169,14 @@ | ||
| walletcatdesktop: "Desktop" | ||
| 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." | ||
| + 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 than other clients and takes a lot of space and memory." |
harding
Jun 15, 2017
Contributor
This edit LGTM, but I think we should probably update the Bitcoin Core description in a separate PR. Specifically, I don't think we should say that it has fewer features than other wallets (it has features other wallets lack, and it lacks features other wallets have) and I think with the introduction of the space-limited mempool a few releases back, it's memory issues are under control (with default settings, it uses less memory here than Firefox with one tab opened to this page on GitHub).
gene1wood
Jun 17, 2017
Sounds fine to me. I'll leave this one as is and someone who knows about the tech can write the PR you describe (I'm no bitcoin expert, just a native English speaker)
| walletbitcoinknots: "Bitcoin Knots is a full Bitcoin client and builds the backbone of the network. It offers high levels of security, privacy, and stability. It includes more advanced features than Bitcoin Core, but they are not as well-tested. It uses a lot of space and memory." | ||
| 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." | ||
| 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." | ||
| walletelectrum: "Electrum's focus is speed and simplicity, with low resource usage. It uses remote servers that handle the most complicated parts of the Bitcoin system, and it allows you to recover your wallet from a secret phrase." | ||
| walletmsigna: "mSIGNA is an advanced yet easy-to-use wallet featuring speed and simplicity, enterprise-level scalability, and strong security. It supports BIP32, multisignature transactions, offline storage, multidevice synchronization, and encrypted electronic and paper backups." | ||
| walletbitcoinwallet: "Bitcoin Wallet is easy to use and reliable, while also being secure and fast. Its vision is de-centralization and zero trust; no central service is needed for Bitcoin-related operations. The app is a good choice for non-technical people." | ||
| - walletairbitzwallet: "Airbitz is a mobile Bitcoin Wallet making high levels of privacy, security, and decentralization very familiar and usable to the masses. Airbitz wallets are always automatically encrypted, backed up, and even function when Airbitz servers go down." | ||
| + walletairbitzwallet: "Airbitz is a mobile Bitcoin Wallet providing high levels of privacy, security, and decentralization. Airbitz wallets are always automatically encrypted, backed up, and even function when Airbitz servers are down." |
| informbut: "Read more" | ||
| choose: "Choose your wallet" | ||
| - choosetxt: "You can bring a Bitcoin wallet in your everyday life with your mobile or you can have a wallet only for online payments on your computer. In any case, choosing your wallet can be done in a minute." | ||
| + choosetxt: "You can carry a Bitcoin wallet with you in your everyday life using your mobile phone or you can have a wallet, used only for online payments, on your computer. In either case, choosing your wallet can be done in minutes." |
harding
Jun 15, 2017
Contributor
Maybe use device instead of phone, since many (all?) of our mobile wallets are tablet-compatible.
harding
Jun 15, 2017
Contributor
Nitpick. I think the parenthetical ", used only for online payments," sticks out. Maybe rephrase to, "or you can focus on web payments with a wallet on your computer."
| @@ -684,7 +684,7 @@ | ||
| privacytxt11: "We may update this privacy policy from time to time. We will notify you of any changes by posting the new privacy policy on the Site. You are advised to review this privacy policy periodically for any changes." | ||
| privacytxt12: "This Privacy Policy was last updated" | ||
| privacycontactus: "Contact Us" | ||
| - privacytxt13: "If you have any questions about our privacy policy, or how your data is being collected and processed, please e-mail <a href=\"mailto:privacy@bitcoin.org?Subject=Privacy\">privacy@bitcoin.org</a>." | ||
| + privacytxt13: "If you have any questions about our privacy policy, or how your data is being collected and processed, please e-mail <a href=\"mailto:privacy@bitcoin.org?Subject=Privacy\">privacy@bitcoin.org</a>." |
harding
Jun 15, 2017
Contributor
The English file is the base for our other translations, so any line that changes has to be re-translated. Changing just whitespace, thus, is something we try to avoid. (Usually, though, we would appreciate the removal of unnecessary whitespace, so thank you for trying.)
gene1wood
Jun 17, 2017
•
Whoops, ya, I'll fix this, looks like my IDE actually deleted that trailing whitespace. I'll put it back.
| secure: "Securing your wallet" | ||
| - securetxt: "Like in real life, your wallet must be secured. Bitcoin makes it possible to transfer value anywhere in a very easy way and it allows you to be in control of your money. Such great features also come with great security concerns. At the same time, Bitcoin can provide very high levels of security if used correctly. Always remember that it is your responsibility to adopt good practices in order to protect your money. <a href=\"#secure-your-wallet#\"><b>Read more about securing your wallet</b></a>." | ||
| + securetxt: "Just like in real life, your bitcoin wallet must be secured. Bitcoin makes it possible to transfer value anywhere and control your money very easily. This ease of use brings with it necessary security concerns. Bitcoin can provide very high levels of security if used correctly. Always remember that it is your responsibility to adopt good practices in order to protect your money. <a href=\"#secure-your-wallet#\"><b>Read more about securing your wallet</b></a>." |
harding
Jun 15, 2017
Contributor
Nitpick. I think this rephrasing comes off as a bit jagged with a bunch of short sentences and no transitions. It's fine in my opinion, but feel free to rephrase it entirely if you want.
| volatile: "Bitcoin price is volatile" | ||
| - volatiletxt: "The price of a bitcoin can unpredictably increase or decrease over a short period of time due to its young economy, novel nature, and sometimes illiquid markets. Consequently, keeping your savings with Bitcoin is not recommended at this point. Bitcoin should be seen like a high risk asset, and you should never store money that you cannot afford to lose with Bitcoin. If you receive payments with Bitcoin, many service providers can convert them to your local currency." | ||
| + volatiletxt: "The price of a bitcoin can unpredictably increase or decrease over a short period of time due to it being a young economy, it's novel nature, and infrequent market illiquidity. Consequently, keeping your savings in Bitcoin is not recommended at this point. Bitcoin should be seen like a high risk asset, and you should never store money that you cannot afford to lose with Bitcoin. If you receive payments with Bitcoin, many service providers can convert them to your local currency." |
harding
Jun 15, 2017
Contributor
"it's" is wrongly apostrophized here. Suggestion: "due to Bitcoin's young economy, novel nature, and limited liquidity."
| @@ -844,7 +844,7 @@ | ||
| high_value_minimum: "Minimum recommendation for high-value bitcoin transfers" | ||
| alert_recommendation: "Recommendation during <a href=\"/en/alerts\">emergencies</a> to allow human intervention" | ||
| experimental: "Bitcoin is still experimental" | ||
| - experimentaltxt: "Bitcoin is an experimental new currency that is in active development. Each improvement makes Bitcoin more appealing but also reveals new challenges as Bitcoin adoption grows. During these growing pains you might encounter increased fees, slower confirmations, or even more severe issues. Be prepared for problems and consult a technical expert before making any major investments, but keep in mind that nobody can predict Bitcoin's future." | ||
| + experimentaltxt: "Bitcoin is a new experimental currency that is in active development. Each improvement makes Bitcoin more appealing but also reveals new challenges as Bitcoin adoption grows. During this period of growing pains you might encounter increased fees, slower confirmations, or even more severe issues. Be prepared for problems and consult a technical expert before making any major investments, and keep in mind that nobody can predict Bitcoin's future." |
harding
Jun 15, 2017
Contributor
Nitpick. I prefer starting the final independent clause with "but" as it seems to more clearly confer the idea that experts are not oracles.
gene1wood
commented
Jun 15, 2017
|
@harding Thanks for the review! I'll implement your suggestions on this PR shortly. |
gene1wood
commented
Jun 17, 2017
|
@harding I've added a commit with your suggestions. Please review and take special note of |
wbnns
self-assigned this
Jun 18, 2017
wbnns
requested changes
Jun 18, 2017
@gene1wood Hi there! Thanks for working on this. I just submitted two additional change requests. Aside from that, I yield to @harding on anything else he recommends alongside what he had previously been reviewing.
| @@ -825,9 +825,9 @@ | ||
| pagetitle: "Some things you need to know" | ||
| summary: "If you are about to explore using Bitcoin, there are a few things you should know. Bitcoin lets you exchange money in a different way than you would with a bank. As such, you should take time to educate yourself before using Bitcoin for any serious transaction. Bitcoin should be treated with the same care as your regular wallet, or even more in some cases!" | ||
| secure: "Securing your wallet" | ||
| - securetxt: "Just like in real life, your bitcoin wallet must be secured. Bitcoin makes it possible to transfer value anywhere and control your money very easily. This ease of use brings with it necessary security concerns. Bitcoin can provide very high levels of security if used correctly. Always remember that it is your responsibility to adopt good practices in order to protect your money. <a href=\"#secure-your-wallet#\"><b>Read more about securing your wallet</b></a>." | ||
| + securetxt: "Bitcoin is more similar to cash than to a credit or bank card in regards to the finality of a transfer of money. If a thief uses your credit card fraudulently, you can tyipcally recover the money from your credit card provider. With Bitcoin, just like with cash, there's no way to revert a transfer of money so make sure that you understand that it is your responsibility to adopt good security practices in order to protect your Bitcoin. <a href=\"#secure-your-wallet#\"><b>Read more about securing your wallet</b></a>." |
wbnns
Jun 18, 2017
Contributor
Let's leave this string as-is. The original version should be sufficient for now.
| @@ -543,16 +543,16 @@ | ||
| pagedesc: "Using Bitcoin to pay and get paid is easy and accessible to everyone." | ||
| users: "How to use Bitcoin" | ||
| inform: "Inform yourself" | ||
| - informtxt: "Bitcoin is different than what you know and use every day. Before you start using Bitcoin, there are a few things that you need to know in order to use it securely and avoid common pitfalls." | ||
| + informtxt: "Bitcoin is different than what you know and use every day to make payments. Before you start using Bitcoin, there are a few things that you need to know in order to use it securely and avoid common pitfalls." |
wbnns
Jun 18, 2017
Contributor
Let's strike this change, because we can't assume that the context in which people are using bitcoin each day, is only to make payments.
wbnns
added
Changes Requested
On Hold
labels
Jun 18, 2017
|
@gene1wood Hi there! Since it's been a few weeks and your PR has conflicts, I'm going to close this for now, but please feel free to resubmit with the aforementioned changes if you'd like to pick this back up. |
wbnns
closed this
Jul 13, 2017
gene1wood
added some commits
Jul 24, 2017
gene1wood
commented
Jul 24, 2017
•
gene1wood
referenced this pull request
Aug 1, 2017
Closed
Improve grammar in English translation #1721
wbnns
reopened this
Aug 1, 2017
gene1wood
commented
Aug 1, 2017
|
@wbnns Sure thing. Merge conflicts resolved. |
gene1wood
commented
Aug 7, 2017
|
@wbnns Will, this no longer has conflicts and has all your suggested changes implemented. Is there anything else needed before merging this? |
gene1wood
commented
Aug 10, 2017
|
@wbnns This is still tagged as "Changes Requested" and "On Hold". Are these artifacts and no longer the case or are there pending changes requested? If so can you point me to them? |
|
@gene1wood Hi there! Apologies for the delay - the issue is that since this was originally submitted, we began a bunch of translation updates. As you know, there was a period of time where this PR was closed because it was out of sync and needed rebasing. Now that it's caught up, I'm hesitant to merge because the text changes are trivial and would result in all of the translators for different languages needing to retranslate these sentences. Let's revisit this once we get our translations caught up completely. If you'd still like to press for these changes, then, please let us know. I'll close this for now; thanks for taking the time to suggest these updates! |
wbnns
closed this
Aug 11, 2017
gene1wood
commented
Aug 11, 2017
|
@wbnns That's extremely frustrating. That was a lot of time and effort on my part. I was trying to help and leverage the fact that English is my native language and the pages had mistakes, implying they'd been written by non-native speakers. I'm not a user of bitcoin.org or any bitcoin software (don't even own any bitcoin). Guess I should've just left it broken, darn. |
gene1wood commentedJun 14, 2017
Most of these changes are corrections to grammar mistakes, though some of them are attempts to make a grammatically correct construction a bit less awkward.
Please review these changes and feel free to call out any that you disagree with and I'm happy to update the PR.