am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT...
am 869df29e: (-s ours) am c1ac011a: (-s ours) Import translations. DO NOT MERGE am: 35424cc2 -s ours
am: 8a901a61 -s ours
* commit '8a901a61':
Import translations. DO NOT MERGE