diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:23 -0700 |
| commit | e5e7a9115dc9373f18a6470139cf05d4a541fb16 (patch) | |
| tree | c01aed6cc4e6f193968bfbe773508824805391c6 /git-merge-octopus.sh | |
| parent | Merge branch 'js/t3404-typofix' (diff) | |
| parent | i18n: unpack-trees: avoid substituting only a verb in sentences (diff) | |
| download | tgif-e5e7a9115dc9373f18a6470139cf05d4a541fb16.tar.xz | |
Merge branch 'va/i18n-misc-updates'
Mark several messages for translation.
* va/i18n-misc-updates:
i18n: unpack-trees: avoid substituting only a verb in sentences
i18n: builtin/pull.c: split strings marked for translation
i18n: builtin/pull.c: mark placeholders for translation
i18n: git-parse-remote.sh: mark strings for translation
i18n: branch: move comment for translators
i18n: branch: unmark string for translation
i18n: builtin/rm.c: remove a comma ',' from string
i18n: unpack-trees: mark strings for translation
i18n: builtin/branch.c: mark option for translation
i18n: index-pack: use plural string instead of normal one
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions