am 683fa2a1: (-s ours) am 5daa6dd1: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Oct 2014 22:07:17 +0000 (22:07 +0000)]
* commit '683fa2a1849d24686fd71530247c6046b7f4e3ec':
  Import translations. DO NOT MERGE


Trivial merge