[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 72babaee36 -s ours
am: 36f6254ee3 -s ours
am skip reason: subject contains skip directive

Change-Id: I5f78a3ffc9c0fb487d547a297379a493405b8618