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

Change-Id: I0c22564095a1d9695a4e393ea932bec73f5d6d21