aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:42:27 +0000
committerJunio C Hamano <gitster@pobox.com>2011-03-09 23:52:57 -0800
commite3bd758335ccb2d46ddde628bf391d5155f87730 (patch)
tree7ff84f480ea89642bf9736d4eca7bd7c7a70fac3 /builtin
parentcaeba0ef153574d0240020228e0c48807b665a83 (diff)
downloadgit-e3bd758335ccb2d46ddde628bf391d5155f87730.tar.gz
git-e3bd758335ccb2d46ddde628bf391d5155f87730.tar.xz
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/notes.c6
1 files changed, 4 insertions, 2 deletions
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;