Import translations. DO NOT MERGE am: bcefb0397f
-s ours
am: c42498eddb
-s ours
* commit 'c42498eddb7b687b999f7a2795db8c46055f778c':
Import translations. DO NOT MERGE
This commit is contained in: