[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 69d1c9c037 -s ours am: 2968a449bc -s ours
am: c1591ce486 -s ours
am skip reason: subject contains skip directive

Change-Id: I6c4bba1701a92d70b1be32b52b957c883a0bfc54