am 234114ea: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 12 Feb 2015 20:13:52 +0000 (20:13 +0000)]
* commit '234114eaed644dc7c384ca0ae91eada0de09aaad':
  Import translations. DO NOT MERGE


Trivial merge