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