am c5e08935: (-s ours) am 233d666a: (-s ours) Import translations. DO NOT MERGE

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