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

Change-Id: I55172f5b0f9e0ec8870665a286f64b3893daba51