Merge branch 'va/i18n-misc-updates'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:22 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 May 2016 21:38:23 +0000 (14:38 -0700)
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

1  2 
Makefile
builtin/branch.c
builtin/index-pack.c
builtin/pull.c
unpack-trees.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc builtin/pull.c
Simple merge
diff --cc unpack-trees.c
Simple merge