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

Change-Id: I3db9d617c6c6b62dbf782699cf5ca0ed2e6fda58