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

Change-Id: Iac808d2c1042f00c600b24a28d2962e5ee350665