[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7630c6c549
-s ours
am: ffeda6dcef
-s ours
am skip reason: subject contains skip directive
Change-Id: I79dd684a1dabb2fa4b0a96941a809b8692bea30a
main
commit
bab0b46a2f