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

Change-Id: I71e66cacaa799e8bcb1f2d994862290644fd47c5