Merge branch 'master' of ssh://github.com/osmandapp/Osmand

This commit is contained in:
Victor Shcherb 2015-01-08 00:20:03 +01:00
commit bb4df44930
17 changed files with 74 additions and 42 deletions

View file

@ -1989,4 +1989,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
<string name="traffic_warning_railways">Чыгуначны пераезд</string>
<string name="show_railway_warnings">Паказваць чыгуначныя пераезды</string>
<string name="speak_pedestrian">Папярэджваць пра пешаходныя пераходы</string>
</resources>
<string name="rendering_value__name">Па змоўчаньні</string>
</resources>

View file

@ -1166,7 +1166,7 @@
<string name="distance_measurement_save_gpx">Desa com a GPX</string>
<string name="distance_measurement_load_gpx">Obre un fitxer GPX existent</string>
<string name="wait_current_task_finished">Espereu fins que finalitzi la tasca actual</string>
<string name="use_kalman_filter_compass_descr">Utilitzeu el filtre Kalman per evitar interferències a la brúixola</string>
<string name="use_kalman_filter_compass_descr">Allisat de la brúixola per estabilitzar lectures afegint inèrcia</string>
<string name="use_kalman_filter_compass">Usa el filtre Kalman</string>
<string name="access_mark_final_location_first">Mode d\'accessibilitat: seleccioneu primer la destinació</string>
<string name="use_magnetic_sensor_descr">Podeu usar el sensor magnètic per determinar el valor la brúixola en comptes del sensor d\'orientació</string>
@ -1860,4 +1860,5 @@
<string name="routing_attr_no_new_routing_name">Sense preferències de navegació v1.9</string>
<string name="routing_attr_no_new_routing_description">No feu ús de les preferències de navegació introduïdes a la v1.9</string>
<string name="speak_pedestrian">Anuncia els passos de zebra</string>
</resources>
<string name="rendering_value__name">Renderització per defecte</string>
</resources>

View file

@ -1876,4 +1876,5 @@
<string name="show_railway_warnings">Jernbaneoverskæringer</string>
<string name="show_pedestrian_warnings">Fodgængerovergange</string>
<string name="speak_pedestrian">Fodgængerovergange</string>
</resources>
<string name="rendering_value__name">Standard</string>
</resources>

View file

@ -502,8 +502,7 @@
<string name="route_head">Cabecera</string>
<string name="first_time_continue">Después</string>
<string name="first_time_download">Descargar regiones</string>
<string name="first_time_msg">Gracias por elegir OsmAnd.
Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Después, podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
<string name="first_time_msg">Gracias por elegir OsmAnd. Para poder usar muchas características de la aplicación necesitas algunos datos regionales, que puedes descargar vía \'Opciones\' → \'Gestionar mapas\'. Entonces podrás ver mapas, localizar direcciones, buscar PDIs y encontrar transporte público.</string>
<string name="search_poi_location">Buscando señal…</string>
<string name="search_near_map">Buscar cerca del centro del mapa</string>
<string name="search_nearby">Buscar cercanos</string>
@ -1860,7 +1859,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
<string name="error_avoid_specific_road">No se ha encontrado circunvalación</string>
<string name="everything_up_to_date">Todos los archivos actualizados</string>
<string name="dismiss">Descartar</string>
<string name="no_internet_connection">Imposible descargar, compruebe su conexión a Internet.</string>
<string name="no_internet_connection">Imposible descargar; por favor, comprueba tu conexión a Internet.</string>
<string name="download_tab_downloads">Todas las descargas</string>
<string name="download_tab_updates">Actualizaciones</string>
<string name="download_tab_local">Local</string>
@ -1886,4 +1885,5 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
<string name="navigate_point_easting">Al este</string>
<string name="navigate_point_northing">Al norte</string>
<string name="speak_pedestrian">Anunciar pasos de peatones</string>
</resources>
<string name="rendering_value__name">Por defecto</string>
</resources>

View file

@ -148,7 +148,7 @@
<string name="search_position_undefined">Non défini</string>
<string name="search_position_fixed"/>
<string name="search_position_current_location">Position actuelle…</string>
<string name="search_position_map_view">Dernière vue</string>
<string name="search_position_map_view">Centre de la carte</string>
<string name="select_search_position">Origine :</string>
<string name="context_menu_item_search">Rechercher autour de ce point</string>
<string name="tip_recent_changes_0_6_7_t">Changement pour 0.6.7 :
@ -515,7 +515,7 @@
<string name="first_time_download">Téléchargement des régions</string>
<string name="first_time_msg">Merci d\'avoir choisi OsmAnd. La plupart des fonctionnalités de l\'application nécessitent des données régionales, utilisables hors-ligne, que vous pouvez au préalable télécharger (\'Paramètres\' → \'Données hors-ligne\') ou préparer vous-même. Ces données permettront de visualiser les cartes et de rechercher une adresse, un point d\'intérêt (PI) ou un transport public.</string>
<string name="search_poi_location">Recherche d\'un signal…</string>
<string name="search_near_map">Rechercher près de la dernière position</string>
<string name="search_near_map">Rechercher autour du centre de la carte</string>
<string name="search_nearby">Rechercher à proximité</string>
<string name="map_orientation_default">Automatique</string>
<string name="map_orientation_portrait">Portrait</string>
@ -1303,7 +1303,7 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="use_magnetic_sensor_descr">Utiliser le magnétomètre pour déterminer l\'orientation de la boussole au lieu du capteur d\'orientation</string>
<string name="use_magnetic_sensor">Utiliser le magnétomètre (boussole)</string>
<string name="local_indexes_cat_srtm">Courbes de niveau</string>
<string name="use_kalman_filter_compass_descr">Utiliser un filtre de Kalman pour éviter les interférences de la boussole</string>
<string name="use_kalman_filter_compass_descr">Réduit le bruit sur les mesures de la boussole, mais ajoute de l\'inertie</string>
<string name="use_kalman_filter_compass">Utiliser un filtre de Kalman</string>
<string name="access_mark_final_location_first">Mode d\'accessibilité : veuillez d\'abord définir une destination</string>
<string name="distance_measurement_start_editing">Mesurer sur la carte</string>
@ -1894,4 +1894,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="routing_attr_no_new_routing_description">Ne pas utiliser les nouvelles règles de routage de la version 1.9</string>
<string name="routing_attr_no_new_routing_name">Ne pas utiliser la version 1.9 des calculs de route</string>
<string name="speak_pedestrian">Annoncer les passages piéton</string>
</resources>
<string name="rendering_value__name">Par défaut</string>
</resources>

View file

@ -340,7 +340,7 @@
<string name="search_position_undefined">Nenurodyta</string>
<string name="search_position_fixed"/>
<string name="search_position_current_location">Esama vieta…</string>
<string name="search_position_map_view">Paskutinė žiūrėta žemėlapio vieta</string>
<string name="search_position_map_view">Esamo žemėlapio centras</string>
<string name="select_search_position">Pradžia:</string>
<string name="context_menu_item_search">Ieškoti netoliese nuo čia</string>
<string name="tip_recent_changes_0_6_7_t">Pakeitimai 0.6.7 versijoje :
@ -707,7 +707,7 @@
<string name="first_time_continue">Vėliau</string>
<string name="first_time_download">Parsisiųsti regionus</string>
<string name="search_poi_location">Ieškoma signalo…</string>
<string name="search_near_map">Ieškoti šalia paskutinės vietos žemėlapyje</string>
<string name="search_near_map">Ieškoti šalia dabartinio centro žemėlapyje</string>
<string name="search_nearby">Ieškoti šalia</string>
<string name="map_orientation_default">Kaip ir įrenginys</string>
<string name="map_orientation_portrait">Stačias</string>
@ -1286,7 +1286,7 @@
<string name="download_using_mobile_internet">Šiuo metu Wi-Fi neprijungta. Ar norite tęsti siuntimąsį dabartiniu interneto ryšiu?</string>
<string name="use_magnetic_sensor_descr">Maudoti magnetinį sensorių naudoti vietoje pokrypio sensoriaus kompaso reikšmei nustatyti</string>
<string name="use_magnetic_sensor">Naudoti magnetinį sensorių (kompasą)</string>
<string name="use_kalman_filter_compass_descr">Naudoti Kalmano fltrą kompaso parodymų išlyginimui</string>
<string name="use_kalman_filter_compass_descr">Sumažina kompaso triukšmą, tačiau prideda inertiškumo</string>
<string name="use_kalman_filter_compass">Naudoti Kalmano filtrą</string>
<string name="access_mark_final_location_first">Prieigos režimas: pirmiausia pasirinkite kelionės tikslą</string>
<string name="local_indexes_cat_srtm">Kontūrinių linijų duomenys</string>
@ -1882,4 +1882,5 @@
<string name="show_pedestrian_warnings">Rodyti pėsčiųjų perėjas</string>
<string name="speak_pedestrian">Pranešti apie perėjas</string>
<string name="traffic_warning_pedestrian">Pėčiųjų perėja</string>
<string name="rendering_value__name">Numatytasis</string>
</resources>

View file

@ -235,8 +235,8 @@
<string name="show_gpx_route">Toon op kaart</string>
<string name="poi_filter_nominatim">Online (Nominatim)</string>
<string name="search_position_current_location">Huidige positie…</string>
<string name="search_position_map_view">Laatste kaartweergave</string>
<string name="select_search_position">Zoek in de buurt van:</string>
<string name="search_position_map_view">Midden van kaart</string>
<string name="select_search_position">Startpunt:</string>
<string name="context_menu_item_search">Zoek hier dichtbij</string>
<string name="tip_recent_changes_0_6_7_t">Recent wijzigingen for 0.6.7:
\n\t- Offline gegevensmanager (download, verwijder, activeer / deactiveer offline gegevens direct vanuit OsmAnd)
@ -451,7 +451,7 @@
<string name="m">m</string>
<string name="old_map_index_is_not_supported">Verouderd kaartformaat \'\'{0}\'\' wordt niet ondersteund</string>
<string name="poi_filter_car_aid">Auto hulp</string>
<string name="poi_filter_closest_poi">Interessepunten dichtbij</string>
<string name="poi_filter_closest_poi">POI in de omgeving</string>
<string name="poi_filter_custom_filter">Eigen filter</string>
<string name="poi_filter_food_shop">Eten en drinken (winkel)</string>
<string name="poi_filter_for_tourists">Voor toeristen</string>
@ -514,7 +514,7 @@
<string name="download_files">Download</string>
<string name="context_menu_item_search_transport">Zoek openbaar vervoer</string>
<string name="transport_searching_transport">Openbaar vervoer-resultaten (geen bestemming):</string>
<string name="transport_searching_route">Vervoer resultaten ({0} naar bestemming):</string>
<string name="transport_searching_route">Openbaar vervoer-resultaten ({0} naar bestemming):</string>
<string name="transport_search_none">geen</string>
<string name="transport_search_again">Opnieuw OV zoeken</string>
<string name="map_index">Kaart</string>
@ -602,9 +602,9 @@
<string name="route_head">Koers</string>
<string name="first_time_continue">Ga door</string>
<string name="first_time_download">Download regio\'s</string>
<string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken.</string>
<string name="first_time_msg">Om OsmAnd goed te gebruiken moet je kaartgegevens downloaden (\'Instellingen\' → \'Kaartbeheer\') of deze zelf aanmaken. Daarna kan je de kaart bekijken en adressen, interessepunten en openbaar vervoer opzoeken.</string>
<string name="search_poi_location">Naar signaal zoeken…</string>
<string name="search_near_map">Zoek dichtbij de laatste kaartlocatie</string>
<string name="search_near_map">Zoek bij het midden van de kaart</string>
<string name="search_nearby">Zoek dichtbij</string>
<string name="map_orientation_default">Zelfde als apparaat-instelling</string>
<string name="map_orientation_portrait">Portret</string>
@ -616,14 +616,14 @@
<string name="transport_Routes">Routes</string>
<string name="transport_Stop">Halte</string>
<string name="transport_stops">Haltes</string>
<string name="transport_search_after">Voorbij de route</string>
<string name="transport_search_before">Voorafgaand aan route</string>
<string name="transport_search_after">Aansluitende route</string>
<string name="transport_search_before">Voorafgaande route</string>
<string name="transport_finish_search">Zoeken</string>
<string name="transport_stop_to_go_out">Kies uitstaphalte</string>
<string name="transport_to_go_after">Nog te volgen afstand</string>
<string name="transport_to_go_before">Voorafgaande afstand</string>
<string name="transport_stops_to_pass">Aantal haltes te gaan</string>
<string name="transport_route_distance">Lengte route</string>
<string name="transport_route_distance">Lengte van route</string>
<string name="transport">Openbaar vervoer</string>
<string name="default_buttons_ok">OK</string>
<string name="show_transport_over_map_description">Toon haltes openbaar vervoer op kaart</string>
@ -1444,7 +1444,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="clear_destination">Wis bestemming</string>
<string name="use_magnetic_sensor_descr">Gebruik magnetische sensor in plaats van oriëntatiesensor voor het kompas</string>
<string name="use_magnetic_sensor">Gebruik magnetische sensor</string>
<string name="use_kalman_filter_compass_descr">Gebruik Kalman-filter om kompasafwijkingen te vermijden</string>
<string name="use_kalman_filter_compass_descr">Verminder storingen in het kompas (maakt de kompasweergave langzamer)</string>
<string name="use_kalman_filter_compass">Gebruik Kalman-filter</string>
<string name="access_mark_final_location_first">Toegankelijkheidsmodus: kies eerst een bestemming</string>
<string name="local_indexes_cat_srtm">Gegevens voor hoogtelijnen</string>
@ -1612,9 +1612,9 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="app_mode_truck">Vrachtauto</string>
<string name="android_19_location_disabled">Vanaf Android 4.4 (KitKat) kunnen kaarten niet meer worden opgeslagen in de bestaande map(%s). Wil je een nieuwe map maken op de toegestane locatie en de OsmAnd-bestanden daar naartoe kopiëren?\n Let op: oude bestanden blijven bestaan. U kunt ze zelf verwijderen.\n Let op: het is niet meer mogelijk bestanden te delen tussen OsmAnd en Osmand+.</string>
<string name="application_dir_change_warning2">Wil je dat OsmAnd de bestanden naar de nieuwe map verplaatst? Als je \'Nee\' kiest, gebruikt Osmand een nieuwe, lege map.</string>
<string name="copying_osmand_one_file_descr">Bestand (%s) wordt gekopieerd naar de nieuwe locatie...</string>
<string name="copying_osmand_files_descr">OsmAnd-bestanden worden naar de nieuwe locatie gekopieerd (%s)</string>
<string name="copying_osmand_files">Kopieer OsmAnd-bestanden</string>
<string name="copying_osmand_one_file_descr">Kopieer bestand (%s) naar de nieuwe locatie…</string>
<string name="copying_osmand_files_descr">OsmAnd-bestanden worden naar de nieuwe locatie gekopieerd (%s)</string>
<string name="copying_osmand_files">Kopieer OsmAnd-bestanden</string>
<string name="calculate_osmand_route_gpx">Bereken de route offline met OsmAnd</string>
<string name="routing_attr_prefer_motorway_name">Bij voorkeur autowegen</string>
<string name="routing_attr_prefer_motorway_description">Gebruik bij voorkeur autowegen</string>
@ -1630,7 +1630,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="routing_attr_avoid_motorway_description">Vermijd autowegen</string>
<string name="routing_attr_weight_description">Geef het gewicht van het voertuig voor de routeplanning</string>
<string name="routing_attr_weight_name">Gewicht voertuig</string>
<string name="select_gpx">GPX-bestand kiezen </string>
<string name="select_gpx">GPX-bestand kiezen…</string>
<string name="route_descr_select_destination">Bestemming kiezen</string>
<string name="route_descr_select_on_map">Kies op de kaart…</string>
<string name="route_descr_favorite">Favoriet…</string>
@ -1840,7 +1840,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="gpx_selection_track">%1$s \nTrack %2$s</string>
<string name="gpx_available_current_track">Huidige geregistreerde track</string>
<string name="save_as_favorites_points">Bewaar als groep van favorieten</string>
<string name="loading_smth">Laad %1$s </string>
<string name="loading_smth">Laad %1$s…</string>
<string name="map_widget_plain_time">Huidige tijd</string>
<string name="select_destination_and_intermediate_points">Routepunten kiezen</string>
<string name="layer_amenity_label">Namen van interessepunten</string>
@ -2037,7 +2037,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
<string name="rendering_value_germanRoadAtlas_name">Duitse wegenkaart</string>
<string name="rendering_value_americanRoadAtlas_name">Amerikaanse wegenkaart</string>
<string name="routing_attr_no_new_routing_name">Gebruik routeberekening v1.9 niet</string>
<string name="routing_attr_no_new_routing_description">Gebruik routeberekening v1.9 niet</string>
<string name="routing_attr_no_new_routing_description">Gebruik de routeregels van vóór versie 1.9</string>
<string name="traffic_warning_railways">Spoorweg overgang</string>
<string name="traffic_warning_pedestrian">Voetgangers oversteekplaats</string>
<string name="show_railway_warnings">Toon spoorwegovergangen</string>

View file

@ -1849,4 +1849,5 @@
<string name="traffic_warning_railways">Железнодорожный переезд</string>
<string name="traffic_warning_pedestrian">Пешеходный переход</string>
<string name="speak_pedestrian">Сообщать о пешеходных переходах</string>
</resources>
<string name="rendering_value__name">По умолчанию</string>
</resources>

View file

@ -2001,7 +2001,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="everything_up_to_date">Všetky súbory sú aktuálne</string>
<string name="use_opengl_render">Použiť vykresľovanie OpenGL</string>
<string name="use_opengl_render_descr">Použiť hardvérovo urýchľované vykresľovanie pomocou OpenGL (nemusí na niektorých zariadeniach fungovať)</string>
<string name="no_internet_connection">Sťahovanie nie je možné, prosím pripojte sa na WiFi, aby bolo možné pokračovať.</string>
<string name="no_internet_connection">Sťahovanie nie je možné, prosím skontrolujte pripojenie na Internet.</string>
<string name="navigate_point_zone">Zóna</string>
<string name="download_tab_downloads">Všetky sťahovania</string>
<string name="download_tab_updates">Aktualizácie</string>
@ -2027,4 +2027,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
<string name="routing_attr_no_new_routing_name">Bez smerovacích pravidiel verzie 1.9</string>
<string name="routing_attr_no_new_routing_description">Nepoužívať pravidlá výpočtu trasy zavedené vo verzii 1.9</string>
<string name="speak_pedestrian">Oznamovať priechody pre chodcov</string>
</resources>
<string name="rendering_value__name">Predvolené</string>
</resources>

View file

@ -0,0 +1,4 @@
<?xml version='1.0' encoding='utf-8'?>
<resources><string name="poi_bakery">Pekarna</string>
<string name="poi_mall">Veleblagovnica</string>
</resources>

View file

@ -944,7 +944,7 @@
<string name="first_time_continue">Kasneje</string>
<string name="first_time_download">Prenos območij</string>
<string name="search_poi_location">Iskanje znaka …</string>
<string name="search_near_map">Iskanje v bližini zadnje lokacije</string>
<string name="search_near_map">Iskanje v bližini zadnje lokacije na zemljevidu</string>
<string name="tip_map_switch_t_v2">"Vir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' → \'Nastavitve zemljevida\'.
\n\nPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\' v \'Nastavitve\' → \'Upravljalnik vtičnikov\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku.
\n\nOsmAnd podpira tudi vire po meri. "</string>
@ -1967,4 +1967,5 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A
<string name="navigate_point_zone">Območje</string>
<string name="navigate_point_northing">y koordinata</string>
<string name="navigate_point_easting">x koordinata</string>
</resources>
<string name="rendering_value__name">Privzeto</string>
</resources>

View file

@ -1768,4 +1768,5 @@
<string name="route_descr_destination">Destination</string>
<string name="voices">Röstprompter</string>
<string name="speak_pedestrian">Meddela om övergångsställen</string>
</resources>
<string name="rendering_value__name">Standard</string>
</resources>

View file

@ -1842,7 +1842,7 @@
<string name="use_opengl_render">使用 OpenGL 繪製</string>
<string name="use_opengl_render_descr">使用硬體加速 OpenGL 繪製(可能在某些裝置上無法工作)</string>
<string name="dismiss">排除</string>
<string name="no_internet_connection">不能下載請檢查您的網路連線。</string>
<string name="no_internet_connection">不能下載請檢查您的網路連線。</string>
<string name="download_tab_downloads">全部下載</string>
<string name="download_tab_updates">更新</string>
<string name="download_tab_local">本機</string>
@ -1868,4 +1868,5 @@
<string name="show_railway_warnings">顯示鐵路平交道</string>
<string name="show_pedestrian_warnings">顯示行人穿越道</string>
<string name="speak_pedestrian">通報行人穿越道</string>
</resources>
<string name="rendering_value__name">預設</string>
</resources>

View file

@ -36,4 +36,6 @@
\n\tHarry van der Wolf - contributor (contribute to country boundaries + configuration file + address files and else), active forum participant.
</string>
<string name="app_edition"></string>
<string name="preferred_locale_no_translate">Display language</string>
<string name="system_locale_no_translate">Device language</string>
</resources>

View file

@ -9,6 +9,7 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="rendering_value__name">Default</string>
<string name="speak_pedestrian">Announce pedestrian crosswalks</string>
<string name="rendering_attr_roadStyle_name">Road style</string>
<string name="rendering_value_default_name">Default</string>
@ -34,7 +35,7 @@
<string name="download_tab_downloads">All&#160;Downloads</string>
<string name="download_tab_updates">Updates</string>
<string name="download_tab_local">Local</string>
<string name="no_internet_connection">Downloading not possible, please check your Internet connetion.</string>
<string name="no_internet_connection">Downloading not possible, please check your Internet connection.</string>
<string name="dismiss">Dismiss</string>
<string name="everything_up_to_date">All files up to date</string>
<string name="use_opengl_render">Use OpenGL rendering</string>

View file

@ -153,6 +153,9 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
// See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/
String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")";
// Add this in Latin also so it can be more easily identified if foreign language has been selected by mistake
String latinSystemDefaultSuffix = " (" + getString(R.string.system_locale_no_translate) + ")";
//getResources().getAssets().getLocales();
entrieValues = new String[] { "",
"en",
@ -203,7 +206,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"uk",
"vi",
"cy"};
entries = new String[] { getString(R.string.system_locale),
entries = new String[] { getString(R.string.system_locale) + latinSystemDefaultSuffix,
getString(R.string.lang_en),
getString(R.string.lang_af),
getString(R.string.lang_al) + incompleteSuffix,
@ -253,6 +256,10 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
getString(R.string.lang_vi) + incompleteSuffix,
getString(R.string.lang_cy) + incompleteSuffix,};
registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues);
// Display "Device language" in Latin for all non-en languages
if (!getResources().getString(R.string.preferred_locale).equals(getResources().getString(R.string.preferred_locale_no_translate))) {
((ListPreference) screen.findPreference(settings.PREFERRED_LOCALE.getId())).setTitle(getString(R.string.preferred_locale) + " (" + getString(R.string.preferred_locale_no_translate) + ")");
}
}

View file

@ -78,8 +78,16 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
if(selectFromMapForTarget) {
getTargets().navigateToPoint(latlon, true, -1);
} else {
//TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.)
getTargets().setStartPoint(latlon, true, null);
//TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.)
//-Test code only--
//Try force resuming route re-caculation if stopped due to Issue2515
//if (!routingHelper.isRouteBeingCalculated()) {
// getTargets().setStartPoint(latlon, true, null);
//}
//or like this:
// routingHelper.recalculateRouteDueToSettingsChange();
//-----------------
}
contextMenu.setLocation(latlon, null);
showDialog();