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

Change-Id: I63f97d8e5e0431f0abb4759ae0921fb5d0536125