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

Change-Id: I96907502ea1190a249d4281d2efff33459fd23fd