On Tue, Aug 31, 2010 at 19:14, Erik Faye-Lund <kusmabite@xxxxxxxxx> wrote: > On Tue, Aug 31, 2010 at 7:01 PM, Ævar Arnfjörð Bjarmason > <avarab@xxxxxxxxx> wrote: >> On Tue, Aug 31, 2010 at 15:29, Jonathan Nieder <jrnieder@xxxxxxxxx> wrote: >>> Ævar Arnfjörð Bjarmason wrote: >>> >>>> --- a/po/is.po >>>> +++ b/po/is.po >>>> @@ -11,35 +11,154 @@ msgstr "" >>>> "Content-Type: text/plain; charset=UTF-8\n" >>>> "Content-Transfer-Encoding: 8bit\n" >>>> >>>> -#: t/t0200/test.c:4 >>>> +#: builtin/init-db.c:34 >>> >>> Is there a diff driver that will ignore these --add-location lines? >>> >>> Alternatively, would it be possible to get msgmerge and xgettext to >>> provide the filenames without the line numbers? My experience is >>> that most translation diffs are very hard to read because about 80% >>> noise. :( >>> >>> Aside from that, this looks good and sane (well, the English part >>> I can read does). >> >> Some context, an earlier discussion on this: >> http://kerneltrap.org/mailarchive/git/2010/5/30/31415/thread#mid-31415 >> > > msgmerge and xgettext does seem to have the --no-location flag to > avoid these annotations from being generated. The documentation does > say "Note that using this option makes it harder for technically > skilled translators to understand each message's context. ", though. > But perhaps the annotated versions could be generated when needed and > never checked-in (similar to what you suggested in that e-mail)? It > sounds to me like that would give us the best of all worlds. If it's > possible, that is. It's certainly possible. But each time you worked with these files you'd have add the line numbers yourself to generate the context, then translate, then remove them again, then submit your patch. I just think it's overly tedious work for getting smaller diffs. -- 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