[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6562981448
-s ours
am: 786dd43b9e
-s ours
am skip reason: subject contains skip directive
Change-Id: If9d9679862a20f662574f2480fe3fb0668f106a4
main
commit
882969d4f5