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