Import translations. DO NOT MERGE am: c81b0617a6  -s ours am: 431d174f26  -s ours am: 8eef658cf9  -s ours
am: 1e6e698881  -s ours

* commit '1e6e69888109fa24da71e8c859ff12d5a16ca657':
  Import translations. DO NOT MERGE