[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 505a46f7ff -s ours am: 704789a5d5 -s ours
am: 5e371d6051 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib5c792f38dc2884542bd5d30b21d4917f7828296
This commit is contained in: