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

Change-Id: I9b835a1b15237f1237990219e2f64fecedd596a5