[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: aa0ebd7da9 -s ours
am: 43ee27f969 -s ours
am skip reason: subject contains skip directive

Change-Id: Iafb9e5ee5fdeba05a050676dd373adc0cd9b60e1