Merge "Import translations. DO NOT MERGE" into nyc-dev am: a563c75537 -s ours
am: 91b7774efd -s ours
* commit '91b7774efd1d88e2953868fcfa323a05234c3591':
Import translations. DO NOT MERGE
This commit is contained in: