diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-06-17 20:20:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-17 22:45:48 (GMT) |
| commit | 8785c425320e9288d13f0218e591a8aa5c57479c (patch) | |
| tree | 355547c164734faa4e47f834f62972c5cc097fa0 /t/t5520-pull.sh | |
| parent | e9f3cec494330a86a412adaee95360ddea6fcf54 (diff) | |
| download | git-8785c425320e9288d13f0218e591a8aa5c57479c.zip git-8785c425320e9288d13f0218e591a8aa5c57479c.tar.gz git-8785c425320e9288d13f0218e591a8aa5c57479c.tar.bz2 | |
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>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 739c089..45e44ca 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -211,7 +211,7 @@ test_expect_success 'fail if the index has unresolved entries' ' test -n "$(git ls-files -u)" && cp file expected && test_must_fail git pull . second 2>err && - test_i18ngrep "Pull is not possible because you have unmerged files" err && + test_i18ngrep "Pulling is not possible because you have unmerged files." err && test_cmp expected file && git add file && test -z "$(git ls-files -u)" && |