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

Change-Id: I761eb5f8a956555ef6341f001b6ba952a1c888e8