Merge "Import translations. DO NOT MERGE" into nyc-dev am: 3efe250
-s ours
am: 0e4d7cf
-s ours
* commit '0e4d7cf33fad229505c506e1f1b18c7e2cfc1833':
Import translations. DO NOT MERGE
This commit is contained in: