attached message from Alexey. Can You please update files in pootle or will
it be automatically?
---------- Forwarded message ----------
From: Alexey Yakovenko <wakeroid@...>
Subject: Re: Deadbeef translation
To: Sérgio Marques <smarquespt@...>
i ran make update-po, and pushed the newly generated files to lxde branch.
now it should contain all strings
From: Martin Bagge / brother <brother@bs...> - 2012-09-11 10:16:06
-----BEGIN PGP SIGNED MESSAGE-----
On 2012-09-10 23:37, Sérgio Marques wrote:
> attached message from Alexey. Can You please update files in pootle
> or will it be automatically?
It is automatic if you don't touch the PO files indeed.
> ---------- Forwarded message ---------- From: Alexey Yakovenko
> i ran make update-po, and pushed the newly generated files to lxde
> branch. now it should contain all strings
indeed. I am not sure how many times I have asked you to NOT do that.
error: Your local changes to the following files would be overwritten
Please, commit your changes or stash them before you can merge.
The Pootle server is because of this move (touching PO files) not
updated and the work being done in the server will diverge with upstream.
I can not promise that I can merge French, Indonesian and Brazilian
Portugese translations. The rule of thumb is that the translators is
to blame because they didn't commit their work but when the
developers is stupid and touches PO files it's hard for me to motivate
to drop the translations. Hopefully I can rebase merge the changes as
they all use the standard alphabet as we do in Sweden. If this would
happen for one of the script based languages (Russian, Chinese or
Bengali) I would not be able to do it.
CAN YOU PLEASE AVOID TOUCHING PO FILES!?
That was not a question, just stop doing that.
I have done the best I could of the situation. An hour hopefully well
spent. Please don't drain my patience with this.
Update the POT file, but never ever touch the PO files. If I see an
updated POT file I generally make the updates to the PO file just to
make the tree in sync. That is all I need to react.
 How to commit to VCS to avoid these things
 wall of shame, updated every hour
(do the commit thing above if you are on the list. an hour later you
will be removed...THAT easy indeed.)
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
-----END PGP SIGNATURE-----