am c7c23071: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 13 Feb 2015 01:14:48 +0000 (01:14 +0000)]
* commit 'c7c23071be84c8df58cc59a9597ae84af5cac026':
  Import translations. DO NOT MERGE


Trivial merge