Merge remote-tracking branch 'origin/master'

This commit is contained in:
Nazar 2019-07-10 15:17:53 +03:00
commit fd2bf300ea

View file

@ -38,7 +38,7 @@
<string name="turn_screen_on_sensor">Use proximity sensor</string>
<string name="turn_screen_on_sensor_descr">Wave your hand over the top of the screen to turn on the screen while navigating.</string>
<string name="app_mode_offroad">Offroad</string>
<string name="edit_profile_setup_title">Setup Profile</string>
<string name="edit_profile_setup_title">Setup profile</string>
<string name="edit_profile_setup_subtitle">Profile keeps its own settings</string>
<string name="edit_profile_setup_map_subtitle">Select default map options for profile</string>
<string name="edit_profile_screen_options_subtitle">Select default screen options for profile</string>
@ -85,11 +85,11 @@
<string name="downloaded_maps">Maps downloaded</string>
<string name="visited_screens">Screens visited</string>
<string name="collected_data">Data collected</string>
<string name="collected_data_descr">List of data you want to share with OsmAnd.</string>
<string name="downloaded_maps_collect_descr">We collect this data to understand which maps of which regions and countries are the most popular.</string>
<string name="visited_screens_collect_descr">We collect this data to understand which OsmAnd features are the most popular.</string>
<string name="collected_data_descr">Define which data you allow OsmAnd to share.</string>
<string name="downloaded_maps_collect_descr">Helps us understand which maps of which regions and countries are the most popular.</string>
<string name="visited_screens_collect_descr">Helps us understand which OsmAnd features are the most popular.</string>
<string name="privacy_and_security_change_descr">By tapping \"Allow\" you agree with our %1$s</string>
<string name="settings_privacy_and_security">Privacy and Security</string>
<string name="settings_privacy_and_security">Privacy and security</string>
<string name="settings_privacy_and_security_desc">Select which data you are sharing with us</string>
<string name="shared_string_no_thank_you">No, thank you</string>
<string name="shared_string_allow">Allow</string>
@ -110,7 +110,7 @@
<string name="settings_derived_routing_mode_string">User mode, derived from: %s</string>
<string name="routing_profile_ski">Ski</string>
<string name="profile_type_descr_string">Type: %s</string>
<string name="profile_type_base_string">Base Profile</string>
<string name="profile_type_base_string">Base profile</string>
<string name="profile_alert_need_routing_type_title">Select navigation type</string>
<string name="profile_alert_need_routing_type_msg">Please select a navigation type for the new application profile</string>
<string name="profile_alert_need_profile_name_title">Enter profile name</string>