[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 6f1fc7fd3f -s ours
am: 6f47e12841 -s ours
am skip reason: subject contains skip directive

Change-Id: I2276d86c6601e418d53e52dced7e7a29a25145e4