Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:45:56 +0000 (16:45 +0000)]
am: b24f46b8ae  -s ours

* commit 'b24f46b8ae97d6c947a93bd1660a366d9d143438':
  Import translations. DO NOT MERGE


Trivial merge