am cf4b908c: (-s ours) am 938c0265: (-s ours) Import translations. DO NOT MERGE

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