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