[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 9905cc9b50 -s ours
am: 9e8e6dffa0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic9cc8b30718cac28df42090d4ddff0010b5953a6