diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:10 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 09:03:10 +0900 |
commit | b19174e2f37cc696cbfded9a02c2f2fd6e93bce7 (patch) | |
tree | a006fc1e437b51f50e904ffca1e10add88b0ede8 /ref-filter.c | |
parent | Merge branch 'ls/travis-doc-asciidoctor' into maint (diff) | |
parent | C style: use standard style for "TRANSLATORS" comments (diff) | |
download | tgif-b19174e2f37cc696cbfded9a02c2f2fd6e93bce7.tar.xz |
Merge branch 'ab/c-translators-comment-style' into maint
Update the C style recommendation for notes for translators, as
recent versions of gettext tools can work with our style of
multi-line comments.
* ab/c-translators-comment-style:
C style: use standard style for "TRANSLATORS" comments
Diffstat (limited to 'ref-filter.c')
-rw-r--r-- | ref-filter.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ref-filter.c b/ref-filter.c index 3a640448fd..5632841753 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1251,13 +1251,17 @@ char *get_head_description(void) state.branch); else if (state.detached_from) { if (state.detached_at) - /* TRANSLATORS: make sure this matches - "HEAD detached at " in wt-status.c */ + /* + * TRANSLATORS: make sure this matches "HEAD + * detached at " in wt-status.c + */ strbuf_addf(&desc, _("(HEAD detached at %s)"), state.detached_from); else - /* TRANSLATORS: make sure this matches - "HEAD detached from " in wt-status.c */ + /* + * TRANSLATORS: make sure this matches "HEAD + * detached from " in wt-status.c + */ strbuf_addf(&desc, _("(HEAD detached from %s)"), state.detached_from); } |