From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:22 +0000 (-0700)
Subject: Merge branch 'va/i18n-misc-updates'
X-Git-Tag: v2.9.0-rc0~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e5e7a9115dc9373f18a6470139cf05d4a541fb16

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
---

e5e7a9115dc9373f18a6470139cf05d4a541fb16