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

Change-Id: I68c2eb28f9d617d4e24d140001f2671a59d8a820