Merge "Import translations. DO NOT MERGE" into nyc-dev am: c76c37ef6d -s ours
am: ddbf785d63 -s ours
* commit 'ddbf785d63a61b25e6aa787db814bcc4938120d9':
Import translations. DO NOT MERGE
This commit is contained in: