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