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

Change-Id: I15e21b7a025ea0cd61313e51b6efa7b781ded911