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

Change-Id: I896c8a40e34c1fe024dd537ae11f8e3088f05fe3