am 5e116a6d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 27 Feb 2015 16:34:35 +0000 (16:34 +0000)]
* commit '5e116a6d63b4f5060041adeeb1bdc2b0585266cd':
  Import translations. DO NOT MERGE


Trivial merge