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

Change-Id: I5ba9360d64ea4be4d52eb9136d01563ab563be2f