am bdb78458: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Jul 2015 15:11:27 +0000 (15:11 +0000)]
* commit 'bdb784583441806542b90e8dfe454eb85d995037':
  Import translations. DO NOT MERGE


Trivial merge