i18n: advice: internationalize message for conflicts
authorVasco Almeida <vascomalmeida@sapo.pt>
Fri, 17 Jun 2016 20:20:52 +0000 (20:20 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 17 Jun 2016 22:45:48 +0000 (15:45 -0700)
commit8785c425320e9288d13f0218e591a8aa5c57479c
tree355547c164734faa4e47f834f62972c5cc097fa0
parente9f3cec494330a86a412adaee95360ddea6fcf54
i18n: advice: internationalize message for conflicts

Mark message for translation telling the user she has conflicts to
resolve. Expose each particular use case, in order to enable translating
entire sentences which would facilitate translating into other
languages.

Change "Pull" to lowercase to match other instances. Update test
t5520-pull.sh, that relied on the old error message, to use the new one.

Although we loose in source code conciseness, we would gain better
translations because translators can 1) translate the entire sentence,
including those terms concerning Git (committing, merging, etc) 2) have
leeway to adapt to their languages.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
advice.c
builtin/pull.c
t/t5520-pull.sh