[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 64302ec808
-s ours
am: b403889818
-s ours
am skip reason: subject contains skip directive
Change-Id: I2437556ccbcaf0d5595f3269a7b6f8fad12cf1b9
main
commit
b69aaf4750