am 07564951: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 20:43:36 +0000 (20:43 +0000)]
* commit '075649517428dfadeeb3084f50b535f30fedeaa6':
  Import translations. DO NOT MERGE


Trivial merge