Ævar Arnfjörð Bjarmason wrote: > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -116,13 +116,13 @@ static struct strategy *get_strategy(const char *name) > exclude_cmds(&main_cmds, ¬_strategies); > } > if (!is_in_cmdlist(&main_cmds, name) && !is_in_cmdlist(&other_cmds, name)) { > - fprintf(stderr, "Could not find merge strategy '%s'.\n", name); > - fprintf(stderr, "Available strategies are:"); > + fprintf(stderr, _("Could not find merge strategy '%s'.\n"), name); > + fprintf(stderr, _("Available strategies are:")); Another basic question (sorry for my ignorance): do translators prefer whole paragraphs or line-by-line messages like this? (Of course that is not a topic for this patch; I am just curious.) > @@ -513,7 +513,7 @@ static int git_merge_config(const char *k, const char *v, void *cb) > int is_bool; > shortlog_len = git_config_bool_or_int(k, v, &is_bool); > if (!is_bool && shortlog_len < 0) > - return error("%s: negative length %s???", k, v); > + return error(_("%s: negative length %s???"), k, v); What branch are you translating? I am hoping the omgwtfbbq??! message gets a chance to be tweaked before release. -- 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