am 8f6b3cb4: am 1f1f4e09: (-s ours) am 6a5dd95e: am 29e5c899: Import translations. DO NOT MERGE

* commit '8f6b3cb4a2f5018ebcf87c05ddd058972ebc226c':