am 8448c8f6: (-s ours) am 4cdee7a6: (-s ours) am 90817b80: (-s ours) am 8c2158e5: Import translations. DO NOT MERGE * commit '8448c8f6':