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

Merge remote-tracking branch 'origin/quickaction_fix_3.3' into quickaction_fix_3.3

Browse source 
# Conflicts:
#	OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
This commit is contained in:
madwasp79 2019-03-15 17:56:28 +02:00
commit fc91c5582f
34 changed files with 1875 additions and 1263 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java
View file

@ -43,14 +43,14 @@ public class TransportRoute extends MapObject {
}
public List<Way> getForwardWays() {
return forwardWays;
return forwardWays == null ? Collections.emptyList() : forwardWays;
}
public void mergeForwardWays() {
boolean changed = true;
// combine as many ways as possible
while (changed) {
while (changed && forwardWays != null) {
changed = false;
for(int k = 0; k < forwardWays.size(); ) {
// scan to merge with the next segment
@ -113,7 +113,7 @@ public class TransportRoute extends MapObject {
if (forwardStops.size() > 0) {
// resort ways to stops order
final Map<Way, int[]> orderWays = new HashMap<Way, int[]>();
for (Way w : forwardWays) {
for (Way w : getForwardWays()) {
int[] pair = new int[] { 0, 0 };
Node firstNode = w.getFirstNode();
TransportStop st = forwardStops.get(0);

13
OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleSearchRequest.java
View file

@ -35,6 +35,19 @@ public class RenderingRuleSearchRequest {
saveState();
}
public RenderingRuleSearchRequest(RenderingRuleSearchRequest renderingRuleSearchRequest) {
this.storage = renderingRuleSearchRequest.storage;
this.props = renderingRuleSearchRequest.props;
this.values = new int[renderingRuleSearchRequest.values.length];
this.fvalues = new float[renderingRuleSearchRequest.fvalues.length];
this.object = renderingRuleSearchRequest.object;
this.searchResult = renderingRuleSearchRequest.searchResult;
this.ALL = renderingRuleSearchRequest.ALL;
System.arraycopy(renderingRuleSearchRequest.values, 0, values, 0, renderingRuleSearchRequest.values.length);
System.arraycopy(renderingRuleSearchRequest.fvalues, 0, fvalues, 0, renderingRuleSearchRequest.fvalues.length);
saveState();
}
public void setStringFilter(RenderingRuleProperty p, String filter) {
assert p.isInputProperty();
values[p.getId()] = storage.getDictionaryValue(filter);

78
OsmAnd-java/src/main/java/net/osmand/router/RouteStatistics.java
View file

@ -16,36 +16,39 @@ public class RouteStatistics {
private final RenderingRulesStorage currentRenderer;
private final RenderingRulesStorage defaultRenderer;
private final boolean nightMode;
private final RenderingRuleSearchRequest currentSearchRequest;
private final RenderingRuleSearchRequest defaultSearchRequest;
private RouteStatistics(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, boolean nightMode) {
private RouteStatistics(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, RenderingRuleSearchRequest currentSearchRequest, RenderingRuleSearchRequest defaultSearchRequest) {
this.route = route;
this.currentRenderer = currentRenderer;
this.defaultRenderer = defaultRenderer;
this.nightMode = nightMode;
this.defaultSearchRequest = defaultSearchRequest;
this.currentSearchRequest = currentSearchRequest;
}
public static RouteStatistics newRouteStatistic(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, boolean nightMode) {
return new RouteStatistics(route, currentRenderer, defaultRenderer, nightMode);
public static RouteStatistics newRouteStatistic(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, RenderingRuleSearchRequest currentSearchRequest, RenderingRuleSearchRequest defaultSearchRequest) {
return new RouteStatistics(route, currentRenderer, defaultRenderer, currentSearchRequest, defaultSearchRequest);
}
public Statistics getRouteSurfaceStatistic() {
RouteStatisticComputer statisticComputer = new RouteSurfaceStatisticComputer(route, currentRenderer, defaultRenderer, nightMode);
RouteStatisticComputer statisticComputer = new RouteSurfaceStatisticComputer(route, currentRenderer, defaultRenderer, currentSearchRequest, defaultSearchRequest);
return statisticComputer.computeStatistic();
}
public Statistics getRouteSmoothnessStatistic() {
RouteStatisticComputer statisticComputer = new RouteSmoothnessStatisticComputer(route, currentRenderer, defaultRenderer, nightMode);
RouteStatisticComputer statisticComputer = new RouteSmoothnessStatisticComputer(route, currentRenderer, defaultRenderer, currentSearchRequest, defaultSearchRequest);
return statisticComputer.computeStatistic();
}
public Statistics getRouteClassStatistic() {
RouteStatisticComputer statisticComputer = new RouteClassStatisticComputer(route, currentRenderer, defaultRenderer, nightMode);
RouteStatisticComputer statisticComputer = new RouteClassStatisticComputer(route, currentRenderer, defaultRenderer, currentSearchRequest, defaultSearchRequest);
return statisticComputer.computeStatistic();
}
public Statistics getRouteSteepnessStatistic(List<Incline> inclines) {
RouteStatisticComputer statisticComputer = new RouteSteepnessStatisticComputer(inclines, currentRenderer, defaultRenderer, nightMode);
RouteStatisticComputer statisticComputer = new RouteSteepnessStatisticComputer(inclines, currentRenderer, defaultRenderer, currentSearchRequest, defaultSearchRequest);
return statisticComputer.computeStatistic();
}
@ -55,16 +58,19 @@ public class RouteStatistics {
private final List<RouteSegmentResult> route;
private final StatisticType type;
protected final RenderingRulesStorage currentRenderer;
protected final RenderingRulesStorage defaultRenderer;
protected final boolean nightMode;
final RenderingRulesStorage currentRenderer;
final RenderingRulesStorage defaultRenderer;
final RenderingRuleSearchRequest currentRenderingRuleSearchRequest;
final RenderingRuleSearchRequest defaultRenderingRuleSearchRequest;
public RouteStatisticComputer(RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, List<RouteSegmentResult> route, StatisticType type, boolean nightMode) {
public RouteStatisticComputer(RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, List<RouteSegmentResult> route, StatisticType type,
RenderingRuleSearchRequest currentRenderingRuleSearchRequest, RenderingRuleSearchRequest defaultRenderingRuleSearchRequest) {
this.route = route;
this.currentRenderer = currentRenderer;
this.defaultRenderer = defaultRenderer;
this.type = type;
this.nightMode = nightMode;
this.currentRenderingRuleSearchRequest = currentRenderingRuleSearchRequest;
this.defaultRenderingRuleSearchRequest = defaultRenderingRuleSearchRequest;
}
protected Map<E, RouteSegmentAttribute<E>> makePartition(List<RouteSegmentAttribute<E>> routeAttributes) {
@ -121,13 +127,17 @@ public class RouteStatistics {
return new Statistics<>(routeAttributes, partition, totalDistance, type);
}
RenderingRuleSearchRequest getSearchRequest(boolean useCurrentRenderer) {
return new RenderingRuleSearchRequest(useCurrentRenderer ? currentRenderingRuleSearchRequest : defaultRenderingRuleSearchRequest);
}
public int getColor(E attribute) {
int color = 0;
RenderingRuleSearchRequest currentRequest = new RenderingRuleSearchRequest(currentRenderer);
RenderingRuleSearchRequest currentRequest = getSearchRequest(true);
if (searchRenderingAttribute(currentRenderer, currentRequest, attribute)) {
color = currentRequest.getIntPropertyValue(currentRenderer.PROPS.R_ATTR_COLOR_VALUE);
} else {
RenderingRuleSearchRequest defaultRequest = new RenderingRuleSearchRequest(defaultRenderer);
RenderingRuleSearchRequest defaultRequest = getSearchRequest(false);
if (searchRenderingAttribute(defaultRenderer, defaultRequest, attribute)) {
color = defaultRequest.getIntPropertyValue(defaultRenderer.PROPS.R_ATTR_COLOR_VALUE);
}
@ -147,8 +157,8 @@ public class RouteStatistics {
private static final String SURFACE_ATTR = "surface";
private static final String SURFACE_COLOR_ATTR = "surfaceColor";
public RouteSurfaceStatisticComputer(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, boolean nightMode) {
super(currentRenderer, defaultRenderer, route, StatisticType.SURFACE, nightMode);
public RouteSurfaceStatisticComputer(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, RenderingRuleSearchRequest currentSearchRequest, RenderingRuleSearchRequest defaultSearchRequest) {
super(currentRenderer, defaultRenderer, route, StatisticType.SURFACE, currentSearchRequest, defaultSearchRequest);
}
@Override
@ -157,11 +167,11 @@ public class RouteStatistics {
if (segmentSurface == null) {
return UNDEFINED_ATTR;
}
RenderingRuleSearchRequest currentRequest = new RenderingRuleSearchRequest(currentRenderer);
RenderingRuleSearchRequest currentRequest = getSearchRequest(true);
if (searchRenderingAttribute(currentRenderer, currentRequest, segmentSurface)) {
return segmentSurface;
} else {
RenderingRuleSearchRequest defaultRequest = new RenderingRuleSearchRequest(defaultRenderer);
RenderingRuleSearchRequest defaultRequest = getSearchRequest(false);
if (searchRenderingAttribute(defaultRenderer, defaultRequest, segmentSurface)) {
return segmentSurface;
}
@ -177,7 +187,6 @@ public class RouteStatistics {
@Override
public boolean searchRenderingAttribute(RenderingRulesStorage rrs, RenderingRuleSearchRequest req, String attribute) {
String additional = SURFACE_ATTR + "=" + attribute;
req.setBooleanFilter(rrs.PROPS.R_NIGHT_MODE, nightMode);
req.setStringFilter(rrs.PROPS.R_ATTR_STRING_VALUE, SURFACE_ATTR + "_" + attribute);
req.setStringFilter(rrs.PROPS.R_ADDITIONAL, additional);
return req.searchRenderingAttribute(SURFACE_COLOR_ATTR);
@ -189,8 +198,8 @@ public class RouteStatistics {
private static final String SMOOTHNESS_ATTR = "smoothness";
private static final String SMOOTHNESS_COLOR_ATTR = "smoothnessColor";
public RouteSmoothnessStatisticComputer(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, boolean nightMode) {
super(currentRenderer, defaultRenderer, route, StatisticType.SMOOTHNESS, nightMode);
public RouteSmoothnessStatisticComputer(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, RenderingRuleSearchRequest currentSearchRequest, RenderingRuleSearchRequest defaultSearchRequest) {
super(currentRenderer, defaultRenderer, route, StatisticType.SMOOTHNESS, currentSearchRequest, defaultSearchRequest);
}
@Override
@ -199,11 +208,11 @@ public class RouteStatistics {
if (segmentSmoothness == null) {
return UNDEFINED_ATTR;
}
RenderingRuleSearchRequest currentRequest = new RenderingRuleSearchRequest(currentRenderer);
RenderingRuleSearchRequest currentRequest = getSearchRequest(true);
if (searchRenderingAttribute(currentRenderer, currentRequest, segmentSmoothness)) {
return segmentSmoothness;
} else {
RenderingRuleSearchRequest defaultRequest = new RenderingRuleSearchRequest(defaultRenderer);
RenderingRuleSearchRequest defaultRequest = getSearchRequest(false);
if (searchRenderingAttribute(defaultRenderer, defaultRequest, segmentSmoothness)) {
return segmentSmoothness;
}
@ -219,7 +228,6 @@ public class RouteStatistics {
@Override
public boolean searchRenderingAttribute(RenderingRulesStorage rrs, RenderingRuleSearchRequest req, String attribute) {
String additional = SMOOTHNESS_ATTR + "=" + attribute;
req.setBooleanFilter(rrs.PROPS.R_NIGHT_MODE, nightMode);
req.setStringFilter(rrs.PROPS.R_ATTR_STRING_VALUE, SMOOTHNESS_ATTR + "_" + attribute);
req.setStringFilter(rrs.PROPS.R_ADDITIONAL, additional);
return req.searchRenderingAttribute(SMOOTHNESS_COLOR_ATTR);
@ -231,8 +239,8 @@ public class RouteStatistics {
private static final String HIGHWAY_ATTR = "highway";
private static final String ROAD_CLASS_COLOR_ATTR = "roadClassColor";
public RouteClassStatisticComputer(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, boolean nightMode) {
super(currentRenderer, defaultRenderer, route, StatisticType.CLASS, nightMode);
public RouteClassStatisticComputer(List<RouteSegmentResult> route, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, RenderingRuleSearchRequest currentSearchRequest, RenderingRuleSearchRequest defaultSearchRequest) {
super(currentRenderer, defaultRenderer, route, StatisticType.CLASS, currentSearchRequest, defaultSearchRequest);
}
@Override
@ -248,11 +256,11 @@ public class RouteStatistics {
@Override
public int getColor(String attribute) {
int color = 0;
RenderingRuleSearchRequest currentRequest = new RenderingRuleSearchRequest(currentRenderer);
RenderingRuleSearchRequest currentRequest = getSearchRequest(true);
if (currentRequest.searchRenderingAttribute(attribute)) {
color = currentRequest.getIntPropertyValue(currentRenderer.PROPS.R_ATTR_COLOR_VALUE);
} else {
RenderingRuleSearchRequest defaultRequest = new RenderingRuleSearchRequest(defaultRenderer);
RenderingRuleSearchRequest defaultRequest = getSearchRequest(false);
if (defaultRequest.searchRenderingAttribute(attribute)) {
color = defaultRequest.getIntPropertyValue(defaultRenderer.PROPS.R_ATTR_COLOR_VALUE);
}
@ -268,7 +276,6 @@ public class RouteStatistics {
@Override
public boolean searchRenderingAttribute(RenderingRulesStorage rrs, RenderingRuleSearchRequest req, String attribute) {
req.setBooleanFilter(rrs.PROPS.R_NIGHT_MODE, nightMode);
req.setStringFilter(rrs.PROPS.R_TAG, HIGHWAY_ATTR);
req.setStringFilter(rrs.PROPS.R_VALUE, attribute);
return req.searchRenderingAttribute(ROAD_CLASS_COLOR_ATTR);
@ -276,14 +283,14 @@ public class RouteStatistics {
private String getAttributeType(String attribute) {
String type = null;
RenderingRuleSearchRequest currentRequest = new RenderingRuleSearchRequest(currentRenderer);
RenderingRuleSearchRequest currentRequest = getSearchRequest(true);
if (searchRenderingAttribute(currentRenderer, currentRequest, attribute)) {
type = currentRequest.getStringPropertyValue(currentRenderer.PROPS.R_ATTR_STRING_VALUE);
if (currentRequest.searchRenderingAttribute(type)) {
type = currentRequest.getStringPropertyValue(currentRenderer.PROPS.R_ATTR_STRING_VALUE);
}
} else {
RenderingRuleSearchRequest defaultRequest = new RenderingRuleSearchRequest(defaultRenderer);
RenderingRuleSearchRequest defaultRequest = getSearchRequest(false);
if (searchRenderingAttribute(defaultRenderer, defaultRequest, attribute)) {
type = defaultRequest.getStringPropertyValue(currentRenderer.PROPS.R_ATTR_STRING_VALUE);
if (defaultRequest.searchRenderingAttribute(type)) {
@ -302,8 +309,8 @@ public class RouteStatistics {
private final List<Incline> inclines;
public RouteSteepnessStatisticComputer(List<Incline> inclines, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, boolean nightMode) {
super(currentRenderer, defaultRenderer, null, StatisticType.STEEPNESS, nightMode);
public RouteSteepnessStatisticComputer(List<Incline> inclines, RenderingRulesStorage currentRenderer, RenderingRulesStorage defaultRenderer, RenderingRuleSearchRequest currentSearchRequest, RenderingRuleSearchRequest defaultSearchRequest) {
super(currentRenderer, defaultRenderer, null, StatisticType.STEEPNESS, currentSearchRequest, defaultSearchRequest);
this.inclines = inclines;
}
@ -365,7 +372,6 @@ public class RouteStatistics {
range.append(upperBoundary < 0 ? "_" : "-");
range.append(upperBoundary);
String additional = STEEPNESS_ATTR + "=" + range;
req.setBooleanFilter(rrs.PROPS.R_NIGHT_MODE, nightMode);
req.setStringFilter(rrs.PROPS.R_ADDITIONAL, additional);
return req.searchRenderingAttribute(STEEPNESS_COLOR_ATTR);
}

28
OsmAnd-java/src/main/java/net/osmand/router/TransportRoutePlanner.java
View file

@ -1,8 +1,10 @@
package net.osmand.router;
import net.osmand.Location;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.binary.BinaryMapIndexReader.SearchRequest;
import net.osmand.data.LatLon;
import net.osmand.data.QuadRect;
import net.osmand.data.TransportRoute;
import net.osmand.data.TransportSchedule;
import net.osmand.data.TransportStop;
@ -44,6 +46,7 @@ public class TransportRoutePlanner {
queue.add(r);
}
double finishTime = ctx.cfg.maxRouteTime;
double maxTravelTimeCmpToWalk = MapUtils.getDistance(start, end) / ctx.cfg.walkSpeed - ctx.cfg.changeTime / 2;
List<TransportRouteSegment> results = new ArrayList<TransportRouteSegment>();
initProgressBar(ctx, start, end);
while (!queue.isEmpty()) {
@ -65,7 +68,8 @@ public class TransportRoutePlanner {
if (segment.getDepth() > ctx.cfg.maxNumberOfChanges) {
continue;
}
if (segment.distFromStart > finishTime + ctx.cfg.finishTimeSeconds) {
if (segment.distFromStart > finishTime + ctx.cfg.finishTimeSeconds ||
segment.distFromStart > maxTravelTimeCmpToWalk) {
break;
}
long segmentId = segment.getId();
@ -146,7 +150,8 @@ public class TransportRoutePlanner {
if (finishTime > finish.distFromStart) {
finishTime = finish.distFromStart;
}
if(finish.distFromStart < finishTime + ctx.cfg.finishTimeSeconds) {
if(finish.distFromStart < finishTime + ctx.cfg.finishTimeSeconds &&
(finish.distFromStart < maxTravelTimeCmpToWalk || results.size() == 0)) {
results.add(finish);
}
}
@ -319,6 +324,25 @@ public class TransportRoutePlanner {
return route.getForwardStops().subList(start, end + 1);
}
public QuadRect getSegmentRect() {
double left = 0, right = 0;
double top = 0, bottom = 0;
for (Node n : getNodes()) {
if (left == 0 && right == 0) {
left = n.getLongitude();
right = n.getLongitude();
top = n.getLatitude();
bottom = n.getLatitude();
} else {
left = Math.min(left, n.getLongitude());
right = Math.max(right, n.getLongitude());
top = Math.max(top, n.getLatitude());
bottom = Math.min(bottom, n.getLatitude());
}
}
return left == 0 && right == 0 ? null : new QuadRect(left, top, right, bottom);
}
public List<Node> getNodes() {
List<Node> nodes = new ArrayList<>();
List<Way> ways = getGeometry();

2
OsmAnd/res/layout/bottom_sheet_item_with_radio_btn_left.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_list_item_height"
android:background="?android:attr/selectableItemBackground"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="@dimen/bottom_sheet_list_item_height"
android:paddingLeft="@dimen/content_padding"

44
OsmAnd/res/layout/transport_stop_route_item_with_icon.xml
View file

@ -7,24 +7,32 @@
android:background="@drawable/transport_stop_route_bg"
android:orientation="horizontal">
<ImageView
android:id="@+id/transport_stop_route_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
tools:src="@drawable/ic_action_bus_dark" />
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/transport_stop_route_text"
<LinearLayout
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="3" />
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackgroundBorderless">
<ImageView
android:id="@+id/transport_stop_route_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_margin="4dp"
tools:src="@drawable/ic_action_bus_dark" />
<net.osmand.plus.widgets.TextViewEx
android:id="@+id/transport_stop_route_text"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:gravity="center"
android:textColor="@color/color_white"
android:textSize="@dimen/default_desc_text_size"
osmand:typeface="@string/font_roboto_medium"
tools:text="3" />
</LinearLayout>
</LinearLayout>

2
OsmAnd/res/values-da/phrases.xml
View file

@ -3207,7 +3207,7 @@
<string name="poi_gorge">Kløft</string>
<string name="poi_couloir">Couloir</string>
<string name="poi_mountain_area">Bjergområde</string>
<string name="poi_surface_clay">Grus</string>
<string name="poi_surface_clay">Ler</string>
<string name="poi_surface_tartan">Tartan</string>
<string name="poi_surface_artificial_turf">Kunstgræs</string>
<string name="poi_surface_decoturf">DecoTurf</string>

4
OsmAnd/res/values-de/strings.xml
View file

@ -1724,7 +1724,7 @@ Lon %2$s</string>
<string name="favorite_category_select">Kategorie auswählen</string>
<string name="default_speed_system_descr">Geschwindigkeitseinheit festlegen.</string>
<string name="default_speed_system">Geschwindigkeitseinheit</string>
<string name="nm">kn</string>
<string name="nm">sm</string>
<string name="nm_h">kn</string>
<string name="min_mile">min/m</string>
<string name="min_km">min/km</string>
@ -2935,4 +2935,4 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="sit_on_the_stop">Zusteigen an Haltestelle</string>
<string name="use_osm_live_public_transport_description">Öffentliche Verkehrsmittel für Änderungen an OsmAnd Live aktivieren.</string>
<string name="use_osm_live_public_transport">OsmAnd Live öffentliche Verkehrsmittel</string>
</resources>
</resources>

69
OsmAnd/res/values-es-rUS/strings.xml
View file

@ -34,7 +34,7 @@
<string name="storage_directory">Almacenamiento del mapa</string>
<string name="shared_string_places">Lugares</string>
<string name="delay_to_start_navigation_descr">Indica el tiempo de espera para permanecer en la pantalla de planificación de ruta.</string>
<string name="delay_to_start_navigation">Iniciar navegación giro-a-giro luego de…</string>
<string name="delay_to_start_navigation">Iniciar la guía de giro-a-giro luego de…</string>
<string name="shared_string_go">Ir</string>
<string name="osmand_parking_overdue">vencido</string>
<string name="action_create">Acción crear</string>
@ -68,8 +68,8 @@ Lon %2$s</string>
<string name="shared_string_off">No</string>
<string name="shared_string_enabled">Activado</string>
<string name="shared_string_disabled">Desactivado</string>
<string name="shared_string_selected">Seleccionado</string>
<string name="shared_string_selected_lowercase">seleccionado</string>
<string name="shared_string_selected">Marcado(s)</string>
<string name="shared_string_selected_lowercase">marcado(s)</string>
<string name="shared_string_never">Nunca</string>
<string name="shared_string_and">y</string>
<string name="shared_string_or">o</string>
@ -466,7 +466,7 @@ Lon %2$s</string>
<string name="gps_wake_up_timer">Intervalo para despertar GPS</string>
<string name="map_preferred_locale_descr">Idioma preferido para las etiquetas en el mapa (si no está disponible, se usarán nombres en inglés o locales).</string>
<string name="map_preferred_locale">Idioma preferido del mapa</string>
<string name="forward">de frente</string>
<string name="forward">Siguiente</string>
<string name="home">Panel de control</string>
<string name="live_monitoring_m_descr">Envía los datos de seguimiento a un servicio web específico, si la grabación GPX está activada.</string>
<string name="live_monitoring_m">Rastreo en línea (requiere GPX)</string>
@ -478,7 +478,7 @@ Lon %2$s</string>
<string name="rendering_attr_hideWoodScrubs_name">Bosques y matorrales</string>
<string name="no_index_file_to_download">No se encontraron descargas, comprueba tu conexión a Internet.</string>
<string name="select_index_file_to_download">Nada encontrado. Si no encuentras tu región, puedes hacerla tú mismo (Ver https://osmand.net).</string>
<string name="none_selected_gpx">Sin archivos GPX seleccionados. Mantén pulsado para elegir uno.</string>
<string name="none_selected_gpx">Sin archivos GPX marcados. Mantén pulsado para elegir uno.</string>
<string name="gpx_split_interval">Intervalo de división</string>
<string name="save_as_favorites_points">Guardar como grupo de Favoritos</string>
<string name="delay_navigation_start">Iniciar automáticamente la navegación giro a giro</string>
@ -966,7 +966,7 @@ Lon %2$s</string>
<string name="back_right">hacia atrás a la derecha</string>
<string name="back">hacia atrás</string>
<string name="back_left">hacia atrás a la izquierda</string>
<string name="left">restante(s)</string>
<string name="left">a la izquierda</string>
<string name="front_left">hacia atrás a la izquierda</string>
<string name="oclock">en punto</string>
<string name="towards">hacia</string>
@ -1134,7 +1134,7 @@ Lon %2$s</string>
<string name="trace_rendering">Información de depuración de visualización</string>
<string name="trace_rendering_descr">Muestra el rendimiento de visualización.</string>
<string name="installing_new_resources">Desempaquetando nuevos datos…</string>
<string name="internet_connection_required_for_online_route">Seleccionado un servicio de navegación en línea, pero no hay conexión a Internet.</string>
<string name="internet_connection_required_for_online_route">Se eligió un servicio de navegación en línea, pero no hay conexión a Internet.</string>
<string name="tts_language_not_supported_title">Idioma no soportado</string>
<string name="tts_language_not_supported">El idioma elegido es incompatible con el motor TTS (texto a voz) de Android. ¿Buscar otro motor TTS en la tienda de aplicaciones? Si no, se usará el idioma TTS predefinido.</string>
<string name="tts_missing_language_data_title">Faltan datos</string>
@ -1252,7 +1252,7 @@ Lon %2$s</string>
<string name="daynight_descr">Elige el motivo de cambio entre el modo nocturno y diurno.</string>
<string name="daynight">Modo diurno/nocturno</string>
<string name="download_files_question">¿Descargar {0} archivo(s) ({1} MB)?</string>
<string name="items_were_selected">{0} elemento(s) seleccionado(s)</string>
<string name="items_were_selected">{0} elemento(s) marcado(s)</string>
<string name="filter_existing_indexes">Descargados</string>
<string name="fast_route_mode">Ruta más rápida</string>
<string name="fast_route_mode_descr">Activar para calcular la ruta más rápida o desactivar para la más eficiente en combustible.</string>
@ -1413,7 +1413,7 @@ Lon %2$s</string>
<string name="fav_points_not_exist">Sin puntos de Favoritos</string>
<string name="update_existing">Reemplazar</string>
<string name="only_show">Mostrar ruta</string>
<string name="follow">Seguir navegación</string>
<string name="follow">Iniciar la guía</string>
<string name="mark_final_location_first">Elige primero el destino</string>
<string name="get_directions">Indicaciones</string>
<string name="opening_hours">Horario de atención</string>
@ -1850,7 +1850,7 @@ Lon %2$s</string>
<string name="weekly">Cada semana</string>
<string name="morning">Por la mañana</string>
<string name="night">Por la noche</string>
<string name="shared_string_not_selected">No seleccionado</string>
<string name="shared_string_not_selected">No marcado(s)</string>
<string name="select_month_and_country">Elige mes y país</string>
<string name="shared_string_type">Tipo</string>
<string name="starting_point">Punto de partida</string>
@ -2917,7 +2917,7 @@ Lon %2$s</string>
<string name="add_destination_query">Primero añada el destino</string>
<string name="shared_string_swap">Intercambiar</string>
<string name="show_more">Mostrar más</string>
<string name="tracks_on_map">Trazas en el mapa</string>
<string name="tracks_on_map">Trazas mostradas</string>
<string name="time_of_day">Hora del día</string>
<string name="by_transport_type">En %1$s</string>
<string name="step_by_step">Paso a paso</string>
@ -2946,4 +2946,51 @@ Lon %2$s</string>
\n</string>
<string name="use_osm_live_public_transport_description">Activar el transporte público para los cambios de OsmAnd Live.</string>
<string name="use_osm_live_public_transport">Transporte público en OsmAnd Live</string>
<string name="transfers_size">%1$d transbordo(s)</string>
<string name="add_start_and_end_points">Añadir puntos de inicio y final</string>
<string name="route_add_start_point">Añadir punto de inicio</string>
<string name="route_descr_select_start_point">Marca el punto de inicio</string>
<string name="rendering_attr_surface_unpaved_name">Sin pavimento</string>
<string name="rendering_attr_surface_sand_name">Arena</string>
<string name="rendering_attr_surface_grass_name">Césped</string>
<string name="rendering_attr_surface_grass_paver_name">Césped pavimentado</string>
<string name="rendering_attr_surface_ground_name">Tierra (natural)</string>
<string name="rendering_attr_surface_dirt_name">Tierra (lodosa)</string>
<string name="rendering_attr_surface_mud_name">Lodazal</string>
<string name="rendering_attr_surface_ice_name">Hielo</string>
<string name="rendering_attr_surface_salt_name">Sal</string>
<string name="rendering_attr_surface_snow_name">Nieve</string>
<string name="rendering_attr_surface_asphalt_name">Asfalto</string>
<string name="rendering_attr_surface_paved_name">Pavimento</string>
<string name="rendering_attr_surface_concrete_name">Hormigón</string>
<string name="rendering_attr_surface_sett_name">Adoquín</string>
<string name="rendering_attr_surface_cobblestone_name">Empedrado (adoquín)</string>
<string name="rendering_attr_surface_paving_stones_name">Pavimento intertrabado / Adoquín prefabricado</string>
<string name="rendering_attr_surface_pebblestone_name">Canto rodado</string>
<string name="rendering_attr_surface_stone_name">Piedra</string>
<string name="rendering_attr_surface_metal_name">Metal</string>
<string name="rendering_attr_surface_wood_name">Madera</string>
<string name="rendering_attr_surface_gravel_name">Grava</string>
<string name="rendering_attr_surface_fine_gravel_name">Grava fina</string>
<string name="rendering_attr_surface_compacted_name">Compactado</string>
<string name="rendering_attr_smoothness_excellent_name">Excelente</string>
<string name="rendering_attr_smoothness_good_name">Bueno</string>
<string name="rendering_attr_smoothness_intermediate_name">Intermedio</string>
<string name="rendering_attr_smoothness_bad_name">Malo</string>
<string name="rendering_attr_smoothness_very_bad_name">Muy malo</string>
<string name="rendering_attr_smoothness_horrible_name">Horrible</string>
<string name="rendering_attr_smoothness_very_horrible_name">Muy horrible</string>
<string name="rendering_attr_smoothness_impassable_name">Intransitable</string>
<string name="rendering_attr_highway_class_motorway_name">Autopista</string>
<string name="rendering_attr_highway_class_state_road_name">Carretera estatal</string>
<string name="rendering_attr_highway_class_road_name">Carretera</string>
<string name="rendering_attr_highway_class_street_name">Calle</string>
<string name="rendering_attr_highway_class_service_name">Servicio</string>
<string name="rendering_attr_highway_class_footway_name">Vereda</string>
<string name="rendering_attr_highway_class_track_name">Camino rural</string>
<string name="rendering_attr_highway_class_bridleway_name">Camino ecuestre</string>
<string name="rendering_attr_highway_class_steps_name">Escalera</string>
<string name="rendering_attr_highway_class_path_name">Sendero</string>
<string name="rendering_attr_highway_class_cycleway_name">Ciclovía / Bicisenda</string>
<string name="rendering_attr_undefined_name">Indefinido</string>
</resources>

67
OsmAnd/res/values-es/strings.xml
View file

@ -288,7 +288,7 @@
<string name="daynight_descr">Elige el motivo de cambio entre el modo nocturno y diurno.</string>
<string name="daynight">Modo diurno/nocturno</string>
<string name="download_files_question">¿Descargar {0} archivo(s) ({1} MB)?</string>
<string name="items_were_selected">{0} elemento(s) seleccionado(s)</string>
<string name="items_were_selected">{0} elemento(s) marcado(s)</string>
<string name="filter_existing_indexes">Descargados</string>
<string name="shared_string_select_all">Marcar todo</string>
<string name="shared_string_refresh">Actualizar</string>
@ -463,7 +463,7 @@
<string name="fav_points_not_exist">Sin puntos de Favoritos</string>
<string name="update_existing">Reemplazar</string>
<string name="only_show">Mostrar ruta</string>
<string name="follow">Seguir navegación</string>
<string name="follow">Iniciar la guía</string>
<string name="recalculate_route_to_your_location">Modo transporte:</string>
<string name="mark_final_location_first">Elige primero el destino</string>
<string name="get_directions">Indicaciones</string>
@ -680,7 +680,7 @@
<string name="back_right">hacia atrás a la derecha</string>
<string name="back">hacia atrás</string>
<string name="back_left">hacia atrás a la izquierda</string>
<string name="left">restante(s)</string>
<string name="left">a la izquierda</string>
<string name="front_left">hacia atrás a la izquierda</string>
<string name="oclock">en punto</string>
<string name="towards">hacia</string>
@ -1257,7 +1257,7 @@
<string name="loading_smth">Cargando %1$s…</string>
<string name="selected_gpx_info_show">\n\nMantenga pulsado para ver en el mapa</string>
<string name="delay_navigation_start">Iniciar automáticamente la navegación giro a giro</string>
<string name="shared_string_selected_lowercase">seleccionado</string>
<string name="shared_string_selected_lowercase">marcado(s)</string>
<string name="gpx_split_interval">Intervalo de división</string>
<string name="gpx_info_subtracks">Subtrazas: %1$s</string>
<string name="gpx_info_waypoints">Puntos de referencia: %1$s</string>
@ -1304,7 +1304,7 @@
<string name="local_map_names">Nombres locales</string>
<string name="lang_sw">Suajili</string>
<string name="lang_he">Hebreo</string>
<string name="forward">de frente</string>
<string name="forward">Siguiente</string>
<string name="home">Panel de control</string>
<string name="live_monitoring_m_descr">Envía los datos de seguimiento a un servicio web específico, si la grabación GPX está activada.</string>
<string name="live_monitoring_m">Seguimiento en línea (requiere GPX)</string>
@ -1508,7 +1508,7 @@
<string name="rename_failed">Fallo al renombrar.</string>
<string name="shared_string_currently_recording_track">Grabando traza actual</string>
<string name="back_to_map">Volver al mapa</string>
<string name="shared_string_selected">Seleccionado</string>
<string name="shared_string_selected">Marcado(s)</string>
<string name="track_segments">Segmentos de la traza</string>
<string name="track_points">Puntos de la traza</string>
<string name="action_create">Acción crear</string>
@ -1539,7 +1539,7 @@
<string name="route_points">Puntos de la ruta</string>
<string name="shared_string_release">Liberado</string>
<string name="osmand_parking_overdue">vencido</string>
<string name="delay_to_start_navigation">Iniciar navegación giro-a-giro luego de…</string>
<string name="delay_to_start_navigation">Iniciar la guía de giro-a-giro luego de…</string>
<string name="shared_string_go">Ir</string>
<string name="delay_to_start_navigation_descr">Indica el tiempo de espera para permanecer en la pantalla de planificación de ruta.</string>
<string name="local_osm_changes_upload_all_confirm">¿Subir %1$d cambio(s) a OSM?</string>
@ -1879,7 +1879,7 @@
<string name="weekly">Cada semana</string>
<string name="morning">Por la mañana</string>
<string name="night">Por la noche</string>
<string name="shared_string_not_selected">No seleccionado</string>
<string name="shared_string_not_selected">No marcado(s)</string>
<string name="select_month_and_country">Elige mes y país</string>
<string name="shared_string_type">Tipo</string>
<string name="starting_point">Punto de partida</string>
@ -2765,7 +2765,7 @@
<string name="wikivoyage_download_pics_descr">Las imágenes del artículo pueden descargarse para su uso sin conexión.
\nSiempre disponible en «Explorar» → «Opciones».</string>
<string name="shared_string_wifi_only">Sólo con Wi-Fi</string>
<string name="select_travel_book">Seleccionar un libro de viaje</string>
<string name="select_travel_book">Marcar un libro de viaje</string>
<string name="shared_string_travel_book">Libro de viajes</string>
<string name="download_images">Descargar imágenes</string>
<string name="purchase_dialog_title">Elegir plan</string>
@ -2956,7 +2956,7 @@
<string name="add_destination_query">Primero añada el destino</string>
<string name="shared_string_swap">Intercambiar</string>
<string name="show_more">Mostrar más</string>
<string name="tracks_on_map">Trazas en el mapa</string>
<string name="tracks_on_map">Trazas mostradas</string>
<string name="time_of_day">Hora del día</string>
<string name="by_transport_type">En %1$s</string>
<string name="step_by_step">Paso a paso</string>
@ -2985,4 +2985,51 @@
\n</string>
<string name="use_osm_live_public_transport_description">Activar el transporte público para los cambios de OsmAnd Live.</string>
<string name="use_osm_live_public_transport">Transporte público en OsmAnd Live</string>
<string name="transfers_size">%1$d transbordo(s)</string>
<string name="add_start_and_end_points">Añadir puntos de inicio y final</string>
<string name="route_add_start_point">Añadir punto de inicio</string>
<string name="route_descr_select_start_point">Marca el punto de inicio</string>
<string name="rendering_attr_surface_unpaved_name">Sin pavimento</string>
<string name="rendering_attr_surface_sand_name">Arena</string>
<string name="rendering_attr_surface_grass_name">Césped</string>
<string name="rendering_attr_surface_grass_paver_name">Césped pavimentado</string>
<string name="rendering_attr_surface_ground_name">Tierra (natural)</string>
<string name="rendering_attr_surface_dirt_name">Tierra (lodosa)</string>
<string name="rendering_attr_surface_mud_name">Lodazal</string>
<string name="rendering_attr_surface_ice_name">Hielo</string>
<string name="rendering_attr_surface_salt_name">Sal</string>
<string name="rendering_attr_surface_snow_name">Nieve</string>
<string name="rendering_attr_surface_asphalt_name">Asfalto</string>
<string name="rendering_attr_surface_paved_name">Pavimento</string>
<string name="rendering_attr_surface_concrete_name">Hormigón</string>
<string name="rendering_attr_surface_sett_name">Adoquín</string>
<string name="rendering_attr_surface_cobblestone_name">Empedrado (adoquín)</string>
<string name="rendering_attr_surface_paving_stones_name">Pavimento intertrabado / Adoquín prefabricado</string>
<string name="rendering_attr_surface_pebblestone_name">Canto rodado</string>
<string name="rendering_attr_surface_stone_name">Piedra</string>
<string name="rendering_attr_surface_metal_name">Metal</string>
<string name="rendering_attr_surface_wood_name">Madera</string>
<string name="rendering_attr_surface_gravel_name">Grava</string>
<string name="rendering_attr_surface_fine_gravel_name">Grava fina</string>
<string name="rendering_attr_surface_compacted_name">Compactado</string>
<string name="rendering_attr_smoothness_excellent_name">Excelente</string>
<string name="rendering_attr_smoothness_good_name">Bueno</string>
<string name="rendering_attr_smoothness_intermediate_name">Intermedio</string>
<string name="rendering_attr_smoothness_bad_name">Malo</string>
<string name="rendering_attr_smoothness_very_bad_name">Muy malo</string>
<string name="rendering_attr_smoothness_horrible_name">Horrible</string>
<string name="rendering_attr_smoothness_very_horrible_name">Muy horrible</string>
<string name="rendering_attr_smoothness_impassable_name">Intransitable</string>
<string name="rendering_attr_highway_class_motorway_name">Autopista</string>
<string name="rendering_attr_highway_class_state_road_name">Carretera estatal</string>
<string name="rendering_attr_highway_class_road_name">Carretera</string>
<string name="rendering_attr_highway_class_street_name">Calle</string>
<string name="rendering_attr_highway_class_service_name">Servicio</string>
<string name="rendering_attr_highway_class_footway_name">Acera</string>
<string name="rendering_attr_highway_class_track_name">Camino rural</string>
<string name="rendering_attr_highway_class_bridleway_name">Camino ecuestre</string>
<string name="rendering_attr_highway_class_steps_name">Escalera</string>
<string name="rendering_attr_highway_class_path_name">Sendero</string>
<string name="rendering_attr_highway_class_cycleway_name">Ciclovía / Bicisenda</string>
<string name="rendering_attr_undefined_name">Indefinido</string>
</resources>

2
OsmAnd/res/values-fa/phrases.xml
View file

@ -987,7 +987,7 @@
<string name="poi_surface_paved">سطح: روسازی‌شده</string>
<string name="poi_surface_asphalt">سطح: آسفالت</string>
<string name="poi_surface_concrete">سطح: بتن</string>
<string name="poi_surface_sett">سطح: پاره‌سنگ</string>
<string name="poi_surface_sett">سطح: سنگفرش سنگی</string>
<string name="poi_surface_cobblestone">سطح: قلوه‌سنگ</string>
<string name="poi_surface_paving_stones">سطح: سنگ‌فرش</string>
<string name="poi_surface_pebblestone">سطح: ریگ</string>

41
OsmAnd/res/values-fa/strings.xml
View file

@ -121,7 +121,7 @@
<string name="osmand_parking_position_description_add_time">ساعت پارک‌کردن خودرو</string>
<string name="global_app_allocated_memory">حافظهٔ اختصاص‌یافته</string>
<string name="native_app_allocated_memory">حافظهٔ کل سیستم</string>
<string name="starting_point_too_far">نقطهٔ شروع از نزدیک‌ترین جاده خیلی دور است.</string>
<string name="starting_point_too_far">مبدأ از نزدیک‌ترین جاده خیلی دور است.</string>
<string name="osmand_parking_event">خودرو را از پارکینگ بردارید</string>
<string name="osmand_parking_warning">هشدار</string>
<string name="osmand_parking_warning_text">برای برداشتن خودرو از پارکینگ یک یادآور به تقویم افزوده شده است. تا زمانی که خودتان پاکش نکنید همان‌جا خواهد ماند.</string>
@ -154,7 +154,7 @@
<string name="offline_navigation_not_available">مسیریابی آفلاین OsmAnd موقتاً در دسترس نیست.</string>
<string name="left_side_navigation">رانندگی از چپ</string>
<string name="left_side_navigation_descr">برای کشورهایی که از سمت چپ جاده می‌رانند.</string>
<string name="unknown_from_location">نقطهٔ شروع هنوز مشخص نیست</string>
<string name="unknown_from_location">مبدأ هنوز مشخص نیست</string>
<string name="unknown_location">موقعیت هنوز مشخص نیست</string>
<string name="modify_transparency">تغییر شفافیت (0 - شفاف، 255 - مات)</string>
<string name="confirm_interrupt_download">دانلود فایل را لغو می‌کنید؟</string>
@ -294,7 +294,7 @@
<string name="fav_points_not_exist">هیچ نقطهٔ برگزیده‌ای وجود ندارد</string>
<string name="update_existing">جایگزین‌کردن</string>
<string name="only_show">مسیر را نشان بده</string>
<string name="follow">شروع ناوبری</string>
<string name="follow">شروع هدایت</string>
<string name="mark_final_location_first">لطفاً ابتدا مقصد را انتخاب کنید</string>
<string name="get_directions">مسیریابی</string>
<string name="opening_hours">ساعات کاری</string>
@ -1242,7 +1242,7 @@
<string name="selected_gpx_info_show">"
\n
\nبرای نمایش بر روی نقشه انگشت خود را چند لحظه بر روی صفحه نگه دارید"</string>
<string name="delay_navigation_start">راهنمایی پیچ تا پیچ به‌صورت خودکار شروع شود</string>
<string name="delay_navigation_start">راهنمایی پیچ به پیچ به‌صورت خودکار شروع شود</string>
<string name="shared_string_selected_lowercase">انتخاب</string>
<string name="gpx_split_interval">بازهٔ تقسیم</string>
<string name="gpx_info_subtracks">زیرمسیرها: %1$s</string>
@ -1507,7 +1507,7 @@
<string name="local_osm_changes_upload_all_confirm">آیا از بارگذاری این %1$d تغییر در OSM مطمئن هستید؟</string>
<string name="confirmation_to_clear_history">سوابق را پاک می‌کنید؟</string>
<string name="delay_to_start_navigation_descr">مدت‌زمان ماندن در صفحهٔ طراحی مسیر تا شروع ناوبری را مشخص کنید.</string>
<string name="delay_to_start_navigation">ناوبری پیچ تا پیچ را با این تأخیر شروع کن…</string>
<string name="delay_to_start_navigation">آغاز راهنمایی پیچ به پیچ پس از…</string>
<string name="shared_string_go">برو</string>
<string name="osmand_parking_overdue">تأخیر دارید</string>
<string name="general_settings_2">تنظیمات کلی</string>
@ -1681,7 +1681,7 @@
<string name="replace_favorite_confirmation">آیا این نقطهٔ جدید را جایگزین «%1$s» می‌کنید؟</string>
<string name="rendering_attr_hideOverground_name">اشیای روی زمین</string>
<string name="shared_string_change">تغییر</string>
<string name="get_started">شروع کن</string>
<string name="get_started">شروع</string>
<string name="route_stops_before">%1$s ایستگاه قبلی</string>
<string name="coords_search">جست‌وجوی مختصات</string>
<string name="advanced_coords_search">جست‌وجوی پیشرفتهٔ مختصات</string>
@ -1891,7 +1891,7 @@
<string name="measurement_tool">اندازه‌گیری مسافت</string>
<string name="quick_action_resume_pause_navigation">مکث/ادامهٔ ناوبری</string>
<string name="quick_action_show_navigation_finish_dialog">پیغام پایان‌یافتن ناوبری را نشان بده</string>
<string name="quick_action_start_stop_navigation">شروع/اتمام ناوبری</string>
<string name="quick_action_start_stop_navigation">شروع/پایان ناوبری</string>
<string name="shared_string_reset">تنظیم مجدد</string>
<string name="shared_string_reload">بارگیری مجدد</string>
<string name="remove_from_map_markers">از نشانه‌های نقشه حذف شود</string>
@ -1944,7 +1944,7 @@
<string name="clear_updates_proposition_message">به‌روزرسانی‌های دانلودشده را حذف کنید تا به نسخهٔ اولیهٔ نقشه برگردید</string>
<string name="road_blocked">جاده مسدود است</string>
<string name="shared_string_select">انتخاب</string>
<string name="switch_start_finish">عوض‌کردن مبدأ با مقصد</string>
<string name="switch_start_finish">تعویض مبدأ و مقصد</string>
<string name="rendering_attr_hideIcons_name">آیکون POIها</string>
<string name="item_removed">حذف شد</string>
<string name="n_items_removed">حذف شدند</string>
@ -2249,7 +2249,7 @@
<string name="empty_state_favourites">افزودن نقاط برگزیده</string>
<string name="empty_state_favourites_desc">نقاط موردعلاقه‌تان را روی نقشه علامت بزنید یا آن‌ها را از یک فایل وارد کنید.</string>
<string name="move_point">جابه‌جاکردن نقطه</string>
<string name="make_round_trip_descr">نقطهٔ شروع را به‌عنوان مقصد هم در نظر بگیر.</string>
<string name="make_round_trip_descr">مبدأ را به‌عنوان مقصد هم در نظر بگیر.</string>
<string name="make_round_trip">ایجاد سفر رفت‌وبرگشتی</string>
<string name="coordinates_format">قالب مختصات</string>
<string name="use_system_keyboard">صفحه‌کلید سیستم</string>
@ -2257,7 +2257,7 @@
<string name="routing_attr_avoid_ice_roads_fords_name">پرهیز از گُدارها و راه‌های یخی</string>
<string name="routing_attr_avoid_ice_roads_fords_description">از راه‌های یخی و گُدارها پرهیز شود.</string>
<string name="use_location">استفاده از موقعیت</string>
<string name="add_location_as_first_point_descr">برای طراحی یک مسیر کامل موقعیتتان را به‌عنوان نقطهٔ شروع اضافه کنید.</string>
<string name="add_location_as_first_point_descr">برای طراحی یک مسیر کامل، موقعیت خود را به‌عنوان مبدأ اضافه کنید.</string>
<string name="my_location">موقعیت من</string>
<string name="shared_string_finish">پایان</string>
<string name="plan_route">طراحی مسیر</string>
@ -2705,7 +2705,7 @@
<string name="subsequent_dest_description">مقصد بالا می‌رود و مقصد جدیدی ایجاد می‌شود</string>
<string name="map_import_error">خطای واردکردن نقشه</string>
<string name="map_imported_successfully">نقشه وارد شد</string>
<string name="make_as_start_point">انتخاب به‌عنوان نقطهٔ آغازین</string>
<string name="make_as_start_point">انتخاب به‌عنوان مبدأ</string>
<string name="enter_the_file_name">نام فایل را بنویسید.</string>
<string name="enter_lon">ورود طول جغرافیایی</string>
<string name="enter_lat">ورود عرض جغرافیایی</string>
@ -2925,7 +2925,7 @@
<string name="swap_start_and_destination">تعویض مبدأ و مقصد</string>
<string name="add_destination_point">افزودن مقصد</string>
<string name="add_intermediate_point">افزودن نقطهٔ میانی</string>
<string name="add_start_point">افزودن نقطهٔ شروع</string>
<string name="add_start_point">افزودن مبدأ</string>
<string name="intermediate_waypoint">نقطهٔ میانی</string>
<string name="transfers">انتقال‌ها</string>
<string name="on_foot">پیاده</string>
@ -2955,7 +2955,7 @@
<string name="add_destination_query">لطفاً ابتدا مقصد را اضافه کنید</string>
<string name="previous_route">مسیر قبلی</string>
<string name="show_more">بیشتر نشان بده</string>
<string name="tracks_on_map">ردها روی نقشه</string>
<string name="tracks_on_map">ردهای نمایان</string>
<string name="shared_string_swap">تعویض</string>
<string name="time_of_day">ساعت</string>
<string name="by_transport_type">با %1$s</string>
@ -2984,4 +2984,19 @@
\n • حذف آمارگیرهای Facebook و Firebase از نسخهٔ رایگان (OsmAnd+‎ آن را ندارد)</string>
<string name="use_osm_live_public_transport_description">حمل‌ونقل عمومی با استفاده از به‌روزرسانی‌های OsmAnd Live فعال شود.</string>
<string name="use_osm_live_public_transport">حمل‌ونقل عمومی با OsmAnd Live</string>
<string name="transfers_size">%1$d انتقال</string>
<string name="add_start_and_end_points">افزودن نقاط مبدأ و مقصد</string>
<string name="route_add_start_point">افزودن مبدأ</string>
<string name="route_descr_select_start_point">انتخاب نقطهٔ شروع</string>
<string name="rendering_attr_surface_unpaved_name">روسازی‌نشده</string>
<string name="rendering_attr_surface_dirt_name">خاک</string>
<string name="rendering_attr_surface_mud_name">گِل</string>
<string name="rendering_attr_surface_ice_name">یخ</string>
<string name="rendering_attr_surface_salt_name">نمک</string>
<string name="rendering_attr_surface_snow_name">برف</string>
<string name="rendering_attr_surface_asphalt_name">آسفالت</string>
<string name="rendering_attr_surface_paved_name">روسازی‌شده</string>
<string name="rendering_attr_surface_concrete_name">بتن</string>
<string name="rendering_attr_surface_sett_name">سنگفرش سنگی</string>
<string name="rendering_attr_surface_cobblestone_name">قلوه‌سنگ</string>
</resources>

1518
OsmAnd/res/values-fi/strings.xml
View file

File diff suppressed because it is too large Load diff

49
OsmAnd/res/values-fr/strings.xml
View file

@ -442,7 +442,7 @@
<string name="fav_points_not_exist">Il n\'existe aucun favori</string>
<string name="update_existing">Remplacer</string>
<string name="only_show">Afficher seulement</string>
<string name="follow">Suivre</string>
<string name="follow">Démarrer le guidage</string>
<string name="recalculate_route_to_your_location">Choisir le mode de transport :</string>
<string name="mark_final_location_first">Veuillez tout d\'abord définir une destination</string>
<string name="get_directions">Navigation</string>
@ -1497,7 +1497,7 @@ Mémoire proportionnelle %4$s Mo (limite Android %5$s Mo, Dalvik %6$s Mo).</stri
<string name="shared_string_go">Aller</string>
<string name="confirmation_to_clear_history">Effacer l\'historique ?</string>
<string name="local_osm_changes_upload_all_confirm">%1$d modification(s) vont être envoyée(s) vers OSM. Confirmez-vous cet envoi ?</string>
<string name="delay_to_start_navigation">Démarrer la navigation après</string>
<string name="delay_to_start_navigation">Lancer la navigation pas à pas après …</string>
<string name="osm_changes_added_to_local_edits">Modifications OSM mémorisées localement</string>
<string name="mark_to_delete">Marquer pour suppression</string>
<string name="current_route">Itinéraire actuel</string>
@ -2587,7 +2587,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="shared_string_deleted">Supprimé</string>
<string name="shared_string_edited">Modifié</string>
<string name="shared_string_added">Ajouté</string>
<string name="marker_activated">Marque %s activée</string>
<string name="marker_activated">Marque %s activée.</string>
<string name="one_tap_active_descr">Appuyez sur une marque de la carte pour qu\'elle devienne immédiatement la première marque active sans utiliser le menu contextuel.</string>
<string name="one_tap_active">Appui court sur une marque</string>
<string name="empty_state_av_notes">Prenez des notes !</string>
@ -2891,7 +2891,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="add_destination_query">Veuillez commencer en ajoutant une Destination</string>
<string name="shared_string_swap">Permuter</string>
<string name="show_more">Afficher plus</string>
<string name="tracks_on_map">Traces sur la carte</string>
<string name="tracks_on_map">Traces affichées</string>
<string name="time_of_day">Heure de la journée</string>
<string name="by_transport_type">Par %1$s</string>
<string name="step_by_step">Pas à pas</string>
@ -2904,4 +2904,45 @@ représentant la zone : %1$s x %2$s</string>
<string name="use_osm_live_public_transport">Transports publics OsmAnd Live</string>
<string name="sit_on_the_stop">Panneau d\'affichage à l\'arrêt</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Appuyez sur ce bouton pour afficher / masquer les traces GPX sélectionnées</string>
<string name="transfers_size">%1$d transferts</string>
<string name="add_start_and_end_points">Ajouter des points de départ et d\'arrivée</string>
<string name="route_add_start_point">Ajouter un point de départ</string>
<string name="route_descr_select_start_point">Sélectionnez un point de départ</string>
<string name="rendering_attr_surface_unpaved_name">Non revêtu</string>
<string name="rendering_attr_surface_sand_name">Sable</string>
<string name="rendering_attr_surface_grass_name">Herbe</string>
<string name="rendering_attr_surface_ground_name">Sol</string>
<string name="rendering_attr_surface_dirt_name">Poussière</string>
<string name="rendering_attr_surface_mud_name">Boue</string>
<string name="rendering_attr_surface_ice_name">Glace</string>
<string name="rendering_attr_surface_salt_name">Sel</string>
<string name="rendering_attr_surface_snow_name">Neige</string>
<string name="rendering_attr_surface_asphalt_name">Asphalte</string>
<string name="rendering_attr_surface_paved_name">Pavés</string>
<string name="rendering_attr_surface_concrete_name">Béton</string>
<string name="rendering_attr_surface_stone_name">Pierre</string>
<string name="rendering_attr_surface_metal_name">Métal</string>
<string name="rendering_attr_surface_wood_name">Bois</string>
<string name="rendering_attr_surface_gravel_name">Gravier</string>
<string name="rendering_attr_surface_fine_gravel_name">Gravier fin</string>
<string name="rendering_attr_smoothness_excellent_name">Excellent</string>
<string name="rendering_attr_smoothness_good_name">Bon</string>
<string name="rendering_attr_smoothness_intermediate_name">Intermédiaire</string>
<string name="rendering_attr_smoothness_bad_name">Mauvais</string>
<string name="rendering_attr_smoothness_very_bad_name">Très mauvais</string>
<string name="rendering_attr_smoothness_horrible_name">Horrible</string>
<string name="rendering_attr_smoothness_very_horrible_name">Vraiment horrible</string>
<string name="rendering_attr_smoothness_impassable_name">Infranchissable</string>
<string name="rendering_attr_highway_class_motorway_name">Autoroute</string>
<string name="rendering_attr_highway_class_state_road_name">Route nationale</string>
<string name="rendering_attr_highway_class_road_name">Route</string>
<string name="rendering_attr_highway_class_street_name">Rue</string>
<string name="rendering_attr_highway_class_service_name">Service</string>
<string name="rendering_attr_highway_class_footway_name">Passerelle</string>
<string name="rendering_attr_highway_class_track_name">Piste</string>
<string name="rendering_attr_highway_class_bridleway_name">Passage piéton</string>
<string name="rendering_attr_highway_class_steps_name">Étape</string>
<string name="rendering_attr_highway_class_path_name">Chemin</string>
<string name="rendering_attr_highway_class_cycleway_name">Voie cyclable</string>
<string name="rendering_attr_undefined_name">Non défini</string>
</resources>

17
OsmAnd/res/values-gl/phrases.xml
View file

@ -3551,4 +3551,21 @@
<string name="poi_park_ride_tram">Tranvía</string>
<string name="poi_park_ride_ferry">Ferri</string>
<string name="poi_generator_source_biomass">Fonte de enerxía: biomasa</string>
<string name="poi_rtsa_scale_filter">Categoría da dificultade</string>
<string name="poi_health_specialty_radiotheraphy_yes">Radioterapia</string>
<string name="poi_hazard">Perigo</string>
<string name="poi_rtsa_scale_nc">н/к</string>
<string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
<string name="poi_rtsa_scale_1a">1А</string>
<string name="poi_rtsa_scale_1a_asterisk">1А*</string>
<string name="poi_rtsa_scale_1b">1B</string>
<string name="poi_rtsa_scale_1b_asterisk">1B*</string>
<string name="poi_rtsa_scale_2a">2А</string>
<string name="poi_rtsa_scale_2a_asterisk">2А*</string>
<string name="poi_rtsa_scale_2b">2B</string>
<string name="poi_rtsa_scale_2b_asterisk">2B*</string>
<string name="poi_rtsa_scale_3a">3А</string>
<string name="poi_rtsa_scale_3a_asterisk">3А*</string>
<string name="poi_rtsa_scale_3b">3B</string>
<string name="poi_rtsa_scale_3b_asterisk">3B*</string>
</resources>

76
OsmAnd/res/values-gl/strings.xml
View file

@ -1226,7 +1226,7 @@
<string name="fav_points_not_exist">Non hai ningún punto de Favorito</string>
<string name="update_existing">Substituír</string>
<string name="only_show">Amosar rota</string>
<string name="follow">Start navigation</string>
<string name="follow">Comezar guía</string>
<string name="mark_final_location_first">Escolla primeiro o destino</string>
<string name="get_directions">Indicacións</string>
<string name="opening_hours">Horas de apertura</string>
@ -1662,7 +1662,7 @@ Lon %2$s</string>
<string name="agps_info">Información de A-GPS</string>
<string name="agps_data_last_downloaded">Datos de A-GPS baixados por última vez: %1$s</string>
<string name="delay_to_start_navigation_descr">Indica-lo tempo de agarda durante o que ficar na pantalla de planificación das rotas.</string>
<string name="delay_to_start_navigation">Iniciar a navegación paso a paso despois de…</string>
<string name="delay_to_start_navigation">Comezar a guía paso a paso após…</string>
<string name="parking_place_limited">Tempo de aparcamento limitado a</string>
<string name="plugin_nautical_name">Vista do mapa náutico</string>
<string name="save_track_to_gpx_globally_headline">Rexistro de pistas baixo petición</string>
@ -2321,7 +2321,7 @@ Lon %2$s</string>
<string name="is_saved">foi gardado</string>
<string name="marker_save_as_track_descr">Exporte as súas marcaxes cara un ficheiro que pode fornecer eiquí:</string>
<string name="move_to_history">Mover ao historial</string>
<string name="group_will_be_removed_after_restart">O grupo será riscado despois de reiniciar.</string>
<string name="group_will_be_removed_after_restart">O grupo será riscado após o reinicio.</string>
<string name="show_guide_line">Amosar liñas direccionais</string>
<string name="show_arrows_on_the_map">Amosar frechas no mapa</string>
<string name="remove_from_map_markers">Eliminar das \"Marcaxes do mapa\"</string>
@ -2361,7 +2361,7 @@ Lon %2$s</string>
<string name="choose_navigation_type">Elixi-lo perfil da navegación</string>
<string name="none_point_error">Engada ao menos un punto.</string>
<string name="enter_gpx_name">Nome do ficheiro GPX:</string>
<string name="show_on_map_after_saving">Amosar no mapa despois de gardar</string>
<string name="show_on_map_after_saving">Amosar no mapa após o gardado</string>
<string name="measurement_tool">Medir distancia</string>
<string name="appearance_on_the_map">Aparencia no mapa</string>
<string name="add_track_to_markers_descr">Escolla os puntos de pasaxe da pista que quere que OsmAnd engada ás marcaxes.</string>
@ -2982,12 +2982,76 @@ Lon %2$s</string>
<string name="step_by_step">Paseniño</string>
<string name="road_types">Tipos de estrada</string>
<string name="exit_at">Saír en</string>
<string name="sit_on_the_stop">Agardar na paraxe</string>
<string name="sit_on_the_stop">Embarcar na paraxe</string>
<string name="shared_string_swap">Trocar</string>
<string name="show_more">Amosar máis</string>
<string name="tracks_on_map">Pistas no mapa</string>
<string name="tracks_on_map">Pistas amosadas</string>
<string name="quick_action_show_hide_gpx_tracks">Amosar/Agochar pistas GPX</string>
<string name="quick_action_show_hide_gpx_tracks_descr">Premendo neste botón de acción, amosa ou agocha as pistas GPX escollidas no mapa</string>
<string name="quick_action_gpx_tracks_hide">Agochar pistas GPX</string>
<string name="quick_action_gpx_tracks_show">Amosar pistas GPX</string>
<string name="transfers_size">%1$d transferencias</string>
<string name="add_start_and_end_points">Engadir puntos de comezo e fin</string>
<string name="route_add_start_point">Engadir punto de comezo</string>
<string name="route_descr_select_start_point">Escoller punto de comezo</string>
<string name="rendering_attr_surface_unpaved_name">Sen pavimento</string>
<string name="rendering_attr_surface_sand_name">Area</string>
<string name="rendering_attr_surface_grass_name">Céspede</string>
<string name="rendering_attr_surface_grass_paver_name">Pavimento con céspede</string>
<string name="rendering_attr_surface_ground_name">Chan natural</string>
<string name="rendering_attr_surface_dirt_name">Terra</string>
<string name="rendering_attr_surface_mud_name">Lama</string>
<string name="rendering_attr_surface_ice_name">Xeo</string>
<string name="rendering_attr_surface_salt_name">Sal</string>
<string name="rendering_attr_surface_snow_name">Neve</string>
<string name="rendering_attr_surface_asphalt_name">Asfalto</string>
<string name="rendering_attr_surface_paved_name">Pavimentado</string>
<string name="rendering_attr_surface_concrete_name">Cimento</string>
<string name="rendering_attr_surface_sett_name">Lastra</string>
<string name="rendering_attr_surface_cobblestone_name">Empedrado</string>
<string name="rendering_attr_surface_paving_stones_name">Pavimento de pedra</string>
<string name="rendering_attr_surface_pebblestone_name">Pedregullo</string>
<string name="rendering_attr_surface_stone_name">Pedra</string>
<string name="rendering_attr_surface_metal_name">Metal</string>
<string name="rendering_attr_surface_wood_name">Madeira</string>
<string name="rendering_attr_surface_gravel_name">Cascallo</string>
<string name="rendering_attr_surface_fine_gravel_name">Cascallo fino</string>
<string name="rendering_attr_surface_compacted_name">Compactado</string>
<string name="rendering_attr_smoothness_excellent_name">Excelente</string>
<string name="rendering_attr_smoothness_good_name">Boa</string>
<string name="rendering_attr_smoothness_intermediate_name">Intermedio</string>
<string name="rendering_attr_smoothness_bad_name">Mala</string>
<string name="rendering_attr_smoothness_very_bad_name">Moi mala</string>
<string name="rendering_attr_smoothness_horrible_name">Horríbel</string>
<string name="rendering_attr_smoothness_very_horrible_name">Moi horríbel</string>
<string name="rendering_attr_smoothness_impassable_name">Intransitábel</string>
<string name="rendering_attr_highway_class_motorway_name">Autoestrada</string>
<string name="rendering_attr_highway_class_state_road_name">Estrada nacional</string>
<string name="rendering_attr_highway_class_road_name">Estrada</string>
<string name="rendering_attr_highway_class_street_name">Rúa</string>
<string name="rendering_attr_highway_class_service_name">Vía de servizo</string>
<string name="rendering_attr_highway_class_footway_name">Senda peonil</string>
<string name="rendering_attr_highway_class_track_name">Pista</string>
<string name="rendering_attr_highway_class_bridleway_name">Pista de cabalos</string>
<string name="rendering_attr_highway_class_steps_name">Escadas</string>
<string name="rendering_attr_highway_class_path_name">Camiño</string>
<string name="rendering_attr_highway_class_cycleway_name">Senda ciclista</string>
<string name="rendering_attr_undefined_name">Sen definir</string>
<string name="release_3_3">"• Nova lapela «Direccións»: Amosa os botóns de destino «Casa» e «Traballo», o atallo da «rota anterior», a listaxe de pistas, marcaxes GPX activos e o historial de procura.
\n
\n • Información adicional en «Detalles da rota»: Tipos de camiños, superficie, pendente e suavidade
\n
\n • Suporte na navigación de transporte público: Metro, bus, tranvía, etc.
\n
\n • Novas accións axiñas: «Amosar/agochar pistas» e «Modo día/noite»
\n
\n • Áreas fixas amosadas coma inundadas en Alemaña, Suráfrica e Quebec
\n
\n • Suporte adicional para a importación de KML e KMZ
\n
\n • Corrixidos os erros na apertura de algunhas paraxes de transporte público
\n
\n • Eliminada a análise do Facebook e Firebase da versión de balde (o OsmAnd+ non o inclúe) "</string>
<string name="use_osm_live_public_transport_description">Activar o transporte público para as mudanzas do OsmAnd Live.</string>
<string name="use_osm_live_public_transport">Transporte público no OsmAnd Live</string>
</resources>

168
OsmAnd/res/values-ja/phrases.xml
View file

@ -27,16 +27,16 @@
<string name="poi_transportation">交通機関(Transportation)</string>
<string name="poi_road_obstacle">道路障害物(Road obstacle)</string>
<string name="poi_filling_station">給油所</string>
<string name="poi_personal_transport">交通施設・駐車場や料金所等(Personal transport)</string>
<string name="poi_personal_transport">交通施設・駐車場や料金所等</string>
<string name="poi_public_transport">公共交通機関</string>
<string name="poi_air_transport">空路</string>
<string name="poi_water_transport">水上交通(Water transport)</string>
<string name="poi_bicycle_transport">自転車輸送・持込(Bicycle transport)</string>
<string name="poi_aerialway_transport">索道・ロープウェイ(Aerialway transport)</string>
<string name="poi_aerialway_transport">索道・ロープウェイ</string>
<string name="poi_man_made">人工物(Man made)</string>
<string name="poi_transport_construction">建設中の交通機関(Transport construction)</string>
<string name="poi_water_supply">井戸・給水所(Water supply)</string>
<string name="poi_power">発電所(Power)</string>
<string name="poi_transport_construction">建設中の交通機関</string>
<string name="poi_water_supply">井戸・給水所</string>
<string name="poi_power">発電所</string>
<string name="poi_communication">通信施設(Communication)</string>
<string name="poi_trash_disposal">ゴミ処理施設(Trash disposal)</string>
<string name="poi_education">教育(Education)</string>
@ -47,7 +47,7 @@
<string name="poi_tourism">観光者向け施設(Tourism)</string>
<string name="poi_sightseeing">観光(Sightseeing)</string>
<string name="poi_accomodation">宿泊施設(Accommodation)</string>
<string name="poi_internet_access">インターネット有り(Internet access)</string>
<string name="poi_internet_access">インターネット有り</string>
<string name="poi_entertainment">レジャー(Leisure)</string>
<string name="poi_club">クラブ(Club)</string>
<string name="poi_sustenance">食堂(Food)</string>
@ -56,7 +56,7 @@
<string name="poi_craft">工芸(Craft)</string>
<string name="poi_finance">金融機関(Finance)</string>
<string name="poi_natural">自然(Natural)</string>
<string name="poi_seamark">船舶(Nautical)</string>
<string name="poi_seamark">船舶</string>
<string name="poi_military">軍事施設(Military)</string>
<string name="poi_osmwiki">ウィキペディア(Wikipedia)</string>
<string name="poi_user_defined_other">ユーザー定義</string>
@ -91,7 +91,7 @@
<string name="poi_carpet">敷物店(Carpet store)</string>
<string name="poi_chemist">ドラッグストア・薬局(Drug store)</string>
<string name="poi_clothes">衣料品店(Apparel store)</string>
<string name="poi_clothes_children">子供用衣料(Children\'s apparel)</string>
<string name="poi_clothes_children">子供用衣料</string>
<string name="poi_shoes">靴屋</string>
<string name="poi_computer">パソコンショップ(Computer store)</string>
<string name="poi_copyshop">印刷、現像店(Copy shop)</string>
@ -168,7 +168,7 @@
<string name="poi_lift_gate">遮断機(Lift gate)</string>
<string name="poi_toll_booth">料金所(Toll booth)</string>
<string name="poi_radiotechnics">電器屋(Radiotechnics store)</string>
<string name="poi_atv">四輪バイク販売店(Quad store)</string>
<string name="poi_atv">四輪バイク販売店</string>
<string name="poi_border_control">国境検問所(Border control)</string>
<string name="poi_traffic_calming_bump">減速帯(Speed Bump)</string>
<string name="poi_traffic_calming_hump">減速帯(Speed Hump)</string>
@ -181,7 +181,7 @@
<string name="poi_car_repair">車両修理(Car repair)</string>
<string name="poi_service_tyres">タイヤ(Tires)</string>
<string name="poi_vehicle_inspection">自動車検査(Vehicle inspection)</string>
<string name="poi_fuel">ガソリンスタンド(Gas station)</string>
<string name="poi_fuel">ガソリンスタンド</string>
<string name="poi_electricity_combined_charging">充電ステーション(Charging station)</string>
<string name="poi_vehicle_ramp">車両用取付け道路(Vehicle ramp)</string>
<string name="poi_compressed_air">空気入れ・エアーコンプレッサー(Compressed air)</string>
@ -316,7 +316,7 @@
<string name="poi_prison">刑務所(Prison)</string>
<string name="poi_register_office">役所の市民課・住民登録所(Civil registry office)</string>
<string name="poi_government">政府機関(Government)</string>
<string name="poi_bailiff">裁判所・簡易裁判所(Bailiff)</string>
<string name="poi_bailiff">裁判所・簡易裁判所</string>
<string name="poi_prosecutor">検察官(Prosecutor)</string>
<string name="poi_pension_fund">年金基金(Pension fund)</string>
<string name="poi_tax_inspection">税務調査(Tax inspection)</string>
@ -326,10 +326,10 @@
<string name="poi_village">村(Village)</string>
<string name="poi_hamlet">集落(Hamlet)</string>
<string name="poi_isolated_dwelling">孤立住居(Isolated dwelling)</string>
<string name="poi_suburb">区・区画(Suburb)</string>
<string name="poi_quarter">大字(Quarter)</string>
<string name="poi_suburb">区・区画</string>
<string name="poi_quarter">大字</string>
<string name="poi_neighbourhood">小字・丁目(Neighbourhood)</string>
<string name="poi_locality">非居住地(Locality)</string>
<string name="poi_locality">非居住地</string>
<string name="poi_place_allotments">住居付き農園(Allotments)</string>
<string name="poi_place_farm">農場(Farm)</string>
<string name="poi_residential">住宅地(Residential area)</string>
@ -386,7 +386,7 @@
<string name="poi_archery">アーチェリー(Archery)</string>
<string name="poi_athletics">陸上競技(Athletics)</string>
<string name="poi_american_football">アメリカンフットボール</string>
<string name="poi_australian_football">オーストラリアンフットボール(Australian football)</string>
<string name="poi_australian_football">オーストラリアンフットボール</string>
<string name="poi_base">ベースジャンピング(Base jumping)</string>
<string name="poi_baseball">野球</string>
<string name="poi_basketball">バスケットボール</string>
@ -452,7 +452,7 @@
<string name="poi_rune_stone">ルーン石碑(Rune stone)</string>
<string name="poi_wreck">難破船・座礁船(Shipwreck)</string>
<string name="poi_historic_ship">退役船(Historic ship)</string>
<string name="poi_historic_mine">廃鉱山(Historic mine)</string>
<string name="poi_historic_mine">廃鉱山</string>
<string name="poi_monument">モニュメント・記念碑(Monument)</string>
<string name="poi_aquarium">水族館(Aquarium)</string>
<string name="poi_attraction">観光名所(Tourist attraction)</string>
@ -460,7 +460,7 @@
<string name="poi_photo">写真屋(Photo shop)</string>
<string name="poi_sailing">セーリング(Sailing)</string>
<string name="poi_attraction_amusement_ride">遊園地の乗り物(Amusement ride)</string>
<string name="poi_attraction_animal">動物園(Animal [attraction])</string>
<string name="poi_attraction_animal">動物園</string>
<string name="poi_attraction_big_wheel">観覧車(Ferris wheel)</string>
<string name="poi_attraction_carousel">回転木馬・メリーゴーランド(Carousel)</string>
<string name="poi_attraction_maze">迷路アトラクション(Maze)</string>
@ -492,7 +492,7 @@
<string name="poi_internet_access_wired">インターネット・有線接続有り(Internet access: wired)</string>
<string name="poi_internet_access_public">インターネット有り・種別不明(Internet access: public)</string>
<string name="poi_internet_access_service">インターネット・接続サポート有り(Internet access: service)</string>
<string name="poi_monastery">修道院(Monastery)</string>
<string name="poi_monastery">修道院</string>
<string name="poi_historic_monastery">歴史的修道院(Historic monastery)</string>
<string name="poi_wayside_cross">道端の十字架(Wayside cross)</string>
<string name="poi_wayside_shrine">歴史的礼拝所・地蔵(Wayside shrine)</string>
@ -530,7 +530,7 @@
<string name="poi_club_history">歴史同好会(History club)</string>
<string name="poi_club_music">音楽同好会・楽団(Music club)</string>
<string name="poi_club_ethnic">国際交流会(Ethnic club)</string>
<string name="poi_club_nature">アウトドア・自然に関する同好会(Nature club)</string>
<string name="poi_club_nature">アウトドア・自然に関する同好会</string>
<string name="poi_club_photography">写真同好会(Photography club)</string>
<string name="poi_club_hunting">猟友会(Hunting club)</string>
<string name="poi_club_shooting">射撃同好会(Shooting club)</string>
@ -551,8 +551,8 @@
<string name="poi_social_centre">社会福祉センター(Social center)</string>
<string name="poi_theatre">劇場(Theater)</string>
<string name="poi_theatre_genre_circus">サーカス(Circus)</string>
<string name="poi_dance_floor">ダンスフロア(Dance floor)</string>
<string name="poi_nightclub">ナイトクラブ・ディスコ(Nightclub)</string>
<string name="poi_dance_floor">ダンスフロア</string>
<string name="poi_nightclub">ナイトクラブ・ディスコ</string>
<string name="poi_stripclub">ストリップクラブ(Stripclub)</string>
<string name="poi_beach_resort">海水浴場・リゾートビーチ(Beach resort)</string>
<string name="poi_dog_park">ドッグラン(Dog park)</string>
@ -617,7 +617,7 @@
<string name="poi_craft_stand_builder">イベント設営事務所(Stand builder)</string>
<string name="poi_craft_stonemason">石工・石材加工所(Stonemason)</string>
<string name="poi_craft_sun_protection">日よけ製作所(Sun protection craft)</string>
<string name="poi_craft_sweep">煙突掃除事務所(Sweep)</string>
<string name="poi_craft_sweep">煙突掃除事務所</string>
<string name="poi_craft_tailor">仕立て屋(Tailor)</string>
<string name="poi_craft_tiler">タイル店(Tiler)</string>
<string name="poi_craft_tinsmith">ブリキ製品工場(Tinsmith)</string>
@ -625,7 +625,7 @@
<string name="poi_craft_watchmaker">腕時計職人(Watchmaker)</string>
<string name="poi_craft_window_construction">窓設置工(Window construction)</string>
<string name="poi_funeral_directors">葬儀屋(Funeral directors)</string>
<string name="poi_craft_computer">コンピューター技師(Computer craft)</string>
<string name="poi_craft_computer">コンピューター技師</string>
<string name="poi_beauty">SPA・ネイル・総合美容店(Beauty salon)</string>
<string name="poi_beauty_salon_nails">マニキュア(Manicure)</string>
<string name="poi_hairdresser">美容室(Hairdresser)</string>
@ -647,10 +647,10 @@
<string name="poi_pawnbroker">質屋(Pawnbroker)</string>
<string name="poi_bureau_de_change">両替商・両替機(Bureau de change)</string>
<string name="poi_accountant">会計事務所(Accountant)</string>
<string name="poi_bitcoin_yes">Bitcoin支払い対応(Bitcoin payment)</string>
<string name="poi_bitcoin_yes">Bitcoin支払い対応</string>
<string name="poi_cave_entrance">洞窟入口(Cave entrance)</string>
<string name="poi_peak">山頂(Mountain peak)</string>
<string name="poi_migration">移住(Migration)</string>
<string name="poi_migration">移住</string>
<string name="poi_saddle">鞍部(Saddle)</string>
<string name="poi_volcano">火山(Volcano)</string>
<string name="poi_crater">噴火口・クレーター(Crater)</string>
@ -661,7 +661,7 @@
<string name="poi_river">川(River)</string>
<string name="poi_stream">小川(Stream)</string>
<string name="poi_rapids">急流部(Rapids)</string>
<string name="poi_stone">目印岩(Remarkable stone)</string>
<string name="poi_stone">目印岩</string>
<string name="poi_cape">岬(Cape)</string>
<string name="poi_beach">砂浜(Beach)</string>
<string name="poi_bay">湾(Bay)</string>
@ -683,7 +683,7 @@
<string name="poi_beacon_lateral">灯標-左舷右舷標識(Lateral beacon)</string>
<string name="poi_beacon_safe_water">灯標-安全水域標識(Safe water beacon)</string>
<string name="poi_beacon_special_purpose">灯標-特殊標識(Special purpose beacon)</string>
<string name="poi_berth">係留場所(Berth)</string>
<string name="poi_berth">係留場所</string>
<string name="poi_seamark_bridge">水路と交わる橋・可動橋(Seamark bridge)</string>
<string name="poi_buoy_cardinal">浮標-方位標識(Cardinal buoy)</string>
<string name="poi_buoy_installation">浮標-タンカー用(Installation buoy)</string>
@ -691,16 +691,16 @@
<string name="poi_buoy_lateral">浮標-左舷右舷標識(Lateral buoy)</string>
<string name="poi_buoy_safe_water">浮標-安全水域標識(Safe water buoy)</string>
<string name="poi_buoy_special_purpose">浮標-特殊標識(Special purpose buoy)</string>
<string name="poi_daymark">灯台(Daymark)</string>
<string name="poi_daymark">灯台</string>
<string name="poi_distance_mark">距離標(Distance mark)</string>
<string name="poi_dry_dock">乾ドック・船渠(Dry dock)</string>
<string name="poi_dyke">堤防(Dyke)</string>
<string name="poi_floating_dock">桟橋(Floating dock)</string>
<string name="poi_fog_signal">濃霧信号(Fog signal)</string>
<string name="poi_floating_dock">桟橋</string>
<string name="poi_fog_signal">濃霧信号</string>
<string name="poi_seamark_harbour">港(Harbor)</string>
<string name="poi_landmark">人工建造物(Landmark)</string>
<string name="poi_mooring">係留設備(Mooring)</string>
<string name="poi_military_landuse">軍用エリア(Military zone)</string>
<string name="poi_military_landuse">軍用エリア</string>
<string name="poi_military_airfield">軍用飛行場(Military airfield)</string>
<string name="poi_military_bunker">トーチカ(Military bunker)</string>
<string name="poi_military_barracks">バラック・兵舎(Barracks)</string>
@ -713,12 +713,12 @@
<string name="poi_seamark_light_minor">光源-小、航路標識(Minor light, seamark)</string>
<string name="poi_seamark_light_float">ボート状光源、航路標識(Float light, seamark)</string>
<string name="poi_seamark_light_vessel">光源-船舶、航路標識(Vessel light, seamark)</string>
<string name="poi_notice">警告、航路標識(Notice, seamark)</string>
<string name="poi_notice">警告、航路標識</string>
<string name="poi_pile">杭(Pile)</string>
<string name="poi_radar_transponder">レーダー中継機・トランスポンダ, 航路標識(Radar transponder, seamark)</string>
<string name="poi_radio_station">無線局、航路標識(Radio station, seamark)</string>
<string name="poi_signal_station_traffic">信号所、通航(Signal station, traffic)</string>
<string name="poi_signal_station_warning">信号所、警告(Signal station, warning)</string>
<string name="poi_signal_station_warning">信号所、警告</string>
<string name="poi_small_craft_facility">小型船舶用設備(Small craft facility)</string>
<string name="poi_topmark">トップマーク、航路標識(Topmark, seamark)</string>
<string name="poi_seamark_rock">岩、航路標識(Rock, seamark)</string>
@ -730,16 +730,16 @@
<string name="poi_general_tourist_attraction_yes">一般的な観光名所(General tourist attraction)</string>
<string name="poi_cabin">小屋(Cabin)</string>
<string name="poi_lean_to">下家・差し掛け小屋(Lean-to)</string>
<string name="poi_hunting_lodge">狩猟小屋(Hunting lodge)</string>
<string name="poi_hunting_lodge">狩猟小屋</string>
<string name="poi_picnic_table">ピクニックテーブル(Picnic table)</string>
<string name="poi_hanami">お花見スポット・桜の名所(Hanami)</string>
<string name="poi_hanami">お花見スポット・桜の名所</string>
<string name="poi_wine_cellar">ワインセラー(Wine cellar)</string>
<string name="poi_craft_winery">ワイナリー(Winery)</string>
<string name="poi_piste">ゲレンデ・スノーコース(Piste)</string>
<string name="poi_ski_rental">レンタルスキー(Ski rental)</string>
<string name="poi_gallery">美術館(Art gallery)</string>
<string name="poi_ski_resort">スキーリゾート(Ski resort)</string>
<string name="poi_trail_riding_station">トレイルライディング小屋(Trail riding station)</string>
<string name="poi_trail_riding_station">トレイルライディング小屋</string>
<string name="poi_hiking_routes">ハイキングルート(Hiking routes)</string>
<string name="poi_traffic_enforcement">交通違反取締装置(Traffic enforcement)</string>
<string name="poi_cheese">チーズ専門店(Cheese shop)</string>
@ -749,7 +749,7 @@
<string name="poi_pastry">洋菓子店(Pastry Shop)</string>
<string name="poi_camera">カメラ店(Cameras and lenses)</string>
<string name="poi_candles">ろうそく店・キャンドルショップ(Candles store)</string>
<string name="poi_doors">ドア店(Doors)</string>
<string name="poi_doors">ドア店</string>
<string name="poi_fashion">ファッション店(Fashion store)</string>
<string name="poi_free_flying">フリーフライング用品店(パラグライダー等のスカイスポーツ用品店)</string>
<string name="poi_furnace">暖房機器店(Heating units store)</string>
@ -758,7 +758,7 @@
<string name="poi_music">楽器店(Music store)</string>
<string name="poi_scuba_diving_shop">スキューバダイビング用品店(Scuba diving goods store)</string>
<string name="poi_tyres">タイヤ店(Tire store)</string>
<string name="poi_energy">バッテリー販売店(Energy store)</string>
<string name="poi_energy">バッテリー販売店</string>
<string name="poi_watches">腕時計店(Watches shop)</string>
<string name="poi_swimming_pool_shop">プール用品店(Swimming pool goods store)</string>
<string name="poi_games">ゲーム(Games)</string>
@ -788,8 +788,8 @@
<string name="poi_recycling_scrap_metal">鉄屑(Scrap metal)</string>
<string name="poi_recycling_batteries">家庭用電池(Batteries)</string>
<string name="poi_recycling_plastic_bottles">ペットボトル(Plastic bottles)</string>
<string name="poi_recycling_green_waste">木質系廃棄物(Green waste)</string>
<string name="poi_recycling_waste">リサイクル不能な一般ゴミ・黒いゴミ袋(Waste (black bags))</string>
<string name="poi_recycling_green_waste">木質系廃棄物</string>
<string name="poi_recycling_waste">リサイクル不能な一般ゴミ・黒いゴミ袋</string>
<string name="poi_recycling_plastic_packaging">プラスチック包装(Plastic packaging)</string>
<string name="poi_recycling_newspaper">新聞紙(Newspaper)</string>
<string name="poi_recycling_cartons">飲食物用段ボール(Cartons)</string>
@ -801,7 +801,7 @@
<string name="poi_recycling_books">書籍(Books)</string>
<string name="poi_recycling_shoes">靴</string>
<string name="poi_recycling_aluminium">アルミニウム(Aluminium)</string>
<string name="poi_recycling_organic">生ごみ(Organic)</string>
<string name="poi_recycling_organic">生ごみ</string>
<string name="poi_recycling_beverage_cartons">飲食物の紙パック(Beverage cartons)</string>
<string name="poi_recycling_garden_waste">木質系廃棄物(Garden waste)</string>
<string name="poi_recycling_low_energy_bulbs">電球型蛍光灯(Low energy bulbs)</string>
@ -821,7 +821,7 @@
<string name="poi_recycling_tetrapak">食品用紙パック・テトラパック(Tetrapak)</string>
<string name="poi_recycling_rubble">廃材・瓦礫(Rubble)</string>
<string name="poi_recycling_cds">CD(CDs)</string>
<string name="poi_recycling_waste_oil">廃油(Waste oil)</string>
<string name="poi_recycling_waste_oil">廃油</string>
<string name="poi_recycling_bottles">ボトル(Bottles)</string>
<string name="poi_recycling_cork">コルク製品(Cork)</string>
<string name="poi_recycling_printer_cartridges">プリンターインクカートリッジ・トナー(Printer cartridges)</string>
@ -862,7 +862,7 @@
<string name="poi_notary">公証・法律事務所(Notary)</string>
<string name="poi_foundation">財団事務所(Foundation office)</string>
<string name="poi_tax_advisor">税理士事務所(Tax advisor office)</string>
<string name="poi_tourism_yes">観光名所(Touristic object)</string>
<string name="poi_tourism_yes">観光名所</string>
<string name="poi_religion_voodoo">ブードゥー教(Voodoo)</string>
<string name="poi_religion_unitarian_universalist">ユニテリアン ・ ユニヴァーサリズム(Unitarian universalism)</string>
<string name="poi_religion_multifaith">複合宗教(Multifaith)</string>
@ -899,7 +899,7 @@
<string name="poi_denomination_greek_catholic">東方典礼カトリック教会(Greek catholic)</string>
<string name="poi_denomination_united_reformed">アメリカ・オランダ改革派(United reformed)</string>
<string name="poi_denomination_church_of_scotland">スコットランド国教会(Church of Scotland)</string>
<string name="poi_denomination_tibetan">チベット仏教(Tibetan)</string>
<string name="poi_denomination_tibetan">チベット仏教</string>
<string name="poi_denomination_salvation_army">救世軍(Salvation army)</string>
<string name="poi_denomination_iglesia_ni_cristo">イグレシア・ニ・クリスト(Iglesia ni cristo)</string>
<string name="poi_denomination_uniting">オーストラリア連合教会(Uniting)</string>
@ -918,7 +918,7 @@
<string name="poi_denomination_armenian_apostolic">アルメニア教会(Armenian apostolic)</string>
<string name="poi_denomination_dutch_reformed">オランダ改革派(Dutch reformed)</string>
<string name="poi_traffic_calming_island">交通島・歩行者安全地帯(Traffic island)</string>
<string name="poi_denomination_apostolic">ペンテコステ派(Apostolic)</string>
<string name="poi_denomination_apostolic">ペンテコステ派</string>
<string name="poi_denomination_latter_day_saints">モルモン教会／末日聖徒イエス・キリスト教会(Latter day saints)</string>
<string name="poi_denomination_church_of_christ">キリストの教会-無楽器派(Church of christ)</string>
<string name="poi_denomination_united_church_of_christ">キリスト連合教会(United church of christ)</string>
@ -933,11 +933,11 @@
<string name="poi_denomination_mahayana">大乗仏教(Mahayana)</string>
<string name="poi_internet_access_yes">インターネット有り・種別不明(Internet access: yes)</string>
<string name="poi_internet_access_no">インターネットなし(Internet access: no)</string>
<string name="poi_religious">宗教関係エリア(Religious area)</string>
<string name="poi_religious">宗教関係エリア</string>
<string name="poi_cutline">森林の切れ目(Cutline)</string>
<string name="poi_shower">シャワー</string>
<string name="poi_tree">樹木(Tree)</string>
<string name="poi_military_office">軍事事務所(Military office)</string>
<string name="poi_military_office">軍事事務所</string>
<string name="poi_wiki_place">ウィキペディア(Wikipedia)</string>
<string name="poi_wiki_lang_en">英語 wiki(English wiki)</string>
<string name="poi_wiki_lang_ar">アラビア語 wiki(Arabic wiki)</string>
@ -983,7 +983,7 @@
<string name="poi_wiki_lang_te">テルグ語 wiki(Telugu wiki)</string>
<string name="poi_wiki_lang_th">タイ語 wiki(Thai wiki)</string>
<string name="poi_denomination_reform">改革派教会(Reform)</string>
<string name="poi_denomination_scientist">クリスチャン・サイエンス(Scientist)</string>
<string name="poi_denomination_scientist">クリスチャン・サイエンス</string>
<string name="poi_seamark_dyke">堤防(Seamark dyke)</string>
<string name="poi_wiki_lang_tr">トルコ語 wiki(Turkish wiki)</string>
<string name="poi_wiki_lang_uk">ウクライナ語 wiki(Ukrainian wiki)</string>
@ -1028,7 +1028,7 @@
<string name="vk">VKontakte(VKontakte)</string>
<string name="poi_google_plus">Google+(Google+)</string>
<string name="poi_mobile">モバイル(Mobile)</string>
<string name="poi_service_times">サービス提供時間(Service times)</string>
<string name="poi_service_times">サービス提供時間</string>
<string name="poi_maxheight">高さ制限(Maximum height)</string>
<string name="poi_maxweight">重量制限(Maximum weight)</string>
<string name="poi_height">高さ(Height)</string>
@ -1042,8 +1042,8 @@
<string name="poi_fee_no">無料</string>
<string name="poi_drinking_water_yes">有り</string>
<string name="poi_drinking_water_no">無し</string>
<string name="poi_supervised_yes">監督者(Supervised)</string>
<string name="poi_supervised_no">監督者無し(Without supervision)</string>
<string name="poi_supervised_yes">監督者有り</string>
<string name="poi_supervised_no">監督者無し</string>
<string name="poi_seasonal_yes">限定(Yes)</string>
<string name="poi_seasonal_no">非限定(No)</string>
<string name="poi_seasonal_dry_season">乾季(Dry season)</string>
@ -1052,7 +1052,7 @@
<string name="poi_seasonal_summer">夏(Summer)</string>
<string name="poi_seasonal_autumn">秋(Fall)</string>
<string name="poi_seasonal_winter">冬(Winter)</string>
<string name="poi_crossing_traffic_signals">信号機有り(With stop lights)</string>
<string name="poi_crossing_traffic_signals">信号機有り</string>
<string name="poi_crossing_uncontrolled">信号機なし横断歩道(Uncontrolled)</string>
<string name="poi_crossing_unmarked">信号及び表示なし横断歩道(Unmarked)</string>
<string name="poi_start_date">完成日(Start date)</string>
@ -1074,7 +1074,7 @@
<string name="poi_additional_type">追加(Additional)</string>
<string name="poi_internet_access_type">インターネット接続の種類</string>
<string name="poi_vending_type">自動販売機の種類</string>
<string name="poi_bicycle_service">自転車サービス(Bicycle service)</string>
<string name="poi_bicycle_service">自転車関連サービス</string>
<string name="poi_fire_hydrant_water_source">水源(Water Source)</string>
<string name="poi_payment_toll_type">支払いの種類(Payment type)</string>
<string name="poi_traffic_signals_sound">視覚障害者用信号機音声</string>
@ -1102,7 +1102,7 @@
<string name="poi_payment_coins_50c12">硬貨_50セント、1ユーロ、2ユーロ硬貨(50c, 1€, and 2€ coins)</string>
<string name="poi_payment_cash_yes">現金(Cash)</string>
<string name="poi_payment_ep_cash_yes">キャッシュカード_ゲルトカルテ(電子マネー機能付き)</string>
<string name="poi_free_flying_characteristics">飛行対応ジャンル(Characteristic)</string>
<string name="poi_free_flying_characteristics">飛行対応ジャンル</string>
<string name="poi_free_flying_hanggliding_yes">ハンググライディング(Hanggliding)</string>
<string name="poi_free_flying_site_takeoff">離陸場所(Takeoff)</string>
<string name="poi_free_flying_site_landing">着陸場所(Landing)</string>
@ -1122,7 +1122,7 @@
<string name="poi_nudism_yes">許可(Allowed)</string>
<string name="poi_nudism_no">禁止(Prohibited)</string>
<string name="poi_nudism_obligatory">義務・必須(Obligatory)</string>
<string name="poi_nudism_customary">通例(Customary)</string>
<string name="poi_nudism_customary">通例</string>
<string name="poi_nudism_permissive">許容(Permissive)</string>
<string name="poi_gambling_type">ギャンブルの種類</string>
<string name="poi_gambling_lottery">宝くじ</string>
@ -1144,20 +1144,20 @@
<string name="poi_piste_difficulty_novice">斜度0-30°、初心者用(Novice)</string>
<string name="poi_piste_difficulty_expert">斜度45-50°、上級者用(Expert)</string>
<string name="poi_piste_difficulty_freeride">斜度50-55°、非圧雪面、コース外等(Freeride)</string>
<string name="poi_piste_grooming_classic">一般的なアルペン・ノルディックスキー用(Classic)</string>
<string name="poi_piste_grooming_classic_skating">一般的コース＋スケート可(Classic+skating)</string>
<string name="poi_piste_grooming_classic">一般的なアルペン・ノルディックスキー用</string>
<string name="poi_piste_grooming_classic_skating">一般的コース＋スケート可</string>
<string name="poi_piste_grooming_backcountry">バックカントリー(Backcountry)</string>
<string name="poi_piste_grooming_scooter">スノースクート(Scooter)</string>
<string name="poi_piste_grooming_skating">スケート(Skating)</string>
<string name="poi_piste_grooming_no">無し(No)</string>
<string name="poi_piste_grooming_no">無し</string>
<string name="poi_piste_grooming_mogul">モーグル(Mogul)</string>
<string name="poi_smoking">喫煙(Smoking)</string>
<string name="poi_smoking_no">禁煙(Not allowed)</string>
<string name="poi_smoking_outside">屋外のみ可(Outside only)</string>
<string name="poi_smoking_yes">喫煙可(Allowed)</string>
<string name="poi_smoking_separated">限られた場所のみ・分煙(In a separated room)</string>
<string name="poi_smoking_separated">限られた場所のみ・分煙</string>
<string name="poi_smoking_isolated">喫煙室のみ可(In a isolated room)</string>
<string name="poi_smoking_dedicated">喫煙者専用(Dedicated to smokers)</string>
<string name="poi_smoking_dedicated">喫煙者専用</string>
<string name="poi_theatre_genre">上演種目(Genre)</string>
<string name="poi_theatre_genre_philharmonic">交響楽団(Philharmonic)</string>
<string name="poi_theatre_genre_musical">ミュージカル(Musical)</string>
@ -1215,14 +1215,14 @@
<string name="poi_information_bicyclemap">自転車マップ(Bicycle map)</string>
<string name="poi_information_tactile_model">触知模型(Tactile model)</string>
<string name="poi_information_tactile_map">触地図(Tactile map)</string>
<string name="poi_information_board">看板(Board)</string>
<string name="poi_information_board">看板</string>
<string name="poi_information_hikingmap">ハイキングマップ(Hiking map)</string>
<string name="poi_information_type">案内方法の種類</string>
<string name="poi_information_guidepost">道標(Guidepost)</string>
<string name="poi_information_map">地図(Map)</string>
<string name="poi_information_office">事務所(Office)</string>
<string name="poi_information_terminal">端末(Terminal)</string>
<string name="poi_information_route_marker">ルートマーカー(Route marker)</string>
<string name="poi_information_route_marker">ルートマーカー</string>
<string name="poi_information_trail_blaze">道しるべ(Trail blaze)</string>
<string name="poi_religion_type">宗教(Religion)</string>
<string name="poi_recreation_center">保養施設(Recreation center)</string>
@ -1425,12 +1425,12 @@
<string name="poi_cuisine_jewish">ユダヤ料理(Jewish)</string>
<string name="poi_cuisine_bulgarian">ブルガリア料理(Bulgarian)</string>
<string name="poi_cuisine_tibetan">チベット料理(Tibetan)</string>
<string name="poi_delivery">出前・宅配(Delivery)</string>
<string name="poi_delivery">出前・宅配</string>
<string name="poi_delivery_filter_yes">可</string>
<string name="poi_delivery_yes">宅配可</string>
<string name="poi_delivery_no">宅配不可</string>
<string name="poi_delivery_only">宅配のみ</string>
<string name="poi_diet">ダイエット・食事制限(Diet)</string>
<string name="poi_diet">ダイエット・食事制限</string>
<string name="poi_diet_vegetarian_filter_yes">ベジタリアン(Vegetarian)</string>
<string name="poi_diet_vegetarian_only">ベジタリアンのみ(Vegetarian only)</string>
<string name="poi_diet_vegetarian_yes">ベジタリアン用食提供可(Vegetarian)</string>
@ -1479,7 +1479,7 @@
<string name="poi_takeaway_no">持ち帰り不可</string>
<string name="poi_takeaway_only">テイクアウト・持ち帰りのみ</string>
<string name="poi_archaeological_site_type">遺跡の種類</string>
<string name="poi_health_specialty">医療機関(Health specialty)</string>
<string name="poi_health_specialty">医療機関</string>
<string name="poi_health_specialty_general_yes">総合診療医(General practitioner)</string>
<string name="poi_health_specialty_ophthalmology_yes">眼科(Ophthalmology)</string>
<string name="poi_health_specialty_gynaecology_yes">婦人科(Gynaecology)</string>
@ -1576,16 +1576,16 @@
<string name="poi_social_facility_for_child_juvenile">子供;少年(Child;juvenile)</string>
<string name="poi_free_flying_characteristic">スカイスポーツの対応要素(Characteristic)</string>
<string name="poi_seasonal">季節営業(Seasonal)</string>
<string name="poi_drive_in">ドライブイン(Drive in)</string>
<string name="poi_drive_in">ドライブイン</string>
<string name="poi_drive_in_no">無し</string>
<string name="poi_power_supply_yes">有り</string>
<string name="poi_scout_camp">ボーイスカウト用キャンプ(Scout camp)</string>
<string name="poi_scout_camp">ボーイスカウト用キャンプ</string>
<string name="poi_scout_yes">肯定(yes)</string>
<string name="poi_scout_no">否定(Scout camp: no)</string>
<string name="poi_washing_machine_yes">有り</string>
<string name="poi_shower_filter_yes">有り</string>
<string name="poi_car_wash_yes">有り</string>
<string name="poi_payment_transport_type">送金の種類(Payment type (transport))</string>
<string name="poi_payment_transport_type">送金の種類</string>
<string name="poi_payment_coins_yes">硬貨</string>
<string name="poi_payment_coins_no">硬貨不可</string>
<string name="poi_payment_coins_0_5">硬貨_50セント硬貨</string>
@ -1711,7 +1711,7 @@
<string name="poi_medical_system_unani_yes">ユナニ医学・南アジアの伝統医学(Unani)</string>
<string name="poi_health_facility_type_office">医療事務(Medical office)</string>
<string name="poi_drive_in_yes">有り</string>
<string name="poi_healthcare_alternative_types">特殊医療(Specialty)</string>
<string name="poi_healthcare_alternative_types">代替医療の専門種</string>
<string name="poi_home_visit">往診(Home visit)</string>
<string name="poi_home_visit_no">無し</string>
<string name="poi_home_visit_yes">有り</string>
@ -1720,7 +1720,7 @@
<string name="poi_dispensing_no">無し</string>
<string name="poi_bench_yes">有り</string>
<string name="poi_bench_no">無し</string>
<string name="poi_covered">屋根・覆い(Covered)</string>
<string name="poi_covered">屋根・覆い</string>
<string name="poi_covered_yes">有り</string>
<string name="poi_covered_no">無し</string>
<string name="poi_tactile_paving_yes">有り</string>
@ -1760,7 +1760,7 @@
<string name="poi_pump_powered">電動</string>
<string name="poi_pump_no">無し</string>
<string name="poi_pump_yes">有り</string>
<string name="poi_water_characteristic">水質（Water characteristic)</string>
<string name="poi_water_characteristic">水質</string>
<string name="poi_water_characteristic_mud">泥水</string>
<string name="poi_water_characteristic_mineral">鉱物含む</string>
<string name="poi_water_characteristic_sulfuric">硫黄含む</string>
@ -2341,7 +2341,7 @@
<string name="poi_trees_pomegranate">ザクロの木</string>
<string name="poi_trees_coffea">コーヒーの木</string>
<string name="poi_urban">都市(Urban)</string>
<string name="poi_rural">農村(Rural)</string>
<string name="poi_rural">農村</string>
<string name="poi_animal_shelter_dog_cat">犬、猫</string>
<string name="poi_animal_shelter_dog">犬</string>
<string name="poi_animal_shelter_cat">猫</string>
@ -2349,8 +2349,8 @@
<string name="poi_seats">座席数(Seats)</string>
<string name="poi_backrest_yes">背もたれ:有り</string>
<string name="poi_backrest_no">背もたれ:無し</string>
<string name="poi_intermittent">間欠性水路、湖(Intermittent)</string>
<string name="poi_deadlock">行き詰まり(Deadlock)</string>
<string name="poi_intermittent">間欠性水路、湖</string>
<string name="poi_deadlock">行き詰まり</string>
<string name="poi_generator_source_coal">動力源:石炭</string>
<string name="poi_generator_source_gas">動力源:ガス</string>
<string name="poi_generator_source_nuclear">動力源:原子力</string>
@ -2373,7 +2373,7 @@
<string name="poi_toll_hgv_yes">HGV(重量積載物車両)は有料</string>
<string name="poi_mini_roundabout">小さいラウンドアバウト(環状交差点)</string>
<string name="poi_dead_wood">枯れ木</string>
<string name="poi_windfall">風で落ちた果物(Windfall)</string>
<string name="poi_windfall">風で落ちた果物</string>
<string name="poi_passing_place">単車線道路の退避所</string>
<string name="poi_level">階数</string>
<string name="poi_rtsa_scale">RTSA(ロシア・ツーリスト・スポーツ協会)による難易度評価</string>
@ -3021,4 +3021,22 @@
<string name="poi_provided_for_boy_yes">20歳未満の男性:可</string>
<string name="poi_provided_for_boy_no">20歳未満の男性:不可</string>
<string name="poi_capacity_beds">ベッド定員</string>
<string name="poi_treat_inpatient_yes">入院:可</string>
<string name="poi_treat_inpatient_no">入院:不可</string>
<string name="poi_treat_inpatient_only">入院:必須</string>
<string name="poi_counselling_yes">カウンセリング:可</string>
<string name="poi_counselling_no">カウンセリング:不可</string>
<string name="poi_disease_malaria_yes">マラリア患者対応:可</string>
<string name="poi_disease_malaria_no">マラリア患者対応:不可</string>
<string name="poi_disease_ebola_yes">エボラ患者対応:可</string>
<string name="poi_disease_ebola_no">エボラ患者対応:不可</string>
<string name="poi_disease_autism_yes">自閉症患者対応:可</string>
<string name="poi_disease_autism_no">自閉症患者対応:不可</string>
<string name="poi_disease_aids_yes">エイズ患者対応:可</string>
<string name="poi_disease_aids_no">エイズ患者対応:不可</string>
<string name="poi_office_podologist">足病医</string>
<string name="poi_fire_hydrant_diameter">消火栓の口径</string>
<string name="poi_fire_hydrant_pressure">消火栓の圧力</string>
<string name="poi_fire_hydrant_count">消火栓数</string>
<string name="poi_fire_hydrant_flow_capacity">消火栓の放水流量</string>
</resources>

47
OsmAnd/res/values-nb/strings.xml
View file

@ -2944,4 +2944,51 @@
\n</string>
<string name="use_osm_live_public_transport_description">Skru på offentlig transport i OsmAnd Live-endringer.</string>
<string name="use_osm_live_public_transport">Offentlig transport i OsmAnd Live</string>
<string name="transfers_size">%1$d overføringer</string>
<string name="add_start_and_end_points">Legg til start- og sluttpunkt</string>
<string name="route_add_start_point">Legg til startpunkt</string>
<string name="route_descr_select_start_point">Velg startpunkt</string>
<string name="rendering_attr_surface_unpaved_name">Uasfaltert</string>
<string name="rendering_attr_surface_sand_name">Sand</string>
<string name="rendering_attr_surface_grass_name">Gress</string>
<string name="rendering_attr_surface_grass_paver_name">Gressteinsdekk</string>
<string name="rendering_attr_surface_ground_name">Jord</string>
<string name="rendering_attr_surface_dirt_name">Bakke</string>
<string name="rendering_attr_surface_mud_name">Gjørme</string>
<string name="rendering_attr_surface_ice_name">Is</string>
<string name="rendering_attr_surface_salt_name">Salt</string>
<string name="rendering_attr_surface_snow_name">Snø</string>
<string name="rendering_attr_surface_asphalt_name">Asfalt</string>
<string name="rendering_attr_surface_paved_name">Asfaltert</string>
<string name="rendering_attr_surface_concrete_name">Betong</string>
<string name="rendering_attr_surface_sett_name">Brostein</string>
<string name="rendering_attr_surface_cobblestone_name">Rustikk brostein</string>
<string name="rendering_attr_surface_paving_stones_name">Steinbelagt</string>
<string name="rendering_attr_surface_pebblestone_name">Småstein</string>
<string name="rendering_attr_surface_stone_name">Stein</string>
<string name="rendering_attr_surface_metal_name">Metall</string>
<string name="rendering_attr_surface_wood_name">Tre</string>
<string name="rendering_attr_surface_gravel_name">Grus</string>
<string name="rendering_attr_surface_fine_gravel_name">Fin grus</string>
<string name="rendering_attr_surface_compacted_name">Komprimert</string>
<string name="rendering_attr_smoothness_excellent_name">Utmerket</string>
<string name="rendering_attr_smoothness_good_name">God</string>
<string name="rendering_attr_smoothness_intermediate_name">Middels</string>
<string name="rendering_attr_smoothness_bad_name">Dårlig</string>
<string name="rendering_attr_smoothness_very_bad_name">Veldig dårlig</string>
<string name="rendering_attr_smoothness_horrible_name">Fryktelig</string>
<string name="rendering_attr_smoothness_very_horrible_name">Uhyre fryktelig</string>
<string name="rendering_attr_smoothness_impassable_name">Ikke farbart</string>
<string name="rendering_attr_highway_class_motorway_name">Motorvei</string>
<string name="rendering_attr_highway_class_state_road_name">Fylkesvei</string>
<string name="rendering_attr_highway_class_road_name">Vei</string>
<string name="rendering_attr_highway_class_street_name">Gate</string>
<string name="rendering_attr_highway_class_service_name">Tjeneste</string>
<string name="rendering_attr_highway_class_footway_name">Tursti</string>
<string name="rendering_attr_highway_class_track_name">Turvei</string>
<string name="rendering_attr_highway_class_bridleway_name">Ridesti</string>
<string name="rendering_attr_highway_class_steps_name">Trapper</string>
<string name="rendering_attr_highway_class_path_name">Sti</string>
<string name="rendering_attr_highway_class_cycleway_name">Sykkelvei</string>
<string name="rendering_attr_undefined_name">Udefinert</string>
</resources>

49
OsmAnd/res/values-pt-rBR/strings.xml
View file

@ -2900,7 +2900,7 @@ Pôr do Sol: %2$s</string>
<string name="work_button">Trabalho</string>
<string name="shared_string_swap">Inverter</string>
<string name="show_more">Mostrar mais</string>
<string name="tracks_on_map">Faixas no mapa</string>
<string name="tracks_on_map">Trilhas na tela</string>
<string name="time_of_day">Hora do dia</string>
<string name="by_transport_type">Por %1$s</string>
<string name="step_by_step">Passo a passo</string>
@ -2929,4 +2929,51 @@ Pôr do Sol: %2$s</string>
\n</string>
<string name="use_osm_live_public_transport_description">Habilitar o transporte público para alterações do OsmAnd Live.</string>
<string name="use_osm_live_public_transport">Transporte público OsmAnd Live</string>
<string name="rendering_attr_surface_unpaved_name">Não pavimentado</string>
<string name="rendering_attr_surface_sand_name">Areia</string>
<string name="rendering_attr_surface_grass_name">Grama</string>
<string name="rendering_attr_surface_ice_name">Gelo</string>
<string name="rendering_attr_surface_snow_name">Neve</string>
<string name="rendering_attr_surface_asphalt_name">Asfalto</string>
<string name="rendering_attr_surface_paved_name">Pavimentado</string>
<string name="rendering_attr_surface_concrete_name">Concreto</string>
<string name="rendering_attr_surface_sett_name">Paralelepípedo</string>
<string name="rendering_attr_surface_cobblestone_name">Pavimento de pedras irregulares</string>
<string name="rendering_attr_surface_paving_stones_name">Piso intertravado</string>
<string name="rendering_attr_surface_pebblestone_name">Seixo rolado</string>
<string name="rendering_attr_surface_stone_name">Rocha</string>
<string name="rendering_attr_surface_metal_name">Metal</string>
<string name="rendering_attr_surface_wood_name">Madeira</string>
<string name="rendering_attr_surface_gravel_name">Cascalho</string>
<string name="rendering_attr_surface_fine_gravel_name">Cascalho fino</string>
<string name="rendering_attr_surface_compacted_name">Solo compactado</string>
<string name="rendering_attr_smoothness_excellent_name">Excelente</string>
<string name="rendering_attr_smoothness_good_name">Boa</string>
<string name="rendering_attr_smoothness_intermediate_name">Intermediária</string>
<string name="rendering_attr_smoothness_bad_name">Ruim</string>
<string name="rendering_attr_smoothness_very_bad_name">Muito ruim</string>
<string name="rendering_attr_smoothness_horrible_name">Horrível</string>
<string name="rendering_attr_smoothness_very_horrible_name">Muito horrível</string>
<string name="rendering_attr_smoothness_impassable_name">Intransitável</string>
<string name="rendering_attr_highway_class_motorway_name">Autoestrada/Via expressa</string>
<string name="rendering_attr_highway_class_state_road_name">Rodovia</string>
<string name="rendering_attr_highway_class_road_name">Estrada/Avenida</string>
<string name="rendering_attr_highway_class_street_name">Rua</string>
<string name="rendering_attr_highway_class_service_name">Via de serviço</string>
<string name="rendering_attr_highway_class_footway_name">Passeio</string>
<string name="rendering_attr_highway_class_track_name">Trilha</string>
<string name="rendering_attr_highway_class_steps_name">Escada</string>
<string name="rendering_attr_highway_class_path_name">Caminho</string>
<string name="rendering_attr_highway_class_cycleway_name">Ciclovia</string>
<string name="rendering_attr_undefined_name">Não definido</string>
<string name="transfers_size">%1$d transferências</string>
<string name="add_start_and_end_points">Adicionar pontos inicial e final</string>
<string name="route_add_start_point">Adicionar ponto inicial</string>
<string name="route_descr_select_start_point">Selecionar o ponto inicial</string>
<string name="rendering_attr_surface_grass_paver_name">Pavimentadora de grama</string>
<string name="rendering_attr_surface_ground_name">Chão</string>
<string name="rendering_attr_surface_dirt_name">Terra (lamacenta)</string>
<string name="rendering_attr_surface_mud_name">Lama</string>
<string name="rendering_attr_surface_salt_name">Sal</string>
<string name="rendering_attr_highway_class_bridleway_name">Estrada equestre</string>
</resources>

72
OsmAnd/res/values-ru/strings.xml
View file

@ -2898,7 +2898,7 @@
<string name="add_home">Добавить дом</string>
<string name="add_work">Добавить работу</string>
<string name="work_button">Работа</string>
<string name="route_smoothness_stat_container">Ровность</string>
<string name="route_smoothness_stat_container">Проходимость</string>
<string name="previous_route">Предыдущий маршрут</string>
<string name="add_destination_query">Сначала добавьте пункт назначения</string>
<string name="shared_string_swap">Поменять</string>
@ -2914,21 +2914,63 @@
<string name="by_transport_type">На %1$s</string>
<string name="exit_at">Выход на</string>
<string name="sit_on_the_stop">Посадка на остановке</string>
<string name="release_3_3">• Новый экран \"Маршруты\" отображает: кнопки пунктов назначения \"Дом\" и \"Работа\", ярлык \"Предыдущий маршрут\", список активных GPX треков и маркеров, историю поиска.
\n
\n• Дополнительная информация в разделе \"Детали маршрута\": типы дорог, поверхность, крутизна, ровность.
\n
\n• Навигация на общественном транспорте поддерживает все виды транспорта: метро, автобус, трамвай и др.
\n
\n• Новые быстрые действия для показа/скрытия треков и дневного/ночного режимов.
\n
\n• Исправлены области, отображаемые как затопленные в Германии, Южной Африке, Квебеке.
\n
\n• Дополнительная поддержка импорта KML и KMZ.
\n
\n• Исправлены падения при открытии некоторых остановок общественного транспорта.
\n
<string name="release_3_3">• Новый экран \"Маршруты\" отображает: кнопки пунктов назначения \"Дом\" и \"Работа\", ярлык \"Предыдущий маршрут\", список активных GPX треков и маркеров, историю поиска.
\n
\n• Дополнительная информация в разделе \"Детали маршрута\": типы дорог, поверхность, крутизна, проходимость.
\n
\n• Навигация на общественном транспорте поддерживает все виды транспорта: метро, автобус, трамвай и др.
\n
\n• Новые быстрые действия для показа/скрытия треков и дневного/ночного режимов.
\n
\n• Исправлены области, отображаемые как затопленные в Германии, Южной Африке, Квебеке.
\n
\n• Дополнительная поддержка импорта KML и KMZ.
\n
\n• Исправлены падения при открытии некоторых остановок общественного транспорта.
\n
\n• Удалена аналитика Facebook и Firebase из бесплатной версии (OsmAnd+ ее не включает).</string>
<string name="use_osm_live_public_transport_description">Включить общественный транспорт с учетом автообновлений OsmAnd Live.</string>
<string name="use_osm_live_public_transport">Общественный транспорт OsmAnd Live</string>
<string name="transfers_size">%1$d пересадки</string>
<string name="rendering_attr_surface_unpaved_name">Грунтовая</string>
<string name="rendering_attr_surface_sand_name">Песок</string>
<string name="rendering_attr_surface_grass_name">Трава</string>
<string name="rendering_attr_surface_ground_name">Земля</string>
<string name="rendering_attr_surface_dirt_name">Грязь</string>
<string name="rendering_attr_surface_mud_name">Ил</string>
<string name="rendering_attr_surface_ice_name">Лед</string>
<string name="rendering_attr_surface_salt_name">Соль</string>
<string name="rendering_attr_surface_snow_name">Снег</string>
<string name="rendering_attr_surface_asphalt_name">Асфальт</string>
<string name="rendering_attr_surface_paved_name">Твердая</string>
<string name="rendering_attr_surface_concrete_name">Бетон</string>
<string name="rendering_attr_surface_sett_name">Брусчатка</string>
<string name="rendering_attr_surface_cobblestone_name">Булыжник</string>
<string name="rendering_attr_surface_paving_stones_name">Тротуарная плитка</string>
<string name="rendering_attr_surface_pebblestone_name">Галька</string>
<string name="rendering_attr_surface_stone_name">Камень</string>
<string name="rendering_attr_surface_metal_name">Металл</string>
<string name="rendering_attr_surface_wood_name">Дерево</string>
<string name="rendering_attr_surface_gravel_name">Гравий</string>
<string name="rendering_attr_surface_fine_gravel_name">Многослойный гравий</string>
<string name="rendering_attr_surface_compacted_name">Утрамбованная</string>
<string name="rendering_attr_smoothness_excellent_name">Отличная</string>
<string name="rendering_attr_smoothness_good_name">Хорошая</string>
<string name="rendering_attr_smoothness_intermediate_name">Средняя</string>
<string name="rendering_attr_smoothness_bad_name">Плохая</string>
<string name="rendering_attr_smoothness_very_bad_name">Очень плохая</string>
<string name="rendering_attr_smoothness_horrible_name">Ужасная</string>
<string name="rendering_attr_smoothness_very_horrible_name">Очень ужасная</string>
<string name="rendering_attr_smoothness_impassable_name">Непроходимая</string>
<string name="rendering_attr_highway_class_motorway_name">Автомагистраль</string>
<string name="rendering_attr_highway_class_road_name">Дорога</string>
<string name="rendering_attr_highway_class_street_name">Улица</string>
<string name="rendering_attr_highway_class_service_name">Проезд</string>
<string name="rendering_attr_highway_class_footway_name">Тротуар</string>
<string name="rendering_attr_highway_class_track_name">Сельскохозяйственная</string>
<string name="rendering_attr_highway_class_bridleway_name">Конная</string>
<string name="rendering_attr_highway_class_steps_name">Лестница</string>
<string name="rendering_attr_highway_class_path_name">Тропа</string>
<string name="rendering_attr_highway_class_cycleway_name">Велодорожка</string>
<string name="rendering_attr_undefined_name">Неопределённая</string>
</resources>

41
OsmAnd/res/values-sc/phrases.xml
View file

@ -95,7 +95,7 @@
<string name="poi_city_wall">Murallas de sa tzitade</string>
<string name="poi_lift_gate">Ponte levatòiu</string>
<string name="poi_toll_booth">Casellu</string>
<string name="poi_traffic_calming_bump">Dossu istradale</string>
<string name="poi_traffic_calming_bump">Dossu de su caminu</string>
<string name="poi_traffic_calming_hump">Dossu longu</string>
<string name="poi_traffic_calming_chicane">Chicane</string>
<string name="poi_traffic_signals">Lughe de stop</string>
@ -603,7 +603,7 @@
<string name="poi_club">Tzìrculu</string>
<string name="poi_cafe_and_restaurant">Cafeterias e ristorantes</string>
<string name="poi_shop_food">Butega alimentare e supermercadu</string>
<string name="poi_road_obstacle">Impèigu/ostàculu istradale</string>
<string name="poi_road_obstacle">Impèigu/ostàculu in su caminu</string>
<string name="poi_accomodation">Allògiu</string>
<string name="poi_smoking_area">Àrea fumatores</string>
<string name="poi_piste_playground">Pista de iscì pro pitzinneddos</string>
@ -654,7 +654,7 @@
<string name="poi_fuel_e20">E20</string>
<string name="poi_fuel_e85">E85</string>
<string name="poi_fuel_biogas">Biogàs</string>
<string name="poi_junction">Giuntura istradale</string>
<string name="poi_junction">Giuntura de su caminu</string>
<string name="poi_bell_tower">Campanile</string>
<string name="poi_farmyard">Argiola</string>
<string name="poi_landuse_railway">Àrea ferroviària</string>
@ -1208,7 +1208,7 @@
<string name="poi_pump_no">Chene pompa</string>
<string name="poi_pump_yes">Eja</string>
<string name="poi_building">Edifìtziu</string>
<string name="poi_information_guidepost">Indicadore istradale</string>
<string name="poi_information_guidepost">Indicadore de su caminu</string>
<string name="poi_information_nature">Natura</string>
<string name="poi_information_wildlife">Sinnale de informatziones: fàuna agreste</string>
<string name="poi_information_tactile_model">Modellu tàtile</string>
@ -2057,7 +2057,7 @@
<string name="poi_resource_gas">Gas</string>
<string name="poi_resource_gold">Oro</string>
<string name="poi_resource_graphite">Grafite</string>
<string name="poi_resource_gravel">Ghiaia</string>
<string name="poi_resource_gravel">Ghiàia</string>
<string name="poi_resource_gypsum">Ghisu</string>
<string name="poi_resource_iron_ore">Minerales ferrosos</string>
<string name="poi_resource_lead">Prumu</string>
@ -2134,9 +2134,9 @@
<string name="poi_shelter_type_field_shelter">Refùgiu de campu (pro animales)</string>
<string name="poi_shelter_type_sun_shelter">Parasole (meriadòrgiu)</string>
<string name="poi_tunnel_waterway">Galleria de abba</string>
<string name="poi_tunnel_car">Galleria istradale</string>
<string name="poi_tunnel_car">Galleria de su caminu</string>
<string name="poi_tunnel_pedestrian">Galleria pedonale</string>
<string name="poi_bridge_car">Ponte istradale</string>
<string name="poi_bridge_car">Ponte de su caminu</string>
<string name="poi_bridge_pedestrian">Ponte pedonale</string>
<string name="poi_bridge_bicycle">Ponte pro bitzicletas</string>
<string name="poi_bridge_waterway">Ponte de unu riu</string>
@ -2450,10 +2450,10 @@
<string name="poi_network">Retza</string>
<string name="poi_government_legislative">Istitutzione legislativa</string>
<string name="poi_visibility_house">Visibilidade: domo</string>
<string name="poi_visibility_street">Visibilidade: istrada</string>
<string name="poi_visibility_street">Visibilidade: carrera</string>
<string name="poi_visibility_area">Visibilidade: àrea</string>
<string name="poi_operational_status">Istadu operativu</string>
<string name="poi_post_street">Istrada</string>
<string name="poi_post_street">Carrera</string>
<string name="poi_post_housenumber">Nùmeru tzìvicu</string>
<string name="poi_payment_centre">Tzentru de pagamentu</string>
<string name="poi_money_transfer">Tramudòngiu de dinare</string>
@ -2801,9 +2801,9 @@
<string name="poi_fire_hydrant_count">Nùmeru de idrantes</string>
<string name="poi_fire_hydrant_flow_capacity">Capatzidade de flussu de s\'idrante</string>
<string name="poi_fire_hydrant_position_green">In s\'erba</string>
<string name="poi_fire_hydrant_position_lane">In s\'istrada</string>
<string name="poi_fire_hydrant_position_lane">In su caminu</string>
<string name="poi_fire_hydrant_position_parking_lot">In unu parchègiu</string>
<string name="poi_fire_hydrant_position_street">In s\'istrada</string>
<string name="poi_fire_hydrant_position_street">In sa carrera</string>
<string name="poi_fire_hydrant_position_underground">Suta terra</string>
<string name="poi_fire_hydrant_style_wsh">Istile de s\'idrante: wsh</string>
<string name="poi_fire_hydrant_style_water_source_main">Printzipale</string>
@ -3187,7 +3187,7 @@
<string name="poi_motorcycle_type_scooter">Motorinu</string>
<string name="poi_motorcycle_type_sportbike">Mototzicleta isportiva</string>
<string name="poi_motorcycle_type_chopper">Chopper</string>
<string name="poi_motorcycle_type_offroad">Fora de istrada (Offroad)</string>
<string name="poi_motorcycle_type_offroad">Fora de su caminu (Offroad)</string>
<string name="poi_motorcycle_type_dualsport">Dualsport (Enduro)</string>
<string name="poi_motorcycle_type_standard">Istandard</string>
<string name="poi_generator_output_electricity_no">Essida (eletritzidade): nono</string>
@ -3344,7 +3344,7 @@
<string name="poi_amperage">Amperàgiu</string>
<string name="poi_charging_station_output">Essida de s\'istatzione de càrriga</string>
<string name="poi_map_type_topo">Casta de mapa: topogràfica</string>
<string name="poi_map_type_street">Casta de mapa: istrada</string>
<string name="poi_map_type_street">Casta de mapa: carrera</string>
<string name="poi_map_type_scheme">Casta de mapa: ischema</string>
<string name="poi_map_type_toposcope">Casta de mapa: toposcòpica</string>
<string name="poi_post_flats">Appartamentu</string>
@ -3558,4 +3558,19 @@
<string name="poi_generator_source_biomass">Mitza de energia: biomassa</string>
<string name="poi_health_specialty_radiotheraphy_yes">Radioterapia</string>
<string name="poi_hazard">Perìgulu</string>
<string name="poi_rtsa_scale_filter">Categoria de dificultade</string>
<string name="poi_rtsa_scale_nc">н/к</string>
<string name="poi_rtsa_scale_nc_asterisk">н/к*</string>
<string name="poi_rtsa_scale_1a">1А</string>
<string name="poi_rtsa_scale_1a_asterisk">1А*</string>
<string name="poi_rtsa_scale_1b">1Б</string>
<string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
<string name="poi_rtsa_scale_2a">2А</string>
<string name="poi_rtsa_scale_2a_asterisk">2А*</string>
<string name="poi_rtsa_scale_2b">2Б</string>
<string name="poi_rtsa_scale_2b_asterisk">2Б*</string>
<string name="poi_rtsa_scale_3a">3А</string>
<string name="poi_rtsa_scale_3a_asterisk">3А*</string>
<string name="poi_rtsa_scale_3b">3Б</string>
<string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
</resources>

201
OsmAnd/res/values-sc/strings.xml
View file

@ -67,10 +67,10 @@
<string name="route_info">Informatziones pro s’àndala</string>
<string name="routing_attr_prefer_motorway_name">Preferre sas autostradas</string>
<string name="routing_attr_prefer_motorway_description">Preferre sas autostradas</string>
<string name="routing_attr_avoid_toll_name">Istransi sas istradas a pagamentu</string>
<string name="routing_attr_avoid_toll_description">Istransi sas istradas a pagamentu</string>
<string name="routing_attr_avoid_unpaved_name">Istransi sas istradas non apamentadas</string>
<string name="routing_attr_avoid_unpaved_description">Istransi sas istradas non apamentadas.</string>
<string name="routing_attr_avoid_toll_name">Istransi sos caminos a pagamentu</string>
<string name="routing_attr_avoid_toll_description">Istransi sos caminos a pagamentu</string>
<string name="routing_attr_avoid_unpaved_name">Istransi sos caminos non apamentados</string>
<string name="routing_attr_avoid_unpaved_description">Istransi sos caminos non apamentados.</string>
<string name="routing_attr_avoid_ferries_name">Istransi sos naviles</string>
<string name="routing_attr_avoid_ferries_description">Istransi sos naviles</string>
<string name="routing_attr_avoid_motorway_name">Istransi sas autostradas</string>
@ -140,8 +140,8 @@
<string name="driving_region_descr">Issèbera sa regione de ghia: USA, Europa, UK, Àsia e àteras.</string>
<string name="driving_region_japan">Giapone</string>
<string name="speak_title">Annuntzia…</string>
<string name="speak_descr">Cunfigura pro annuntziare sos nùmenes de sas istradas, sos avèrtimentos (pasadas fortzadas, dossos), sos annuntzios de s’autovelox, sos lìmites de lestresa.</string>
<string name="speak_street_names">Nùmenes de sas istradas (TTS)</string>
<string name="speak_descr">Cunfigura pro annuntziare sos nùmenes de sos caminos, sos avèrtimentos (pasadas fortzadas, dossos), sos annuntzios de s’autovelox, sos lìmites de lestresa.</string>
<string name="speak_street_names">Nùmenes de sos caminos (TTS)</string>
<string name="speak_speed_limit">Lìmites de lestresa</string>
<string name="speak_cameras">Autovelox</string>
<string name="speak_traffic_warnings">Avisos de tràfficu</string>
@ -161,8 +161,8 @@
<string name="settings_preset_descr">Issèbera unu profilu de impreu cun impostatziones pessonalizadas pro sa mapa e su nàvigu.</string>
<string name="destination_point">Destinatzione %1$s</string>
<string name="context_menu_item_destination_point">Imposta comente destinatzione</string>
<string name="please_select_address">Issèbera in antis sa tzitade o s’istrada</string>
<string name="search_street_in_neighborhood_cities">Chirca sas istradas in sas tzitades prus a curtzu</string>
<string name="please_select_address">Issèbera in antis sa tzitade o su caminu</string>
<string name="search_street_in_neighborhood_cities">Chirca sos caminos in sas tzitades prus a curtzu</string>
<string name="intermediate_items_sort_return">Òrdine otimizadu pro sas tapas intermèdias de s’andala dae sa positzione atuale a sa destinatzione.</string>
<string name="intermediate_items_sort_by_distance">Cusserta ghenna a ghenna</string>
<string name="local_osm_changes_backup_successful">Documentu de modìfica OSM %1$s creadu</string>
@ -201,7 +201,7 @@
<string name="cancel_navigation">Firma su nàvigu</string>
<string name="clear_destination">Iscantzella sa destinatzione</string>
<string name="download_using_mobile_internet">Non ses connessu a su WiFi. Boles sighire a iscarrigare impreende sa connessione a ìnternet atuale?</string>
<string name="street_name">Nùmene istrada</string>
<string name="street_name">Nùmene de su caminu</string>
<string name="hno">Nùmeru tzivicu</string>
<string name="website">Situ web</string>
<string name="phone">Telèfonu</string>
@ -290,10 +290,10 @@
\nSos datos globales (intre sos 70 grados nord e sos 70 grados sud) sunt basados in supra de sas medidas de su SRTM (Shuttle Radar Topography Mission) e de s’ASTER (Advanced Spaceborne Thermal Emission and Reflection Radiometer), un’aina medidora in subra de Terra, su satèllite de su sistema di osservatzione de sa terra de sa NASA. ASTER est un’isfortzu de cooperatzione intre NASA, su Ministeru de s’Economia Cummèrtziu e Industria (METI) de su Giapone, e su sistema ispatziale giaponesu (J-spacesystems).</string>
<string name="srtm_plugin_name">Curvas de livellu</string>
<string name="download_select_map_types">Àteras mapas</string>
<string name="download_roads_only_item">Petzi istradas</string>
<string name="download_roads_only_item">Caminos ebbia</string>
<string name="download_srtm_maps">Curvas de livellu</string>
<string name="download_regular_maps">Mapas regulares</string>
<string name="download_roads_only_maps">Mapas cun petzi istradas</string>
<string name="download_roads_only_maps">Mapas cun caminos ebbia</string>
<string name="rendering_attr_noAdminboundaries_name">Làcanas</string>
<string name="rendering_attr_noAdminboundaries_description">Cua sas làcanas regionales (livellos amministrativos 5–9).</string>
<string name="map_widget_max_speed">Lìmite de lestresa</string>
@ -304,16 +304,16 @@
<string name="voice_stream_voice_call">Àudio mutidas bogales (firmat fintzas sa mùsica)</string>
<string name="voice_stream_notification">Àudio notìficas</string>
<string name="voice_stream_music">Àudio media/mùsica</string>
<string name="rendering_attr_showRoadMaps_description">Issèbera cando ammustrare mapas cun petzi sas istradas:</string>
<string name="rendering_attr_showRoadMaps_name">Mapas cun petzi istradas</string>
<string name="rendering_attr_showRoadMaps_description">Issèbera cando ammustrare mapas cun sos caminos ebbia:</string>
<string name="rendering_attr_showRoadMaps_name">Mapas cun caminos ebbia</string>
<string name="safe_mode_description">Allue s’aplicatzione in modalidade segura (impreende Android, prus lentu, imbetzes de su còdighe nativu).</string>
<string name="safe_mode">Modalidade segura</string>
<string name="native_library_not_running">S’aplicatzione est traballende in modalidade segura (la podes istudade in sas \'Impostatziones\').</string>
<string name="background_service_is_enabled_question">Su servitziu OsmAnd de isfundu est galu in esecutzione. Boles firmare fintzas custu?</string>
<string name="close_changeset">Serra sas modìficas</string>
<string name="zxing_barcode_scanner_not_found">S’aplicatzione ZXing Barcode Scanner non est installada. La boles chircare in su Market?</string>
<string name="rendering_attr_roadColors_description">Issèbera una cumbinatzione de colores pro sas istradas:</string>
<string name="rendering_attr_roadColors_name">Ischema de colores de sas istradas</string>
<string name="rendering_attr_roadColors_description">Issèbera una cumbinatzione de colores pro sos caminos:</string>
<string name="rendering_attr_roadColors_name">Ischema de colores de sos caminos</string>
<string name="map_widget_show_destination_arrow">Ammustra sa diretzione de sa destinatzione</string>
<string name="enable_plugin_monitoring_services">"Abìlita s’estensione de registratzione biàgios pro impreare sos servìtzios de registratzione de sa positzione (registratzione GPX, arrastamentu in lìnia)"</string>
<string name="non_optimal_route_calculation">Càlcula un’àndala, s’in casu mai fintzas non primorosa, pro sas distantzias longas</string>
@ -330,11 +330,11 @@
<string name="replace_destination_point">Remplasa sa destinatzione</string>
<string name="new_destination_point_dialog">Tenes giai una destinatzione impostada:</string>
<string name="shared_string_target_points">Itineràriu</string>
<string name="intermediate_point_too_far">Sa tapa %1$s est tropu indedda dae s’istrada prus a curtzu.</string>
<string name="intermediate_point_too_far">Sa tapa %1$s est tropu indedda dae su caminu prus a curtzu.</string>
<string name="arrived_at_intermediate_point">Ses arribadu a sa tapa intermèdia</string>
<string name="context_menu_item_intermediate_point">Annanghe·la comente tapa intermèdia</string>
<string name="map_widget_intermediate_distance">Tapa intermèdia</string>
<string name="ending_point_too_far">Puntu finale tropu indedda dae s’istrada prus a curtzu.</string>
<string name="ending_point_too_far">Puntu finale tropu indedda dae su caminu prus a curtzu.</string>
<string name="add_tag">Annanghe etichetta</string>
<string name="btn_advanced_mode">Modalidade avantzada…</string>
<string name="poi_filter_parking">Parchezu</string>
@ -355,8 +355,8 @@
<string name="avoid_motorway">Istense sas autostradas</string>
<string name="auto_zoom_map_descr">Ismanniamentu mapa relativu a sa lestresa (si sa mapa est sincronizzata cun sa positzione currente).</string>
<string name="auto_zoom_map">Ismanniamentu automàticu mapa</string>
<string name="snap_to_road_descr">Arrea sa positzione in subra de sas istradas durante su nàvigu.</string>
<string name="snap_to_road">Arrea in subra de sas istradas</string>
<string name="snap_to_road_descr">Arrea sa positzione in subra de sos caminos durante su nàvigu.</string>
<string name="snap_to_road">Arrea in subra de sos caminos</string>
<string name="interrupt_music_descr">Sos annùntzios vocales ponent sa mùsica in pàusa, imbetzes de li andare petzi in subra.</string>
<string name="interrupt_music">Firma sa mùsica</string>
<string name="osmand_play_title_30_chars">OsmAnd Mapas &amp; Nàvigu</string>
@ -392,7 +392,7 @@
<string name="gpx_monitoring_stop">Firma sa registratzione GPX</string>
<string name="gpx_start_new_segment">Inghitza unu segmentu nou</string>
<string name="rendering_attr_hideBuildings_name">Edifìtzios</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Istradas non carràbiles</string>
<string name="rendering_attr_hideNonVehicleHighways_name">Caminos non carràbiles</string>
<string name="rendering_attr_hideText_name">Testu</string>
<string name="rendering_attr_hideWoodScrubs_name">Padentes e buschedos</string>
<string name="rendering_attr_buildings15zoom_name">Edifìtzios dae s\'ismanniamentu 15</string>
@ -400,8 +400,8 @@
<string name="rendering_attr_lessDetailed_name">Minujas de mancu</string>
<string name="rendering_attr_hideAccess_name">Restritziones de atzessu</string>
<string name="rendering_attr_showAccess_name">Ammustra restritziones de atzessu e pedàgios</string>
<string name="rendering_attr_showSurfaceGrade_name">Ammustra sa calidade de sas istradas</string>
<string name="rendering_attr_showSurfaces_name">Ammustra su tipu de superfìtzie de sas istradas</string>
<string name="rendering_attr_showSurfaceGrade_name">Ammustra sa calidade de sos caminos</string>
<string name="rendering_attr_showSurfaces_name">Ammustra su tipu de superfìtzie de sos caminos</string>
<string name="rendering_attr_showCycleRoutes_name">Ammustra sas àndalas pro bitzicleta</string>
<string name="no_index_file_to_download">Nudda de iscarrigare, pro praghere còmpida sa connessione ìnternet.</string>
<string name="select_index_file_to_download">No est istadu agatadu nudda. Si no agatades sa zona vostra la podies ingendrare bois (bie https://osmand.net).</string>
@ -462,10 +462,10 @@
<string name="map_widget_renderer">Istile de sa mapa</string>
<string name="layer_map_appearance">Cunfigura s’ischermu</string>
<string name="show_lanes">Corsias</string>
<string name="avoid_unpaved">Instransi sas istradas no asfaltadas</string>
<string name="avoid_unpaved">Instransi sos caminos no asfaltados</string>
<string name="avoid_ferries">Istransi sos traghetos</string>
<string name="avoid_in_routing_title">Istransi…</string>
<string name="avoid_in_routing_descr">Istransi pro es. sas istradas a pagamentu, isterradas, traghetos.</string>
<string name="avoid_in_routing_descr">Istransi pro es. sos caminos a pagamentu, sos isterrados, sos traghetos.</string>
<string name="map_widget_fluorescent">Camineras fluorescentes</string>
<string name="map_widget_show_ruler">Righellu</string>
<string name="map_widget_view_direction">Diretzione de sa visuale</string>
@ -530,7 +530,7 @@
<string name="update_poi_is_not_available_for_zoom">Ismanniende podes agiornare sos PDI</string>
<string name="map_widget_vector_attributes">Caraterìsticas de su disinnu</string>
<string name="screen_is_locked">Incarca s’icona de su luchete pro isblocare s’ischermu</string>
<string name="map_widget_top_text">Nùmene de s’istrada</string>
<string name="map_widget_top_text">Nùmene de su caminu</string>
<string name="map_widget_config">Cunfigura s’ischermu</string>
<string name="map_widget_back_to_loc">In ue so</string>
<string name="map_widget_lock_screen">Arrea s’ischermu</string>
@ -552,7 +552,7 @@
<string name="bg_service_interval">Imposta s’intervallu de ischidada:</string>
<string name="show_cameras">Autovelox</string>
<string name="show_traffic_warnings">Lìmites de lestresa</string>
<string name="avoid_toll_roads">Istransi sas istradas a pedàgiu</string>
<string name="avoid_toll_roads">Istransi sos caminos a pedàgiu</string>
<string name="continue_follow_previous_route_auto">S\'ùrtimu nàvigu no est istadu acabbadu. Sighire cun cussu? (%1$s segundos)</string>
<string name="route_updated_loc_found">Isetende sa positzione pro calculare s\'àndala</string>
<string name="osmand_parking_hours">Oras</string>
@ -564,7 +564,7 @@
<string name="native_app_allocated_memory_descr">Memòria nativa totale allocada dae s’aplicu %1$s MB (Dalvik %2$s MB, àteru %3$s MB).
Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</string>
<string name="native_app_allocated_memory">Memòria nativa locale</string>
<string name="starting_point_too_far">Puntu de mòida tropu distante dae s’istrada prus a curtzu.</string>
<string name="starting_point_too_far">Puntu de mòida tropu distante dae su caminu prus a curtzu.</string>
<string name="shared_location">Positzione cumpartzida</string>
<string name="osmand_parking_event">Piga sa màchina dae su parchègiu</string>
<string name="osmand_parking_warning">Atentzione</string>
@ -1126,7 +1126,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="update_poi_no_offline_poi_index">Non sunt disponìbiles datos non in lìnia de sos PDI de cust\'àrea</string>
<string name="context_menu_item_update_map_confirm">Agiornare sos datos locales dae Ìnternet?</string>
<string name="search_history_city">Tzitade: {0}</string>
<string name="search_history_street">Istrada: {0}, {1}</string>
<string name="search_history_street">Carrera: {0}, {1}</string>
<string name="search_history_int_streets">Rugrada: {0} x {1} in {2}</string>
<string name="search_history_building">Edifìtzios: {0}, {1}, {2}</string>
<string name="favorite">Preferidu</string>
@ -1138,7 +1138,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="searching">Chirca…</string>
<string name="searching_address">Chirca indiritzu…</string>
<string name="search_osm_nominatim">Chirca indiritzu cun OSM Nominatim</string>
<string name="hint_search_online">Chirca in lìnia: nùmeru tzìvicu, istrada, tzitade</string>
<string name="hint_search_online">Chirca in lìnia: nùmeru tzìvicu, carrera, tzitade</string>
<string name="search_offline_address">Chene lìnia</string>
<string name="search_online_address">Ìnternet</string>
<string name="max_level_download_tile">Max ismanniamentu in lìnia</string>
@ -1158,7 +1158,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="fav_points_not_exist">Non bi sunt preferidos</string>
<string name="update_existing">Remplasa</string>
<string name="only_show">Ammustra àndala</string>
<string name="follow">Avia nàvigu</string>
<string name="follow">Incumintza cun sa ghia</string>
<string name="mark_final_location_first">Ischerta in antis una destinatzione</string>
<string name="get_directions">Indicatziones</string>
<string name="opening_hours">Oràrios pro abèrrere</string>
@ -1166,9 +1166,9 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="closing_changeset">Serradura modìficas…</string>
<string name="commiting_node">Imbiende su nodu…</string>
<string name="converting_names">Cunvertende nùmenes locales/nùmenes inglesos…</string>
<string name="loading_streets_buildings">Carrigamentu istradas/edifìtzios…</string>
<string name="loading_streets_buildings">Carrigamentu carreras/edifìtzios…</string>
<string name="loading_postcodes">Carrigamentu CAP…</string>
<string name="loading_streets">Carrigamentu istradas…</string>
<string name="loading_streets">Carrigamentu carreras…</string>
<string name="loading_cities">Carrigamentu tzitades…</string>
<string name="error_occurred_saving_gpx">Impossìbile sarvare su documentu GPX</string>
<string name="error_calculating_route">Impossìbile calculare s\'àndala</string>
@ -1207,7 +1207,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="app_settings">Impostatziones aplicatzione</string>
<string name="search_address">Chirca indiritzu</string>
<string name="choose_building">Issèbera nùmeru tzìvicu</string>
<string name="choose_street">Issèbera s’istrada</string>
<string name="choose_street">Issèbera sa carrera</string>
<string name="choose_city">Issèbera sa tzitade o su cap</string>
<string name="ChooseCountry">Issèbera s’istadu</string>
<string name="map_view_3d_descr">Abìlita sa bisura 3D de sa mapa.</string>
@ -1227,7 +1227,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="search_activity">Chirca</string>
<string name="searchpoi_activity">Issèbera PDI</string>
<string name="search_POI_level_btn">Agàtane àteros</string>
<string name="incremental_search_street">Chirca istrada in manera incrementale</string>
<string name="incremental_search_street">Chirca de sa carrera in manera incrementale</string>
<string name="incremental_search_building">Chirca indiritzu in manera incrementale</string>
<string name="choose_available_region">Chirca sa regione dae sa lista</string>
<string name="choose_intersected_street">Chirca rucrada</string>
@ -1247,7 +1247,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="search_address_top_text">Ischerta s’indiritzu</string>
<string name="search_address_region">Regione</string>
<string name="search_address_city">Tzitade</string>
<string name="search_address_street">Istrada</string>
<string name="search_address_street">Carrera</string>
<string name="search_address_building">Tzìvicu</string>
<string name="search_address_building_option">Tzìvicu</string>
<string name="search_address_street_option">Rucrada</string>
@ -1296,7 +1296,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="av_camera_pic_size_descr">Ischerta sas dimensiones de sas fotografias de sa fotocàmera interna.</string>
<string name="navigation_intent_invalid">Formatu non bàlidu: %s</string>
<string name="show_more_map_detail">Ammustra prus minujas in sa mapa</string>
<string name="show_more_map_detail_descr">Ammustra carchi minuja de sas mapas vetoriales (istradas etc.) fintzas a sos livellos de ismanniamentu prus bassos.</string>
<string name="show_more_map_detail_descr">Ammustra carchi minuja de sas mapas vetoriales (caminos etc.) fintzas a sos livellos de ismanniamentu prus bassos.</string>
<string name="show_route">Minujas de s\'àndala</string>
<string name="use_high_res_maps_descr">Non allonghiare (ne inghelare) sos tasseddos de sa mapa in sos dispositivos a carchesa arta.</string>
<string name="background_router_service_descr">Arrastat sa positzione tua cando s’ischermu est istudadu.</string>
@ -1308,8 +1308,8 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="shared_string_all">Totus</string>
<string name="index_tours">Itineràrios</string>
<string name="record_plugin_description">Custa estensione ativat sa funtzionalidade de registratzione de sas rastas tuas carchende su pursante in s’ischermu de sa mapa e ammustrat sas impostatziones pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreende unu servìtziu web.
\n
\nSas rastas registradas podent èssere cumpartzidas cun sos amigos tuos o èssere impreadas pro cuntribuire a OSM. Sos atletas podent impreare sas rastas pro compidare sos allenamentos issoro. Carchi anàlisi de base podet èssere fata deretamente in OsmAnd, comente tempus de giru, lestresa mèdia etc., e sas rastas podent, est craru, èssere analizadas fintzas prus a tardu cun ainas estèrnas de anàlisi.</string>
\n
\nSas rastas registradas podent èssere cumpartzidas cun sos amigos tuos o èssere impreadas pro cuntribuire a OSM. Sos atletas podent impreare sas rastas pro compidare sos allenamentos issoro. Carchi anàlisi de base podet èssere fata deretamente in OsmAnd, comente tempus de giru, lestresa mèdia etc., e sas rastas podent, est craru, èssere analizadas fintzas prus a tardu cun ainas de anàlisi estèrnas.</string>
<string name="record_plugin_name">Registratzione biàgios</string>
<string name="int_hour">h</string>
<string name="duration">Durada</string>
@ -1359,7 +1359,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="rendering_attr_tramTrainRoutes_name">Àndalas tram e trenu</string>
<string name="wake_on_voice">Allughe s’ischermu</string>
<string name="wake_on_voice_descr">Allughe s’ischermu cando b\'est una bortada a curtzu.</string>
<string name="impassable_road">Istransi istradas…</string>
<string name="impassable_road">Istransi caminos…</string>
<string name="rendering_category_hide">Cua</string>
<string name="shared_string_never">Mai</string>
<string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s’ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>
@ -1387,11 +1387,11 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="dash_download_msg">As iscarrigadu %1$s mapas</string>
<string name="dash_download_new_one">Iscàrriga una mapa noa</string>
<string name="dash_download_manage">Amministra</string>
<string name="rendering_attr_roadStyle_name">Istile disinnu de sas istradas</string>
<string name="rendering_attr_roadStyle_name">Istile disinnu de sos caminos</string>
<string name="rendering_value_default_name">Predefinidu</string>
<string name="rendering_value_orange_name">Arantzu</string>
<string name="rendering_value_germanRoadAtlas_name">Atlante de sas istradas tedescas</string>
<string name="rendering_value_americanRoadAtlas_name">Atlante de sas istradas americanas</string>
<string name="rendering_value_germanRoadAtlas_name">Atlante de sos caminos tedescos</string>
<string name="rendering_value_americanRoadAtlas_name">Atlante de sos caminos americanos</string>
<string name="routing_attr_no_new_routing_name">No impreare su càlculu de s’àndala v1.9</string>
<string name="routing_attr_no_new_routing_description">No impreare su càlculu de s’àndala v1.9.</string>
<string name="traffic_warning_railways">Atraessamentu de sa ferrovia</string>
@ -1400,7 +1400,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="show_pedestrian_warnings">Atraessamentos pedonales</string>
<string name="speak_pedestrian">Atraessamentos pedonales</string>
<string name="navigation_over_track">Incumentzare su nàvigu in sa rasta?</string>
<string name="avoid_roads_msg">Càmbia s’àndala ischertende sas istradas de istransire</string>
<string name="avoid_roads_msg">Càmbia s’àndala ischertende sos caminos de istransire</string>
<string name="save_track_to_gpx_globally_headline">Registratzione de sa rasta a segus de rechesta</string>
<string name="settings_privacy">Privadesa</string>
<string name="enable_proxy_title">Abìlita unu proxy HTTP</string>
@ -1434,7 +1434,7 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="free">Lìbera %1$s</string>
<string name="device_memory">Memòria dispositivu</string>
<string name="rendering_attr_pisteRoutes_name">Pistas de iscì</string>
<string name="roads_only">Istradas ebbia</string>
<string name="roads_only">Caminos ebbia</string>
<string name="watch">Relògiu</string>
<string name="notes">Notas</string>
<string name="online_map">Mapa in lìnia</string>
@ -1449,11 +1449,11 @@ Memòria in proportzione %4$s MB (lìmite de Android %5$s MB, Dalvik %6$s MB).</
<string name="plugin_ski_descr">Custa estensione pro OsmAnd ti frunit sas minujas de sas pistas de iscì, de fundu, alpinas e de àtera casta, de sas funivias e de sas isciovias. Sas camineras e sas pistas sunt coloradas pro dificultade, e ammustradas in unu istile de mapa particulare, \'Ierru\', chi s\'assimigiat a unu paesaggiu coloradu dae sa neve de s\'ierru.
\n
\nAlluende custa vista s’istile mapa at a divènnere \'Ierru e iscì\', ammustrende totu sas caraterìsticas de s’iscenàriu in sas cunditziones de s’ierru. Custa vista podet èssere furriada istudende·la inoghe torra o cambiende s’\'Istile mapa\' in \'Cunfigura mapa\'.</string>
<string name="plugin_touringview_descr">Alluende custa vista s’istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.
<string name="plugin_touringview_descr">Allughende custa vista s’istile de sa mapa at a colare a \'Vista turìstica\', una vista fata a sa minuda pro turistas, biagiatores e autistas professionistas.
\n
\nCusta vista frunit, pro cada livellu de ismanniamentu (zoom), su màssimu de sas minujas de biàgiu disponìbiles in sos datos de sa mapa (in particulare minujas de de sas istradas e de sas àndalas e sinnos de orientamentu).
\nCusta vista frunit, pro cada livellu de ismanniamentu (zoom), su màssimu de sas minujas de biàgiu disponìbiles in sos datos de sa mapa (in particulare minujas de de sos caminos e de sas àndalas e sinnos de orientamentu).
\n
\nRapresentat fintzas totu sas castas de istradas in manera crara tramite colores diferentes, agiudende meda, pro nàrrere, sos chi ghiant veìculos mannos meda.
\nRapresentat fintzas totu sas castas de caminos in manera crara impreende colores diferentes, agiudende meda, pro nàrrere, sos chi ghiant veìculos mannos meda.
\n
\nE frunit optziones ispetziales de nàvigu, comente sa visualizatzione de sas àndalas pro sas bitzicletas e s\'alpinismu.
\n
@ -1500,7 +1500,7 @@ Lon %2$s</string>
<string name="osmand_parking_overdue">Iscadidu</string>
<string name="delay_to_start_navigation_descr">Dislinda su tempus de permanèntzia in s\'ischermu de pianificatzione de s\'àndala, in antis de su cumintzu de su nàvigu.</string>
<string name="shared_string_go">Bae</string>
<string name="delay_to_start_navigation">Brinca sa pianificatzione de s\'àndala…</string>
<string name="delay_to_start_navigation">Incumintza sa ghia passu-pro-passu a pustis de…</string>
<string name="confirmation_to_clear_history">Iscantzellare s’istòria?</string>
<string name="local_osm_changes_upload_all_confirm">As a carrigare %1$d modìfica(s) in OSM. Seguru ses?</string>
<string name="osm_changes_added_to_local_edits">Mòdificas OSM annantas a sas modìficas locales</string>
@ -1535,12 +1535,12 @@ Lon %2$s</string>
<string name="application_dir_change_warning3">Cheres copiare in sa destinatzione noa fintzas sos documentos de sos datos de OsmAnd?</string>
<string name="storage_directory_internal_app">Memòria interna de s\'aplicatzione</string>
<string name="rendering_value__name">Predefinidu</string>
<string name="rendering_value_highContrastRoads_name">Istradas a cuntrastu artu</string>
<string name="rendering_value_highContrastRoads_name">Caminos a cuntrastu artu</string>
<string name="storage_directory_multiuser">Memòria multi-impreadore</string>
<string name="storage_directory">Memòria de sas mapas</string>
<string name="rendering_attr_hideHouseNumbers_name">Nùmeros de sas domos</string>
<string name="routing_attr_height_name">Lìmite de artària</string>
<string name="routing_attr_height_description">Dislinda s’artària de su veìculu permitida pro sas istradas.</string>
<string name="routing_attr_height_description">Dislinda s’artària de su veìculu permìtida pro sos caminos.</string>
<string name="routing_attr_avoid_borders_description">Non rugrare sas fronteras intre sos istados</string>
<string name="use_fast_recalculation">Recàlculu intelligente de s’àndala</string>
<string name="use_fast_recalculation_desc">Pro biàgios longos, torra a calculare petzi su cantu initziale de s’àndala.</string>
@ -1667,7 +1667,7 @@ Lon %2$s</string>
<string name="favourites_edit_dialog_title">Informatziones de su preferidu</string>
<string name="shared_string_wikipedia">Wikipedia</string>
<string name="favourites_context_menu_add">Annanghe unu preferidu</string>
<string name="roads">Istradas</string>
<string name="roads">Caminos</string>
<string name="shared_string_trip_recording">Registratzione biàgiu</string>
<string name="shared_string_navigation">Nàvigu</string>
<string name="osmand_running_in_background">Esègui in isfondu</string>
@ -1704,7 +1704,7 @@ Lon %2$s</string>
<string name="favorite_category_dublicate_message">Pro praghere imprea unu nùmene de categoria chi no esistat giai.</string>
<string name="favorite_category_name">Nùmene de sa categoria</string>
<string name="favorite_category_add_new_title">Annanghe una categoria noa</string>
<string name="confirm_download_roadmaps">Sa mapa cun petzi sas istradas non serbit, proite tenes giai cussa istandard (intrea). La cheres iscarrigare su matessi?</string>
<string name="confirm_download_roadmaps">Sa mapa cun sos caminos ebbia non serbit, proite tenes giai cussa istandard (intrea). La cheres iscarrigare su matessi\?</string>
<string name="value_downloaded_of_max">%1$.1f dae %2$.1f MB</string>
<string name="file_size_in_mb">%.1f MB</string>
<string name="update_all">Agiorna totu (%1$s MB)</string>
@ -1781,7 +1781,7 @@ Lon %2$s</string>
<string name="osm_save_offline">Sarva in sa memòria (impreu chene lìnia)</string>
<string name="rendering_attr_currentTrackColor_description">Colore GPX</string>
<string name="rendering_attr_currentTrackWidth_description">Largària GPX</string>
<string name="rendering_attr_roadStyle_description">Istile pro sas istradas</string>
<string name="rendering_attr_roadStyle_description">Istile pro sos caminos</string>
<string name="dashboard_or_drawer_title">Pannellu o menù de controllu</string>
<string name="dashboard_or_drawer_description">Podes isseberare sa comente gestire s\'aplicatzione, dae su pannellu de controllu flessìbile o dae su menù istàticu. As a pòdere semper cambiare s’issèbera tua in sas impostatziones de su pannellu.</string>
<string name="use_dashboard_btn">Imprea su pannellu de controllu</string>
@ -1817,7 +1817,7 @@ Lon %2$s</string>
<string name="no_microphone_permission">S’aplicatzione no est autorizada a impreare su micròfonu.</string>
<string name="select_voice_provider">Ischerta sa boghe de ghia</string>
<string name="select_voice_provider_descr">Ischerta o iscàrriga sa boghe de ghia pro sa limba tua.</string>
<string name="impassable_road_desc">Ischerta sas istradas chi cheres istransire durante su nàvigu.</string>
<string name="impassable_road_desc">Ischerta sos caminos chi cheres istransire durante su nàvigu.</string>
<string name="shared_string_sound">Sonu</string>
<string name="live_updates">Agiornamentos in tempus reale</string>
<string name="available_maps">Mapas disponìbiles</string>
@ -1918,7 +1918,7 @@ Lon %2$s</string>
<string name="shared_string_move_up">Moe ↑</string>
<string name="shared_string_move_down">Moe ↓</string>
<string name="finish_navigation">Concrui su nàvigu</string>
<string name="avoid_road">Istransi s\'istrada</string>
<string name="avoid_road">Istransi su caminu</string>
<string name="storage_directory_shared">Memòria cumpartzida</string>
<string name="full_report">Raportu cumpridu</string>
<string name="open_street_map_login_and_pass">Nùmene impreadore e crae de OpenStreetMap</string>
@ -1952,7 +1952,7 @@ Lon %2$s</string>
<string name="access_no_destination">Destinatzione non definida</string>
<string name="map_widget_magnetic_bearing">Bùssola magnètica</string>
<string name="map_widget_bearing">Bùssola relativa</string>
<string name="access_disable_offroute_recalc">Non torrare a calculare s\'àndala si ses essidu dae s\'istrada</string>
<string name="access_disable_offroute_recalc">Non torrare a calculare s\'àndala si ses essidu dae su caminu</string>
<string name="access_disable_offroute_recalc_descr">Perunu ricàlculu automàticu de s\'àndala cando nde ses essidu.</string>
<string name="access_disable_wrong_direction_recalc">Non cambiare s\'àndala si sa diretzione est isballiada</string>
<string name="access_disable_wrong_direction_recalc_descr">Perunu ricàlculu automàticu de s\'àndala si ti ses moende in sa diretzione isballiada.</string>
@ -2066,7 +2066,7 @@ Lon %2$s</string>
<string name="rendering_value_light_brown_name">Castàngiu craru</string>
<string name="rendering_value_dark_brown_name">Castàngiu iscuru</string>
<string name="rendering_attr_contourColorScheme_name">Ischema de colores pro sas curvas de livellu</string>
<string name="rendering_attr_surfaceIntegrity_name">Integridade superfitziale istradale</string>
<string name="rendering_attr_surfaceIntegrity_name">Integridade superfitziale de su caminu</string>
<string name="trip_rec_notification_settings">Abìlita sa registratzione biàgios lestra</string>
<string name="trip_rec_notification_settings_desc">Ammustra una notìfica chi permitit de incumintzare a registrare su biàgiu.</string>
<string name="shared_string_notifications">Notìficas</string>
@ -2186,7 +2186,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="routing_attr_height_obstacles_name">Imprea sos datos de s\'artària</string>
<string name="routing_attr_height_obstacles_description">Fatore pro s\'artària de su terrinu (dae datos SRTM, ASTER e EU-DEM).</string>
<string name="routing_attr_driving_style_name">Istile de ghia</string>
<string name="route_altitude">Artària de s\'istrada</string>
<string name="route_altitude">Artària de su caminu</string>
<string name="altitude_descent">Falada</string>
<string name="altitude_ascent">Artziada</string>
<string name="altitude_range">Intervallu de artària</string>
@ -2219,7 +2219,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="routing_attr_relief_smoothness_factor_more_plains_name">Terrinu in paris</string>
<string name="routing_attr_driving_style_speed_name">Àndalas prus curtzas</string>
<string name="routing_attr_driving_style_balance_name">Bilantziadu</string>
<string name="routing_attr_driving_style_safety_name">Privilègia sas istradas segundàrias</string>
<string name="routing_attr_driving_style_safety_name">Privilègia sos caminos segundàrios</string>
<string name="routing_attr_relief_smoothness_factor_name">Ischerta su valore de variatzione de s\'artària</string>
<string name="full_version_thanks">Gràtzias pro àere comporadu sa versione a pagamentu de OsmAnd.</string>
<string name="do_not_send_anonymous_app_usage">No imbies informatziones anònimas a pitzu de s\'impreu de s\'aplicatzione</string>
@ -2308,8 +2308,8 @@ Pro praghere iscrie su còdighe intreu</string>
\n• Datos OSM disponìbiles pro istadu o regione
\n• PDI Wikipedia, ispantosos pro su turismu • Iscarrigamentos de badas illimitados, diretamente dae s\'aplicatzione
\n• Mapas vetoriales cumpatas agiornadas a su mancu una borta a su mese
\n
\n• Issèbera intra sos datos intreos pro sas regiones o petzi sos de sas istradas (esèmpiu: totu su Giapone est 700 MB, sas istradas ebbia sunt 200 MB)</string>
\n
\n• Issèbera intra sos datos intreos pro sas regiones o petzi sos de sos caminos (esèmpiu: totu su Giapone est 700 MB, sos caminos ebbia sunt 200 MB)</string>
<string name="osmand_plus_extended_description_part5">Funtzionalidades pro sa seguresa
\n• Muda automàtica optzionale de sa vista die/note
\n• Visulaizatzione automàtica de su lìmite de lestresa, cun avisos cando lu barigas
@ -2374,7 +2374,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="type_postcode">Iscrie su còdighe postale</string>
<string name="select_postcode">Issèbera su còdighe postale</string>
<string name="type_address">Iscrie s\'indiritzu</string>
<string name="select_street">Ischerta sas istradas</string>
<string name="select_street">Ischerta sos caminos</string>
<string name="shared_string_in_name">in %1$s</string>
<string name="shared_string_overview">Vista generale</string>
<string name="animate_my_location">Ànima sa positzione mea</string>
@ -2383,7 +2383,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="change_color">Càmbia colore</string>
<string name="edit_name">Acontza su nùmene</string>
<string name="save_poi_too_many_uppercase">In su nùmene bi sunt tropas lìteras maiùscolas. Boles sighire?</string>
<string name="route_is_too_long_v2">Pro praghere annanghe carchi destinatzione intermèdia si in 10 minutos s\'àndala no at a èssere pronta pro custu tratu longu de istrada.</string>
<string name="route_is_too_long_v2">Pro praghere annanghe carchi destinatzione intermèdia si in 10 minutos s\'àndala no at a èssere pronta pro custu tratu longu de caminu.</string>
<string name="display_zoom_level">Livellu ismmaniamentu ischermu: %1$s</string>
<string name="srtm_color_scheme">Ischema de colores</string>
<string name="show_from_zoom_level">Ammustra dae su livellu de ismanniamentu</string>
@ -2405,14 +2405,14 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="increase_search_radius">Ismànnia su raju de chirca</string>
<string name="nothing_found">Nudda de agatadu</string>
<string name="nothing_found_descr">Muda sos critèrios de chirca o a ismànnia su raju de chirca.</string>
<string name="private_access_routing_req">Sa destinatzione tua est positzionada in un\'àrea cun atzessu privadu. Cheres abilitare s\'atzessu a sas istradas privadas pro custu biàgiu?</string>
<string name="private_access_routing_req">Sa destinatzione tua est positzionada in un\'àrea cun atzessu privadu. Cheres abilitare s\'atzessu a sos caminos privados pro custu biàgiu\?</string>
<string name="mapillary">Mapillary</string>
<string name="mapillary_widget">Widget pro Mapillary</string>
<string name="mapillary_widget_descr">Permitit de contribuire in manera lestra e fàtzile a Mapillary.</string>
<string name="mapillary_descr">Fotografias a livellu de sas istradas in lìnia pro totus. Iscoberi logos, agiuda, catura su mundu.</string>
<string name="mapillary_descr">Fotografias a livellu de sos caminos in lìnia pro totus. Iscoberi logos, agiuda, catura su mundu.</string>
<string name="shared_string_add_photos">Annanghe fotografias</string>
<string name="mapillary_action_descr">Contribui cun sas vistas tuas a livellu de s\'istrada pro mèdiu de Mapillary.</string>
<string name="plugin_mapillary_descr">Fotografias a livellu de s\'istrada pro totus. Iscoberi logos, collàbora, catura su mundu.</string>
<string name="mapillary_action_descr">Contribui cun sas vistas tuas a livellu de su caminu pro mèdiu de Mapillary.</string>
<string name="plugin_mapillary_descr">Fotografias a livellu de su caminu pro totus. Iscoberi logos, collàbora, catura su mundu.</string>
<string name="online_photos">Fotografias in lìnia</string>
<string name="no_photos_descr">Non tenimus fotografias pro custu logu.</string>
<string name="open_mapillary">Aberi Mapillary</string>
@ -2521,8 +2521,8 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="use_system_keyboard">Imprea su tecladu de sistema</string>
<string name="fast_coordinates_input_descr">Issèbera su formadu de sas coordinadas. L\'as a pòdere semper cambiare dae sas \'Optziones\'.</string>
<string name="fast_coordinates_input">Insertada lestra de sas coordinadas</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Istransi sas istradas de astra, sos bados</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Istransi sas istradas de astra e sos bados.</string>
<string name="routing_attr_avoid_ice_roads_fords_name">Istransi sos caminos de astra, sos bados</string>
<string name="routing_attr_avoid_ice_roads_fords_description">Istransi sos caminos de astra e sos bados.</string>
<string name="use_location">Imprea positzione</string>
<string name="add_location_as_first_point_descr">Annanghe sa positzione tua comente primu puntu pro pranificare un\'àndala perfeta.</string>
<string name="my_location">Positzione mea</string>
@ -2540,7 +2540,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="context_menu_item_modify_note">Modìfica sa nota OSM</string>
<string name="make_round_trip_descr">Annanghe una còpia de su puntu de incumintzu comente destinatzione.</string>
<string name="make_round_trip">Faghe unu biàgiu tzirculare</string>
<string name="shared_string_road">Istrada</string>
<string name="shared_string_road">Caminu</string>
<string name="show_map">Ammustra sa mapa</string>
<string name="route_is_calculated">Àndala calculada</string>
<string name="round_trip">Àndala tzirculare</string>
@ -2769,14 +2769,14 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="show_full_description">Ammustra sa descritzione intrea</string>
<string name="nautical_render_descr">Istile pro su nàvigu marìtimu e de sos rios. Caraterìsticas printzipales: pidagnos, faros, bias fluviales, lìnias e edifìtzios nàuticos, portos, servìtzios marìtimos, curvas de livellu marinas.</string>
<string name="ski_map_render_descr">Istile pro s\'iscì. Caraterìsticas printzipales: pistas de iscì, funivias e àteras istruturas pro s\'iscì in una manera conveniente. Prus pagos ogetos de mapa secondàrios chi distraent.</string>
<string name="light_rs_render_descr">Istile simple e cun cuntrastu artu pro su nàvigu in màchina. Gentile pro sos ogros in sa modalidade noturna. Caraterìsticas printzipales: lìnias de livellu, istradas cun cuntrastu artu in colore arantzu, prus pagos ogetos de mapa secondàrios chi distraent.</string>
<string name="topo_render_descr">Istile cun cuntrastu artu disinnadu primariamente pro escursionismu o tziclismu. Legibilidade bona un\'illuminatzione esterna cumplessa. Caraterìsticas printzipales: istradas e ogetos naturales in cuntrastu artu, castas diferentes de àndalas, curvas de livellu cun impostatziones avantzadas, prus minujas in sos livellos de ismanniamentu currispondentes chi in s\'istile predefinidu. S\'optzione de integridade de sa superfìtzie ti permitit de distìnghere intre sas istradas cun calidades de sas superfìtzies diferentes. Peruna modalidade noturna.</string>
<string name="light_rs_render_descr">Istile simple e cun cuntrastu artu pro su nàvigu in màchina. Gentile pro sos ogros in sa modalidade noturna. Caraterìsticas printzipales: lìnias de livellu, caminos cun cuntrastu artu in colore arantzu, prus pagos ogetos de mapa secondàrios chi distraent.</string>
<string name="topo_render_descr">Istile cun cuntrastu artu disinnadu primariamente pro escursionismu o tziclismu. Legibilidade bona un\'illuminatzione esterna cumplessa. Caraterìsticas printzipales: caminos e ogetos naturales in cuntrastu artu, castas diferentes de àndalas, curvas de livellu cun impostatziones avantzadas, prus minujas in sos livellos de ismanniamentu currispondentes chi in s\'istile predefinidu. S\'optzione de integridade de sa superfìtzie ti permitit de distìnghere intre sos caminos cun calidades de sas superfìtzies diferentes. Peruna modalidade noturna.</string>
<string name="mapnik_render_descr">Istile betzu de renderizatzione simigiante a cussu de \'Mapnik\'. Caraterìsticas printzipales: sos colores sunt simigiantes a s\'istile de \'Mapnik\'.</string>
<string name="default_render_descr">Istile de impreu generale. Renderizatzione semplificada pro tènnere mapas prus netas in sas tzitades cun un\'arta densidade de populatzione. Caraterìsticas printzipales: curvas de livellu, àndalas, calidades de sas superfìtzies, restritziones de atzessu, iscudos istradales, rapresentatzione de sas camineras sighende s\'iscala SAC, funtzionalidades pro sos isports de abba durche.</string>
<string name="touring_view_render_descr">Istile fatu a sa minuda pro su turismu. Incluit totu sas optziones de configuratzione de s\'istile predefinidu e, in prus: ammustrat totu sas minujas chi est possìbile ammustrare, in particulare totu sas istradas, camineras, e sas àteras maneras de biagiare. Faghet una distintzione crara intre totu sas castas de istrada, in una manera sìmile a medas atlantes pro su turismu. Tenet un\'ischema de colores a cuntrastu artu pro s\'impreu a s\'àera aberta, una modalidade pro sa die e una pro sa note.</string>
<string name="default_render_descr">Istile de impreu generale. Renderizatzione semplificada pro tènnere mapas prus netas in sas tzitades cun un\'arta densidade de populatzione. Caraterìsticas printzipales: curvas de livellu, àndalas, calidades de sas superfìtzies, restritziones de atzessu, iscudos de sos caminos, rapresentatzione de sas camineras sighende s\'iscala SAC, funtzionalidades pro sos isports de abba durche.</string>
<string name="touring_view_render_descr">Istile fatu a sa minuda pro su turismu. Incluit totu sas optziones de configuratzione de s\'istile predefinidu e, in prus: ammustrat totu sas minujas chi est possìbile ammustrare, in particulare totu sos caminos, sas camineras, e sas àteras maneras de biagiare. Faghet una distintzione crara intre totu sas castas de caminu, in una manera sìmile a medas atlantes pro su turismu. Tenet un\'ischema de colores a cuntrastu artu pro s\'impreu a s\'àera aberta, una modalidade pro sa die e una pro sa note.</string>
<string name="shared_string_bookmark">Sinnalibru</string>
<string name="off_road_render_descr">Adatu pro s\'impreu durante sa ghia foras de sas istradas. Adatu pro s\'impreu cun mapas satellitares birdes comente suta-istratos. Caraterìsticas printzipales: grussesa de sas istradas printzipales minimada, grussesa de sas rastas, sas camineras, de sas pistas tziclàbiles e de sas àteras àndalas ismanniada. Basadu in subra de s\'istile topogràficu.</string>
<string name="unirs_render_descr">Modìfica de s\'istile predefinidu pro ismanniare su cuntrastu pro sas istradas pedonales e sas pistas tziclàbiles. Impreat sos colores de sa versione betza de Mapnik.</string>
<string name="off_road_render_descr">Adatu pro s\'impreu durante sa ghia foras de sos caminos. Adatu pro s\'impreu cun mapas satellitares birdes comente suta-istratos. Caraterìsticas printzipales: grussesa de sos caminos printzipales minimada, grussesa de sas rastas, sas camineras, de sas pistas tziclàbiles e de sas àteras àndalas ismanniada. Basadu in subra de s\'istile topogràficu.</string>
<string name="unirs_render_descr">Modìfica de s\'istile predefinidu pro ismanniare su cuntrastu pro sos caminos pedonales e sas pistas tziclàbiles. Impreat sos colores de sa versione betza de Mapnik.</string>
<string name="access_intermediate_arrival_time">Ora de arrivu a sa tapa</string>
<string name="map_widget_intermediate_time">Tempus de arrivu a sa tapa</string>
<string name="shared_string_gpx_files">Documentos GPX</string>
@ -2902,7 +2902,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="add_destination_query">In antis annanghe una destinatzione</string>
<string name="shared_string_swap">Cuncàmbia</string>
<string name="show_more">Ammustra àteru</string>
<string name="tracks_on_map">Rastas in sa mapa</string>
<string name="tracks_on_map">Rastas ammustradas</string>
<string name="time_of_day">Ora de sa die</string>
<string name="by_transport_type">Tràmite %1$s</string>
<string name="step_by_step">Passu pro passu</string>
@ -2932,4 +2932,51 @@ Pro praghere iscrie su còdighe intreu</string>
\n</string>
<string name="use_osm_live_public_transport_description">Abìlita su trasportu pùblicu pro sas modìficas de OsmAnd Live.</string>
<string name="use_osm_live_public_transport">Trasportu pùblicu in OsmAnd Live</string>
<string name="transfers_size">%1$d tramudòngios</string>
<string name="add_start_and_end_points">Annanghe sos puntos de incumintzu e acabu</string>
<string name="route_add_start_point">Annaghe su puntu de incumintzu</string>
<string name="route_descr_select_start_point">Ischerta su puntu de incumintzu</string>
<string name="rendering_attr_surface_unpaved_name">Chene pamentu</string>
<string name="rendering_attr_surface_sand_name">Arena</string>
<string name="rendering_attr_surface_grass_name">Erba</string>
<string name="rendering_attr_surface_grass_paver_name">Pamentadore de erba</string>
<string name="rendering_attr_surface_ground_name">Terrinu (naturale)</string>
<string name="rendering_attr_surface_dirt_name">Terra</string>
<string name="rendering_attr_surface_mud_name">Ludu</string>
<string name="rendering_attr_surface_ice_name">Astra</string>
<string name="rendering_attr_surface_salt_name">Sale</string>
<string name="rendering_attr_surface_snow_name">Nie</string>
<string name="rendering_attr_surface_asphalt_name">Asfaltu</string>
<string name="rendering_attr_surface_paved_name">Pamentadu</string>
<string name="rendering_attr_surface_concrete_name">Tzimentu</string>
<string name="rendering_attr_surface_sett_name">Pavè</string>
<string name="rendering_attr_surface_cobblestone_name">Impedradu</string>
<string name="rendering_attr_surface_paving_stones_name">Impedradu regulare</string>
<string name="rendering_attr_surface_pebblestone_name">Perdas de riu</string>
<string name="rendering_attr_surface_stone_name">Perda</string>
<string name="rendering_attr_surface_metal_name">Metallu</string>
<string name="rendering_attr_surface_wood_name">Linna</string>
<string name="rendering_attr_surface_gravel_name">Ghiàia</string>
<string name="rendering_attr_surface_fine_gravel_name">Ghiàia fina</string>
<string name="rendering_attr_surface_compacted_name">Cumpatadu</string>
<string name="rendering_attr_smoothness_excellent_name">Primorosa</string>
<string name="rendering_attr_smoothness_good_name">Bona</string>
<string name="rendering_attr_smoothness_intermediate_name">Intermèdia</string>
<string name="rendering_attr_smoothness_bad_name">Mala</string>
<string name="rendering_attr_smoothness_very_bad_name">Mala meda</string>
<string name="rendering_attr_smoothness_horrible_name">Orrorosa</string>
<string name="rendering_attr_smoothness_very_horrible_name">Orrorosa a beru</string>
<string name="rendering_attr_smoothness_impassable_name">Inatzetàbile</string>
<string name="rendering_attr_highway_class_motorway_name">Autostrada</string>
<string name="rendering_attr_highway_class_state_road_name">Caminu istatale</string>
<string name="rendering_attr_highway_class_road_name">Caminu</string>
<string name="rendering_attr_highway_class_street_name">Carrera</string>
<string name="rendering_attr_highway_class_service_name">Servìtziu</string>
<string name="rendering_attr_highway_class_footway_name">Caminu pro pedones</string>
<string name="rendering_attr_highway_class_track_name">Rasta</string>
<string name="rendering_attr_highway_class_bridleway_name">Caminu pro caddos</string>
<string name="rendering_attr_highway_class_steps_name">Iscalinos</string>
<string name="rendering_attr_highway_class_path_name">Caminera</string>
<string name="rendering_attr_highway_class_cycleway_name">Pista tziclàbile</string>
<string name="rendering_attr_undefined_name">Non dessinidu</string>
</resources>

40
OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
View file

@ -414,7 +414,18 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
@Override
public void onClick(View v) {
if (editingCtx.getPointsCount() > 0) {
addToGpx(mapActivity);
if (newGpxData != null && newGpxData.getActionType() == NewGpxData.ActionType.EDIT_SEGMENT
&& editingCtx.isInSnapToRoadMode()) {
if (mapActivity != null && measurementLayer != null) {
if (editingCtx.getPointsCount() > 0) {
openSaveAsNewTrackMenu(mapActivity);
} else {
Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
}
}
} else {
addToGpx(mapActivity);
}
} else {
Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
}
@ -594,6 +605,17 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
}
}
@Override
public void overwriteOldTrackOnClick() {
if (mapActivity != null && measurementLayer != null) {
if (editingCtx.getPointsCount() > 0) {
overwriteGpx(mapActivity);
} else {
Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
}
}
}
@Override
public void clearAllOnClick() {
editingCtx.getCommandManager().execute(new ClearPointsCommand(measurementLayer));
@ -1116,6 +1138,14 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
saveExistingGpx(gpx, showOnMap, actionType, true);
}
private void overwriteGpx(MapActivity mapActivity) {
GPXFile gpx = editingCtx.getNewGpxData().getGpxFile();
SelectedGpxFile selectedGpxFile = mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedFileByPath(gpx.path);
boolean showOnMap = selectedGpxFile != null;
ActionType actionType = ActionType.OVERWRITE_SEGMENT;
saveExistingGpx(gpx, showOnMap, actionType, true);
}
private void saveAsGpx(final SaveType saveType) {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
@ -1297,6 +1327,14 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
segment.points.addAll(points);
gpx.replaceSegment(editingCtx.getNewGpxData().getTrkSegment(), segment);
break;
case OVERWRITE_SEGMENT:
List<WptPt> snappedPoints = new ArrayList<>();
snappedPoints.addAll(before.points);
snappedPoints.addAll(after.points);
TrkSegment segment1 = new TrkSegment();
segment1.points.addAll(snappedPoints);
gpx.replaceSegment(editingCtx.getNewGpxData().getTrkSegment(), segment1);
break;
}
} else {
gpx.addRoutePoints(points);

3
OsmAnd/src/net/osmand/plus/measurementtool/NewGpxData.java
View file

@ -8,7 +8,8 @@ public class NewGpxData {
public enum ActionType {
ADD_SEGMENT,
ADD_ROUTE_POINTS,
EDIT_SEGMENT
EDIT_SEGMENT,
OVERWRITE_SEGMENT
}
private GPXUtilities.GPXFile gpxFile;

35
OsmAnd/src/net/osmand/plus/measurementtool/OptionsBottomSheetDialogFragment.java
View file

@ -70,6 +70,39 @@ public class OptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragm
})
.create();
items.add(saveAsNewSegmentItem);
} else if (addLineMode) {
BaseBottomSheetItem saveAsNewTrackItem = new SimpleBottomSheetItem.Builder()
.setIcon(getContentIcon(R.drawable.ic_action_polygom_dark))
.setTitle(getString(R.string.shared_string_save_as_gpx))
.setLayoutId(R.layout.bottom_sheet_item_simple)
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (listener != null) {
listener.saveAsNewTrackOnClick();
}
dismiss();
}
})
.create();
items.add(saveAsNewTrackItem);
BaseBottomSheetItem saveAsNewSegmentItem = new SimpleBottomSheetItem.Builder()
.setIcon(getContentIcon(R.drawable.ic_action_polygom_dark))
.setTitle("Overwrite GPX")
.setLayoutId(R.layout.bottom_sheet_item_simple)
.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (listener != null) {
listener.overwriteOldTrackOnClick();
}
dismiss();
}
})
.create();
items.add(saveAsNewSegmentItem);
} else {
BaseBottomSheetItem saveAsNewTrackItem = new SimpleBottomSheetItem.Builder()
.setIcon(getContentIcon(R.drawable.ic_action_polygom_dark))
@ -138,6 +171,8 @@ public class OptionsBottomSheetDialogFragment extends MenuBottomSheetDialogFragm
void addToTheTrackOnClick();
void overwriteOldTrackOnClick();
void clearAllOnClick();
}
}

2
OsmAnd/src/net/osmand/plus/quickaction/actions/DayNightModeAction.java
View file

@ -41,7 +41,6 @@ public class DayNightModeAction extends QuickAction {
.inflate(R.layout.quick_action_with_text, parent, false);
((TextView) view.findViewById(R.id.text))
.setText(R.string.quick_action_switch_day_night_descr);
parent.addView(view);
}
@ -61,6 +60,5 @@ public class DayNightModeAction extends QuickAction {
} else {
return String.format(application.getString(R.string.quick_action_day_night_mode), DayNightMode.DAY.toHumanString(application));
}
}
}

82
OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
View file

@ -641,44 +641,7 @@ public class MapRenderRepositories {
boolean nightMode = app.getDaynightHelper().isNightMode();
// boolean moreDetail = prefs.SHOW_MORE_MAP_DETAIL.get();
RenderingRulesStorage storage = app.getRendererRegistry().getCurrentSelectedRenderer();
RenderingRuleSearchRequest renderingReq = new RenderingRuleSearchRequest(storage);
renderingReq.setBooleanFilter(renderingReq.ALL.R_NIGHT_MODE, nightMode);
for (RenderingRuleProperty customProp : storage.PROPS.getCustomRules()) {
if (customProp.isBoolean()) {
if(customProp.getAttrName().equals(RenderingRuleStorageProperties.A_ENGINE_V1)) {
renderingReq.setBooleanFilter(customProp, true);
} else if (RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(customProp.getCategory())) {
renderingReq.setBooleanFilter(customProp, false);
} else {
CommonPreference<Boolean> pref = prefs.getCustomRenderBooleanProperty(customProp.getAttrName());
renderingReq.setBooleanFilter(customProp, pref.get());
}
} else if (RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(customProp.getCategory())) {
if (customProp.isString()) {
renderingReq.setStringFilter(customProp, "");
} else {
renderingReq.setIntFilter(customProp, 0);
}
} else {
CommonPreference<String> settings = prefs.getCustomRenderProperty(customProp.getAttrName());
String res = settings.get();
if (!Algorithms.isEmpty(res)) {
if (customProp.isString()) {
renderingReq.setStringFilter(customProp, res);
} else {
try {
renderingReq.setIntFilter(customProp, Integer.parseInt(res));
} catch (NumberFormatException e) {
e.printStackTrace();
}
}
} else {
if (customProp.isString()) {
renderingReq.setStringFilter(customProp, "");
}
}
}
}
RenderingRuleSearchRequest renderingReq = getSearchRequestWithAppliedCustomRules(storage, nightMode);
renderingReq.saveState();
NativeOsmandLibrary nativeLib = !prefs.SAFE_MODE.get() ? NativeOsmandLibrary.getLibrary(storage, context) : null;
@ -880,6 +843,49 @@ public class MapRenderRepositories {
}
public RenderingRuleSearchRequest getSearchRequestWithAppliedCustomRules(RenderingRulesStorage storage, boolean nightMode) {
// boolean moreDetail = prefs.SHOW_MORE_MAP_DETAIL.get();
RenderingRuleSearchRequest renderingReq = new RenderingRuleSearchRequest(storage);
renderingReq.setBooleanFilter(renderingReq.ALL.R_NIGHT_MODE, nightMode);
for (RenderingRuleProperty customProp : storage.PROPS.getCustomRules()) {
if (customProp.isBoolean()) {
if(customProp.getAttrName().equals(RenderingRuleStorageProperties.A_ENGINE_V1)) {
renderingReq.setBooleanFilter(customProp, true);
} else if (RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(customProp.getCategory())) {
renderingReq.setBooleanFilter(customProp, false);
} else {
CommonPreference<Boolean> pref = prefs.getCustomRenderBooleanProperty(customProp.getAttrName());
renderingReq.setBooleanFilter(customProp, pref.get());
}
} else if (RenderingRuleStorageProperties.UI_CATEGORY_HIDDEN.equals(customProp.getCategory())) {
if (customProp.isString()) {
renderingReq.setStringFilter(customProp, "");
} else {
renderingReq.setIntFilter(customProp, 0);
}
} else {
CommonPreference<String> settings = prefs.getCustomRenderProperty(customProp.getAttrName());
String res = settings.get();
if (!Algorithms.isEmpty(res)) {
if (customProp.isString()) {
renderingReq.setStringFilter(customProp, res);
} else {
try {
renderingReq.setIntFilter(customProp, Integer.parseInt(res));
} catch (NumberFormatException e) {
e.printStackTrace();
}
}
} else {
if (customProp.isString()) {
renderingReq.setStringFilter(customProp, "");
}
}
}
}
return renderingReq;
}
public Bitmap getBitmap() {
return bmp;
}

6
OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java
View file

@ -63,7 +63,8 @@ public class ChooseRouteFragment extends BaseOsmAndFragment implements CardListe
portrait = AndroidUiHelper.isOrientationPortrait(mapActivity);
map = getMapActivity().getMapView();
OsmandApplication app = mapActivity.getMyApplication();
List<TransportRouteResult> routes = app.getTransportRoutingHelper().getRoutes();
TransportRoutingHelper transportRoutingHelper = app.getTransportRoutingHelper();
List<TransportRouteResult> routes = transportRoutingHelper.getRoutes();
if (routes != null && !routes.isEmpty()) {
view = inflater.inflate(R.layout.fragment_show_all_routes, null);
viewPager = view.findViewById(R.id.pager);
@ -71,7 +72,8 @@ public class ChooseRouteFragment extends BaseOsmAndFragment implements CardListe
AndroidUtils.addStatusBarPadding21v(mapActivity, view);
for (int i = 0; i < routes.size(); i++) {
PublicTransportCard card = new PublicTransportCard(mapActivity, routes.get(i), i);
PublicTransportCard card = new PublicTransportCard(mapActivity, transportRoutingHelper.getStartLocation(),
transportRoutingHelper.getEndLocation(), routes.get(i), i);
card.setListener(this);
card.setShowTopShadow(false);
card.setShowBottomShadow(false);

9
OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
View file

@ -77,6 +77,7 @@ import net.osmand.plus.routepreparationmenu.cards.TracksCard;
import net.osmand.plus.routepreparationmenu.cards.WarningCard;
import net.osmand.plus.routing.IRouteInformationListener;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.routing.TransportRoutingHelper;
import net.osmand.plus.search.QuickSearchHelper;
import net.osmand.router.GeneralRouter;
import net.osmand.router.GeneralRouter.RoutingParameter;
@ -465,6 +466,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
mainView = main;
OsmandApplication app = mapActivity.getMyApplication();
nightMode = app.getDaynightHelper().isNightModeForMapControls();
TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
updateStartPointView();
updateWaypointsView();
@ -484,9 +486,11 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
}
bottomShadowVisible = gpx == null;
} else if (isTransportRouteCalculated()) {
List<TransportRouteResult> routes = app.getTransportRoutingHelper().getRoutes();
TransportRoutingHelper transportRoutingHelper = app.getTransportRoutingHelper();
List<TransportRouteResult> routes = transportRoutingHelper.getRoutes();
for (int i = 0; i < routes.size(); i++) {
PublicTransportCard card = new PublicTransportCard(mapActivity, routes.get(i), i);
PublicTransportCard card = new PublicTransportCard(mapActivity, transportRoutingHelper.getStartLocation(),
transportRoutingHelper.getEndLocation(), routes.get(i), i);
card.setShowBottomShadow(i == routes.size() - 1);
card.setShowTopShadow(i != 0);
card.setListener(this);
@ -502,7 +506,6 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
menuCards.add(homeWorkCard);
// Previous route card
TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
TargetPoint startBackup = targetPointsHelper.getPointToStartBackup();
if (startBackup == null) {
startBackup = targetPointsHelper.getMyLocationToStart();

166
OsmAnd/src/net/osmand/plus/routepreparationmenu/ShowRouteInfoDialogFragment.java
View file

@ -90,19 +90,23 @@ import net.osmand.plus.helpers.GpxUiHelper.GPXDataSetType;
import net.osmand.plus.mapcontextmenu.InterceptorLinearLayout;
import net.osmand.plus.mapcontextmenu.MenuBuilder.CollapsableView;
import net.osmand.plus.mapcontextmenu.MenuController;
import net.osmand.plus.render.MapRenderRepositories;
import net.osmand.plus.routepreparationmenu.cards.BaseCard;
import net.osmand.plus.routepreparationmenu.cards.PublicTransportCard;
import net.osmand.plus.routepreparationmenu.cards.PublicTransportCard.PublicTransportCardListener;
import net.osmand.plus.routepreparationmenu.cards.RouteInfoCard;
import net.osmand.plus.routepreparationmenu.cards.RouteStatisticCard;
import net.osmand.plus.routing.RouteCalculationResult;
import net.osmand.plus.routing.RouteDirectionInfo;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.routing.TransportRoutingHelper;
import net.osmand.plus.transport.TransportStopRoute;
import net.osmand.plus.views.OsmandMapTileView;
import net.osmand.plus.views.TurnPathHelper;
import net.osmand.plus.views.controls.HorizontalSwipeConfirm;
import net.osmand.plus.widgets.TextViewEx;
import net.osmand.plus.widgets.style.CustomTypefaceSpan;
import net.osmand.render.RenderingRuleSearchRequest;
import net.osmand.render.RenderingRulesStorage;
import net.osmand.router.RouteSegmentResult;
import net.osmand.router.RouteStatistics;
@ -128,7 +132,7 @@ import static net.osmand.plus.routepreparationmenu.MapRouteInfoMenu.MenuState.FU
import static net.osmand.plus.routepreparationmenu.MapRouteInfoMenu.MenuState.HALF_SCREEN;
import static net.osmand.plus.routepreparationmenu.MapRouteInfoMenu.MenuState.HEADER_ONLY;
public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment implements PublicTransportCardListener {
public static final String TAG = "ShowRouteInfoDialogFragment";
@ -443,7 +447,10 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
List<TransportRouteResult> routes = routingHelper.getTransportRoutingHelper().getRoutes();
if (routes != null && routes.size() > transportRouteId) {
TransportRouteResult routeResult = routingHelper.getTransportRoutingHelper().getRoutes().get(transportRouteId);
PublicTransportCard card = new PublicTransportCard(mapActivity, routeResult, transportRouteId);
TransportRoutingHelper transportRoutingHelper = app.getTransportRoutingHelper();
PublicTransportCard card = new PublicTransportCard(mapActivity, transportRoutingHelper.getStartLocation(),
transportRoutingHelper.getEndLocation(), routeResult, transportRouteId);
card.setTransportCardListener(this);
menuCards.add(card);
cardsContainer.addView(card.build(mapActivity));
buildRowDivider(cardsContainer, false);
@ -518,7 +525,12 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
if (route != null) {
RenderingRulesStorage currentRenderer = app.getRendererRegistry().getCurrentSelectedRenderer();
RenderingRulesStorage defaultRender = app.getRendererRegistry().defaultRender();
RouteStatistics routeStatistics = RouteStatistics.newRouteStatistic(route, currentRenderer,defaultRender, nightMode);
MapRenderRepositories maps = app.getResourceManager().getRenderer();
RenderingRuleSearchRequest currentSearchRequest = maps.getSearchRequestWithAppliedCustomRules(currentRenderer, nightMode);
RenderingRuleSearchRequest defaultSearchRequest = maps.getSearchRequestWithAppliedCustomRules(defaultRender, nightMode);
RouteStatistics routeStatistics = RouteStatistics.newRouteStatistic(route, currentRenderer, defaultRender, currentSearchRequest, defaultSearchRequest);
GPXUtilities.GPXTrackAnalysis analysis = gpx.getAnalysis(0);
RouteInfoCard routeClassCard = new RouteInfoCard(mapActivity, routeStatistics.getRouteClassStatistic(), analysis);
@ -595,7 +607,7 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
!nightMode ? R.color.ctx_menu_collapse_icon_color_light : R.color.ctx_menu_collapse_icon_color_dark);
}
private void buildSegmentItem(View view, TransportRouteResultSegment segment, long startTime) {
private void buildSegmentItem(View view, final TransportRouteResultSegment segment, long startTime) {
TransportRoute transportRoute = segment.route;
List<TransportStop> stops = segment.getTravelStops();
final TransportStop startStop = stops.get(0);
@ -629,13 +641,20 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
title.setSpan(new CustomTypefaceSpan(typeface), 0, title.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
title.setSpan(new ForegroundColorSpan(getActiveColor()), 0, title.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
buildStartStopRow(stopsContainer, icon, timeText, transportStopRoute, title, secondaryText, new OnClickListener() {
buildStartStopRow(stopsContainer, icon, timeText, title, secondaryText, new OnClickListener() {
@Override
public void onClick(View v) {
showLocationOnMap(startStop.getLocation());
}
});
buildTransportStopRouteRow(stopsContainer, transportStopRoute, new OnClickListener() {
@Override
public void onClick(View v) {
showRouteSegmentOnMap(segment);
}
});
CollapsableView collapsableView = null;
if (stops.size() > 2) {
collapsableView = getCollapsableTransportStopRoutesView(app, transportStopRoute, stops.subList(1, stops.size() - 1));
@ -873,14 +892,26 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
}
}
public void showWalkingRouteOnMap(TransportRouteResultSegment startSegment, TransportRouteResultSegment endSegment) {
public void showRouteOnMap(@NonNull RouteCalculationResult result) {
QuadRect rect = result.getLocationsRect();
if (rect != null) {
openMenuHeaderOnly();
fitRectOnMap(rect);
}
}
public void showWalkingRouteOnMap(@Nullable TransportRouteResultSegment startSegment, @Nullable TransportRouteResultSegment endSegment) {
RouteCalculationResult walkingRouteSegment = app.getTransportRoutingHelper().getWalkingRouteSegment(startSegment, endSegment);
if (walkingRouteSegment != null) {
QuadRect rect = walkingRouteSegment.getLocationsRect();
if (rect != null) {
openMenuHeaderOnly();
fitRectOnMap(rect, null, true);
}
showRouteOnMap(walkingRouteSegment);
}
}
public void showRouteSegmentOnMap(@NonNull TransportRouteResultSegment segment) {
QuadRect rect = segment.getSegmentRect();
if (rect != null) {
openMenuHeaderOnly();
fitRectOnMap(rect);
}
}
@ -889,7 +920,7 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
QuadRect rect = app.getTransportRoutingHelper().getTransportRouteRect(result);
if (rect != null) {
openMenuHeaderOnly();
fitRectOnMap(rect, null, true);
fitRectOnMap(rect);
}
}
}
@ -1039,8 +1070,8 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
((LinearLayout) view).addView(baseItemView);
}
public void buildStartStopRow(final View view, Drawable icon, String timeText, TransportStopRoute transportStopRoute,
final Spannable title, Spannable secondaryText, OnClickListener onClickListener) {
public void buildStartStopRow(final View view, Drawable icon, String timeText, final Spannable title,
Spannable secondaryText, OnClickListener onClickListener) {
MapActivity mapActivity = getMapActivity();
if (mapActivity == null) {
return;
@ -1102,23 +1133,58 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
baseItemView.addView(timeView);
}
if (transportStopRoute != null) {
TextView routeTypeView = new TextView(view.getContext());
LinearLayout.LayoutParams routeTypeParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
routeTypeParams.setMargins(0, dpToPx(4), 0, 0);
routeTypeView.setLayoutParams(routeTypeParams);
routeTypeView.setTextSize(16);
AndroidUtils.setTextSecondaryColor(app, routeTypeView, nightMode);
routeTypeView.setText(transportStopRoute.getDescription(app));
llText.addView(routeTypeView);
View routeBadge = createRouteBadge(mapActivity, transportStopRoute, nightMode);
LinearLayout.LayoutParams routeBadgeParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
routeBadgeParams.setMargins(0, dpToPx(6), 0, dpToPx(8));
routeBadge.setLayoutParams(routeBadgeParams);
llText.addView(routeBadge);
if (onClickListener != null) {
ll.setOnClickListener(onClickListener);
}
((LinearLayout) view).addView(baseItemView);
}
public void buildTransportStopRouteRow(final View view, @NonNull TransportStopRoute transportStopRoute,
OnClickListener onClickListener) {
MapActivity mapActivity = getMapActivity();
if (mapActivity == null) {
return;
}
final String routeDescription = transportStopRoute.getDescription(app);
FrameLayout baseItemView = new FrameLayout(view.getContext());
FrameLayout.LayoutParams baseViewLayoutParams = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
baseItemView.setLayoutParams(baseViewLayoutParams);
LinearLayout baseView = new LinearLayout(view.getContext());
baseView.setOrientation(LinearLayout.VERTICAL);
baseView.setLayoutParams(baseViewLayoutParams);
baseView.setGravity(Gravity.END);
baseView.setBackgroundResource(AndroidUtils.resolveAttribute(view.getContext(), android.R.attr.selectableItemBackground));
baseItemView.addView(baseView);
LinearLayout ll = buildHorizontalContainerView(36, new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
copyToClipboard(routeDescription, view.getContext());
return true;
}
});
baseView.addView(ll);
LinearLayout llText = buildTextContainerView();
ll.addView(llText);
TextView routeTypeView = new TextView(view.getContext());
LinearLayout.LayoutParams routeTypeParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
routeTypeParams.setMargins(0, dpToPx(4), 0, 0);
routeTypeView.setLayoutParams(routeTypeParams);
routeTypeView.setTextSize(16);
AndroidUtils.setTextSecondaryColor(app, routeTypeView, nightMode);
routeTypeView.setText(routeDescription);
llText.addView(routeTypeView);
View routeBadge = createRouteBadge(mapActivity, transportStopRoute, nightMode);
LinearLayout.LayoutParams routeBadgeParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
routeBadgeParams.setMargins(0, dpToPx(6), 0, dpToPx(8));
routeBadge.setLayoutParams(routeBadgeParams);
llText.addView(routeBadge);
if (onClickListener != null) {
ll.setOnClickListener(onClickListener);
}
@ -1263,7 +1329,17 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
}
}
private void fitRectOnMap(QuadRect rect, LatLon location, boolean forceFit) {
private void showOnMap(@NonNull LatLon start, @NonNull LatLon end) {
double left = Math.min(start.getLongitude(), end.getLongitude());
double right = Math.max(start.getLongitude(), end.getLongitude());
double top = Math.max(start.getLatitude(), end.getLatitude());
double bottom = Math.min(start.getLatitude(), end.getLatitude());
QuadRect rect = new QuadRect(left, top, right, bottom);
openMenuHeaderOnly();
fitRectOnMap(rect);
}
private void fitRectOnMap(QuadRect rect) {
MapActivity mapActivity = getMapActivity();
if (mapActivity != null) {
RotatedTileBox tb = mapActivity.getMapView().getCurrentRotatedTileBox().copy();
@ -1278,17 +1354,8 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
}
if (tileBoxHeightPx > 0) {
int topMarginPx = toolbar.getHeight();
if (forceFit) {
mapActivity.getMapView().fitRectToMap(rect.left, rect.right, rect.top, rect.bottom,
tileBoxWidthPx, tileBoxHeightPx, topMarginPx);
} else if (location != null &&
!mapActivity.getMapView().getTileBox(tileBoxWidthPx, tileBoxHeightPx, topMarginPx).containsLatLon(location)) {
boolean animating = mapActivity.getMapView().getAnimatedDraggingThread().isAnimating();
mapActivity.getMapView().fitLocationToMap(location.getLatitude(), location.getLongitude(),
mapActivity.getMapView().getZoom(), tileBoxWidthPx, tileBoxHeightPx, topMarginPx, !animating);
} else {
mapActivity.refreshMap();
}
mapActivity.getMapView().fitRectToMap(rect.left, rect.right, rect.top, rect.bottom,
tileBoxWidthPx, tileBoxHeightPx, topMarginPx);
}
}
}
@ -1773,6 +1840,21 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
}
}
@Override
public void onPublicTransportCardBadgePressed(@NonNull PublicTransportCard card, @NonNull TransportRouteResultSegment segment) {
showRouteSegmentOnMap(segment);
}
@Override
public void onPublicTransportCardBadgePressed(@NonNull PublicTransportCard card, @NonNull RouteCalculationResult result) {
showRouteOnMap(result);
}
@Override
public void onPublicTransportCardBadgePressed(@NonNull PublicTransportCard card, @NonNull LatLon start, @NonNull LatLon end) {
showOnMap(start, end);
}
public class CumulativeInfo {
public int distance;
public int time;
@ -2399,7 +2481,7 @@ public class ShowRouteInfoDialogFragment extends BaseOsmAndFragment {
}
private void doLayoutMenu() {
final int posY = getPosY(getViewY(), false, getCurrentMenuState());
final int posY = getPosY(initLayout ? CURRENT_Y_UNDEFINED : getViewY(), false, getCurrentMenuState());
setViewY(posY, true, !initLayout);
updateMainViewLayout(posY);
}

163
OsmAnd/src/net/osmand/plus/routepreparationmenu/cards/PublicTransportCard.java
View file

@ -3,6 +3,8 @@ package net.osmand.plus.routepreparationmenu.cards;
import android.graphics.Typeface;
import android.graphics.drawable.GradientDrawable;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
@ -14,13 +16,16 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import net.osmand.AndroidUtils;
import net.osmand.data.LatLon;
import net.osmand.data.TransportRoute;
import net.osmand.plus.OsmAndFormatter;
import net.osmand.plus.R;
import net.osmand.plus.UiUtilities;
import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.routepreparationmenu.ShowRouteInfoDialogFragment;
import net.osmand.plus.helpers.FontCache;
import net.osmand.plus.routepreparationmenu.ShowRouteInfoDialogFragment;
import net.osmand.plus.routing.RouteCalculationResult;
import net.osmand.plus.routing.TransportRoutingHelper;
import net.osmand.plus.transport.TransportStopRoute;
import net.osmand.plus.widgets.FlowLayout;
import net.osmand.plus.widgets.style.CustomTypefaceSpan;
@ -37,12 +42,23 @@ public class PublicTransportCard extends BaseCard {
public static final int DETAILS_BUTTON_INDEX = 0;
public static final int SHOW_BUTTON_INDEX = 1;
private LatLon startLocation;
private LatLon endLocation;
private TransportRouteResult routeResult;
private PublicTransportCardListener transportCardListener;
private int routeId;
public PublicTransportCard(MapActivity mapActivity, TransportRouteResult routeResult, int routeId) {
public interface PublicTransportCardListener {
void onPublicTransportCardBadgePressed(@NonNull PublicTransportCard card, @NonNull TransportRouteResultSegment segment);
void onPublicTransportCardBadgePressed(@NonNull PublicTransportCard card, @NonNull RouteCalculationResult result);
void onPublicTransportCardBadgePressed(@NonNull PublicTransportCard card, @NonNull LatLon start, @NonNull LatLon end);
}
public PublicTransportCard(MapActivity mapActivity, LatLon startLocation, LatLon endLocation, TransportRouteResult routeResult, int routeId) {
super(mapActivity);
this.startLocation = startLocation;
this.endLocation = endLocation;
this.routeResult = routeResult;
this.routeId = routeId;
}
@ -52,6 +68,14 @@ public class PublicTransportCard extends BaseCard {
return R.layout.transport_route_card;
}
public PublicTransportCardListener getTransportCardListener() {
return transportCardListener;
}
public void setTransportCardListener(PublicTransportCardListener listener) {
this.transportCardListener = listener;
}
@Override
protected void updateContent() {
List<TransportRouteResultSegment> segments = routeResult.getSegments();
@ -177,14 +201,29 @@ public class PublicTransportCard extends BaseCard {
FlowLayout routesBadges = (FlowLayout) view.findViewById(R.id.routes_badges);
routesBadges.removeAllViews();
TransportRoutingHelper transportRoutingHelper = app.getTransportRoutingHelper();
Iterator<TransportRouteResultSegment> iterator = segments.iterator();
TransportRouteResultSegment prevSegment = null;
while (iterator.hasNext()) {
TransportRouteResultSegment s = iterator.next();
if (s.walkDist > 0) {
RouteCalculationResult walkingSegment = transportRoutingHelper.getWalkingRouteSegment(prevSegment, s);
if (walkingSegment != null) {
double walkTime = walkingSegment.getRoutingTime();
if (walkTime > MIN_WALK_TIME) {
routesBadges.addView(createWalkRouteBadge(walkingSegment), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
routesBadges.addView(createArrow(), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
}
} else if (s.walkDist > 0) {
double walkTime = getWalkTime(s.walkDist, routeResult.getWalkSpeed());
if (walkTime > MIN_WALK_TIME) {
String walkTimeS = OsmAndFormatter.getFormattedDuration((int) walkTime, app);
routesBadges.addView(createWalkRouteBadge(walkTimeS), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
LatLon start;
LatLon end = s.getStart().getLocation();
if (prevSegment != null) {
start = prevSegment.getEnd().getLocation();
} else {
start = this.startLocation;
}
routesBadges.addView(createWalkRouteBadge(walkTime, start, end), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
routesBadges.addView(createArrow(), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
}
}
@ -192,60 +231,96 @@ public class PublicTransportCard extends BaseCard {
if (iterator.hasNext()) {
routesBadges.addView(createArrow(), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
} else {
double finishWalkDist = routeResult.getFinishWalkDist();
if (finishWalkDist > 0) {
double walkTime2 = getWalkTime(finishWalkDist, routeResult.getWalkSpeed());
if (walkTime2 > MIN_WALK_TIME) {
String walkTimeS = OsmAndFormatter.getFormattedDuration((int) walkTime2, app);
walkingSegment = transportRoutingHelper.getWalkingRouteSegment(s, null);
if (walkingSegment != null) {
double walkTime = walkingSegment.getRoutingTime();
if (walkTime > MIN_WALK_TIME) {
routesBadges.addView(createArrow(), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
routesBadges.addView(createWalkRouteBadge(walkTimeS));
routesBadges.addView(createWalkRouteBadge(walkingSegment), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
}
} else {
double finishWalkDist = routeResult.getFinishWalkDist();
if (finishWalkDist > 0) {
double walkTime = getWalkTime(finishWalkDist, routeResult.getWalkSpeed());
if (walkTime > MIN_WALK_TIME) {
LatLon start = s.getEnd().getLocation();
LatLon end = this.endLocation;
routesBadges.addView(createArrow(), new FlowLayout.LayoutParams(itemsSpacing, itemsSpacing));
routesBadges.addView(createWalkRouteBadge(walkTime, start, end));
}
}
}
}
prevSegment = s;
}
}
private View createRouteBadge(TransportRouteResultSegment segment) {
LinearLayout convertView = (LinearLayout) getMapActivity().getLayoutInflater().inflate(R.layout.transport_stop_route_item_with_icon, null, false);
if (segment != null) {
TransportRoute transportRoute = segment.route;
TransportStopRoute transportStopRoute = TransportStopRoute.getTransportStopRoute(transportRoute, segment.getStart());
private View createRouteBadge(@NonNull final TransportRouteResultSegment segment) {
LinearLayout bageView = (LinearLayout) mapActivity.getLayoutInflater().inflate(R.layout.transport_stop_route_item_with_icon, null, false);
TransportRoute transportRoute = segment.route;
TransportStopRoute transportStopRoute = TransportStopRoute.getTransportStopRoute(transportRoute, segment.getStart());
String routeRef = segment.route.getAdjustedRouteRef();
int bgColor = transportStopRoute.getColor(app, nightMode);
String routeRef = segment.route.getAdjustedRouteRef();
int bgColor = transportStopRoute.getColor(app, nightMode);
TextView transportStopRouteTextView = (TextView) convertView.findViewById(R.id.transport_stop_route_text);
ImageView transportStopRouteImageView = (ImageView) convertView.findViewById(R.id.transport_stop_route_icon);
TextView transportStopRouteTextView = (TextView) bageView.findViewById(R.id.transport_stop_route_text);
ImageView transportStopRouteImageView = (ImageView) bageView.findViewById(R.id.transport_stop_route_icon);
int drawableResId = transportStopRoute.type == null ? R.drawable.ic_action_bus_dark : transportStopRoute.type.getResourceId();
transportStopRouteImageView.setImageDrawable(app.getUIUtilities().getPaintedIcon(drawableResId, UiUtilities.getContrastColor(app, bgColor, true)));
transportStopRouteTextView.setText(routeRef);
GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground();
gradientDrawableBg.setColor(bgColor);
transportStopRouteTextView.setTextColor(UiUtilities.getContrastColor(app, bgColor, true));
int drawableResId = transportStopRoute.type == null ? R.drawable.ic_action_bus_dark : transportStopRoute.type.getResourceId();
transportStopRouteImageView.setImageDrawable(app.getUIUtilities().getPaintedIcon(drawableResId, UiUtilities.getContrastColor(app, bgColor, true)));
transportStopRouteTextView.setText(routeRef);
GradientDrawable gradientDrawableBg = (GradientDrawable) bageView.getBackground();
gradientDrawableBg.setColor(bgColor);
transportStopRouteTextView.setTextColor(UiUtilities.getContrastColor(app, bgColor, true));
if (transportCardListener != null) {
bageView.findViewById(R.id.button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
transportCardListener.onPublicTransportCardBadgePressed(PublicTransportCard.this, segment);
}
});
}
return convertView;
return bageView;
}
private View createWalkRouteBadge(String walkTime) {
LinearLayout convertView = (LinearLayout) getMapActivity().getLayoutInflater().inflate(R.layout.transport_stop_route_item_with_icon, null, false);
if (walkTime != null) {
int bgColor = ContextCompat.getColor(app, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
TextView transportStopRouteTextView = (TextView) convertView.findViewById(R.id.transport_stop_route_text);
ImageView transportStopRouteImageView = (ImageView) convertView.findViewById(R.id.transport_stop_route_icon);
transportStopRouteImageView.setImageDrawable(getColoredIcon(R.drawable.ic_action_pedestrian_dark, nightMode ? R.color.ctx_menu_bottom_view_url_color_dark : R.color.ctx_menu_bottom_view_url_color_light));
transportStopRouteTextView.setText(walkTime);
GradientDrawable gradientDrawableBg = (GradientDrawable) convertView.getBackground();
gradientDrawableBg.setColor(bgColor);
transportStopRouteTextView.setTextColor(ContextCompat.getColor(app, nightMode ? R.color.ctx_menu_bottom_view_url_color_dark : R.color.ctx_menu_bottom_view_url_color_light));
AndroidUtils.setBackground(app, convertView, nightMode, R.drawable.btn_border_active_light, R.drawable.btn_border_active_dark);
private View createWalkRouteBadge(@NonNull final RouteCalculationResult result) {
View v = createWalkRouteBadge(result.getRoutingTime(), null, null);
if (transportCardListener != null) {
v.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
transportCardListener.onPublicTransportCardBadgePressed(PublicTransportCard.this, result);
}
});
}
return v;
}
return convertView;
private View createWalkRouteBadge(double walkTime, @Nullable final LatLon start, @Nullable final LatLon end) {
LinearLayout bageView = (LinearLayout) getMapActivity().getLayoutInflater().inflate(R.layout.transport_stop_route_item_with_icon, null, false);
int bgColor = ContextCompat.getColor(app, nightMode ? R.color.active_buttons_and_links_dark : R.color.active_buttons_and_links_light);
TextView transportStopRouteTextView = (TextView) bageView.findViewById(R.id.transport_stop_route_text);
ImageView transportStopRouteImageView = (ImageView) bageView.findViewById(R.id.transport_stop_route_icon);
transportStopRouteImageView.setImageDrawable(getColoredIcon(R.drawable.ic_action_pedestrian_dark, nightMode ? R.color.ctx_menu_bottom_view_url_color_dark : R.color.ctx_menu_bottom_view_url_color_light));
transportStopRouteTextView.setText(OsmAndFormatter.getFormattedDuration((int) walkTime, app));
GradientDrawable gradientDrawableBg = (GradientDrawable) bageView.getBackground();
gradientDrawableBg.setColor(bgColor);
transportStopRouteTextView.setTextColor(ContextCompat.getColor(app, nightMode ? R.color.ctx_menu_bottom_view_url_color_dark : R.color.ctx_menu_bottom_view_url_color_light));
AndroidUtils.setBackground(app, bageView, nightMode, R.drawable.btn_border_active_light, R.drawable.btn_border_active_dark);
if (transportCardListener != null && start != null && end != null) {
bageView.findViewById(R.id.button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
transportCardListener.onPublicTransportCardBadgePressed(PublicTransportCard.this, start, end);
}
});
}
return bageView;
}
private View createArrow() {

5
OsmAnd/src/net/osmand/plus/routing/TransportRoutingHelper.java
View file

@ -105,7 +105,10 @@ public class TransportRoutingHelper {
@Nullable
public RouteCalculationResult getWalkingRouteSegment(TransportRouteResultSegment s1, TransportRouteResultSegment s2) {
return walkingRouteSegments.get(new Pair<>(s1, s2));
if (walkingRouteSegments != null) {
return walkingRouteSegments.get(new Pair<>(s1, s2));
}
return null;
}
public void setCurrentRoute(int currentRoute) {

19
OsmAnd/src/net/osmand/plus/views/GPXLayer.java
View file

@ -1,5 +1,8 @@
package net.osmand.plus.views;
import static net.osmand.plus.dialogs.ConfigureMapMenu.CURRENT_TRACK_COLOR_ATTR;
import static net.osmand.plus.dialogs.ConfigureMapMenu.CURRENT_TRACK_WIDTH_ATTR;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
@ -108,12 +111,17 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
@ColorInt
private int grayColor;
private CommonPreference<String> currentTrackColorPref;
private CommonPreference<String> currentTrackWidthPref;
@Override
public void initLayer(OsmandMapTileView view) {
this.view = view;
selectedGpxHelper = view.getApplication().getSelectedGpxHelper();
mapMarkersHelper = view.getApplication().getMapMarkersHelper();
osmandRenderer = view.getApplication().getResourceManager().getRenderer().getRenderer();
currentTrackColorPref = view.getSettings().getCustomRenderProperty(CURRENT_TRACK_COLOR_ATTR);
currentTrackWidthPref = view.getSettings().getCustomRenderProperty(CURRENT_TRACK_WIDTH_ATTR);
initUI();
}
@ -214,23 +222,24 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
private int updatePaints(int color, boolean routePoints, boolean currentTrack, DrawSettings nightMode, RotatedTileBox tileBox) {
RenderingRulesStorage rrs = view.getApplication().getRendererRegistry().getCurrentSelectedRenderer();
final boolean isNight = nightMode != null && nightMode.isNightMode();
int hsh = calculateHash(rrs, routePoints, isNight, tileBox.getMapDensity(), tileBox.getZoom());
int hsh = calculateHash(rrs, routePoints, isNight, tileBox.getMapDensity(), tileBox.getZoom(),
currentTrackColorPref.get(), currentTrackWidthPref.get());
if (hsh != cachedHash) {
cachedHash = hsh;
cachedColor = ContextCompat.getColor(view.getApplication(), R.color.gpx_track);
if (rrs != null) {
RenderingRuleSearchRequest req = new RenderingRuleSearchRequest(rrs);
req.setBooleanFilter(rrs.PROPS.R_NIGHT_MODE, isNight);
CommonPreference<String> p = view.getSettings().getCustomRenderProperty("currentTrackColor");
CommonPreference<String> p = view.getSettings().getCustomRenderProperty(CURRENT_TRACK_COLOR_ATTR);
if (p != null && p.isSet()) {
RenderingRuleProperty ctColor = rrs.PROPS.get("currentTrackColor");
RenderingRuleProperty ctColor = rrs.PROPS.get(CURRENT_TRACK_COLOR_ATTR);
if (ctColor != null) {
req.setStringFilter(ctColor, p.get());
}
}
CommonPreference<String> p2 = view.getSettings().getCustomRenderProperty("currentTrackWidth");
CommonPreference<String> p2 = view.getSettings().getCustomRenderProperty(CURRENT_TRACK_WIDTH_ATTR);
if (p2 != null && p2.isSet()) {
RenderingRuleProperty ctWidth = rrs.PROPS.get("currentTrackWidth");
RenderingRuleProperty ctWidth = rrs.PROPS.get(CURRENT_TRACK_WIDTH_ATTR);
if (ctWidth != null) {
req.setStringFilter(ctWidth, p2.get());
}

14
OsmAnd/src/net/osmand/plus/views/MapQuickActionLayer.java
View file

@ -201,11 +201,11 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
return quickActionsWidget.getVisibility() == View.VISIBLE;
}
/**
* @param showWidget
* @return true, if state was changed
*/
public boolean setLayerState(boolean showWidget) {
/**
* @param showWidget
* @return true, if state was changed
*/
public boolean setLayerState(boolean showWidget) {
prevWidgetState = showWidget;
if (isWidgetVisible() == showWidget) // check if state change is needed
return false;
@ -229,8 +229,8 @@ public class MapQuickActionLayer extends OsmandMapLayer implements QuickActionRe
quickActionsWidget.setSelectionListener(MapQuickActionLayer.this);
}
return true;
}
return true;
}
private void animateWidget(final boolean show) {
AnimatorSet set = new AnimatorSet();