[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928
-s ours am: 545560b547
-s ours am: 5f9a1f096a
-s ours
am: a9d47e02c1
-s ours
am skip reason: subject contains skip directive
Change-Id: I708bb1bbb61a638db4df643d3b574be1cbd6180b
main
commit
ed55f25bf9