am 3d30b374: (-s ours) am 058f62ba: (-s ours) am bd044818: Import revised translations. DO NOT MERGE
* commit '3d30b374f6cedb63d06844f6b2c7fa33f50dd77d': Import revised translations. DO NOT MERGE
This commit is contained in: