diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-09-21 15:15:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-21 15:15:28 -0700 |
| commit | 1fe6f5fb0a4bf348b22790b4d766a463e013a384 (patch) | |
| tree | 8edd9f522bdb14e170d7ac53f34454268e5ad5bb /t | |
| parent | Merge branch 'jt/format-patch-base-info-above-sig' (diff) | |
| parent | i18n: update-index: mark warnings for translation (diff) | |
| download | tgif-1fe6f5fb0a4bf348b22790b4d766a463e013a384.tar.xz | |
Merge branch 'va/i18n'
More i18n.
* va/i18n:
i18n: update-index: mark warnings for translation
i18n: show-branch: mark plural strings for translation
i18n: show-branch: mark error messages for translation
i18n: receive-pack: mark messages for translation
notes: spell first word of error messages in lowercase
i18n: notes: mark error messages for translation
i18n: merge-recursive: mark verbose message for translation
i18n: merge-recursive: mark error messages for translation
i18n: config: mark error message for translation
i18n: branch: mark option description for translation
i18n: blame: mark error messages for translation
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3320-notes-merge-worktrees.sh | 2 | ||||
| -rwxr-xr-x | t/t8003-blame-corner-cases.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh index 6e0511596b..b9c3bc2487 100755 --- a/t/t3320-notes-merge-worktrees.sh +++ b/t/t3320-notes-merge-worktrees.sh @@ -52,7 +52,7 @@ test_expect_success 'merge z into y while mid-merge in another workdir fails' ' cd worktree && git config core.notesRef refs/notes/y && test_must_fail git notes merge z 2>err && - test_i18ngrep "A notes merge into refs/notes/y is already in-progress at" err + test_i18ngrep "a notes merge into refs/notes/y is already in-progress at" err ) && test_path_is_missing .git/worktrees/worktree/NOTES_MERGE_REF ' diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh index e48370dfa0..661f9d430d 100755 --- a/t/t8003-blame-corner-cases.sh +++ b/t/t8003-blame-corner-cases.sh @@ -212,12 +212,12 @@ EOF test_expect_success 'blame -L with invalid start' ' test_must_fail git blame -L5 tres 2>errors && - grep "has only 2 lines" errors + test_i18ngrep "has only 2 lines" errors ' test_expect_success 'blame -L with invalid end' ' test_must_fail git blame -L1,5 tres 2>errors && - grep "has only 2 lines" errors + test_i18ngrep "has only 2 lines" errors ' test_expect_success 'blame parses <end> part of -L' ' |