summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-04-02 10:12:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-04-02 10:12:38 -0700
commit1614dd0fbc8a14f488016b7855de9f0566706244 (patch)
treee514a33b2dee2d0dd79936e330e108944f1e6b36 /merge-recursive.h
parentMerge branch 'pw/add-p-single' (diff)
parentl10n: de.po: translate 132 new messages (diff)
downloadtgif-1614dd0fbc8a14f488016b7855de9f0566706244.tar.xz
Merge tag 'l10n-2.17.0-rnd1' of git://github.com/git-l10n/git-po
l10n for Git 2.17.0 round 1 * tag 'l10n-2.17.0-rnd1' of git://github.com/git-l10n/git-po: l10n: de.po: translate 132 new messages l10n: zh_CN: review for git v2.17.0 l10n round 1 l10n: zh_CN: for git v2.17.0 l10n round 1 l10n: ko.po: Update Korean translation l10n: fr.po: v2.17.0 no fuzzy l10n: sv.po: Update Swedish translation (3376t0f0u) l10n: Update Catalan translation l10n: fr.po v2.17.0 round 1 l10n: vi.po(3376t): Updated Vietnamese translation for v2.17 l10n: bg.po: Updated Bulgarian translation (3376t) l10n: es.po: Update Spanish translation 2.17.0 l10n: git.pot: v2.17.0 round 1 (132 new, 44 removed) l10n: es.po: fixes to Spanish translation
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions