am dfc0adfe: am b0aabbfb: (-s ours) am 8dafc8e8: (-s ours) am 22e6a5c5: Import translations. DO NOT MERGE * commit 'dfc0adfe':