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

Change-Id: If09c6154f34480342999bdb88f96934bb2334b08