[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: eaadb371c5 -s ours
am: 181237a246 -s ours
am skip reason: subject contains skip directive

Change-Id: If5c0ad4f0e0b809d03d921b540e5ea570ff446c1