mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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
This commit is contained in:
commit
e6d88ca87c
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
32
remote.c
32
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue