On Fri, Aug 3, 2012 at 2:16 PM, Thomas Rast <trast@xxxxxxxxxxxxxxx> wrote: >>> >>> KONFLIKT (rename/delete): foo gelöscht in bar und renamed in quux. Stand ... >> >> Gah, I misunderstood the values of the placeholders. The reason why I haven't >> translate "delete" or "rename" is because they're part of the >> "KONFLIKT (%s/delete)" >> messages, aren't they? Translate it all would solve the problem. Thanks > > Well, it's a bit confusing. AFAICS the verb (rename/modify) goes into > the parens at the start, and the participle (renamed/modified) goes into > the fourth %s. So if you decided to *not* translate the > "(rename/delete)" conflict description, you would have to translate > "renamed" (to fit it into the sentence) but not "rename". > > Which would be really hard to maintain. So let's not do that. I think > it's better if you translate them all. > That's what i meant. Sorry if I was unclear. -- 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