diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:51:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:51:18 +0100 |
| commit | be13464a488ccc2837b0c178ff16086be341e570 (patch) | |
| tree | c0923835f7522452ca12f66a7a3785b2c6b70d5a /src/location/maps | |
| parent | 93cd42ef606178261e12eeffc88cd4b7d029dbc3 (diff) | |
| parent | 444a2d5b19e601e74e78384c823d7d048e797c4c (diff) | |
| download | qtlocation-be13464a488ccc2837b0c178ff16086be341e570.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I786a0bff424afcb791a9aff68cc16df074153492
Diffstat (limited to 'src/location/maps')
| -rw-r--r-- | src/location/maps/qgeorouteparserosrmv5.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/location/maps/qgeorouteparserosrmv5.cpp b/src/location/maps/qgeorouteparserosrmv5.cpp index cbbf7fc4..6c73b1f7 100644 --- a/src/location/maps/qgeorouteparserosrmv5.cpp +++ b/src/location/maps/qgeorouteparserosrmv5.cpp @@ -428,9 +428,9 @@ static QString instructionNewName(const QString &wayName, QGeoManeuver::Instruct case QGeoManeuver::DirectionLightRight: case QGeoManeuver::DirectionBearRight: if (wayName.isEmpty()) - return QGeoRouteParserOsrmV5::tr("Contine slightly right"); + return QGeoRouteParserOsrmV5::tr("Continue slightly right"); else - return QGeoRouteParserOsrmV5::tr("Contine slightly right onto %1").arg(wayName); + return QGeoRouteParserOsrmV5::tr("Continue slightly right onto %1").arg(wayName); case QGeoManeuver::DirectionUTurnLeft: case QGeoManeuver::DirectionUTurnRight: if (wayName.isEmpty()) @@ -468,9 +468,9 @@ static QString instructionNotification(const QString &wayName, QGeoManeuver::Ins case QGeoManeuver::DirectionLightRight: case QGeoManeuver::DirectionBearRight: if (wayName.isEmpty()) - return QGeoRouteParserOsrmV5::tr("Contine on the right"); + return QGeoRouteParserOsrmV5::tr("Continue on the right"); else - return QGeoRouteParserOsrmV5::tr("Contine on the right on %1").arg(wayName); + return QGeoRouteParserOsrmV5::tr("Continue on the right on %1").arg(wayName); case QGeoManeuver::DirectionForward: default: if (wayName.isEmpty()) |