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

Change-Id: I0bcf3e37a5be8383140bfb2ec6733bd429f50beb