am 5daa6dd1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Oct 2014 22:02:29 +0000 (22:02 +0000)]
* commit '5daa6dd11cfe3bc7b814dd994b1fdc7ad878de9f':
  Import translations. DO NOT MERGE


Trivial merge