Junio C Hamano <[email protected]> wrote: > If identifying the exact commit has value, on the other hand, we can > rephrase it like this: > > error(_("no -m option was given to pick a merge '%s'", ...)); > > to place it not in the middle. We can do similar rephrasing for > other messages as well. > >>> - return error(_("Commit %s does not have parent %d"), >>> - sha1_to_hex(commit->object.sha1), >>> opts->mainline); > > error(_("No parent %d for commit '%s'", opts->mainline, ...); > >>> - return error(_("Mainline was specified but commit %s is not >>> a merge."), >>> - sha1_to_hex(commit->object.sha1)); > > error(_("-m option was given for non-merge commit '%s'", ...);
The %s can be placed to somewhere else in translations. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
