summaryrefslogtreecommitdiff
path: root/mergetools/p4merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-01-22 13:45:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-01-22 13:45:07 -0800
commitd588d4d9406691692c60d96e5893d49063129dab (patch)
tree55be9d9dabe451fd18b99466af423ea97c2c7d17 /mergetools/p4merge
parentMerge branch 'sh/asciidoc-git-version-fix' (diff)
parentl10n: correct indentation of show-branch usage (diff)
downloadtgif-d588d4d9406691692c60d96e5893d49063129dab.tar.xz
Merge git://github.com/git-l10n/git-po
* git://github.com/git-l10n/git-po: l10n: correct indentation of show-branch usage l10n: de.po: translate 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions