am 18828fa6
: (-s ours) am 7bb19a89
: am 17fcd476
: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '18828fa65dfac58a8a0f7d3798c7c35f64d1ea20' * commit '18828fa65dfac58a8a0f7d3798c7c35f64d1ea20': Import revised translations. DO NOT MERGE
This commit is contained in: