summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2011-02-22 23:41:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-10 07:52:53 (GMT)
commita5760906e78adeab2ae8f404528c4ce10d046f5c (patch)
tree9e529e2111ad7575459569a82c6ad6dc1b0537c4 /builtin/branch.c
parent8af42b0f7773bff2529f6c8990bb3d872b8270d5 (diff)
downloadgit-a5760906e78adeab2ae8f404528c4ce10d046f5c.zip
git-a5760906e78adeab2ae8f404528c4ce10d046f5c.tar.gz
git-a5760906e78adeab2ae8f404528c4ce10d046f5c.tar.bz2
i18n: git-branch "git branch -v" messages
Make the "git branch -v" messages translatable, e.g.: 5054b57 [ahead 8] branch error fixup This is possibly a plumbing message. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index d276681..4c1a256 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -373,11 +373,11 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name,
strbuf_addf(stat, "%s: ",
shorten_unambiguous_ref(branch->merge[0]->dst, 0));
if (!ours)
- strbuf_addf(stat, "behind %d] ", theirs);
+ strbuf_addf(stat, _("behind %d] "), theirs);
else if (!theirs)
- strbuf_addf(stat, "ahead %d] ", ours);
+ strbuf_addf(stat, _("ahead %d] "), ours);
else
- strbuf_addf(stat, "ahead %d, behind %d] ", ours, theirs);
+ strbuf_addf(stat, _("ahead %d, behind %d] "), ours, theirs);
}
static int matches_merge_filter(struct commit *commit)