am 82f69f42: (-s ours) am 5e116a6d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 27 Feb 2015 16:46:58 +0000 (16:46 +0000)]
* commit '82f69f42c87b6868fd5398e72f12685a84f66faf':
  Import translations. DO NOT MERGE


Trivial merge