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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-11-09 18:37:19 +01:00
commit f4980b5c2c
34 changed files with 110 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java
View file

@ -1,5 +1,14 @@
package net.osmand.osm; package net.osmand.osm;
import net.osmand.PlatformUtil;
import net.osmand.StringMatcher;
import net.osmand.data.Amenity;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
@ -16,15 +25,6 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.TreeMap; import java.util.TreeMap;
import net.osmand.PlatformUtil;
import net.osmand.StringMatcher;
import net.osmand.data.Amenity;
import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class MapPoiTypes { public class MapPoiTypes {
private static MapPoiTypes DEFAULT_INSTANCE = null; private static MapPoiTypes DEFAULT_INSTANCE = null;
@ -398,6 +398,7 @@ public class MapPoiTypes {
tp.setNameOnly("true".equals(parser.getAttributeValue("", "name_only"))); tp.setNameOnly("true".equals(parser.getAttributeValue("", "name_only")));
tp.setNameTag(parser.getAttributeValue("", "name_tag")); tp.setNameTag(parser.getAttributeValue("", "name_tag"));
tp.setRelation("true".equals(parser.getAttributeValue("", "relation"))); tp.setRelation("true".equals(parser.getAttributeValue("", "relation")));
tp.setNotEditableOsm("true".equals(parser.getAttributeValue("", "no_edit")));
if (lastFilter != null) { if (lastFilter != null) {
lastFilter.addPoiType(tp); lastFilter.addPoiType(tp);
} }

9
OsmAnd-java/src/net/osmand/osm/PoiType.java
View file

@ -12,6 +12,7 @@ public class PoiType extends AbstractPoiType {
private String osmTag2; private String osmTag2;
private String osmValue; private String osmValue;
private String osmValue2; private String osmValue2;
private boolean notEditableOsm;
private String nameTag; private String nameTag;
private boolean text; private boolean text;
@ -144,6 +145,14 @@ public class PoiType extends AbstractPoiType {
this.relation = relation; this.relation = relation;
} }
public boolean isNotEditableOsm() {
return notEditableOsm;
}
public void setNotEditableOsm(boolean notEditableOsm) {
this.notEditableOsm = notEditableOsm;
}
@Override @Override
public String toString() { public String toString() {
return "PoiType{" + return "PoiType{" +

39
OsmAnd/res/layout/list_menu_item_native.xml
View file

@ -2,7 +2,8 @@
<LinearLayout <LinearLayout
android:id="@+id/LinearLayout1" android:id="@+id/LinearLayout1"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
@ -13,7 +14,8 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="24dp" android:layout_marginLeft="24dp"
android:gravity="center" android:gravity="center"
android:visibility="gone"/> android:visibility="gone"
tools:visibility="visible"/>
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -27,26 +29,21 @@
android:text="@string/layer_poi" android:text="@string/layer_poi"
android:textSize="@dimen/default_list_text_size"/> android:textSize="@dimen/default_list_text_size"/>
<LinearLayout <ImageView
android:id="@+id/icon_settings"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="match_parent"
android:gravity="center_vertical"> android:focusable="false"
android:gravity="center_vertical"
android:visibility="gone"
tools:visibility="visible"/>
<ImageView <!-- android:button="@drawable/ic_btn_wocheckbox" -->
android:id="@+id/icon_settings" <CheckBox
android:layout_width="wrap_content" android:id="@+id/check_item"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:focusable="false" android:layout_height="match_parent"
android:gravity="center_vertical" android:layout_marginRight="24dp"
android:visibility="gone"/> android:focusable="false"/>
<!-- android:button="@drawable/ic_btn_wocheckbox" -->
<CheckBox
android:id="@+id/check_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:focusable="false"/>
</LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -1779,7 +1779,7 @@
<string name="storage_directory_multiuser">Агульнае сховішча</string> <string name="storage_directory_multiuser">Агульнае сховішча</string>
<string name="application_dir_change_warning3">Вы хочаце, каб OsmAnd таксама скапіяваў свае файлы дадзеных у новае месца прызначэньня?</string> <string name="application_dir_change_warning3">Вы хочаце, каб OsmAnd таксама скапіяваў свае файлы дадзеных у новае месца прызначэньня?</string>
<string name="rendering_attr_hideHouseNumbers_name">Схаваць нумары дамоў</string> <string name="rendering_attr_hideHouseNumbers_name">Схаваць нумары дамоў</string>
<string name="routing_attr_avoid_borders_name">Пазьбягаць перасячэньне мяжы</string>
<string name="routing_attr_avoid_borders_description">Пазьбягаць перасячэньня мяжы іншай краіны</string> <string name="routing_attr_avoid_borders_description">Пазьбягаць перасячэньня мяжы іншай краіны</string>
<string name="routing_attr_height_name">Абмежаваньне па вышыні</string> <string name="routing_attr_height_name">Абмежаваньне па вышыні</string>
<string name="routing_attr_height_description">Пазначце вышыню транспартнага сродку для разьліку маршруту</string> <string name="routing_attr_height_description">Пазначце вышыню транспартнага сродку для разьліку маршруту</string>

5
OsmAnd/res/values-ca/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="show_warnings_title">Mostra els missatges d\'avís…</string> <string name="show_warnings_title">Mostra els missatges d\'avís…</string>
<string name="map_widget_fluorescent">Rutes amb fluorescència</string> <string name="map_widget_fluorescent">Rutes amb fluorescència</string>
@ -1601,7 +1600,7 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="storage_directory">Emmagatzematge de mapes</string> <string name="storage_directory">Emmagatzematge de mapes</string>
<string name="shared_string_copy">Copia</string> <string name="shared_string_copy">Copia</string>
<string name="rendering_attr_hideHouseNumbers_name">Amaga la numeració de finques</string> <string name="rendering_attr_hideHouseNumbers_name">Amaga la numeració de finques</string>
<string name="routing_attr_avoid_borders_name">Evita creuar fronteres</string>
<string name="routing_attr_avoid_borders_description">Evita creuar la frontera a un altre pais</string> <string name="routing_attr_avoid_borders_description">Evita creuar la frontera a un altre pais</string>
<string name="routing_attr_height_name">Límit d\'alçada</string> <string name="routing_attr_height_name">Límit d\'alçada</string>
<string name="routing_attr_height_description">Indiqueu l\'alçada del vehicle que les rutes han d\'admetre</string> <string name="routing_attr_height_description">Indiqueu l\'alçada del vehicle que les rutes han d\'admetre</string>

5
OsmAnd/res/values-cs/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string> <string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string>
<string name="send_files_to_osm">Nahrát GPX soubory do OSM?</string> <string name="send_files_to_osm">Nahrát GPX soubory do OSM?</string>
@ -1600,7 +1599,7 @@
<string name="storage_directory">Úložiště map</string> <string name="storage_directory">Úložiště map</string>
<string name="shared_string_copy">Kopírovat</string> <string name="shared_string_copy">Kopírovat</string>
<string name="rendering_attr_hideHouseNumbers_name">Skrýt popisná čísla domů</string> <string name="rendering_attr_hideHouseNumbers_name">Skrýt popisná čísla domů</string>
<string name="routing_attr_avoid_borders_name">Vyhnout se překročení hranic</string>
<string name="routing_attr_avoid_borders_description">Nepřekračovat hranice do jiné země</string> <string name="routing_attr_avoid_borders_description">Nepřekračovat hranice do jiné země</string>
<string name="routing_attr_height_name">Výškové omezení</string> <string name="routing_attr_height_name">Výškové omezení</string>
<string name="routing_attr_height_description">Zadejte výšku vozidla, jaká má být povolena na cestách</string> <string name="routing_attr_height_description">Zadejte výšku vozidla, jaká má být povolena na cestách</string>

5
OsmAnd/res/values-da/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string> <string name="srtm_paid_version_msg">Overvej at købe Højdekurve udvidelsen (\'Contour lines\') på Google Play for at støtte den videre udvikling.</string>
<string name="av_def_action_video">Optag video</string> <string name="av_def_action_video">Optag video</string>
<string name="av_def_action_audio">Optag audio</string> <string name="av_def_action_audio">Optag audio</string>
@ -1781,7 +1780,7 @@
<string name="rendering_attr_hideHouseNumbers_name">Skjul husnumre</string> <string name="rendering_attr_hideHouseNumbers_name">Skjul husnumre</string>
<string name="routing_attr_avoid_borders_description">Undgå at krydse landegrænser</string> <string name="routing_attr_avoid_borders_description">Undgå at krydse landegrænser</string>
<string name="routing_attr_height_name">Højdegrænse</string> <string name="routing_attr_height_name">Højdegrænse</string>
<string name="routing_attr_avoid_borders_name">Undgå at krydse grænser</string>
<string name="routing_attr_height_description">Køretøjets højde der tillades på ruter</string> <string name="routing_attr_height_description">Køretøjets højde der tillades på ruter</string>
<string name="use_fast_recalculation">Smart rutegenberegning</string> <string name="use_fast_recalculation">Smart rutegenberegning</string>
<string name="use_fast_recalculation_desc">Genberegn kun den indledende del af ruten for lange ture</string> <string name="use_fast_recalculation_desc">Genberegn kun den indledende del af ruten for lange ture</string>

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

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="regions">Regionen</string> <string name="regions">Regionen</string>
<string name="region_maps">Regionsweite Karten</string> <string name="region_maps">Regionsweite Karten</string>
<string name="world_maps">Weltweite Karten</string> <string name="world_maps">Weltweite Karten</string>
@ -1949,7 +1948,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="shared_string_logoff">Abmelden</string> <string name="shared_string_logoff">Abmelden</string>
<string name="osmo_share_my_location">Teile meine Position</string> <string name="osmo_share_my_location">Teile meine Position</string>
<string name="rendering_value_disabled_name">Deaktiviert</string> <string name="rendering_value_disabled_name">Deaktiviert</string>
<string name="routing_attr_avoid_borders_name">Grenzübergänge vermeiden</string>
<string name="routing_attr_height_name">Höhenbeschränkung</string> <string name="routing_attr_height_name">Höhenbeschränkung</string>
<string name="read_full_article">Vollständigen Artikel lesen (online)</string> <string name="read_full_article">Vollständigen Artikel lesen (online)</string>
<string name="shared_string_wikipedia">Wikipedia</string> <string name="shared_string_wikipedia">Wikipedia</string>
@ -2072,7 +2071,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
<string name="show_free_version_banner_description">Auch bei der bezahlten Version ist das Banner der kostenlosen Version sichtbar.</string> <string name="show_free_version_banner_description">Auch bei der bezahlten Version ist das Banner der kostenlosen Version sichtbar.</string>
<string name="rendering_attr_hideProposed_name">Vorgeschlagene Objekte ausblenden</string> <string name="rendering_attr_hideProposed_name">Vorgeschlagene Objekte ausblenden</string>
<string name="shared_string_update">Aktualisieren</string> <string name="shared_string_update">Aktualisieren</string>
<string name="rec_photo_description">Foto %1$s</string>
<string name="rec_video_description">Video %1$s</string> <string name="rec_video_description">Video %1$s</string>
<string name="shared_string_upload">Hochladen</string> <string name="shared_string_upload">Hochladen</string>
<string name="shared_string_qr_code">QR-Code</string> <string name="shared_string_qr_code">QR-Code</string>

5
OsmAnd/res/values-es-rAR/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string> <string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
<string name="copying_osmand_file_failed">Falló al copiar archivos</string> <string name="copying_osmand_file_failed">Falló al copiar archivos</string>
@ -1729,7 +1728,7 @@
<string name="plugin_description_title">Descripción</string> <string name="plugin_description_title">Descripción</string>
<string name="plugin_install_needs_network">Necesitas una conexión a Internet para instalar este complemento.</string> <string name="plugin_install_needs_network">Necesitas una conexión a Internet para instalar este complemento.</string>
<string name="get_plugin">Obtener</string> <string name="get_plugin">Obtener</string>
<string name="routing_attr_avoid_borders_name">Evitar cruzar fronteras</string>
<string name="routing_attr_avoid_borders_description">Evite cruzar fronteras con otro país</string> <string name="routing_attr_avoid_borders_description">Evite cruzar fronteras con otro país</string>
<string name="routing_attr_height_name">Límite de altura</string> <string name="routing_attr_height_name">Límite de altura</string>
<string name="routing_attr_height_description">Indica la altura permitida del vehículo en rutas</string> <string name="routing_attr_height_description">Indica la altura permitida del vehículo en rutas</string>

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

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="layer_map_appearance">Configurar pantalla</string> <string name="layer_map_appearance">Configurar pantalla</string>
<string name="show_lanes">Mostrar carriles</string> <string name="show_lanes">Mostrar carriles</string>
@ -1742,7 +1741,7 @@
<string name="shared_string_copy">Copiar</string> <string name="shared_string_copy">Copiar</string>
<string name="application_dir_change_warning3">¿Quiere que OsmAnd también copie los archivos de datos al nuevo destino?</string> <string name="application_dir_change_warning3">¿Quiere que OsmAnd también copie los archivos de datos al nuevo destino?</string>
<string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string> <string name="rendering_attr_hideHouseNumbers_name">Ocultar números de casa</string>
<string name="routing_attr_avoid_borders_name">Evitar cruce de fronteras</string>
<string name="routing_attr_avoid_borders_description">Evita cruzar una frontera hacia otro país</string> <string name="routing_attr_avoid_borders_description">Evita cruzar una frontera hacia otro país</string>
<string name="routing_attr_height_name">Límite de altura</string> <string name="routing_attr_height_name">Límite de altura</string>
<string name="routing_attr_height_description">Especifique la altura del vehículo que se permite en las rutas</string> <string name="routing_attr_height_description">Especifique la altura del vehículo que se permite en las rutas</string>

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

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources><string name="local_osm_changes_backup_failed">پشتیبان‌گیری از تغییرات OsmAnd ناموفق بود</string>
<resources><string name="local_osm_changes_backup_failed">پشتیبان‌گیری از تغییرات OsmAnd ناموفق بود</string>
<string name="plugin_distance_point_time">زمان</string> <string name="plugin_distance_point_time">زمان</string>
<string name="plugin_distance_point_hdop">دقت</string> <string name="plugin_distance_point_hdop">دقت</string>
<string name="plugin_distance_point_speed">سرعت</string> <string name="plugin_distance_point_speed">سرعت</string>
@ -868,7 +867,7 @@
<string name="download_hillshade_maps">لایه تپه سایه</string> <string name="download_hillshade_maps">لایه تپه سایه</string>
<string name="osmand_srtm_long_description_1000_chars">"این افزونه، منحنی‌های هم‌تراز را که در نقشه‌های آفلاین OsmAnd نمایش داده میشوند فراهم میکند. داده‌های جهانی (بین 70 درجه شمالی و 70 درجه جنوبی) در این زمینه براساس اندازه گیری‌های SRTM (مأموریت توپوگرافی رادار شاتل) و ASTER (رادیومتر انعکاسی و پرتویی حرارتی هوایی پیشرفته)، یک ابزار تصویربرداری پردازنده ترا و ماهواره فوق پیشرفته سیستم نظارتی زمین ناسا مییباشند. ASTER محصول تلاش مشترک میان ناسا، وزارت اقتصاد ژاپن، صنعت و تجارت (متی)، و سیستم های فضایی ژاپن (جی-اسپیس سیستم) است. "</string> <string name="osmand_srtm_long_description_1000_chars">"این افزونه، منحنی‌های هم‌تراز را که در نقشه‌&#157;های آفلاین OsmAnd نمایش داده میشوند فراهم میکند. داده‌های جهانی (بین 70 درجه شمالی و 70 درجه جنوبی) در این زمینه براساس اندازه گیری‌های SRTM (مأموریت توپوگرافی رادار شاتل) و ASTER (رادیومتر انعکاسی و پرتویی حرارتی هوایی پیشرفته)، یک ابزار تصویربرداری پردازنده ترا و ماهواره فوق پیشرفته سیستم نظارتی زمین ناسا مییباشند. ASTER محصول تلاش مشترک میان ناسا، وزارت اقتصاد ژاپن، صنعت و تجارت (متی)، و سیستم های فضایی ژاپن (جی-اسپیس سیستم) است. "</string>
<string name="srtm_plugin_description">تسهیل دانلود خطوط هم‌تراز و سایه تپه (\'تنظیمات\'-&gt;\'مدیریت نقشه ها\'-&gt;\'دانلود\'-&gt;\'انتخاب نوع نقشه\' مورد نظر).</string> <string name="srtm_plugin_description">تسهیل دانلود خطوط هم‌تراز و سایه تپه (\'تنظیمات\'-&gt;\'مدیریت نقشه ها\'-&gt;\'دانلود\'-&gt;\'انتخاب نوع نقشه\' مورد نظر).</string>
<string name="monitoring_control_start">جی پی ایکس</string> <string name="monitoring_control_start">جی پی ایکس</string>
<string name="rendering_attr_noPolygons_description">محو کردن همه عوارض زمین روی نقشه</string> <string name="rendering_attr_noPolygons_description">محو کردن همه عوارض زمین روی نقشه</string>

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

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="offline_edition">Modifications hors-ligne</string> <string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string> <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
@ -1851,7 +1850,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="shared_string_copy">Copier</string> <string name="shared_string_copy">Copier</string>
<string name="application_dir_change_warning3">Souhaitez-vous aussi qu\'OsmAnd copie ses fichiers de données vers la nouvelle destination ?</string> <string name="application_dir_change_warning3">Souhaitez-vous aussi qu\'OsmAnd copie ses fichiers de données vers la nouvelle destination ?</string>
<string name="rendering_attr_hideHouseNumbers_name">Masquer les numéros dans les rues</string> <string name="rendering_attr_hideHouseNumbers_name">Masquer les numéros dans les rues</string>
<string name="routing_attr_avoid_borders_name">Ne pas franchir les frontières</string>
<string name="routing_attr_avoid_borders_description">Éviter de franchir les frontières entre pays</string> <string name="routing_attr_avoid_borders_description">Éviter de franchir les frontières entre pays</string>
<string name="routing_attr_height_name">Limite de hauteur</string> <string name="routing_attr_height_name">Limite de hauteur</string>
<string name="routing_attr_height_description">Précisez la hauteur du véhicule qui doit être respectée sur les routes empruntées</string> <string name="routing_attr_height_description">Précisez la hauteur du véhicule qui doit être respectée sur les routes empruntées</string>

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

@ -1761,7 +1761,7 @@
<string name="proxy_host_descr">Configurar o nome de servidor do proxy (p.ex. 127.0.0.1)</string> <string name="proxy_host_descr">Configurar o nome de servidor do proxy (p.ex. 127.0.0.1)</string>
<string name="proxy_port_title">Porto do proxy</string> <string name="proxy_port_title">Porto do proxy</string>
<string name="proxy_port_descr">Configure o número de porto do proxy (p.ex. 8118)</string> <string name="proxy_port_descr">Configure o número de porto do proxy (p.ex. 8118)</string>
<string name="routing_attr_avoid_borders_name">Evitar cruzar fronteiras</string>
<string name="routing_attr_avoid_borders_description">Evitar cruzar unha fronteira con outro país</string> <string name="routing_attr_avoid_borders_description">Evitar cruzar unha fronteira con outro país</string>
<string name="routing_attr_height_name">Gálibo</string> <string name="routing_attr_height_name">Gálibo</string>
<string name="routing_attr_height_description">Indique a altura dos vehículos permitida nas rutas</string> <string name="routing_attr_height_description">Indique a altura dos vehículos permitida nas rutas</string>

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

@ -1495,7 +1495,7 @@
<string name="use_displayed_track_for_navigation">Želite li koristiti prikazan zapis za vašu navigaciju?</string> <string name="use_displayed_track_for_navigation">Želite li koristiti prikazan zapis za vašu navigaciju?</string>
<string name="route_preferences">Postavke rute</string> <string name="route_preferences">Postavke rute</string>
<string name="route_info">Informacije o ruti</string> <string name="route_info">Informacije o ruti</string>
<string name="routing_attr_avoid_borders_name">Izbjegavajt granične prijelaze</string>
<string name="routing_attr_avoid_borders_description">Izbjegavajte prelazak granice u drugu zemlju</string> <string name="routing_attr_avoid_borders_description">Izbjegavajte prelazak granice u drugu zemlju</string>
<string name="routing_attr_height_name">Ograničenje visine</string> <string name="routing_attr_height_name">Ograničenje visine</string>
<string name="routing_attr_height_description">Odredite visinu vozila da biste znali kojim putevima vam je dopušteno voziti</string> <string name="routing_attr_height_description">Odredite visinu vozila da biste znali kojim putevima vam je dopušteno voziti</string>

5
OsmAnd/res/values-hu/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="send_files_to_osm">GPX fájl küldése OSM-re?</string> <string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
<string name="gpx_visibility_txt">Láthatóság</string> <string name="gpx_visibility_txt">Láthatóság</string>
<string name="gpx_tags_txt">Címkék</string> <string name="gpx_tags_txt">Címkék</string>
@ -1770,7 +1769,7 @@
<string name="index_name_netherlands">Európa - Hollandia</string> <string name="index_name_netherlands">Európa - Hollandia</string>
<string name="application_dir_change_warning3">Szeretnéd, hogy az OsmAnd az adatfájljaidat is az új helyre másolja?</string> <string name="application_dir_change_warning3">Szeretnéd, hogy az OsmAnd az adatfájljaidat is az új helyre másolja?</string>
<string name="rendering_attr_hideHouseNumbers_name">Házszámok elrejtése</string> <string name="rendering_attr_hideHouseNumbers_name">Házszámok elrejtése</string>
<string name="routing_attr_avoid_borders_name">Határátlépések elkerülése</string>
<string name="routing_attr_avoid_borders_description">A határ átlépésének elkerülése egy másik országba</string> <string name="routing_attr_avoid_borders_description">A határ átlépésének elkerülése egy másik országba</string>
<string name="routing_attr_height_name">Magasságkorlát</string> <string name="routing_attr_height_name">Magasságkorlát</string>
<string name="routing_attr_height_description">Az utakon engedélyezett járműmagasság megadása</string> <string name="routing_attr_height_description">Az utakon engedélyezett járműmagasság megadása</string>

5
OsmAnd/res/values-it/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string> <string name="use_fluorescent_overlays">Sovrapposizioni fluorescenti</string>
<string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string> <string name="use_fluorescent_overlays_descr">Usa colori fluorescenti per visualizzare tracce e percorsi</string>
<string name="offline_edition">Modifiche offline</string> <string name="offline_edition">Modifiche offline</string>
@ -1812,7 +1811,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
<string name="rendering_value_highContrastRoads_name">Strade ad alto contrasto</string> <string name="rendering_value_highContrastRoads_name">Strade ad alto contrasto</string>
<string name="storage_directory_multiuser">Memorizzazione multiutente</string> <string name="storage_directory_multiuser">Memorizzazione multiutente</string>
<string name="rendering_attr_hideHouseNumbers_name">Nascondi i numeri civici</string> <string name="rendering_attr_hideHouseNumbers_name">Nascondi i numeri civici</string>
<string name="routing_attr_avoid_borders_name">Evita attraversamenti di frontiera</string>
<string name="routing_attr_avoid_borders_description">Evita l\'attraversamento di una frontiera verso un\'altra nazione</string> <string name="routing_attr_avoid_borders_description">Evita l\'attraversamento di una frontiera verso un\'altra nazione</string>
<string name="routing_attr_height_name">Limite di altezza</string> <string name="routing_attr_height_name">Limite di altezza</string>
<string name="routing_attr_height_description">Specifica l\'altezza del veicolo che deve essere permessa sui percorsi</string> <string name="routing_attr_height_description">Specifica l\'altezza del veicolo che deve essere permessa sui percorsi</string>

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

@ -1857,7 +1857,7 @@ POIの更新は利用できません</string>
<string name="rendering_value_disabled_name">無効</string> <string name="rendering_value_disabled_name">無効</string>
<string name="osmo_share_my_location">現在地の共有</string> <string name="osmo_share_my_location">現在地の共有</string>
<string name="shared_string_logoff">ログオフ</string> <string name="shared_string_logoff">ログオフ</string>
<string name="routing_attr_avoid_borders_name">国境越えを回避する</string>
<string name="routing_attr_avoid_borders_description">国境越えを避ける</string> <string name="routing_attr_avoid_borders_description">国境越えを避ける</string>
<string name="routing_attr_height_name">高さ制限</string> <string name="routing_attr_height_name">高さ制限</string>
<string name="routing_attr_height_description">ルート上で通行可能な車両の高さを指定します</string> <string name="routing_attr_height_description">ルート上で通行可能な車両の高さを指定します</string>

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

@ -2042,7 +2042,7 @@
<string name="rendering_value_walkingRoutesOSMC_name">OSMC에 따라 색상변경</string> <string name="rendering_value_walkingRoutesOSMC_name">OSMC에 따라 색상변경</string>
<string name="osmo_share_my_location">내 위치를 공유</string> <string name="osmo_share_my_location">내 위치를 공유</string>
<string name="shared_string_logoff">로그 오프</string> <string name="shared_string_logoff">로그 오프</string>
<string name="routing_attr_avoid_borders_name">국경 횡단 방지</string>
<string name="routing_attr_avoid_borders_description">타국의 국경 횡단 방지</string> <string name="routing_attr_avoid_borders_description">타국의 국경 횡단 방지</string>
<string name="routing_attr_height_name">높이 제한</string> <string name="routing_attr_height_name">높이 제한</string>
<string name="routing_attr_height_description">도로에 통행가능한 차량중량을 지정</string> <string name="routing_attr_height_description">도로에 통행가능한 차량중량을 지정</string>

5
OsmAnd/res/values-lt/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string> <string name="starting_point_too_far">Pradžios taškas yra per toli nuo artimiausio kelio.</string>
<string name="shared_location">Bendrinta vieta</string> <string name="shared_location">Bendrinta vieta</string>
<string name="osmand_parking_warning">Dėmesio</string> <string name="osmand_parking_warning">Dėmesio</string>
@ -1770,7 +1769,7 @@
<string name="osmand_parking_overdue">pradelsta</string> <string name="osmand_parking_overdue">pradelsta</string>
<string name="shared_string_currently_recording_track">Šiuo metu įrašomas maršrutas</string> <string name="shared_string_currently_recording_track">Šiuo metu įrašomas maršrutas</string>
<string name="plugin_touringview_descr">"Aktyvus šį rodinį pasikeis OsmAnd\'s žemėlapių stilius į \"Touring view\", kuris yra detalus duomenų rodinys turistas ir profesionaliems vairuotojams. "</string> <string name="plugin_touringview_descr">"Aktyvus šį rodinį pasikeis OsmAnd\'s žemėlapių stilius į \"Touring view\", kuris yra detalus duomenų rodinys turistas ir profesionaliems vairuotojams. "</string>
<string name="routing_attr_avoid_borders_name">Vengti kirsti sieną</string>
<string name="routing_attr_avoid_borders_description">Vengti kirsti sieną išvažiuojant užsienio šalin</string> <string name="routing_attr_avoid_borders_description">Vengti kirsti sieną išvažiuojant užsienio šalin</string>
<string name="routing_attr_height_name">Aukščio ribojimas</string> <string name="routing_attr_height_name">Aukščio ribojimas</string>
<string name="use_fast_recalculation">Išmanusis maršruto perskaičiavimas</string> <string name="use_fast_recalculation">Išmanusis maršruto perskaičiavimas</string>

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

@ -1932,7 +1932,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
<string name="routing_attr_height_description">Transportlīdzekļa maksimālais atļautais augstums maršrutos</string> <string name="routing_attr_height_description">Transportlīdzekļa maksimālais atļautais augstums maršrutos</string>
<string name="routing_attr_height_name">Augstuma limits</string> <string name="routing_attr_height_name">Augstuma limits</string>
<string name="routing_attr_avoid_borders_description">Neiebraukt citas valsts teritorijā</string> <string name="routing_attr_avoid_borders_description">Neiebraukt citas valsts teritorijā</string>
<string name="routing_attr_avoid_borders_name">Izvairīties no robežu šķēršošanas</string>
<string name="archive_wikipedia_data">Lejupielādēti veci nederīgi vikipēdijas dati. Vai arhivēt tos?</string> <string name="archive_wikipedia_data">Lejupielādēti veci nederīgi vikipēdijas dati. Vai arhivēt tos?</string>
<string name="download_wikipedia_files">Vai lejupielādēt papildus vikipēdijas datus (%1$s MB) ?</string> <string name="download_wikipedia_files">Vai lejupielādēt papildus vikipēdijas datus (%1$s MB) ?</string>
<string name="gps_network_not_enabled">GPS ir izslēgts. Vai ieslēgt to tagad?</string> <string name="gps_network_not_enabled">GPS ir izslēgts. Vai ieslēgt to tagad?</string>

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

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string> <string name="rendering_attr_roadColors_description">Velg fargeskjema for veier:</string>
<string name="rendering_attr_roadColors_name">Veifargeskjema</string> <string name="rendering_attr_roadColors_name">Veifargeskjema</string>
<string name="map_widget_show_destination_arrow">Vis retning til målet</string> <string name="map_widget_show_destination_arrow">Vis retning til målet</string>
@ -1296,7 +1295,7 @@
<string name="shared_string_video">Video</string> <string name="shared_string_video">Video</string>
<string name="rendering_attr_pisteRoutes_name">Skibakker</string> <string name="rendering_attr_pisteRoutes_name">Skibakker</string>
<string name="rendering_attr_pisteGrooming_name">Løypepreparering</string> <string name="rendering_attr_pisteGrooming_name">Løypepreparering</string>
<string name="routing_attr_avoid_borders_name">Unngå grensekryssing</string>
<string name="routing_attr_avoid_borders_description">Unngå å krysse grensen til et annet land</string> <string name="routing_attr_avoid_borders_description">Unngå å krysse grensen til et annet land</string>
<string name="shared_string_import2osmand">Importer til OsmAnd</string> <string name="shared_string_import2osmand">Importer til OsmAnd</string>
<string name="read_full_article">Les hele artikkelen (på nett)</string> <string name="read_full_article">Les hele artikkelen (på nett)</string>

5
OsmAnd/res/values-nl/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="layer_map_appearance">Configureer scherm</string> <string name="layer_map_appearance">Configureer scherm</string>
<string name="show_lanes">Toon rijstroken</string> <string name="show_lanes">Toon rijstroken</string>
@ -1975,7 +1974,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="rendering_value__name">Standaard</string> <string name="rendering_value__name">Standaard</string>
<string name="rendering_value_highContrastRoads_name">Wegen met hoog contrast</string> <string name="rendering_value_highContrastRoads_name">Wegen met hoog contrast</string>
<string name="index_name_netherlands">Europa - Nederland</string> <string name="index_name_netherlands">Europa - Nederland</string>
<string name="routing_attr_avoid_borders_name">Vermijd grensovergangen</string>
<string name="routing_attr_avoid_borders_description">Vermijd het oversteken van landsgrenzen</string> <string name="routing_attr_avoid_borders_description">Vermijd het oversteken van landsgrenzen</string>
<string name="routing_attr_height_name">Hoogtelimiet</string> <string name="routing_attr_height_name">Hoogtelimiet</string>
<string name="routing_attr_height_description">Geef de massa van het voertuig dat toegestaan moet zijn op de routes</string> <string name="routing_attr_height_description">Geef de massa van het voertuig dat toegestaan moet zijn op de routes</string>

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

@ -1941,7 +1941,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
<string name="search_poi_category_hint">Wprowadź tekst, aby wyszukać dane</string> <string name="search_poi_category_hint">Wprowadź tekst, aby wyszukać dane</string>
<string name="rendering_attr_hideHouseNumbers_name">Ukrywanie numerów budynków</string> <string name="rendering_attr_hideHouseNumbers_name">Ukrywanie numerów budynków</string>
<string name="storage_directory_multiuser">Pamięć użytkownika</string> <string name="storage_directory_multiuser">Pamięć użytkownika</string>
<string name="routing_attr_avoid_borders_name">Unikanie przekraczania granicy</string>
<string name="routing_attr_avoid_borders_description">Unika przekraczania granicy z innym państwem</string> <string name="routing_attr_avoid_borders_description">Unika przekraczania granicy z innym państwem</string>
<string name="routing_attr_height_name">Limit wysokości</string> <string name="routing_attr_height_name">Limit wysokości</string>
<string name="routing_attr_height_description">Określa maksymalną, dozwoloną wysokość pojazdu</string> <string name="routing_attr_height_description">Określa maksymalną, dozwoloną wysokość pojazdu</string>

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

@ -1672,7 +1672,7 @@
<string name="osmo_share_my_location">Compartilhar a minha posição</string> <string name="osmo_share_my_location">Compartilhar a minha posição</string>
<string name="shared_string_logoff">Desconectar</string> <string name="shared_string_logoff">Desconectar</string>
<string name="routing_attr_avoid_borders_name">Evitar atravessar fronteiras</string>
<string name="routing_attr_avoid_borders_description">Evitar atravessar fronteiras com outro país</string> <string name="routing_attr_avoid_borders_description">Evitar atravessar fronteiras com outro país</string>
<string name="routing_attr_height_name">Limite de altura</string> <string name="routing_attr_height_name">Limite de altura</string>
<string name="routing_attr_height_description">Especificar a altura do veículo para ser permitida nas rotas</string> <string name="routing_attr_height_description">Especificar a altura do veículo para ser permitida nas rotas</string>

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

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="rendering_attr_hideProposed_name">Скрыть планируемые объекты</string> <string name="rendering_attr_hideProposed_name">Скрыть планируемые объекты</string>
<string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string> <string name="osmo_use_https_descr">Использовать безопасное подключение к серверу</string>
@ -1602,7 +1601,7 @@
<string name="application_dir_change_warning3">Переместить также файлы данных OsmAnd в новое место назначения?</string> <string name="application_dir_change_warning3">Переместить также файлы данных OsmAnd в новое место назначения?</string>
<string name="search_poi_category_hint">Напечатайте для поиска</string> <string name="search_poi_category_hint">Напечатайте для поиска</string>
<string name="rendering_attr_hideHouseNumbers_name">Скрыть номера домов</string> <string name="rendering_attr_hideHouseNumbers_name">Скрыть номера домов</string>
<string name="routing_attr_avoid_borders_name">Избегать пересечение границы</string>
<string name="routing_attr_avoid_borders_description">Избегать пересечение границы с другой страной</string> <string name="routing_attr_avoid_borders_description">Избегать пересечение границы с другой страной</string>
<string name="routing_attr_height_name">Ограничение высоты</string> <string name="routing_attr_height_name">Ограничение высоты</string>
<string name="routing_attr_height_description">Укажите высоту автомобиля для учёта при построении маршрута</string> <string name="routing_attr_height_description">Укажите высоту автомобиля для учёта при построении маршрута</string>

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

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string> <string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
<string name="voice_pref_title">Boghe</string> <string name="voice_pref_title">Boghe</string>
<string name="misc_pref_title">Mistura</string> <string name="misc_pref_title">Mistura</string>
@ -1759,7 +1758,7 @@
<string name="routing_attr_avoid_borders_description">Non rugrare sas fronteras intre sos istados</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">Recàlculu intelligente de s’àndala</string>
<string name="use_fast_recalculation_desc">Torra a calculare petzi su cantu initziale de s’àndala pro biàgios longos</string> <string name="use_fast_recalculation_desc">Torra a calculare petzi su cantu initziale de s’àndala pro biàgios longos</string>
<string name="routing_attr_avoid_borders_name">Non rugres sas fronteras</string>
<string name="rendering_value_disabled_name">Disabilitadu</string> <string name="rendering_value_disabled_name">Disabilitadu</string>
<string name="osmo_share_my_location">Cumpartzi sa positzione mea</string> <string name="osmo_share_my_location">Cumpartzi sa positzione mea</string>
<string name="shared_string_logoff">Essi</string> <string name="shared_string_logoff">Essi</string>

5
OsmAnd/res/values-sk/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="recording_context_menu_show">Zobraziť</string> <string name="recording_context_menu_show">Zobraziť</string>
<string name="recording_photo_description">Fotografia %1$s %2$s</string> <string name="recording_photo_description">Fotografia %1$s %2$s</string>
@ -1741,7 +1740,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="shared_string_copy">Kopírovať</string> <string name="shared_string_copy">Kopírovať</string>
<string name="application_dir_change_warning3">Chcete aby OsmAnd skopíroval svoje údaje do nového cieľa?</string> <string name="application_dir_change_warning3">Chcete aby OsmAnd skopíroval svoje údaje do nového cieľa?</string>
<string name="rendering_attr_hideHouseNumbers_name">Skryť čísla domov</string> <string name="rendering_attr_hideHouseNumbers_name">Skryť čísla domov</string>
<string name="routing_attr_avoid_borders_name">Vyhnúť sa prekročeniu hraníc</string>
<string name="routing_attr_avoid_borders_description">Vyhnúť sa prekročeniu hranice do inej krajiny</string> <string name="routing_attr_avoid_borders_description">Vyhnúť sa prekročeniu hranice do inej krajiny</string>
<string name="routing_attr_height_name">Výškový limit</string> <string name="routing_attr_height_name">Výškový limit</string>
<string name="routing_attr_height_description">Zadajte výšku vozidla aká musí byť povolená na cestách</string> <string name="routing_attr_height_description">Zadajte výšku vozidla aká musí byť povolená na cestách</string>

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

@ -1756,7 +1756,7 @@
\n\nPodrobni izris je mogoče prekiniti z onemogočanjem možnosti ali pa s spreminjanjem vrste prikaza zemljevida. "</string> \n\nPodrobni izris je mogoče prekiniti z onemogočanjem možnosti ali pa s spreminjanjem vrste prikaza zemljevida. "</string>
<string name="plugin_ski_descr">"Vstavek omogoča prikaz prog za nordijsko in alpsko smučanje, splošnih smučišč, žičnic in vlečnic in druge smučarske podrobnosti. Težavnost smučišč je označena barvnimi kodami, podrobni izris zemljevida pa je primeren za zimski pogled pokrajine.\n\nZ izborom tega pogleda se slog prikaza spremeni v \'Zimski pogled\' in kaže vse podrobnosti v zimskem pogledu. Izris je mogoče prekiniti z onemogočanjem možnosti ali pa s spreminjanjem vrste prikaza zemljevida. "</string> <string name="plugin_ski_descr">"Vstavek omogoča prikaz prog za nordijsko in alpsko smučanje, splošnih smučišč, žičnic in vlečnic in druge smučarske podrobnosti. Težavnost smučišč je označena barvnimi kodami, podrobni izris zemljevida pa je primeren za zimski pogled pokrajine.\n\nZ izborom tega pogleda se slog prikaza spremeni v \'Zimski pogled\' in kaže vse podrobnosti v zimskem pogledu. Izris je mogoče prekiniti z onemogočanjem možnosti ali pa s spreminjanjem vrste prikaza zemljevida. "</string>
<string name="plugin_nautical_descr">"Vstavek obogati vsebino zemljevidov OsmAnd in kakovost navigacije s podrobnimi pomorskimi zemljevidi za plovila, jadralce in druge vrste vodnih športov.\n\nS tem posebnim prekrivnim zemljevidom je mogoč izris posebnih navigacijskih oznak, ki so sicer značilne za navtične zemljevide. Opisi posamezne oznake pripomorejo k določanju (kategorije, oblike, barve, zaporedja, sklica ...).\n\nVrnitev na običajni pogled je mogoče na dva načina. Ali odklopite prekrivni sloj ali pa spremenite slog zemljevida med \'Nastavitvami zemljevida\' v meniju. "</string> <string name="plugin_nautical_descr">"Vstavek obogati vsebino zemljevidov OsmAnd in kakovost navigacije s podrobnimi pomorskimi zemljevidi za plovila, jadralce in druge vrste vodnih športov.\n\nS tem posebnim prekrivnim zemljevidom je mogoč izris posebnih navigacijskih oznak, ki so sicer značilne za navtične zemljevide. Opisi posamezne oznake pripomorejo k določanju (kategorije, oblike, barve, zaporedja, sklica ...).\n\nVrnitev na običajni pogled je mogoče na dva načina. Ali odklopite prekrivni sloj ali pa spremenite slog zemljevida med \'Nastavitvami zemljevida\' v meniju. "</string>
<string name="routing_attr_avoid_borders_name">Izogni se mejnim prehodom</string>
<string name="routing_attr_avoid_borders_description">Izogibanje prehodom meje z drugimi državami</string> <string name="routing_attr_avoid_borders_description">Izogibanje prehodom meje z drugimi državami</string>
<string name="routing_attr_height_name">Omejitev višine</string> <string name="routing_attr_height_name">Omejitev višine</string>
<string name="routing_attr_height_description">Določitev omejitve višine vozila za določeno pot</string> <string name="routing_attr_height_description">Določitev omejitve višine vozila za določeno pot</string>

5
OsmAnd/res/values-sv/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string> <string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
<string name="ChooseCountry">Välj land</string> <string name="ChooseCountry">Välj land</string>
<string name="choose_city">Välj stad</string> <string name="choose_city">Välj stad</string>
@ -1752,7 +1751,7 @@
<string name="routing_attr_height_name">Höjdgräns</string> <string name="routing_attr_height_name">Höjdgräns</string>
<string name="use_fast_recalculation">Smart omräkning av rutt</string> <string name="use_fast_recalculation">Smart omräkning av rutt</string>
<string name="use_fast_recalculation_desc">Räkna om endast början av rutten för långa resor</string> <string name="use_fast_recalculation_desc">Räkna om endast början av rutten för långa resor</string>
<string name="routing_attr_avoid_borders_name">Undvik gränsövergångar</string>
<string name="routing_attr_height_description">Ange tillåten fordonshöjd på rutter</string> <string name="routing_attr_height_description">Ange tillåten fordonshöjd på rutter</string>
<string name="osmo_share_my_location">Dela ut min position</string> <string name="osmo_share_my_location">Dela ut min position</string>
<string name="shared_string_logoff">Logga ut</string> <string name="shared_string_logoff">Logga ut</string>

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

@ -1948,7 +1948,7 @@ OsmAnd має відкриті сирці і активно розвиваєть
<string name="rendering_value__name">За замовчуванням</string> <string name="rendering_value__name">За замовчуванням</string>
<string name="rendering_value_highContrastRoads_name">Контрастні дороги</string> <string name="rendering_value_highContrastRoads_name">Контрастні дороги</string>
<string name="index_name_netherlands">Європа - Нідерланди</string> <string name="index_name_netherlands">Європа - Нідерланди</string>
<string name="routing_attr_avoid_borders_name">Уникати перетину кордону</string>
<string name="routing_attr_avoid_borders_description">Уникати перетину кордону з іншою країною</string> <string name="routing_attr_avoid_borders_description">Уникати перетину кордону з іншою країною</string>
<string name="routing_attr_height_name">Обмеження висоти</string> <string name="routing_attr_height_name">Обмеження висоти</string>
<string name="routing_attr_height_description">Вкажіть висоту автівки, щоб враховувати її під час прокладання маршрутів</string> <string name="routing_attr_height_description">Вкажіть висоту автівки, щоб враховувати її під час прокладання маршрутів</string>

5
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1,5 +1,4 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
<resources>
<string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string> <string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
<string name="rendering_attr_roadColors_name">道路的色彩調配</string> <string name="rendering_attr_roadColors_name">道路的色彩調配</string>
<string name="map_widget_show_destination_arrow">顯示目的地方向</string> <string name="map_widget_show_destination_arrow">顯示目的地方向</string>
@ -1740,7 +1739,7 @@
<string name="storage_directory">地圖存儲</string> <string name="storage_directory">地圖存儲</string>
<string name="shared_string_copy">複製</string> <string name="shared_string_copy">複製</string>
<string name="rendering_attr_hideHouseNumbers_name">隱藏門牌號碼</string> <string name="rendering_attr_hideHouseNumbers_name">隱藏門牌號碼</string>
<string name="routing_attr_avoid_borders_name">避開越過邊境</string>
<string name="routing_attr_avoid_borders_description">防止越過邊界進入別國</string> <string name="routing_attr_avoid_borders_description">防止越過邊界進入別國</string>
<string name="routing_attr_height_name">高度限制</string> <string name="routing_attr_height_name">高度限制</string>
<string name="routing_attr_height_description">指定許可在路線行駛的車輛高度</string> <string name="routing_attr_height_description">指定許可在路線行駛的車輛高度</string>

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

@ -728,7 +728,6 @@
<string name="routing_attr_avoid_ferries_description">Avoid ferries</string> <string name="routing_attr_avoid_ferries_description">Avoid ferries</string>
<string name="routing_attr_avoid_motorway_name">Avoid motorways</string> <string name="routing_attr_avoid_motorway_name">Avoid motorways</string>
<string name="routing_attr_avoid_motorway_description">Avoid motorways</string> <string name="routing_attr_avoid_motorway_description">Avoid motorways</string>
<string name="routing_attr_avoid_borders_name">Avoid border crossing</string>
<string name="routing_attr_avoid_borders_description">Avoid crossing a border into another country</string> <string name="routing_attr_avoid_borders_description">Avoid crossing a border into another country</string>
<string name="routing_attr_weight_name">Weight limit</string> <string name="routing_attr_weight_name">Weight limit</string>
<string name="routing_attr_weight_description">Specify vehicle weight to be permitted on routes</string> <string name="routing_attr_weight_description">Specify vehicle weight to be permitted on routes</string>

2
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -344,7 +344,7 @@ public class ContextMenuAdapter {
}); });
} }
if (convertView == null || (convertView.getTag() != lid)) { if (convertView == null || (convertView.getTag() != lid)) {
convertView = activity.getLayoutInflater().inflate(lid, null); convertView = activity.getLayoutInflater().inflate(lid, parent, false);
convertView.setTag(lid); convertView.setTag(lid);
} }
TextView tv = (TextView) convertView.findViewById(R.id.title); TextView tv = (TextView) convertView.findViewById(R.id.title);

12
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -9,6 +9,7 @@ import android.view.View;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Toast; import android.widget.Toast;
import net.osmand.PlatformUtil;
import net.osmand.access.AccessibleToast; import net.osmand.access.AccessibleToast;
import net.osmand.core.android.MapRendererContext; import net.osmand.core.android.MapRendererContext;
import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter;
@ -36,6 +37,8 @@ import net.osmand.render.RenderingRuleStorageProperties;
import net.osmand.render.RenderingRulesStorage; import net.osmand.render.RenderingRulesStorage;
import net.osmand.util.Algorithms; import net.osmand.util.Algorithms;
import org.apache.commons.logging.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -45,6 +48,7 @@ import java.util.List;
import gnu.trove.list.array.TIntArrayList; import gnu.trove.list.array.TIntArrayList;
public class ConfigureMapMenu { public class ConfigureMapMenu {
private static final Log LOG = PlatformUtil.getLog(ConfigureMapMenu.class);
public interface OnClickListener{ public interface OnClickListener{
public void onClick(boolean result); public void onClick(boolean result);
@ -126,10 +130,12 @@ public class ConfigureMapMenu {
ma.getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow(); ma.getMyApplication().getSelectedGpxHelper().clearAllGpxFileToShow();
} else { } else {
AlertDialog dialog = ma.getMapLayers().showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView()); AlertDialog dialog = ma.getMapLayers().showGPXFileLayer(getAlreadySelectedGpx(), ma.getMapView());
dialog.setOnCancelListener(new DialogInterface.OnCancelListener() { dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override @Override
public void onCancel(DialogInterface dialogInterface) { public void onDismiss(DialogInterface dialog) {
cm.setSelection(pos, 0); boolean areAnyGpxTracksVisible =
ma.getMyApplication().getSelectedGpxHelper().isShowingAnyGpxFiles();
cm.setSelection(pos, areAnyGpxTracksVisible ? 1 : 0);
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
} }
}); });