am bb23697a: (-s ours) am d58d91ef: (-s ours) am 2ae0419f: (-s ours) Import translations. DO NOT MERGE * commit 'bb23697a': Import translations. DO NOT MERGE