am 911ed4c7: (-s ours) am 7a2ae880: (-s ours) am bfcc8f05: (-s ours) Import translations. DO NOT MERGE

* commit '911ed4c7ecffa17171a5ad82cb2b1d407a4cbde8':
  Import translations. DO NOT MERGE