am 0e333b8a: (-s ours) am 07564951: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 20:47:38 +0000 (20:47 +0000)]
* commit '0e333b8ad819a105e56dcf36bf9ef2487e60b048':
  Import translations. DO NOT MERGE


Trivial merge