Merge "Import translations. DO NOT MERGE" into nyc-dev am: 10561c0674 -s ours
am: 1fee9029eb -s ours
* commit '1fee9029eb5e6b505aae026bd751a5dd0db15e2e':
Import translations. DO NOT MERGE
This commit is contained in: