[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: ab46c2ff33
-s ours
am skip reason: subject contains skip directive
Change-Id: I82565b5a973742014900769bd382fb17a001ab52
main
commit
d61e6b5090