From: Martin Bagge / brother <brother@bs...> - 2011-11-24 18:15:19
-----BEGIN PGP SIGNED MESSAGE-----
On 2011-11-23 14:40, Alexey Yakovenko wrote:
> it was my push yesterday. sorry for the inconvenience.. i don't
> understand what the problem is though. if someone could explain what
> i should avoid doing in the future -- i'll be following the rules.
The problem is two parts.
1. Translators (not all of them and thankfully not even the majority)
forget to click the link to commit the changes to VCS when they are
"done". Leaving uncommitted work at the Pootle server. When I update
the git repositories it will be with no problems at all until some
upstream change is found in a file that is present at the pootle server.
If the work is not committed this change will hold up the inflow of the
git pull command.
2. To make a successful merge of a translation I can do it in two ways;
git merge or msgmerge. Non of them are very attractive when I do not
know the language in question.
Pick a language that you don't know and try to make the decision if the
merged string is a correct representation of the english original.
If you see a merge just going through and have the time to do it adding
a fuzzy marker on the string is a good thing. This is not always the case.
The solution to avoid these things is solved by NEVER EVER add changes
to PO files upstream.
In this case one change was in a file outside version control and that's
a hard case but using the above rule it would be forbidden.
"But how can I get updated PO files with the new/updated strings?"
- we add the POT file to VCS and when that is updated we run
intltool-update -r at the Pootle server and recommit the PO files as a
I get a ping message when the POT files are updated, this update is not
a automatic hook by any means. And I also try to do a resync every now
I also read email and IRC so sending a message to me or the mailing list
about changes in strings is a good way to tell people to update the files.
 done in the sense; "I will not do any more work on this particular
component now". Not necessarily in the sense "every single string is now
translated and ready to be committed to VCS".
When leaving the "session of translation for component X" is all I care
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
-----END PGP SIGNATURE-----