diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-01-16 14:49:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-16 14:49:58 -0800 |
| commit | e0d575025a80c83c3eaec82a217714610f0ab115 (patch) | |
| tree | 35209251f51f05c1fef694a82e0e643ebe4f8b88 /xdiff/xmerge.c | |
| parent | RelNotes: minor typofix (diff) | |
| parent | l10n: de.po: translate 72 new messages (diff) | |
| download | tgif-e0d575025a80c83c3eaec82a217714610f0ab115.tar.xz | |
Merge tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-po
l10n for Git 2.16.0 round 2
* tag 'l10n-2.16.0-rnd2' of git://github.com/git-l10n/git-po: (24 commits)
l10n: de.po: translate 72 new messages
l10n: de.po: improve messages when a branch starts to track another ref
l10n: bg.po: Updated Bulgarian translation (3288t)
l10n: TEAMS: add zh_CN team members
l10n: zh_CN: for git v2.16.0 l10n round 2
l10n: sv.po: Update Swedish translation (3288t0f0u)
l10n: ru.po: update Russian translation
l10n: TEAMS: Add ko team members
l10n: ko.po: Update Korean translation
l10n: fr.po 2.16 round 2
l10n: es.po: Spanish translation 2.16.0 round 2
l10n: vi.po(3288t): Updated Vietnamese translation for v2.16.0 round 2
l10n: git.pot: v2.16.0 round 2 (8 new, 4 removed)
l10n: es.po: Update Spanish Translation v2.16.0
l10n: fr.po v2.16.0 round 1
l10n: bg.po: Updated Bulgarian translation (3284t)
l10n: sv.po: Update Swedish translation (3284t0f0u)
l10n: fr.po: "worktree list" mistranslated as prune
l10n: git.pot: v2.16.0 round 1 (64 new, 25 removed)
l10n: fixes to German translation
...
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions