[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 7604e64ecc
-s ours
am skip reason: subject contains skip directive
Change-Id: Iaf05b347b2b5d48857c449a4eecba8d917aa54da
main
commit
48fd3d016a