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

OsmAnd/res/values-de/phrases.xml

@@ -3730,4 +3730,5 @@
     <string name="poi_craft_cabinet_maker">Möbeltischler</string>
     <string name="poi_charge">Gebühr</string>
     <string name="poi_pet_grooming">Haustierpflege</string>
+    <string name="poi_atm_yes">Geldausgabeautomat: ja</string>
 </resources>

OsmAnd/res/values-de/strings.xml

@@ -3341,6 +3341,17 @@ Abgedeckte Fläche: %1$s x %2$s</string>
     <string name="shared_string_memory_tb_desc">%1$s TB</string>
     <string name="shared_string_memory_gb_desc">%1$s GB</string>
     <string name="shared_string_memory_mb_desc">%1$s MB</string>
-    <string name="shared_string_memory_kb_desc">%1$s KB</string>
+    <string name="shared_string_memory_kb_desc">%1$s kB</string>
     <string name="shared_sting_tiles">Kacheln</string>
+    <string name="data_storage_preference_summary">%1$s • %2$s</string>
+    <string name="data_storage_space_description">%1$s GB frei - Insgesamt %2$s GB</string>
+    <string name="shared_string_memory_used_tb_desc">%1$s TB verwendet</string>
+    <string name="shared_string_memory_used_gb_desc">%1$s GB verwendet</string>
+    <string name="shared_string_memory_used_mb_desc">%1$s MB verwendet</string>
+    <string name="shared_string_memory_used_kb_desc">%1$s kB verwendet</string>
+    <string name="contour_lines_and_hillshade">Konturlinien und Hillshade</string>
+    <string name="routing_attr_prefer_unpaved_name">Unbefestigte Straßen bevorzugen</string>
+    <string name="routing_attr_prefer_unpaved_description">Unbefestigte Straßen bevorzugen.</string>
+    <string name="update_all_maps">Alle Karten aktualisieren</string>
+    <string name="update_all_maps_q">Sind Sie sicher, dass Sie alle (%1$d) Karten aktualisieren möchten\?</string>
 </resources>

OsmAnd/res/values-es-rAR/phrases.xml

@@ -3734,4 +3734,5 @@
     <string name="poi_craft_cabinet_maker">Ebanista</string>
     <string name="poi_charge">Cargo</string>
     <string name="poi_pet_grooming">Cuidado de mascotas</string>
+    <string name="poi_atm_yes">Cajero automático: sí</string>
 </resources>

OsmAnd/res/values-es-rAR/strings.xml

@@ -3331,5 +3331,21 @@ Lon %2$s</string>
     <string name="shared_string_memory_tb_desc">%1$s TB</string>
     <string name="shared_string_memory_gb_desc">%1$s GB</string>
     <string name="shared_string_memory_mb_desc">%1$s MB</string>
-    <string name="shared_string_memory_kb_desc">%1$s KB</string>
+    <string name="shared_string_memory_kb_desc">%1$s kB</string>
+    <string name="data_storage_preference_summary">%1$s • %2$s</string>
+    <string name="data_storage_space_description">Libre %1$s GB • Total %2$s GB</string>
+    <string name="track_storage_directory">Directorio de almacenamiento de trazas</string>
+    <string name="track_storage_directory_descrp">Las trazas pueden almacenarse en una carpeta de grabación o en carpetas mensuales o diarias.</string>
+    <string name="store_tracks_in_rec_directory">Almacenar las trazas grabadas en la carpeta de grabación</string>
+    <string name="store_tracks_in_daily_directories">Almacenar las trazas grabadas en carpetas diarias</string>
+    <string name="store_tracks_in_daily_directories_descrp">Almacena las trazas grabadas en subcarpetas por día de grabación (como 2018-01-01).</string>
+    <string name="shared_string_memory_used_tb_desc">Usado %1$s TB</string>
+    <string name="shared_string_memory_used_gb_desc">Usado %1$s GB</string>
+    <string name="shared_string_memory_used_mb_desc">Usado %1$s MB</string>
+    <string name="shared_string_memory_used_kb_desc">Usado %1$s kB</string>
+    <string name="contour_lines_and_hillshade">Curvas de nivel y sombreados</string>
+    <string name="routing_attr_prefer_unpaved_name">Preferir caminos sin pavimentar</string>
+    <string name="routing_attr_prefer_unpaved_description">Prefiere caminos sin pavimentar.</string>
+    <string name="update_all_maps">Actualizar todos los mapas</string>
+    <string name="update_all_maps_q">¿Actualizar todos los mapas (%1$d)\?</string>
 </resources>

OsmAnd/res/values-fa/strings.xml

@@ -2134,7 +2134,7 @@
     <string name="downloads">دانلودها</string>
     <string name="confirm_download_roadmaps">نقشهٔ فقط-جاده لازم نیست، زیرا نقشهٔ استاندارد (کامل) را دارید. هنوز مایلید که دانلودش کنید؟</string>
     <string name="value_downloaded_of_max">%1$.1f از %2$.1f مگابایت</string>
-    <string name="file_size_in_mb">%.1f م‌بـ</string>
+    <string name="file_size_in_mb">‎%.1f MB</string>
     <string name="update_all">به‌روزرسانی همه (%1$s مگابایت)</string>
     <string name="free_downloads_used">دانلودهای رایگان استفاده‌شده</string>
     <string name="free_downloads_used_description">تعداد دانلودهای رایگان باقیمانده را نشان می‌دهد.</string>
@@ -3362,4 +3362,30 @@
     <string name="routing_attr_width_name">محدودیت عرض</string>
     <string name="routing_attr_width_description">محدودیت پهنای وسیله در مسیرها را مشخص کنید.</string>
     <string name="avoid_in_routing_descr_">از مسیرهای بخصوص و انواع جاده‌ها بپرهیزید</string>
+    <string name="data_storage_preference_summary">%1$s • %2$s</string>
+    <string name="data_storage_space_description">خالی ‎%1$s GB • کل ‎%2$s GB</string>
+    <string name="app_mode_utv">پهلو به پهلو</string>
+    <string name="rendering_attr_piste_difficulty_aerialway_name">راه هوایی</string>
+    <string name="shared_string_calculate">محاسبه</string>
+    <string name="shared_string_osmand_usage">کارکرد OsmAnd</string>
+    <string name="shared_sting_tiles">کاشی‌ها</string>
+    <string name="shared_string_maps">نقشه‌ها</string>
+    <string name="shared_string_memory_tb_desc">‎%1$s TB</string>
+    <string name="shared_string_memory_gb_desc">‎%1$s GB</string>
+    <string name="shared_string_memory_mb_desc">‎%1$s MB</string>
+    <string name="shared_string_memory_kb_desc">‎%1$s kB</string>
+    <string name="track_storage_directory">پوشهٔ ذخیره‌سازی رد</string>
+    <string name="track_storage_directory_descrp">ردها را می‌توانید در پوشهٔ rec یا پوشه‌های ماهانه یا روزانه ذخیره کنید.</string>
+    <string name="store_tracks_in_rec_directory">ردهای ضبط‌شده در پوشهٔ rec ذخیره شوند</string>
+    <string name="store_tracks_in_daily_directories">ردهای ضبط‌شده در پوشه‌های روزانه ذخیره شوند</string>
+    <string name="store_tracks_in_daily_directories_descrp">ردهای ضبط‌شده در زیرپوشهٔ مخصوص آن روز ذخیره می‌شود (مانند ‎2018-01-01).</string>
+    <string name="shared_string_memory_used_tb_desc">استفاده‌شده ‎%1$s TB</string>
+    <string name="shared_string_memory_used_gb_desc">استفاده‌شده ‎%1$s GB</string>
+    <string name="shared_string_memory_used_mb_desc">استفاده‌شده ‎%1$s MB</string>
+    <string name="shared_string_memory_used_kb_desc">استفاده‌شده ‎%1$s kB</string>
+    <string name="contour_lines_and_hillshade">سایه‌روشن و منحنی‌های میزان</string>
+    <string name="routing_attr_prefer_unpaved_name">ترجیح جاده‌های روسازی‌نشده</string>
+    <string name="routing_attr_prefer_unpaved_description">جاده‌های روسازی‌نشده را ترجیح می‌دهم.</string>
+    <string name="update_all_maps">به‌روزرسانی همهٔ نقشه‌ها</string>
+    <string name="update_all_maps_q">آیا همهٔ نقشه‌ها (%1$d) را به‌روز می‌کنید؟</string>
 </resources>

OsmAnd/res/values-fr/strings.xml

@@ -3299,5 +3299,17 @@ représentant la zone : %1$s x %2$s</string>
     <string name="shared_string_memory_tb_desc">%1$s TB</string>
     <string name="shared_string_memory_gb_desc">%1$s GB</string>
     <string name="shared_string_memory_mb_desc">%1$s MB</string>
-    <string name="shared_string_memory_kb_desc">%1$s KB</string>
+    <string name="shared_string_memory_kb_desc">%1$s kB</string>
+    <string name="data_storage_preference_summary">%1$s • %2$s</string>
+    <string name="data_storage_space_description">Libre %1$s GB • Total %2$s GB</string>
+    <string name="track_storage_directory">Surveiller le dossier de stockage</string>
+    <string name="shared_string_memory_used_tb_desc">%1$s TB utilisés</string>
+    <string name="shared_string_memory_used_gb_desc">%1$s GB utilisés</string>
+    <string name="shared_string_memory_used_mb_desc">%1$s MB utilisés</string>
+    <string name="shared_string_memory_used_kb_desc">%1$s kB utilisés</string>
+    <string name="contour_lines_and_hillshade">Courbes de niveaux et Ombrage du relief</string>
+    <string name="routing_attr_prefer_unpaved_name">Privilégier les routes non revêtues</string>
+    <string name="routing_attr_prefer_unpaved_description">Privilégier les routes non revêtues.</string>
+    <string name="update_all_maps">Mettre à jour toutes les cartes</string>
+    <string name="update_all_maps_q">Êtes-vous certain de vouloir mettre à jour les (%1$d) cartes \?</string>
 </resources>

OsmAnd/res/values-he/strings.xml

@@ -3318,4 +3318,14 @@
     <string name="shared_string_memory_gb_desc">%1$s ג״ב</string>
     <string name="shared_string_memory_mb_desc">%1$s מ״ב</string>
     <string name="shared_string_memory_kb_desc">%1$s ק״ב</string>
+    <string name="track_storage_directory">תיקיית אחסון מסלולים</string>
+    <string name="shared_string_memory_used_tb_desc">%1$s ט״ב בשימוש</string>
+    <string name="shared_string_memory_used_gb_desc">%1$s ג״ב בשימוש</string>
+    <string name="shared_string_memory_used_mb_desc">%1$s מ״ב בשימוש</string>
+    <string name="shared_string_memory_used_kb_desc">%1$s ק״ב בשימוש</string>
+    <string name="contour_lines_and_hillshade">קווי מתאר והצללות תוואי שטח</string>
+    <string name="routing_attr_prefer_unpaved_name">להעדיף דרכים בלתי סלולות</string>
+    <string name="routing_attr_prefer_unpaved_description">להעדיף דרכים בלתי סלולות.</string>
+    <string name="update_all_maps">עדכון כל המפות</string>
+    <string name="update_all_maps_q">לעדכן את כל (%1$d) המפות\?</string>
 </resources>

OsmAnd/res/values-pt-rBR/phrases.xml

@@ -3727,4 +3727,5 @@
     <string name="poi_craft_cabinet_maker">Marceneiro</string>
     <string name="poi_charge">Pagamento</string>
     <string name="poi_pet_grooming">Cuidado de animais</string>
+    <string name="poi_atm_yes">Caixa automático: sim</string>
 </resources>

OsmAnd/res/values-pt-rBR/strings.xml

@@ -3317,5 +3317,21 @@ Pôr do Sol: %2$s</string>
     <string name="shared_string_memory_tb_desc">%1$s TB</string>
     <string name="shared_string_memory_gb_desc">%1$s GB</string>
     <string name="shared_string_memory_mb_desc">%1$s MB</string>
-    <string name="shared_string_memory_kb_desc">%1$s KB</string>
+    <string name="shared_string_memory_kb_desc">%1$s kB</string>
+    <string name="data_storage_preference_summary">%1$s • %2$s</string>
+    <string name="data_storage_space_description">Livre %1$s GB • Total %2$s GB</string>
+    <string name="track_storage_directory">Diretório de armazenamento de trilhas</string>
+    <string name="track_storage_directory_descrp">As faixas podem ser armazenadas na pasta rec ou em pastas mensais ou diárias.</string>
+    <string name="store_tracks_in_rec_directory">Armazenar faixas gravadas na pasta rec</string>
+    <string name="store_tracks_in_daily_directories">Armazenar faixas gravadas em pastas diárias</string>
+    <string name="store_tracks_in_daily_directories_descrp">"Armazenaras caminhos  gravadas em subpastas por dia de gravação (como 01-01-2018)."</string>
+    <string name="shared_string_memory_used_tb_desc">Usado %1$s TB</string>
+    <string name="shared_string_memory_used_gb_desc">Usado %1$s GB</string>
+    <string name="shared_string_memory_used_mb_desc">Usado %1$s MB</string>
+    <string name="shared_string_memory_used_kb_desc">Usado %1$s kB</string>
+    <string name="contour_lines_and_hillshade">Curvas de nível e Sombras de relevo</string>
+    <string name="routing_attr_prefer_unpaved_name">Preferir estradas não pavimentadas</string>
+    <string name="routing_attr_prefer_unpaved_description">Preferir estradas não pavimentadas.</string>
+    <string name="update_all_maps">Atualizar todos os mapas</string>
+    <string name="update_all_maps_q">Tem certeza de que deseja atualizar todos os mapas (%1$d)\?</string>
 </resources>

OsmAnd/res/values-pt/strings.xml

@@ -3327,11 +3327,22 @@
     <string name="shared_string_memory_tb_desc">%1$s TB</string>
     <string name="shared_string_memory_gb_desc">%1$s GB</string>
     <string name="shared_string_memory_mb_desc">%1$s MB</string>
-    <string name="shared_string_memory_kb_desc">%1$s KB</string>
+    <string name="shared_string_memory_kb_desc">%1$s kB</string>
     <string name="rendering_attr_piste_difficulty_aerialway_name">Via aérea</string>
     <string name="track_storage_directory">Diretório de Armazenamento de Caminhos</string>
     <string name="track_storage_directory_descrp">Os caminhos podem ser armazenados na pasta rec ou em pastas mensais, ou diárias.</string>
     <string name="store_tracks_in_rec_directory">Armazenar os caminhos gravados na pasta rec</string>
     <string name="store_tracks_in_daily_directories">Armazenar caminhos gravados em pastas diárias</string>
     <string name="store_tracks_in_daily_directories_descrp">Armazenar caminhos gravados em subpastas por dia de gravação (como 2018-01-01).</string>
+    <string name="data_storage_preference_summary">%1$s • %2$s</string>
+    <string name="data_storage_space_description">Livre %1$s GB • Total %2$s GB</string>
+    <string name="shared_string_memory_used_tb_desc">%1$s TB usado(s)</string>
+    <string name="shared_string_memory_used_gb_desc">%1$s GB usado(s)</string>
+    <string name="shared_string_memory_used_mb_desc">%1$s MB usado(s)</string>
+    <string name="shared_string_memory_used_kb_desc">%1$s kB usado(s)</string>
+    <string name="contour_lines_and_hillshade">Curvas de nível e Sombras de relevo</string>
+    <string name="routing_attr_prefer_unpaved_name">Preferir estradas não pavimentadas</string>
+    <string name="routing_attr_prefer_unpaved_description">Preferir estradas não pavimentadas.</string>
+    <string name="update_all_maps">Atualizar todos os mapas</string>
+    <string name="update_all_maps_q">Tem certeza de que deseja atualizar todos os mapas (%1$d)\?</string>
 </resources>

OsmAnd/res/values-ru/strings.xml

@@ -3269,4 +3269,8 @@
     <string name="internal_app_storage_description">Внутреннее хранилище, скрытое от пользователя и других приложений, поэтому никто, кроме OsmAnd не может получить доступ к вашим данным</string>
     <string name="change_data_storage_folder">Изменение папку хранения данных</string>
     <string name="avoid_in_routing_descr_">Избегать определенные маршруты и типы дорог</string>
+    <string name="shared_string_memory_used_tb_desc">Использовано %1$sТБ</string>
+    <string name="shared_string_memory_used_gb_desc">Использовано %1$s ГБ</string>
+    <string name="shared_string_memory_used_mb_desc">Использовано %1$s МБ</string>
+    <string name="shared_string_memory_used_kb_desc">Использовано %1$s кБ</string>
 </resources>

OsmAnd/res/values-tr/strings.xml

@@ -3281,5 +3281,21 @@
     <string name="shared_string_memory_tb_desc">%1$s TB</string>
     <string name="shared_string_memory_gb_desc">%1$s GB</string>
     <string name="shared_string_memory_mb_desc">%1$s MB</string>
-    <string name="shared_string_memory_kb_desc">%1$s KB</string>
+    <string name="shared_string_memory_kb_desc">%1$s kB</string>
+    <string name="data_storage_preference_summary">%1$s • %2$s</string>
+    <string name="data_storage_space_description">Boş %1$s GB • Toplam %2$s GB</string>
+    <string name="track_storage_directory">Yol-izi Depolama Dizini</string>
+    <string name="track_storage_directory_descrp">Yol-izleri rec dizininde ya da aylık veya günlük dizinlerde depolanabilir.</string>
+    <string name="store_tracks_in_rec_directory">Kaydedilen yol-izlerini rec dizininde depola</string>
+    <string name="store_tracks_in_daily_directories">Kaydedilen yol-izlerini günlük dizinlerde depola</string>
+    <string name="store_tracks_in_daily_directories_descrp">Kaydedilen yol-izlerini kayıt gününe göre alt-dizinlerde depola (2018-01-01 gibi).</string>
+    <string name="shared_string_memory_used_tb_desc">Kullanılan %1$s TB</string>
+    <string name="shared_string_memory_used_gb_desc">Kullanılan %1$s GB</string>
+    <string name="shared_string_memory_used_mb_desc">Kullanılan %1$s MB</string>
+    <string name="shared_string_memory_used_kb_desc">Kullanılan %1$s kB</string>
+    <string name="contour_lines_and_hillshade">Eşyükselti çizgileri ve Tepe gölgeleri</string>
+    <string name="routing_attr_prefer_unpaved_name">Asfaltsız yolları tercih edin</string>
+    <string name="routing_attr_prefer_unpaved_description">Asfaltsız yolları tercih edin.</string>
+    <string name="update_all_maps">Tüm haritaları güncelle</string>
+    <string name="update_all_maps_q">Tüm (%1$d) haritaları güncellemek istediğinizden emin misiniz\?</string>
 </resources>

OsmAnd/res/values-zh-rCN/strings.xml

@@ -960,7 +960,7 @@
     <string name="si_min_m">分钟/英里</string>
     <string name="si_nm_h">海里/小时 (节)</string>
     <string name="nm_h">浬里/时</string>
-    <string name="min_mile"></string>
+    <string name="min_mile"/>
     <string name="min_km">分/公里</string>
     <string name="m_s">米/秒</string>
     <string name="shared_string_navigation">导航</string>
@@ -2746,4 +2746,38 @@
     <string name="default_speed_setting_title">默认速率</string>
     <string name="shared_string_default">默认</string>
     <string name="transport_nearby_routes">之间</string>
+    <string name="shared_string_privacy_policy">隐私政策</string>
+    <string name="help_us_make_osmand_better">帮助我们让 OsmAnd 变得更好！</string>
+    <string name="shared_string_no_thank_you">不，谢谢</string>
+    <string name="shared_string_allow">允许</string>
+    <string name="nav_type_hint">导航类型</string>
+    <string name="app_mode_taxi">出租车</string>
+    <string name="process_downloading_service">OsmAnd 下载服务</string>
+    <string name="shared_string_crash">崩溃</string>
+    <string name="turn_screen_on_sensor">使用接近传感器</string>
+    <string name="rendering_attr_winter_road_name">冬季道路</string>
+    <string name="price_free">免费</string>
+    <string name="cancel_subscription">取消订阅</string>
+    <string name="units_and_formats">单位和格式</string>
+    <string name="appearance">外观</string>
+    <string name="list_of_installed_plugins">已安装插件列表</string>
+    <string name="configure_navigation">配置导航</string>
+    <string name="general_settings_profile_descr">应用主题、单位、区域</string>
+    <string name="language_and_output">语言和输出</string>
+    <string name="reset_to_default">重置为默认值</string>
+    <string name="osmand_settings">OsmAnd 设置</string>
+    <string name="shared_string_other">其它</string>
+    <string name="plugins_settings">插件设置</string>
+    <string name="shared_string_select_folder">选择文件夹</string>
+    <string name="shared_string_calculate">计算</string>
+    <string name="shared_string_osmand_usage">OsmAnd 用法</string>
+    <string name="shared_string_memory_used_tb_desc">已使用 %1$s TB</string>
+    <string name="shared_string_memory_used_gb_desc">已使用 %1$s GB</string>
+    <string name="shared_string_memory_used_mb_desc">已使用 %1$s MB</string>
+    <string name="shared_string_memory_used_kb_desc">已使用 %1$s kB</string>
+    <string name="contour_lines_and_hillshade">轮廓线和山体阴影</string>
+    <string name="routing_attr_prefer_unpaved_name">偏好未铺装道路</string>
+    <string name="routing_attr_prefer_unpaved_description">偏好未铺装道路。</string>
+    <string name="update_all_maps">更新所有地图</string>
+    <string name="update_all_maps_q">您确认要更新全部（%1$d）地图吗？</string>
 </resources>

OsmAnd/res/values/strings.xml

@@ -13,6 +13,16 @@
 -->
     <string name="apply_preference_to_all_profiles">You can apply this change to all profiles or only to selected.</string>
     <string name="shared_preference">Shared</string>
+    <string name="release_3_5">
+    • Updated application and profile Settings. Convenient arrangement of settings by type, ability to customize each profile\n\n
+    • New map download dialog that suggests a map to download while browsing\n\n
+    • Night theme fixes\n\n
+    • Fixed few routing issues around the world\n\n
+    • Updated basemap with more detailed road network\n\n
+    • Fixed flooded areas around the world\n\n
+    • Ski routing: added height profile and route complexity to the route details\n\n
+    • Other bug fixes\n\n
+    </string>
     <string name="shared_string_memory_used_tb_desc">Used %1$s TB</string>
     <string name="shared_string_memory_used_gb_desc">Used %1$s GB</string>
     <string name="shared_string_memory_used_mb_desc">Used %1$s MB</string>