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


Trivial merge