am 43db8085: am f351b6c0: (-s ours) am 54e55fee: (-s ours) am 9ec75cef: Import translations. DO NOT MERGE * commit '43db8085':