Skip to content

Various translation fixups and restorations#1796

Merged
laanwj merged 1 commit intobitcoin:masterfrom
luke-jr:bugfix_ts
Sep 8, 2012
Merged

Various translation fixups and restorations#1796
laanwj merged 1 commit intobitcoin:masterfrom
luke-jr:bugfix_ts

Conversation

@luke-jr
Copy link
Copy Markdown
Member

@luke-jr luke-jr commented Sep 7, 2012

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...

@laanwj
Copy link
Copy Markdown
Member

laanwj commented Sep 7, 2012

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

Great work btw

@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 7, 2012

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 <.<

@laanwj
Copy link
Copy Markdown
Member

laanwj commented Sep 7, 2012

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 :)

@Diapolo
Copy link
Copy Markdown

Diapolo commented Sep 7, 2012

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

@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 7, 2012

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

@Diapolo
Copy link
Copy Markdown

Diapolo commented Sep 7, 2012

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.

@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 7, 2012

4.8.2

@Diapolo
Copy link
Copy Markdown

Diapolo commented Sep 7, 2012

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.

@laanwj
Copy link
Copy Markdown
Member

laanwj commented Sep 7, 2012

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.

@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 7, 2012

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.

@Diapolo
Copy link
Copy Markdown

Diapolo commented Sep 7, 2012

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.

@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 7, 2012

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

@Diapolo
Copy link
Copy Markdown

Diapolo commented Sep 7, 2012

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...

@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 7, 2012

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

@BitcoinPullTester
Copy link
Copy Markdown

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

@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 8, 2012

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!

@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 8, 2012

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.

@laanwj
Copy link
Copy Markdown
Member

laanwj commented Sep 8, 2012

ACK after rebasing into one commit

… 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)
@luke-jr
Copy link
Copy Markdown
Member Author

luke-jr commented Sep 8, 2012

Squashed into a single commit.

laanwj added a commit that referenced this pull request Sep 8, 2012
Various translation fixups and restorations
@laanwj laanwj merged commit 31fac11 into bitcoin:master Sep 8, 2012
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants