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


Trivial merge