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

Change-Id: I504073395d6038c42eb8ee65fa3231366252ce02