am fbbc8f1e: (-s ours) am 58305fc4: (-s ours) Import translations. DO NOT MERGE

* commit 'fbbc8f1ed23890056b4841a54f0a95b593f0a3df':
  Import translations. DO NOT MERGE