From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Feb 2011 23:42:27 +0000 (+0000) Subject: i18n: git-notes GIT_NOTES_REWRITE_MODE error message X-Git-Tag: v1.7.5-rc1~19^2~5 X-Git-Url: https://git.tokkee.org/?p=git.git;a=commitdiff_plain;h=e3bd758335ccb2d46ddde628bf391d5155f87730 i18n: git-notes GIT_NOTES_REWRITE_MODE error message Use sprintf format for the error message that's displayed if GIT_NOTES_REWRITE_MODE is invalid, and leave a note in a TRANSLATORS comment indicating what the message means. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/builtin/notes.c b/builtin/notes.c index 4c6cf8563..a0aa99515 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -382,8 +382,10 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd) c->mode_from_env = 1; c->combine = parse_combine_notes_fn(rewrite_mode_env); if (!c->combine) - error("Bad " GIT_NOTES_REWRITE_MODE_ENVIRONMENT - " value: '%s'", rewrite_mode_env); + /* TRANSLATORS: The first %s is the name of the + environment variable, the second %s is its value */ + error(_("Bad %s value: '%s'"), GIT_NOTES_REWRITE_MODE_ENVIRONMENT, + rewrite_mode_env); } if (rewrite_refs_env) { c->refs_from_env = 1;