am 105f5cef: (-s ours) am 26a590e9: (-s ours) Import translations. DO NOT MERGE

* commit '105f5cefb0f6362da78310b29d212576a55cefa6':
  Import translations. DO NOT MERGE