Import translations. DO NOT MERGE
am: cb83108117  -s ours

* commit 'cb831081173e2ea85a0505e6c170008c9dc51732':
  Import translations. DO NOT MERGE