On Thu, May 31, 2012 at 8:52 PM, Jonathan Nieder [off-list ref] wrote:
Nguyễn Thái Ngọc Duy wrote:
quoted
+ 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.
Yeah, should have separated these sentences, less work for translators.
--
Duy