Translations need to be updated

wbnns commented 7 years ago

Bounty: 120,000 bits / ~$300 USD

Here's a high level overview of the process:

Use the Transifex CLI client* to download latest translations (including en.yml) from Transifex
Diff bitcoin.org's en.yaml against the Transifex yaml to review changes
Identify English strings we don't want translators to re-translate from scratch (for example, very minute text changes - if in doubt, just ask)
Identify which translations had those strings reviewed (usually translations near 100% reviewed)
Manually update en.yml with the English strings we don't want re-translated
Review together here
Once reviewed, push to Transifex using the Transifex CLI client (this re-uploads en.yml, and all translations
Go to Transifex to manually set strings as reviewed that were identified in Step 4
Upload the latest en.yml from bitcoin.org manually (any additional changed strings will have to be retranslated)

Basically, we should work to reduce changes sent to Transifex, because translations don't scale well (but are obviously still very important to us because we have so many international users and non English speakers who use the site). Small stuff can escalate into large work, and small errors can turn out to be big. For example, there are currently 70+ languages in our Transifex translation project, so a single erroneous change could cause 70+ translators to do 70+ times the work. That would of course multiply by the number of changes that are made (this example is just assuming one).

TLDR: We don't want translators to have to start over on work they've already done.

*Transifex CLI commands can be found here: https://github.com/bitcoin-dot-org/bitcoin.org/blob/master/docs/assisting-with-translations.md#update-english-strings

NimaDgr commented 7 years ago

Is there any chance you want to add Persian translation? I can do that.

Pajulapoiss commented 7 years ago

I could translate to Estonian.

skae1l commented 7 years ago

I could translate everything into German.

ceanes commented 7 years ago

I could translate to Portuguese

2017-07-07 8:35 GMT-03:00 FajarHima notifications@github.com:

I could translate to Indonesian

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/bitcoin-dot-org/bitcoin.org/issues/1657#issuecomment-313658002, or mute the thread https://github.com/notifications/unsubscribe-auth/AclALBzsWpQMJIJ_dZocdFrAjclZ7-3Kks5sLhf-gaJpZM4OLd2t .

soyvzk commented 7 years ago

I'm a professional english-spanish translator and I'd be glad to help with this project!

23kb commented 7 years ago

I can translate to Urdu

Bluewan commented 7 years ago

I would like to translate to Turkish or German.

ghost commented 7 years ago

*Transifex CLI commands can be found here: https://github.com/bitcoin-dot-org/bitcoin.org#update-english-strings

This link is broken?

wbnns commented 7 years ago

@NimaDgr @Pajulapoiss @skae1l @ceanes @soyvzk @23kb @Bluewan Thank you all for the offers. This particular bounty is focused on updating the existing translations that volunteer translators have already made on Transifex as outlined in the process above.

If you're interested in joining one of the translation teams, though, you can do so, here - it would be great to have additional translation contributors: https://www.transifex.com/bitcoinorg/bitcoinorg/.

@mcccs Nice catch! Thanks for mentioning. I've updated the link above. 👍

fjdhgjaf commented 7 years ago

Hello, I could translate to Hungarian.

azeyrx commented 7 years ago

I could translate to Polish and German

boscoarinze commented 7 years ago

i could translate to Igbo

boscoarinze commented 7 years ago

please i could translate to Igbo,one official local language in Nigeria

kuzzmi commented 7 years ago

Here is the diff between the one from Github (on the left) and from Transifex (on the right):

https://www.diffchecker.com/gIYuArWK

Here is a compiled list of keys, where the changes are either minor, or stylistical, or that just haven't been changed enough to be retranslated:

about-us:
    helptxt - minor updates

bitcoin-for-businesses:
    lowfee - minor updates

bitcoin-for-developers:
    owntext - minor updates
    anonymoustext - minor updates

bitcoin-for-individuals:
    lowfee - minor updates

community:
    walletmyceliumwallet - minor updates
    wallettrezor - minor updates
    checkgoodvalidationfullnodetxt - minor updates
    checkgoodvalidationfullnoderequiredtxt - minor updates
    checkfailenvironmentdesktoptxt - minor updates

development:
    morechoose - links updates
    notesync - minor updates with templates

faq:
    usedtxt1 - links updates
    acquireli2 - links updates
    advantagesli1 - formatting updates
    tenminutes - minor updates with templates
    tenminutestxt1 - minor updates with templates

getting-started:
    spendbut - minor update

index:
    list1 - lowering expectation updates
    list3 - lowering expectation updates

legal:
    informationtxt1 - links updates
    translationstxt1 - links updates

press:
    volunteernonprofit - links updates

privacy:
    title - minor updates
    pagetitle - minor updates

protect-your-privacy:
    traceabletxt - minor updates

support-bitcoin:
    miningtxt - minor updates and links updates
    donationtxt - links updates
    nonprofittxt - minor updates and links updates
    spreadtxt  - minor updates and links updates
    wikitxt - links updates

layout:
    menu-privacy - minor updates

Here's the diff of those changes that are good to be pushed to Transifex:

1c1
< en:
---
> en:
19c22
<     helptxt: "You can report any problem or help to improve bitcoin.org on <a href=\"https://github.com/bitcoin/bitcoin.org#how-to-participate\">GitHub</a> by opening an issue or a pull request in English. When submitting a pull request, please take required time to discuss your changes and adapt your work. You can help with translations by joining a team on <a href=\"https://github.com/bitcoin/bitcoin.org#translation\">Transifex</a>. Please don't ask for promotion for your personal business or website, except for special cases like conferences. Many thanks to all contributors who are spending time improving bitcoin.org!"
---
>     helptxt: "You can report any problem or help to improve bitcoin.org on <a href=\"https://github.com/bitcoin-dot-org/bitcoin.org#how-to-participate\">GitHub</a> by opening an issue or a pull request in English. When submitting a pull request, please take required time to discuss your changes and adapt your work. You can help with translations by joining a team on <a href=\"https://github.com/bitcoin-dot-org/bitcoin.org#translation\">Transifex</a>. Please don't ask for promotion for your personal business or website, except for special cases like conferences. Many thanks to all contributors who are spending time improving bitcoin.org!"
29,30c36,46
<     lowfee: "The lowest fees out there"
---
>     lowfee: "Choose your own fees"
52c73,79
<     owntext: "If you don't use any third party APIs, you can integrate a Bitcoin server directly in your applications, allowing you to become your own bank and payment processor. With all the responsibilities that this implies, you can build amazing systems that process Bitcoin transactions with almost no fees."
---
>     owntext: >
>       If you don't use any third party APIs, you can integrate a Bitcoin
>       node directly into your applications, allowing you to become your
>       own bank and payment processor. With all the responsibilities that
>       this implies, you can build amazing systems that process Bitcoin
>       transactions however you would like.
71,72c119,128
<     lowfee: "Zero or low fees"
---
>     lowfee: "Choose your own fees"
74c130
<     anonymoustext: "With Bitcoin, there is no credit card number that some malicious actor can collect in order to impersonate you. In fact, it is even possible to send a payment without revealing your identity, almost just like with physical money. You should however take note that some effort can be required to <a href=\"#protect-your-privacy#\">protect your privacy</a>."
---
>     anonymoustext: "With Bitcoin, there is no credit card number that some malicious actor can collect in order to impersonate you. In fact, it is even possible to send a payment without revealing your identity, almost like with physical money. You should however take note that some effort can be required to <a href=\"#protect-your-privacy#\">protect your privacy</a>."
126c181
<     walletmyceliumwallet: "Mycelium Bitcoin Wallet for Android is designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage and offers compatibilty with Trezor and others."
---
>     walletmyceliumwallet: "Mycelium Bitcoin Wallet for Android is designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage and offers compatibility with Trezor and others."
133c189,191
<     wallettrezor: "TREZOR is a hardware wallet providing a high level of security without sacrificing convenience. Unlike cold storage, TREZOR is able to sign transactions while connected to an online device. That means spending bitcoins is secure even when using a compromised computer."
---
>     wallettrezor: "Trezor is a hardware wallet providing a high level of security without sacrificing convenience. Unlike cold storage, Trezor is able to sign transactions while connected to an online device. That means spending bitcoins is secure even when using a compromised computer."
143a207
>     platformwindowsphone: "Windows Phone"
159c223
<     checkgoodvalidationfullnodetxt: "This wallet is a full node that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over 20GB), bandwidth, and a longer initial synchronization time."
---
>     checkgoodvalidationfullnodetxt: "This wallet is a full node that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over {{site.text.bitcoin_datadir_gb}}GB), bandwidth, and a longer initial synchronization time."
161c225
<     checkgoodvalidationfullnoderequiredtxt: "This wallet requires you to install full node software that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over 20GB), bandwidth, and a longer initial synchronization time."
---
>     checkgoodvalidationfullnoderequiredtxt: "This wallet requires you to install full node software that validates and relays transactions on the Bitcoin network. This means no trust in a third party is required when verifying payments. Full nodes provide the highest level of security and are essential to protecting the network. However, they require more space (over {{site.text.bitcoin_datadir_gb}}GB), bandwidth, and a longer initial synchronization time."
193c257
<     checkfailenvironmentdesktoptxt: "This wallet can be loaded on computers which are vulnerable to malware. Securing your computer, using a strong passphrase, moving most of your funds to cold storage or enabling two-factor authentication can make it harder to steal on your bitcoins."
---
>     checkfailenvironmentdesktoptxt: "This wallet can be loaded on computers which are vulnerable to malware. Securing your computer, using a strong passphrase, moving most of your funds to cold storage, or enabling two-factor authentication can make it harder to steal your bitcoins."
231c305,306
<     morechoose: "You can choose a project to contribute to by answering a few <a href=\"http://whatcanidoforbitcoin.org/\">questions about your skills</a>."
---
>     morechoose: "You can choose a project to contribute to by answering a few <a href=\"http://whatcanidoforbitcoin.xyz/\">questions about your skills</a>."
251c326
<     notesync: "Bitcoin Core initial synchronization will take time and download a lot of data. You should make sure that you have enough bandwidth and storage for the full block chain size (over 20GB). If you have a good Internet connection, you can help strengthen the network by keeping your PC running with Bitcoin Core and port 8333 open."
---
>     notesync: "Bitcoin Core initial synchronization will take time and download a lot of data. You should make sure that you have enough bandwidth and storage for the full block chain size (over {{site.text.bitcoin_datadir_gb}}GB). If you have a good Internet connection, you can help strengthen the network by keeping your PC running with Bitcoin Core and port 8333 open."
280c362
<     usedtxt1: "Yes. There is a <a href=\"http://usebitcoins.info/\">growing number of businesses</a> and individuals using Bitcoin. This includes brick and mortar businesses like restaurants, apartments, law firms, and popular online services such as Namecheap, WordPress, and Reddit. While Bitcoin remains a relatively new phenomenon, it is growing fast. At the end of August 2013, the <a href=\"https://bitcoincharts.com/bitcoin/\">value of all bitcoins in circulation</a> exceeded US$ 1.5 billion with millions of dollars worth of bitcoins exchanged daily."
---
>     usedtxt1: "Yes. There are a <a href=\"/en/spend-bitcoin\">growing number of businesses</a> and individuals using Bitcoin. This includes brick-and-mortar businesses like restaurants, apartments, and law firms, as well as popular online services such as Namecheap, Overstock.com, and Reddit. While Bitcoin remains a relatively new phenomenon, it is growing fast. At the end of April 2017, the <a href=\"https://bitcoincharts.com/bitcoin/\">total value of all existing bitcoins</a> exceeded 20 billion US dollars, with millions of dollars worth of bitcoins exchanged daily."
283c365
<     acquireli2: "Purchase bitcoins at a <a href=\"http://howtobuybitcoins.info\">Bitcoin exchange</a>."
---
>     acquireli2: "Purchase bitcoins at a <a href=\"https://www.buybitcoinworldwide.com\">Bitcoin exchange</a>."
290,291c372,391
<     advantagesli1: "<em><b>Payment freedom</b></em> - It is possible to send and receive any amount of money instantly anywhere in the world at any time. No bank holidays. No borders. No imposed limits. Bitcoin allows its users to be in full control of their money."
<     advantagesli2: "<em><b>Very low fees</b></em> - Bitcoin payments are currently processed with either no fees or extremely small fees. Users may include fees with transactions to receive priority processing, which results in faster confirmation of transactions by the network. Additionally, merchant processors exist to assist merchants in processing transactions, converting bitcoins to fiat currency and depositing funds directly into merchants' bank accounts daily. As these services are based on Bitcoin, they can be offered for much lower fees than with PayPal or credit card networks."
---
>     advantagesli1: >
>       <em><b>Payment freedom</b></em> - It is possible to send and
>       receive bitcoins anywhere in the world at any
>       time. No bank holidays. No borders. No bureaucracy. Bitcoin
>       allows its users to be in full control of their money.
>
>     advantagesli2: >
>       <em><b>Choose your own fees</b></em> - There is no fee to receive
>       bitcoins, and many wallets let you control how large a fee to pay
>       when spending. Higher fees can encourage faster <a
>       href="#you-need-to-know##instant">confirmation</a> of your
>       transactions. Fees are unrelated to the amount transferred, so
>       it's possible to send 100,000 bitcoins for the same fee it costs
>       to send 1 bitcoin. Additionally, merchant processors exist to assist
>       merchants in processing transactions, converting bitcoins to fiat
>       currency and depositing funds directly into merchants' bank
>       accounts daily. As these services are based on Bitcoin, they can
>       be offered for much lower fees than with PayPal or credit card
>       networks.
>
362,363c462,481
<     tenminutes: "Why do I have to wait 10 minutes?"
<     tenminutestxt1: "Receiving a payment is almost instant with Bitcoin. However, there is a 10 minutes delay on average before the network begins to confirm your transaction by including it in a block and before you can spend the bitcoins you receive. A confirmation means that there is a consensus on the network that the bitcoins you received haven't been sent to anyone else and are considered your property. Once your transaction has been included in one block, it will continue to be buried under every block after it, which will exponentially consolidate this consensus and decrease the risk of a reversed transaction. Every user is free to determine at what point they consider a transaction confirmed, but 6 confirmations is often considered to be as safe as waiting 6 months on a credit card transaction."
---
>     tenminutes: "Why do I have to wait for confirmation?"
>     tenminutestxt1: >
>       Receiving notification of a payment is almost instant with Bitcoin. However, there
>       is a delay before the network begins to
>       confirm your transaction by including it in a block.
>       A confirmation means that
>       there is a consensus on the network that the bitcoins you received
>       haven't been sent to anyone else and are considered your property.
>       Once your transaction has been included in one block, it will
>       continue to be buried under every block after it, which will
>       exponentially consolidate this consensus and decrease the risk of
>       a reversed transaction.
>       Each confirmation takes between a few seconds and 90 minutes, with
>       10 minutes being the average. If the transaction pays too low a
>       fee or is otherwise atypical, getting the first confirmation can
>       take much longer.  Every user is free to determine at what
>       point they consider a transaction sufficiently confirmed, but <a href="#you-need-to-know##instant">6 confirmations</a>
>       is often considered to be as safe as waiting 6 months on a credit
>       card transaction.
>
416c555
<     spendbut: "Find merchants"
---
>     spendbut: "Find merchants and products"
448c587
<     list1: "Instant peer-to-peer<br>transactions"
---
>     list1: "Fast peer-to-peer<br>transactions"
450c589
<     list3: "Zero or low<br>processing fees"
---
>     list3: "Low<br>processing fees"
485c634
<     informationtxt1: "The website http://bitcoin.org/ (hereinafter, referred to as the \"Website\") provides information and material of a general nature. You are not authorized and nor should you rely on the Website for legal advice, business advice, or advice of any kind. You act at your own risk in reliance on the contents of the Website. Should you make a decision to act or not act you should contact a licensed attorney in the relevant jurisdiction in which you want or need help. In no way are the owners of, or contributors to, the Website responsible for the actions, decisions, or other behavior taken or not taken by you in reliance upon the Website."
---
>     informationtxt1: "The website https://bitcoin.org/ (hereinafter, referred to as the \"Website\") provides information and material of a general nature. You are not authorized and nor should you rely on the Website for legal advice, business advice, or advice of any kind. You act at your own risk in reliance on the contents of the Website. Should you make a decision to act or not act you should contact a licensed attorney in the relevant jurisdiction in which you want or need help. In no way are the owners of, or contributors to, the Website responsible for the actions, decisions, or other behavior taken or not taken by you in reliance upon the Website."
487c636
<     translationstxt1: "The Website may contain translations of the English version of the content available on the Website. These translations are provided only as a convenience. In the event of any conflict between the English language version and the translated version, the English language version shall take precedence. If you notice any inconsistency, please report them on <a href=\"https://github.com/bitcoin/bitcoin.org\">GitHub</a>."
---
>     translationstxt1: "The Website may contain translations of the English version of the content available on the Website. These translations are provided only as a convenience. In the event of any conflict between the English language version and the translated version, the English language version shall take precedence. If you notice any inconsistency, please report them on <a href=\"https://github.com/bitcoin-dot-org/bitcoin.org\">GitHub</a>."
514c663
<     volunteernonprofit: "Communicate with the <a href=\"https://bitcoinfoundation.org/contact/\">Bitcoin Foundation</a> or local <a href=\"#community##[community.non-profit]\">non-profit organizations</a>."
---
>     volunteernonprofit: "Communicate with <a href=\"https://bitgive.org\">BitGive</a> or local <a href=\"#community##[community.non-profit]\">non-profit organizations</a>."
518,523c667,689
<     title: "Privacy - Bitcoin"
<     pagetitle: "Privacy"
---
>     title: "Privacy Policy - Bitcoin"
>     pagetitle: "Privacy Policy"
529c695
<     traceabletxt: "Bitcoin works with an unprecedented level of transparency that most people are not used to dealing with. All Bitcoin transactions are public, traceable, and permanently stored in the Bitcoin network. Bitcoin addresses are the only information used to define where bitcoins are allocated and where they are sent. These addresses are created privately by each user's wallets. However, once addresses are used, they become tainted by the history of all transactions they are involved with. Anyone can see the <a href=\"https://www.biteasy.com\">balance and all transactions</a> of any address. Since users usually have to reveal their identity in order to receive services or goods, Bitcoin addresses cannot remain fully anonymous. For these reasons, Bitcoin addresses should only be used once and users must be careful not to disclose their addresses."
---
>     traceabletxt: "Bitcoin works with an unprecedented level of transparency that most people are not used to dealing with. All Bitcoin transactions are public, traceable, and permanently stored in the Bitcoin network. Bitcoin addresses are the only information used to define where bitcoins are allocated and where they are sent. These addresses are created privately by each user's wallets. However, once addresses are used, they become tainted by the history of all transactions they are involved with. Anyone can see the <a href=\"https://www.biteasy.com\">balance and all transactions</a> of any address. Since users usually have to reveal their identity in order to receive services or goods, Bitcoin addresses cannot remain fully anonymous. As the block chain is permanent, it's important to note that something not traceable currently may become trivial to trace in the future. For these reasons, Bitcoin addresses should only be used once and users must be careful not to disclose their addresses."
608c782
<     miningtxt: "You can start <a href=\"http://www.bitcoinmining.com/\">mining bitcoins</a> to help processing transactions. In order to protect the network, you should join <a href=\"http://mempool.info/pools\">smaller mining pools</a> and prefer decentralized pools like <a href=\"http://p2pool.in/\">P2Pool</a> or <a href=\"https://en.bitcoin.it/wiki/Comparison_of_mining_pools\">pools</a> with getblocktemplate (GBT) support."
---
>     miningtxt: "You can start <a href=\"http://www.bitcoinmining.com/\">mining bitcoins</a> to help processing transactions. In order to protect the network, you should join smaller mining pools and prefer decentralized pools like <a href=\"http://p2pool.in/\">P2Pool</a> or <a href=\"https://en.bitcoin.it/wiki/Comparison_of_mining_pools\">pools</a> with getblocktemplate (GBT) support."
612c786
<     donationtxt: "The easiest way to help is to <a href=\"https://bitcoinfoundation.org/about/donate/\">donate</a> a few bitcoins to the Bitcoin Foundation. Or you can help directly fund any project related to Bitcoin that you believe will be helpful in the future."
---
>     donationtxt: "The easiest way to help is to <a href=\"http://bitgivefoundation.org/donate-now/\">donate</a> a few bitcoins to BitGive. Or you can help directly fund any project related to Bitcoin that you believe will be helpful in the future."
614c788
<     nonprofittxt: "The <a href=\"https://bitcoinfoundation.org/\">Bitcoin Foundation</a> and many other <a href=\"#community##[community.non-profit]\">non-profit organizations</a> are dedicated to protecting and promoting Bitcoin. You can help these groups by joining them and taking part in their projects, discussions and events."
---
>     nonprofittxt: "Many <a href=\"#community##[community.non-profit]\">non-profit organizations</a> are dedicated to protecting and promoting Bitcoin. You can help these groups by joining them and taking part in their projects, discussions and events."
616c790
<     spreadtxt: "Speak about Bitcoin to interested people. Write about it on your blog. Tell your favorite shops you would like to pay with Bitcoin. Help keeping <a href=\"http://usebitcoins.info/\">merchant directories</a> up to date. Or be creative and make yourself a nice Bitcoin T-shirt."
---
>     spreadtxt: "Speak about Bitcoin to interested people. Write about it on your blog. Tell your favorite shops you would like to pay with Bitcoin. Help to keep <a href=\"/en/spend-bitcoin\">merchant directories</a> up to date. Or be creative and make yourself a nice Bitcoin T-shirt."
618c792
<     wikitxt: "<a href=\"https://github.com/bitcoin/bitcoin.org#how-to-participate\">Bitcoin.org</a> and the <a href=\"https://en.bitcoin.it/\">Bitcoin wiki</a> provide useful documentation and we are constantly improving the information they contain. You can help to improve these resources and keep them up to date."
---
>     wikitxt: "<a href=\"https://github.com/bitcoin-dot-org/bitcoin.org#how-to-participate\">Bitcoin.org</a> and the <a href=\"https://en.bitcoin.it/\">Bitcoin wiki</a> provide useful documentation and we are constantly improving the information they contain. You can help to improve these resources and keep them up to date."
692c876
<     menu-privacy: "Privacy"
---
>     menu-privacy: "Privacy Policy"

The difference in the translations can be reviewed and if this list is a valid list of strings we don't want to be retranslated, I'll make changes and proceed with reviewing them on Transifex.

kuzzmi commented 7 years ago

Another question here. Does it make sense to automate this process? I mean Transifex configuration can be included in the repo, for instance, and a few bash scripts could be written to make these diffs creation, so after resolving this issue, it won't take much time to have up-to-date translations.

Also, as another reasonable question, why do we really need to maintain two versions of the translations? Why can't we just pull the translations from Transifex during the build/preview stage? This would simplify things a lot.

MitchellCash commented 7 years ago

@kuzzmi my thoughts exactly. I ended up just joining the Arabic Translation Team on Transifex and went through the same process as you.

My thoughts are:

Add .tx/config to repo

[main]
host = https://www.transifex.com

[bitcoinorg.bitcoinorg]
file_filter = _translations/<lang>.yml
source_file = _translations/en.yml
source_lang = en

Set up Transifex to auto update the English resource using this URL https://raw.githubusercontent.com/bitcoin-dot-org/bitcoin.org/master/_translations/en.yml:

As part of the make deployment process your could automate the tx pull -a -s --skip step

Considerations

All English string updates happen on GitHub, otherwise they will be overridden
This does mean that you can't selectively choose which strings had minor changes and skip translating them again (without going through a lot of effort)

Overall I think this is the best way to handle translations, but @wbnns what do you think?

Some of the steps outlined above need to be actioned by an Admin on Transifex so let me know if you need a hand.

kuzzmi commented 7 years ago

@mitchellcash after giving it some thought, I guess this is a bit too aggressive approach as this will eliminate the convenience of cherry-picking strings, as @wbnns mentioned in the issue description.

Another suggestion: What we can do though is to use what is already presented here in _translations directory as a base and have a tool/script that will generate diffs automatically. In this case it will be much easier to grasp when and what needs to be pulled to Transifex for a full translation and what can be cherry-picked. The process will be semi-automated, so in the end the flexibility is preserved and all routine tasks are automated.

Overall this falls out of this issue discussion and it's probably better to handle it in a separate ticket.

MitchellCash commented 7 years ago

@kuzzmi agree. I guess the scope of this issue is to follow the steps outlined by @wbnns and we can open up a new Pull Request (or Issue) with these new proposals.

wbnns commented 7 years ago

@mitchellcash Thanks for the feedback!

@kuzzmi

What we can do though is to use what is already presented here in _translations directory as a base and have a tool/script that will generate diffs automatically. In this case it will be much easier to grasp when and what needs to be pulled to Transifex for a full translation and what can be cherry-picked. The process will be semi-automated, so in the end the flexibility is preserved and all routine tasks are automated.

This sounds great and could be a significant improvement over the current workflow.

Regarding the diffs, as per our conversation on Telegram, the following will need to be retranslated:

+ 19c22
+ 29,30c36,46
+ 52c73,79
+ 71,72c119,128
+ 143a207
+ 159c223
+ 161c225
+ 251c326
+ 280c362
+ 283c365
+ 290,291c372,391
+ 362,363c462,481
+ 416c555
+ 448c587
+ 450c589
+ 485c634
+ 487c636
+ 514c663
+ 529c695
+ 608c782
+ 612c786
+ 614c788
+ 616c790
+ 618c792

If you have any questions, please let me know.

kuzzmi commented 7 years ago

Here is a full list of changes that I'm about to force-push to Transifex:

74c74
< anonymoustext: "With Bitcoin, there is no credit card number that some malicious actor can collect in order to impersonate you. In fact, it is even possible to send a payment without revealing your identity, almost just like with physical money. You should however take note that some effort can be required to <a href="#protect-your-privacy#">protect your privacy</a>."
---
> anonymoustext: "With Bitcoin, there is no credit card number that some malicious actor can collect in order to impersonate you. In fact, it is even possible to send a payment without revealing your identity, almost like with physical money. You should however take note that some effort can be required to <a href="#protect-your-privacy#">protect your privacy</a>."
126c126
< walletmyceliumwallet: "Mycelium Bitcoin Wallet for Android is designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage and offers compatibilty with Trezor and others."
---
> walletmyceliumwallet: "Mycelium Bitcoin Wallet for Android is designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage and offers compatibility with Trezor and others."
133c133
< wallettrezor: "TREZOR is a hardware wallet providing a high level of security without sacrificing convenience. Unlike cold storage, TREZOR is able to sign transactions while connected to an online device. That means spending bitcoins is secure even when using a compromised computer."
---
> wallettrezor: "Trezor is a hardware wallet providing a high level of security without sacrificing convenience. Unlike cold storage, Trezor is able to sign transactions while connected to an online device. That means spending bitcoins is secure even when using a compromised computer."
193c193
< checkfailenvironmentdesktoptxt: "This wallet can be loaded on computers which are vulnerable to malware. Securing your computer, using a strong passphrase, moving most of your funds to cold storage or enabling two-factor authentication can make it harder to steal on your bitcoins."
---
> checkfailenvironmentdesktoptxt: "This wallet can be loaded on computers which are vulnerable to malware. Securing your computer, using a strong passphrase, moving most of your funds to cold storage, or enabling two-factor authentication can make it harder to steal your bitcoins."
231c231
< morechoose: "You can choose a project to contribute to by answering a few <a href="http://whatcanidoforbitcoin.org/">questions about your skills</a>."
---
> morechoose: "You can choose a project to contribute to by answering a few <a href="http://whatcanidoforbitcoin.xyz/">questions about your skills</a>."
518,519c518,519
< title: "Privacy - Bitcoin"
< pagetitle: "Privacy"
---
> title: "Privacy Policy - Bitcoin"
> pagetitle: "Privacy Policy"
692c692
< menu-privacy: "Privacy"
---
> menu-privacy: "Privacy Policy"

I'll wait for quite a while to get any confirmation whether or not this is fine and so I can update strings on Transifex and manually review the changes.

crwatkins commented 7 years ago

I believe that the above reintroduces a spelling error in the walletmyceliumwallet line for "compatibility".

kuzzmi commented 7 years ago

My bad, I misplaced the files for diffing. Updated the diff in my previous comment.

wbnns commented 7 years ago

@kuzzmi Thanks! Looks good to me - please do it when you're ready.

kuzzmi commented 7 years ago

I think this issue can be considered as resolved.

I've done the following:

[x] Identify English strings we don't want translators to re-translate
[x] Identify which translations have those strings reviewed
[x] Manually update en.yml with the English strings we don't want re-translated
[x] Push changes to Transifex
[x] Manually set strings as reviewed that were identified before
[x] Upload the latest en.yml from github.com/bitcoin-dot-org/bitcoin.org manually

If nobody has any concerns, this address can be used for the bounty payout: 1GomWkkJwg9WSqiGWjvMGUP3UFN3KVxfCw

wbnns commented 7 years ago

Unless others object, this will be closed on Sunday, July 30th.

MitchellCash commented 7 years ago

Nice work @kuzzmi

wbnns commented 7 years ago

@kuzzmi Great work. Here's the transaction confirmation for the bounty.

bitcoin-dot-org / Bitcoin.org

Translations need to be updated #1657