Nguyễn Thái Ngọc Duy wrote: > + const char *msg[] = { > + "CONFLICT (rename/delete): %s deleted in %s and renamed in %s. Version %s of %s left in tree.", > + "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s of %s left in tree.", > + }; > + const char *renamed_msg[] = { > + "CONFLICT (rename/delete): %s deleted in %s and renamed in %s. Version %s of %s left in tree at %s.", > + "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s of %s left in tree at %s.", > + }; Is lego by sentence ok? i.e., having 4 translated messages: CONFLICT (rename/delete): %s deleted in %s and renamed in %s. CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s of %s left in tree. Version %s of %s left in tree at %s. -- 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