am 6a5dd95e: am 29e5c899: Import translations. DO NOT MERGE

* commit '6a5dd95e469fdceae6f917e15d40bb834523d1c7':