Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into plan_route_save_as_new_track

Browse source
This commit is contained in:
Dima-1 2020-08-28 10:01:06 +03:00
commit f2a664c5ab
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/strings.xml
View file

@ -1288,7 +1288,7 @@
<string name="mapillary_widget">Mapillary widget</string>
<string name="mapillary_widget_descr">Allows quick contributions to Mapillary.</string>
<string name="mapillary_descr">Online street-level photos for everyone. Discover places, collaborate, capture the world.</string>
<string name="mapillary">Street-level imagery</string>
<string name="mapillary">Mapillary</string>
<string name="plugin_mapillary_descr">Street-level photos for everyone. Discover places, collaborate, capture the world.</string>
<string name="private_access_routing_req">Your destination is located in an area with private access. Allow using private roads for this trip?</string>
<string name="restart_search">Restart search</string>

2
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -318,7 +318,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
} else if (visibleType == DashboardType.OVERLAY_MAP) {
tv.setText(R.string.map_overlay);
} else if (visibleType == DashboardType.MAPILLARY) {
tv.setText(R.string.mapillary);
tv.setText(R.string.street_level_imagery);
} else if (visibleType == DashboardType.CONTOUR_LINES) {
tv.setText(R.string.srtm_plugin_name);
} else if (visibleType == DashboardType.OSM_NOTES) {

2
OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
View file

@ -181,7 +181,7 @@ public class MapillaryPlugin extends OsmandPlugin {
}
adapter.addItem(new ContextMenuItem.ItemBuilder()
.setId(MAPILLARY)
.setTitleId(R.string.mapillary, mapActivity)
.setTitleId(R.string.street_level_imagery, mapActivity)
.setDescription("Mapillary")
.setSelected(settings.SHOW_MAPILLARY.get())
.setColor(settings.SHOW_MAPILLARY.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)