am be978ed4: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 14 May 2015 10:06:26 +0000 (10:06 +0000)]
* commit 'be978ed48a0792d7784cef6d1bd5bc83dbae695a':
  Import translations. DO NOT MERGE


Trivial merge