Various translation fixups and restorations #1796

pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:bugfix_ts changing 36 files +4922 −4759
  1. luke-jr commented at 6:16 AM on September 7, 2012: member

    Over the releases, numerous translations have been lost due to fixes in English grammar and spelling. Additionally, ampersands/hotkeys seem to keep getting escaped.

    These commits correct some of these issues, but I only got about 20% through the full recovery of old translations so far. This process is very time consuming, and I want to verify it will be accepted upstream before I spend any more time on it.

    I'm aware of Transifex, but I am automating a significant amount of the restoration process (for the most part, my time/effort is just checking the script's work for correctness). Hope these ts files can be imported to it...

  2. laanwj commented at 6:28 AM on September 7, 2012: member

    As the process is fully automated; is it possible to send the restored translations to transifex directly?

    Great work btw

  3. luke-jr commented at 6:34 AM on September 7, 2012: member

    It's not fully automated, it does need the supervision or it will make bogus changes occasionally ;)

    I don't know anything about Transifex other than it being a website <.<

  4. laanwj commented at 6:39 AM on September 7, 2012: member

    It's a website with an API. But apart from that I don't know much about it ether.

    Merging between git and transifex is hard, this is why we usually encourage the one-directional workflow.

    The problem of directly uploading these .ts files to transifex could be that translations that have been made in the time between the last transifex->git import to disappear again. I'm not sure though. Maybe there is an 'add new only' command. Otherwise we'll need to find out the API and upload the restored translated lines one-by-one through that sigh :)

  5. Diapolo commented at 8:30 AM on September 7, 2012: none

    I'm not sure what would be invalid with such code: <translation type="unfinished"/>?

  6. luke-jr commented at 8:32 AM on September 7, 2012: member

    Nothing, I'm sure. But my lupdate does the longer way

  7. Diapolo commented at 8:35 AM on September 7, 2012: none

    What Qt version are you using

    In the end I dislike fixing stuff that way as our default process is to only update english-master and everything else happens via Transifex. It is indeed a time-consuming work you've started here, but I'm not sure we should do it that way.

  8. luke-jr commented at 8:36 AM on September 7, 2012: member

    4.8.2

  9. Diapolo commented at 8:43 AM on September 7, 2012: none

    I have to clarify I guess, I don't want to stop evolution on the translation process, but at least we never uploaded so many changed translation files.

    IMHO before doing your work, the current Transifex state should be merged to current master, to not lose new translations and then disable TX translation for Translators. Then doing what this pull does, merging it, uploading files to Tx and then re-enable TX translation for Translators.

  10. laanwj commented at 1:31 PM on September 7, 2012: member

    Yes, using tx push is too dangerous in this case:

    Here’s how differences between the old and new source files will be handled:
    
    * New strings will be added.
    * Modified strings will be considered new ones and added as well.
    * Strings which do not exist in the new source file (including ones which have been modified) will be removed from the database, along with their translations.
    

    Ideally we only want to add strings that don't exist yet (anymore). Not to override current ones (which may have changed), or to delete anything.

    I do think this is important to do. If we won't, we'll lose more translations every time that we change English spelling/punctuation.

  11. luke-jr commented at 6:07 PM on September 7, 2012: member

    I've sync'd my local copy of this branch with Transifex and updated the first 2 commits there. Will be working with @tcatm to finish the rest.

  12. Diapolo commented at 8:47 PM on September 7, 2012: none

    Can you give a status update? It seems you upped a new english master file to Transifex, but we have not the corresponding bitcoinstrings.cpp update here on Github, which sucks IMO.

    Edit: I somehow also missed the vote to declare you as a maintainer on Transifex.

  13. luke-jr commented at 9:20 PM on September 7, 2012: member

    The updated bitcoinstrings.cpp will be in this pullreq when I finish updating it. It's trivial to update locally anyway...

  14. Diapolo commented at 9:48 PM on September 7, 2012: none

    I read that Gavin wants RC2 to become final, in the Bitcointalk thread. The new translations should be in there... which means we need a bitcoinstrings.cpp update here and another TX update merged into current master. I really dislike the timing of this pull...

  15. luke-jr commented at 10:04 PM on September 7, 2012: member

    RC2 is already done, so if it becomes final this is all too late anyway.

  16. BitcoinPullTester commented at 1:14 AM on September 8, 2012: none

    Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/7f7a4fc3394552c9cf3a97c76232390d7956a9a7 for binaries and test log.

  17. luke-jr commented at 3:34 AM on September 8, 2012: member

    Finished via Transifax for all but 4 with under 10% coverage: ca_ES et eu_ES fr_CA (since less coverage means more work for me, these didn't seem worth it)

    Also did the necessary git<->transifax syncing, so the latest translations are in this too. Should be good to go!

  18. luke-jr commented at 3:40 AM on September 8, 2012: member

    Side note: I did NOT pull the new Japanese translation, since it has 0% coverage (what Transifax sees is from the translation I copied to make it). Eliel (who recently updated the Finnish translation) plans to also fill in this Japanese one in the coming days.

  19. laanwj commented at 4:37 AM on September 8, 2012: member

    ACK after rebasing into one commit

  20. Partially Bugfix: Update English translation strings and translations from Transifex
    Bugfix: Correct doubled-up &amp;amp; in translations
    Bugfix: Remove extra spaces after ampersand in translations (this fixes hotkeys)
    Restore copyright translations, now split up
    Restore old translations lost due to changes to English structure
    	Skipped: ca_ES et eu_ES fr_CA (under 10% coverage)
    4ee706243c
  21. luke-jr commented at 5:00 AM on September 8, 2012: member

    Squashed into a single commit.

  22. laanwj referenced this in commit 31fac119dc on Sep 8, 2012
  23. laanwj merged this on Sep 8, 2012
  24. laanwj closed this on Sep 8, 2012

  25. DrahtBot locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-14 15:16 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me