am 2c63c367: (-s ours) am d58e82b4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 27 Feb 2015 16:47:52 +0000 (16:47 +0000)]
* commit '2c63c367443383fffbefbaafcb91a0131275f437':
  Import translations. DO NOT MERGE


Trivial merge