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