Import translations. DO NOT MERGE am: f20e68c94c
-s ours
am: 9a4eef94ec
-s ours
* commit '9a4eef94eced673c72c4cf2d7d92b19ced882df1':
Import translations. DO NOT MERGE
This commit is contained in: