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

Change-Id: I97418b13fcda83cb59e61c76c772421c3321e2ec