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

diff --combined builtin/commit.c
index 2deccb54447d7f66213414914225a97e79049f74,470b4a4e8c704b995124ebd08bcab225a62601e8..eae5a29aeb4248b972f97632026993c25d5e03da
--- 1/builtin/commit.c
--- 2/builtin/commit.c
+++ b/builtin/commit.c
@@@ -196,16 -196,16 +196,16 @@@ static void determine_whence(struct wt_
  
  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;
        }
  
@@@ -543,7 -543,6 +543,7 @@@ static void determine_author_info(struc
  
        if (author_message) {
                const char *a, *lb, *rb, *eol;
 +              size_t len;
  
                a = strstr(author_message_buffer, "\nauthor ");
                if (!a)
@@@ -564,11 -563,6 +564,11 @@@
                                         (a + strlen("\nauthor "))));
                email = xmemdupz(lb + strlen("<"), rb - (lb + strlen("<")));
                date = xmemdupz(rb + strlen("> "), eol - (rb + strlen("> ")));
 +              len = eol - (rb + strlen("> "));
 +              date = xmalloc(len + 2);
 +              *date = '@';
 +              memcpy(date + 1, rb + strlen("> "), len);
 +              date[len + 1] = '\0';
        }
  
        if (force_author) {