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


Trivial merge