am 097a8676: (-s ours) am ddacd6ac: (-s ours) Import translations. DO NOT MERGE

* commit '097a867692552ddcb5dba74c01136eb2f6b79af5':