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

* commit '8a199896cb9c78adc2cf04082ff7ba42a8b3966a':
  Import translations. DO NOT MERGE


Trivial merge