Merge branch 'origin/master' into Weblate.

OsmAnd/res/values-be/strings.xml

@@ -1088,7 +1088,7 @@
     <string name="lang_ja">Японская</string>
     <string name="lang_ko">Карэйская</string>
     <string name="lang_lv">Латышская</string>
-    <string name="lang_lt">Летувісская</string>
+    <string name="lang_lt">Летувіская</string>
     <string name="lang_mr">Маратхі</string>
     <string name="lang_no">Нарвежская (Bokmål)</string>
     <string name="lang_pl">Польская</string>

OsmAnd/res/values-ja/strings.xml

@@ -3843,7 +3843,7 @@ POIの更新は利用できません</string>
     <string name="subscription_expired_title">OsmAndLiveサブスクリプションの有効期限が切れました</string>
     <string name="subscription_paused_title">OsmAndLiveサブスクリプションが一時停止されました</string>
     <string name="subscription_on_hold_title">OsmAndLiveサブスクリプションは保留中です</string>
-    <string name="markers_history">マーカーの履歴</string>
+    <string name="markers_history">マーカー履歴</string>
     <string name="send_files_to_openstreetmap">GPXファイルをOpenStreetMapに送信</string>
     <string name="enter_text_separated">タグはカンマで区切って入力してください。</string>
     <string name="gpx_upload_public_visibility_descr">\"公開 \"状態は、追跡機能にてユーザーのGPS追跡、公開GPS追跡リスト、および生データのタイムスタンプ付き公開追跡リストに公開されることを意味します。APIを介して提供されるデータはユーザーの追跡ページを参照しません。追跡ポイントのタイムスタンプはパブリックGPS APIでは利用できず、また追跡ポイントは時系列に並んでいません。</string>

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

@@ -3927,4 +3927,5 @@
     <string name="poi_cliff_diving">Mergulho de falésia</string>
     <string name="poi_zurkhaneh_sport">Zurkhaneh</string>
     <string name="poi_bay_filter">Tipo de baía</string>
+    <string name="poi_ultimate">Ultimate</string>
 </resources>

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

@@ -4049,15 +4049,19 @@
     <string name="shared_string_route_line">Linha de rota</string>
     <string name="route_line_use_map_style_appearance">A linha de rota seria usada %1$s especificado no estilo de mapa selecionado: %2$s.</string>
     <string name="specify_color_for_map_mode">Especifique a cor para o modo de mapa: %1$s.</string>
-    <string name="release_4_0_beta">• As atualizações do OsmAnd Live foram movidas para \"Downloads &gt; Atualizações\"
+    <string name="release_4_0_beta">"• Adicionada opção para baixar curvas de nível em pés
 \n
-\n• As trilhas agora podem ser coloridas por altitude, velocidade ou inclinação.
+\n  • Plano de paisagem da rota: guias adicionadas para alternar entre pontos ou gráficos
 \n
-\n• Adicionada opção para alterar a aparência da linha da rota de navegação
+\n  • As atualizações do OsmAnd Live foram movidas para \"Downloads&gt; Atualizações\"
 \n
-\n• Caixa de diálogo \"Gravação de viagem\" atualizada
+\n  • As trilhas agora podem ser coloridas por altitude, velocidade ou inclinação.
 \n
-\n</string>
+\n  • Adicionada opção para alterar a aparência da linha da rota de navegação
+\n
+\n  • Caixa de diálogo \"Gravação de viagem\" atualizada
+\n
+\n"</string>
     <string name="no_purchases">Você não tem nenhuma compra</string>
     <string name="new_device_account">Novo dispositivo / nova conta</string>
     <string name="contact_support_description">Se você tiver alguma dúvida, entre em contato conosco em %1$s.</string>
@@ -4081,4 +4085,8 @@
     <string name="user_points">Pontos do usuário</string>
     <string name="output">Saída</string>
     <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">pés</string>
+    <string name="srtm_unit_format">Formato da unidade de curvas de nível</string>
+    <string name="srtm_download_list_help_message">OsmAnd fornece dados de linhas de contorno em metros e pés. Você precisará baixar novamente o arquivo para alterar o formato.</string>
+    <string name="srtm_download_single_help_message">Selecione o formato necessário. Você precisará baixar novamente o arquivo para alterar o formato.</string>
 </resources>

OsmAnd/res/values-pt/phrases.xml

@@ -193,7 +193,7 @@
     <string name="poi_ford_stepping_stones">Ponte pedonal em pedras separadas</string>
     <string name="poi_mountain_pass">Passo de montanha</string>
     <string name="poi_gate">Portão</string>
-    <string name="poi_city_wall">Muralha de cidade</string>
+    <string name="poi_city_wall">Muralha/cerca de cidade</string>
     <string name="poi_lift_gate">Cancela elevatória</string>
     <string name="poi_toll_booth">Cabine de portagem</string>
     <string name="poi_border_control">Controlo aduaneiro</string>
@@ -637,13 +637,13 @@
     <string name="poi_australian_football">Futebol australiano</string>
     <string name="poi_base">Base jumping</string>
     <string name="poi_baseball">Beisebol</string>
-    <string name="poi_basketball">Basquete</string>
+    <string name="poi_basketball">Basquetebol</string>
     <string name="poi_beachvolleyball">Voleibol de praia</string>
     <string name="poi_bmx">BMX</string>
     <string name="poi_boules">Bocha</string>
     <string name="poi_bowls">Lawn bowls</string>
     <string name="poi_canadian_football">Futebol canadiano</string>
-    <string name="poi_canoe">Canoa</string>
+    <string name="poi_canoe">Canoagem</string>
     <string name="poi_chess">Xadrez</string>
     <string name="poi_climbing">Escalada</string>
     <string name="poi_cricket">Críquete</string>
@@ -694,7 +694,7 @@
     <string name="poi_boundary_stone">Marco de fronteira</string>
     <string name="poi_historic_cannon">Canhão histórico</string>
     <string name="poi_castle">Castelo</string>
-    <string name="poi_city_gate">Portão/arco de cidade</string>
+    <string name="poi_city_gate">Portão/porta/arco de cidade</string>
     <string name="poi_fort">Forte</string>
     <string name="poi_fountain">Chafariz</string>
     <string name="poi_historic_ruins">Ruínas históricas</string>
@@ -707,7 +707,7 @@
     <string name="poi_aquarium">Aquário</string>
     <string name="poi_theme_park">Parque de diversões</string>
     <string name="poi_attraction">Atração turística</string>
-    <string name="poi_tourism_yes">Objeto turístico</string>
+    <string name="poi_tourism_yes">Elemento turístico</string>
     <string name="poi_attraction_amusement_ride">Atracão de feira</string>
     <string name="poi_attraction_animal">Animal (atração)</string>
     <string name="poi_attraction_big_wheel">Roda gigante</string>
@@ -2866,9 +2866,9 @@
     <string name="poi_aquaculture_mussels">Aquicultura: mexilhões</string>
     <string name="poi_mdf">Rede de distribuição principal (MDF)</string>
     <string name="poi_min_age">Idade mínima</string>
-    <string name="poi_organic_yes">Sim</string>
+    <string name="poi_organic_yes">Produtos orgânicos: sim</string>
-    <string name="poi_organic_no">Não</string>
+    <string name="poi_organic_no">Produtos orgânicos: não</string>
-    <string name="poi_organic_only">Unicamente</string>
+    <string name="poi_organic_only">Produtos orgânicos: unicamente</string>
     <string name="poi_traffic_mirror">Espelho de tráfego</string>
     <string name="poi_diplomatic_consulate">Consulado</string>
     <string name="poi_diplomatic_consulate_general">Consulado geral</string>
@@ -3746,7 +3746,7 @@
     <string name="poi_community_gender_male">Sexo comunitário: masculino</string>
     <string name="poi_community_gender_mixed">Sexo comunitário: misto</string>
     <string name="poi_grave">Sepultura</string>
-    <string name="poi_parking_space">Espaço de estacionamento</string>
+    <string name="poi_parking_space">Lugar de estacionamento (1 veículo)</string>
     <string name="poi_url">URL</string>
     <string name="poi_volcano_type">Tipo</string>
     <string name="poi_volcano_status">Estado</string>

OsmAnd/res/values-pt/strings.xml

@@ -2013,7 +2013,7 @@
     <string name="routing_attr_height_obstacles_name">Utilizar dados de elevação</string>
     <string name="rendering_attr_depthContours_description">Mostrar pontos e contornos de profundidade.</string>
     <string name="rendering_attr_depthContours_name">Contornos de profundidade náuticos</string>
-    <string name="show_transparency_seekbar">Mostra a transparência da barra de navegação</string>
+    <string name="show_transparency_seekbar">Mostrar barra deslizante de transparência</string>
     <string name="shared_string_widgets">Widgets</string>
     <string name="rendering_attr_hideUnderground_name">Objetos subterrâneos</string>
     <string name="auto_split_recording_title">Dividir automaticamente as gravações após quebras</string>

OsmAnd/res/values-ru/strings.xml

@@ -2872,7 +2872,7 @@
     <string name="sit_on_the_stop">Посадка на остановке</string>
     <string name="use_osm_live_public_transport_description">Включить общественный транспорт с учётом автообновлений OsmAnd Live.</string>
     <string name="use_osm_live_public_transport">Общественный транспорт OsmAnd Live</string>
-    <string name="transfers_size">%1$d пересадки</string>
+    <string name="transfers_size">пересадки: %1$d</string>
     <string name="rendering_attr_surface_unpaved_name">Грунтовая</string>
     <string name="rendering_attr_surface_sand_name">Песок</string>
     <string name="rendering_attr_surface_grass_name">Трава</string>
@@ -3263,7 +3263,7 @@
     <string name="selected_profile">Выбранный профиль</string>
     <string name="personal_category_name">Персональный</string>
     <string name="shared_string_downloading_formatted">Скачивание %s</string>
-    <string name="rendering_value_thick_name">Толсто</string>
+    <string name="rendering_value_thick_name">Толстая</string>
     <string name="default_speed_dialog_msg">Используется для оценки времени прибытия для неизвестного типа дорог и ограничения скорости для всех дорог (может изменить маршрут)</string>
     <string name="routing_attr_allow_intermediate_name">Разрешить промежуточные маршруты</string>
     <string name="routing_attr_allow_advanced_name">Разрешить расширенные маршруты</string>
@@ -3302,7 +3302,7 @@
     <string name="rendering_attr_piste_difficulty_connection_name">Соединение</string>
     <string name="simulate_your_location_gpx_descr">Симулировать свою позицию используя записанный GPX трек.</string>
     <string name="route_start_point">Начало маршрута</string>
-    <string name="shared_string_revert">Вернуться</string>
+    <string name="shared_string_revert">Сброс</string>
     <string name="suggested_maps_descr">Эти карты необходимо использовать с плагином.</string>
     <string name="added_profiles">Добавленные профили</string>
     <string name="added_profiles_descr">Профили, добавленные плагином</string>
@@ -4056,7 +4056,11 @@
     <string name="next_billing_date">Следующая дата оплаты: %1$s</string>
     <string name="osmand_live">OsmAnd Live</string>
     <string name="annual_subscription">Годовая подписка</string>
-    <string name="release_4_0_beta">• Обновления OsmAnd Live перемещены в «Загрузка карт» → «Обновления».
+    <string name="release_4_0_beta">• Добавлена возможность скачать контурные линии в футах.
+\n
+\n• Планирование маршрута: добавлены вкладки для переключения между точками и графиками.
+\n
+\n• Обновления OsmAnd Live перемещены в «Загрузка карт» → «Обновления».
 \n
 \n• Теперь треки можно раскрашивать по высоте, скорости или уклону.
 \n
@@ -4087,4 +4091,8 @@
     <string name="output">Вывод</string>
     <string name="map_quick_action_pattern">%1$s → …</string>
     <string name="exit_number">Номер съезда</string>
+    <string name="srtm_unit_format">Формат единиц на контурных линиях</string>
+    <string name="srtm_download_single_help_message">Выберите необходимый формат. Для изменения формата потребуется повторно загрузить файл.</string>
+    <string name="shared_string_feet">футы</string>
+    <string name="srtm_download_list_help_message">OsmAnd предоставляет данные изолиний в метрах и футах. Вам нужно будет повторно загрузить файл, чтобы изменить формат.</string>
 </resources>

OsmAnd/res/values-sk/strings.xml

@@ -4045,7 +4045,11 @@
     <string name="lost_data_warning">Všetky neuložené údaje budú stratené.</string>
     <string name="show_start_dialog">Zobraziť úvodné okno</string>
     <string name="trip_recording_show_start_dialog_setting">Ak je vypnuté, záznam začne hneď po stlačení nástroja alebo položky v menu a preskočí okno nastavenia.</string>
-    <string name="release_4_0_beta">• Aktualizácie OsmAnd Live presunuté do \"Sťahovania &gt; Aktualizácie\"
+    <string name="release_4_0_beta">• Pridaná možnosť stiahnutia Vrstevníc v stopách
+\n
+\n• Plánovať trasy: pridané prepínače medzi bodmi a grafmi
+\n
+\n• Aktualizácie OsmAnd Live presunuté do \"Sťahovania &gt; Aktualizácie\"
 \n
 \n • Stopy je teraz možné vyfarbiť podľa nadmorskej výšky, rýchlosti alebo sklonu svahu.
 \n
@@ -4081,4 +4085,8 @@
     <string name="user_points">Body používateľa</string>
     <string name="output">Výstup</string>
     <string name="map_quick_action_pattern">%1$s → …</string>
+    <string name="shared_string_feet">stopy</string>
+    <string name="srtm_unit_format">Formát jednotiek vrstevníc</string>
+    <string name="srtm_download_list_help_message">OsmAnd poskytuje údaje vrstevníc v metroch a stopách. Budete musieť znovu stiahnuť súbor pre zmenu formátu.</string>
+    <string name="srtm_download_single_help_message">Prosím zvoľte požadovaný formát. Budete musieť znovu stiahnuť súbor pre zmenu formátu.</string>
 </resources>