summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-12 16:03:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-12 16:03:20 (GMT)
commitb8de3f4b8c1e01ddbaf9a482e2bd2ef80da39d55 (patch)
treeac80d4bbf363bccb90eb3e354ed11ccc0eefb2fd /git-am.sh
parent745950ce0e7e984158a00cd52c5811918d1f3495 (diff)
parent6672dc8e694f412090417a95cd6cd4b2b5be6da1 (diff)
downloadgit-b8de3f4b8c1e01ddbaf9a482e2bd2ef80da39d55.zip
git-b8de3f4b8c1e01ddbaf9a482e2bd2ef80da39d55.tar.gz
git-b8de3f4b8c1e01ddbaf9a482e2bd2ef80da39d55.tar.bz2
Merge https://github.com/git-l10n/git-po
Updates to localized messages for zn_CN and sv locales. via Jiang Xin * https://github.com/git-l10n/git-po: l10n: Improve zh_CN translation for msg "not something we can merge" l10n: Improve zh_CN trans for msg that cannot fast-forward l10n: Update zh_CN translation for 1.7.10-rc0 Update Swedish translation (732t0f0u). po/sv.po: add Swedish translation l10n: Update git.pot (1 new message) l10n: Update zh_CN translation for 1.7.9.2 l10n: Improve commit msg for zh_CN translation l10n: Improve zh_CN translation for msg that make empty commit when amend. l10n: Improve zh_CN translation for empty cherry-pick msg. l10n: Improve zh_CN translation for msg about branch deletion deny l10n: Improve zh_CN translation for lines insertion and deletion.
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions