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

Change-Id: Iee76ebbb7c24ef0d96e5152d848a0c9484872ca5