am 98be4b70: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Oct 2014 22:05:59 +0000 (22:05 +0000)]
* commit '98be4b708d4ffc1c5b497c198e0ca1d85f8ab7c0':
  Import translations. DO NOT MERGE


Trivial merge