[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 4061ed5736
-s ours
am skip reason: subject contains skip directive
Change-Id: I32a36bccba7d89c4b87599cf431f335a139256cd
main
commit
751578eb61