Merge "Import translations. DO NOT MERGE" into nyc-dev am: c654adf99c
-s ours
am: de12d181f6
-s ours
* commit 'de12d181f6ee6f776060d39dc575965f9b0df7f4':
Import translations. DO NOT MERGE
This commit is contained in: