am 6ef7a95c: am f595a062: (-s ours) Import translations. DO NOT MERGE
* commit '6ef7a95c289b95382fa420e3a15ed6cdf9841e7b': Import translations. DO NOT MERGEmain
commit
7e383483b7
* commit '6ef7a95c289b95382fa420e3a15ed6cdf9841e7b': Import translations. DO NOT MERGEmain