[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9223659928
-s ours am: 545560b547
-s ours
am: 5f9a1f096a
-s ours
am skip reason: subject contains skip directive
Change-Id: I5c32b1d921da8a9616cc728e41a2f45dac07aaec
main
commit
a9d47e02c1