am 2a17dd4e: (-s ours) am e6841c13: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 17:17:27 +0000 (17:17 +0000)]
* commit '2a17dd4e1ecd343aa0257d846fdfc23df1711e4b':
  Import translations. DO NOT MERGE


Trivial merge