am 1cdda6a3: (-s ours) am 4ea79638: am e8f40508: Import translations. DO NOT MERGE

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