am 012dfef7: (-s ours) am 535d77fc: am 3be76c87: am 6c96757f: (-s ours) Import translations. DO NOT MERGE

* commit '012dfef735bde3adda165e5add78b61c1a9862c3':