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

Change-Id: If66285b91e120c64f49e7d39c0093f2d18dd14b2