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

Change-Id: I9db59dd86b48993e3111c286489ba95f58488cd7