summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-16 21:59:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-02-16 21:59:53 (GMT)
commite6d88ca87cbb3d89d639a3ee769486f44f9a33b8 (patch)
tree0aebf2fcb42700fbc813819ec219afd4994201ed
parent68e4b552a1b82343bcefa5d68fa344314b150cc8 (diff)
parent8a5b749428d39a0e85fb0f76306b88945cb5c6e0 (diff)
downloadgit-e6d88ca87cbb3d89d639a3ee769486f44f9a33b8.zip
git-e6d88ca87cbb3d89d639a3ee769486f44f9a33b8.tar.gz
git-e6d88ca87cbb3d89d639a3ee769486f44f9a33b8.tar.bz2
Merge branch 'jx/i18n-more-marking' into maint
* jx/i18n-more-marking: i18n: format_tracking_info "Your branch is behind" message i18n: git-commit whence_s "merge/cherry-pick" message
-rw-r--r--builtin/commit.c6
-rw-r--r--remote.c32
2 files changed, 24 insertions, 14 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index 2deccb5..eae5a29 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -196,16 +196,16 @@ static void determine_whence(struct wt_status *s)
static const char *whence_s(void)
{
- char *s = "";
+ const char *s = "";
switch (whence) {
case FROM_COMMIT:
break;
case FROM_MERGE:
- s = "merge";
+ s = _("merge");
break;
case FROM_CHERRY_PICK:
- s = "cherry-pick";
+ s = _("cherry-pick");
break;
}
diff --git a/remote.c b/remote.c
index 73a3809..af597b3 100644
--- a/remote.c
+++ b/remote.c
@@ -1572,19 +1572,29 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb)
base = branch->merge[0]->dst;
base = shorten_unambiguous_ref(base, 0);
if (!num_theirs)
- strbuf_addf(sb, "Your branch is ahead of '%s' "
- "by %d commit%s.\n",
- base, num_ours, (num_ours == 1) ? "" : "s");
+ strbuf_addf(sb,
+ Q_("Your branch is ahead of '%s' by %d commit.\n",
+ "Your branch is ahead of '%s' by %d commits.\n",
+ num_ours),
+ base, num_ours);
else if (!num_ours)
- strbuf_addf(sb, "Your branch is behind '%s' "
- "by %d commit%s, "
- "and can be fast-forwarded.\n",
- base, num_theirs, (num_theirs == 1) ? "" : "s");
+ strbuf_addf(sb,
+ Q_("Your branch is behind '%s' by %d commit, "
+ "and can be fast-forwarded.\n",
+ "Your branch is behind '%s' by %d commits, "
+ "and can be fast-forwarded.\n",
+ num_theirs),
+ base, num_theirs);
else
- strbuf_addf(sb, "Your branch and '%s' have diverged,\n"
- "and have %d and %d different commit(s) each, "
- "respectively.\n",
- base, num_ours, num_theirs);
+ strbuf_addf(sb,
+ Q_("Your branch and '%s' have diverged,\n"
+ "and have %d and %d different commit each, "
+ "respectively.\n",
+ "Your branch and '%s' have diverged,\n"
+ "and have %d and %d different commits each, "
+ "respectively.\n",
+ num_theirs),
+ base, num_ours, num_theirs);
return 1;
}