From: Omari Stephens <xsdg@xsdg.org>
Date: Mon, 10 Jul 2017 17:07:29 +0000 (+0000)
Subject: Merge pull request #496 from xsdg/view_file_po
X-Git-Tag: v1.4~132
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=efc10a6b92e81d0a920dac55f792e2f2e3c5f0c1;hp=4bb7c12ddbf99f2290d916008948bd8c3c234991

Merge pull request #496 from xsdg/view_file_po

Shuffle files around, and update translation files to match.
---

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..c6eb36e9
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,11 @@
+<xsdg@xsdg.org> <xsdg@google.com>
+<cclark@mcb.net> <colin.clark@cclark.uk>
+Colin Clark <cclark@mcb.net>
+<johne@verizon.net> John Ellis <gqview@users.sf.net>
+<zas@norz.org> Laurent Monin <geeqie@norz.org>
+<mschwendt@fedoraproject.org> <mschwendt@gmail.com>
+<michal@cihar.com> <mcihar@suse.cz>
+<michal@cihar.com> <nijel@debian.org>
+<jrs+git@weitnahbei.de> J. R. Schmid <sixtyfive@users.noreply.github.com>
+Morgan Hardwood <entertheyoni@gmail.com>
+Rezső Páder <rezso@rezso.net>