diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-12 09:08:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-12 09:08:35 -0700 |
| commit | 3a2c13551e95d27d0cb73e9f313bfd1a89b21917 (patch) | |
| tree | 33c48243d93ac867436306ece00ea44a100007df /Documentation/git-merge.txt | |
| parent | Merge branch 'mm/api-credentials-doc' (diff) | |
| parent | Merge git://github.com/ralfth/git-po-de (diff) | |
| download | tgif-3a2c13551e95d27d0cb73e9f313bfd1a89b21917.tar.xz | |
Merge git://github.com/git-l10n/git-po
Updates to German, Vietnamese and simplified Chinese translation.
* git://github.com/git-l10n/git-po:
l10n: de.po: translate 27 new messages
l10n: Update po/vi.po to v1.7.11.rc2.2.gb694fbb
l10n: zh_CN.po: translate 27 new messages
l10n: Update git.pot (27 new, 1 removed messages)
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions