Duy Nguyen venit, vidit, dixit 16.03.2016 14:40: > On Wed, Mar 16, 2016 at 8:33 PM, Michael J Gruber > <git@xxxxxxxxxxxxxxxxxxxx> wrote: >> In hindsight, what happened must have been like this: >> >> "ahead " was marked properly for l10n and translated in the past. >> >> 7a76c28 (status: disable translation when --porcelain is used, >> 2014-03-20) introduced those extra parentheses. Matthieu probably didn't >> rerun "make pot" and "msgmerge" so that he didn't notice the consequences. > > .po(t) files are _very_ noisy because they record line numbers and > that pretty much guarantees huge diffs. Even I as a former translator > do not want to "make pot" and see the differences. If only msgmerge > supports an output without line numbers... > echo '*.po diff=po' >>.gitattributes echo '*.pot diff=po' >>.gitattributes git config diff.po.textconv "msgcat --indent --no-location" With or without the indent, that gives a pretty clean diff. [It's unfortunate that one half of that config is in-tree, one-half is not.] The way it currently is, "non-l10n" coders don't even notice when their changes affect the set of marked strings. But I guess ususally that's not a problem. For our l10n coordinator it is impossible to decide whether a "git.pot" diff between two runs looks the way it is supposed to look - he would have to be aware of all code changes that intentionally change the marked strings. (Likewise, for the translators.) So, really, the "actual coders" know best whether their changes should affect l10n or not, so they should be made more aware of it. Forcing "make pot" (and maybe more) on everyone sounds a bit harsh, but what else can we do? Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html