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

Change-Id: If58d9912c1a65253a8667b55c4c52da6ea3faaa8