am ddf6e375: (-s ours) am b34b9a0c: (-s ours) am bdb78458: (-s ours) Import translati...
Geoff Mendal [Mon, 13 Jul 2015 15:36:09 +0000 (15:36 +0000)]
* commit 'ddf6e375aa5935d5fb4a5475fee0a3582abda9bc':
  Import translations. DO NOT MERGE


Trivial merge