[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 7b9006e18c
-s ours
am skip reason: subject contains skip directive
Change-Id: I443f911c5060cde96ff18fbfcd591360e048a290
main
commit
7735923c52