[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 433e625341
-s ours
am: 3e9da03d0c
-s ours
am skip reason: subject contains skip directive
Change-Id: I59f8af945535b6aae8ab1a286816fdff2b0addbf
This commit is contained in: