[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 0d6a3d5e45
-s ours
am: 187fbe0b78
-s ours
am skip reason: subject contains skip directive
Change-Id: I457059e186ce2593db3df0451a003db2013ab3b9
main
commit
0a5410d82b