am dc6f6268: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

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