am 0038e433: (-s ours) am 25ee68ea: (-s ours) Import translations. DO NOT MERGE

* commit '0038e433bff1859282911132459c6165a51852bb':
  Import translations. DO NOT MERGE