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

Change-Id: I11064f60646733b0bfc4721f94a84b9e160d5ac1