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

Change-Id: I28f28a12fb554a2791fff10d83bd30399c49a34b