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

Change-Id: I7199d9e4e13077d22d045d0531fab7552d7f0f13