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