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

Change-Id: Ic3558179014a9fb5fd18cb4f05408a7ce5082bfd