From: Junio C Hamano Date: Tue, 13 Aug 2013 17:50:01 +0000 (-0700) Subject: Merge git://github.com/git-l10n/git-po X-Git-Tag: v1.8.4-rc3~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/eaaec50fcd705b10f59e1104e22914f844eaf4de?hp=1b5f46f15917fc938c219732fe5ec6a45748f1f7 Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: Add reference for french translation team l10n: fr.po: 821/2112 messages translated --- diff --git a/.mailmap b/.mailmap index 840abf7cba..1c1f5ec6bf 100644 --- a/.mailmap +++ b/.mailmap @@ -18,10 +18,14 @@ Alexey Shumkin Anders Kaseorg Anders Kaseorg Aneesh Kumar K.V +Amos Waterland +Amos Waterland Ben Walton +Benoit Sigoure Bernt Hansen Brandon Casey -Brian M. Carlson +brian m. carlson Brian M. Carlson +brian m. carlson Bryan Larsen Bryan Larsen Cheng Renquan @@ -34,6 +38,8 @@ Dan Johnson Dana L. How Dana L. How Dana How Daniel Barkalow +Daniel Trstenjak +Daniel Trstenjak David Brown David D. Kilzer David Kågedal @@ -68,11 +74,17 @@ J. Bruce Fields J. Bruce Fields Jakub Narębski James Y Knight +# The 2 following authors are probably the same person, +# but both emails bounce. +Jason McMullan +Jason McMullan Jason Riedy Jason Riedy Jay Soffian Jeff King Jeff Muizelaar +Jens Axboe +Jens Axboe Jim Meyering Joachim Berdal Haga Johannes Schindelin @@ -144,7 +156,7 @@ Michele Ballabio Miklos Vajna Namhyung Kim Namhyung Kim -Nanako Shiraishi +Nanako Shiraishi Nanako Shiraishi Nelson Elhage Nelson Elhage @@ -177,6 +189,8 @@ Robert Fitzsimons Robert Shearman Robert Zeh Robin Rosenberg +Rutger Nijlunsing +Rutger Nijlunsing Ryan Anderson Salikh Zakirov Sam Vilain diff --git a/contrib/mw-to-git/.gitignore b/contrib/mw-to-git/.gitignore index b9196555e5..ae545b013d 100644 --- a/contrib/mw-to-git/.gitignore +++ b/contrib/mw-to-git/.gitignore @@ -1 +1,2 @@ git-remote-mediawiki +git-mw