[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 41c7e07d12
-s ours
am skip reason: subject contains skip directive
Change-Id: I0c38b2df9aa5f227b9407a6524a37d11741e46bc
main
commit
0bc3df3750