[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: fed6dee6ce
-s ours
am skip reason: subject contains skip directive
Change-Id: I7505176ccb37b5f3a6654e5ff547f96f10891d27
main
commit
a7038935ba