summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-05 10:57:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-05 10:57:53 -0700
commitf623ca1cae600e97cb0b38131fdd33e4fb669cf8 (patch)
treed2ba177701831e88b4bf55d5969dbdf44bde1ae9 /merge-file.c
parentGit 1.7.11-rc1 (diff)
parentMerge git://github.com/ralfth/git-po-de (diff)
downloadtgif-f623ca1cae600e97cb0b38131fdd33e4fb669cf8.tar.xz
Merge git://github.com/git-l10n/git-po
German and Chinese translation updates. By Ralf Thielow (4) and others via Jiang Xin (1) and Tran Ngoc Quan (1) * git://github.com/git-l10n/git-po: l10n: Update translation for Vietnamese l10n: de.po: add additional newline l10n: de.po: translate 2 new, 3 fuzzy messages l10n: de.po: translate 41 new messages l10n: de.po: translate 265 new messages l10n: zh_CN.po: translate 2 new, 3 fuzzy messages l10n: Update git.pot (5 new, 3 removed messages)
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions