am c15bc96d: (-s ours) am 60bc1537: (-s ours) Import translations. DO NOT MERGE

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