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

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


Trivial merge