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

Change-Id: Iee5bd418d59bfa0de8c0a3bd9cfc5cd8976ccc69