am 4b7c4f1c: (-s ours) am 2bc05a27: Import translations. DO NOT MERGE

* commit '4b7c4f1c12eb77d57670acc7f573747acd4f80d5':
  Import translations. DO NOT MERGE