am cc30f068: (-s ours) Import translations. DO NOT MERGE

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