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-09-13 10:09:22 +02:00
commit 2e73222c05
3 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java
View file

@ -26,7 +26,7 @@ import org.apache.commons.logging.Log;
public class RouteResultPreparation {
public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = false;
private static final float TURN_DEGREE_MIN = 45;
private static final float TURN_DEGREE_MIN = 35;
private Log log = PlatformUtil.getLog(RouteResultPreparation.class);
/**
* Helper method to prepare final result

26
OsmAnd/res/values-ru/phrases.xml
View file

@ -173,6 +173,7 @@
<string name="poi_aerialway_rope_tow">Движущийся канат</string>
<string name="poi_aerialway_goods">Грузовой подъёмник</string>
<string name="poi_aerialway_magic_carpet">Ленточный подъёмник</string>
<string name="poi_aerialway_pylon">Опора канатной дороги</string>
<string name="poi_tunnel">Туннель</string>
<string name="poi_bridge">Мост</string>
@ -196,11 +197,15 @@
<string name="poi_power_transformer">Трансформатор</string>
<string name="poi_power_plant">Электростанция</string>
<string name="poi_power_generator">Генератор</string>
<string name="poi_power_tower">Опора линии электропередач</string>
<string name="poi_power_pole">Столб линии электропередач</string>
<string name="poi_post_office">Почта</string>
<string name="poi_post_box">Почтовый ящик</string>
<string name="poi_telephone">Телефон</string>
<string name="poi_communication_tower">Вышка связи</string>
<string name="poi_cooling_tower">Градирня</string>
<string name="poi_lighting_tower">Осветительная вышка</string>
<string name="poi_telephone_exchange">АТС</string>
<string name="poi_recycling">Переработка отходов</string>
@ -946,7 +951,26 @@
<string name="poi_height">Высота</string>
<string name="poi_ele">Высота над уровнем моря</string>
<string name="poi_seats">Сиденья</string>
<string name="poi_backrest_yes">Со спинкой</string>
<string name="poi_backrest_no">Без спинки</string>
<string name="poi_urban">Городского типа</string>
<string name="poi_rural">Сельского типа</string>
<string name="poi_intermittent">Пересыхающий(ая)</string>
<string name="poi_building">Здание</string>
<string name="poi_hiking_routes">Туристические маршруты</string>
</resources>
<string name="poi_deadlock">Тупик</string>
<string name="poi_generator_source_coal">Источник энергии: уголь</string>
<string name="poi_generator_source_gas">Источник энергии: газ</string>
<string name="poi_generator_source_nuclear">Источник энергии: ядерное топливо</string>
<string name="poi_generator_source_solar">Источник энергии: солнце</string>
<string name="poi_generator_source_hydro">Источник энергии: вода</string>
<string name="poi_generator_source_wind">Источник энергии: ветер</string>
<string name="poi_generator_source_geothermal">Источник энергии: геотермальный</string>
<string name="poi_generator_source_oil">Источник энергии: мазут</string>
<string name="poi_generator_source_diesel">Источник энергии: дизельное топливо</string>
</resources>

25
OsmAnd/res/values/phrases.xml
View file

@ -274,6 +274,7 @@
<string name="poi_aerialway_rope_tow">Rope tow lift</string>
<string name="poi_aerialway_goods">Goods lift</string>
<string name="poi_aerialway_magic_carpet">Carpet lift</string>
<string name="poi_aerialway_pylon">Aerial lift pylon</string>
<string name="poi_tunnel">Tunnel</string>
<string name="poi_bridge">Bridge</string>
@ -304,6 +305,8 @@
<string name="poi_power_cable_distribution_cabinet">Cable distribution cabinet</string>
<string name="poi_power_plant">Power plant</string>
<string name="poi_power_generator">Power generator</string>
<string name="poi_power_tower">Power tower</string>
<string name="poi_power_pole">Power pole</string>
<string name="poi_post_office">Post office</string>
<string name="poi_post_box">Post box</string>
@ -311,6 +314,8 @@
<string name="poi_communication_tower">Communication tower</string>
<string name="poi_observation_tower">Observation tower</string>
<string name="poi_bell_tower">Bell tower</string>
<string name="poi_cooling_tower">Cooling tower</string>
<string name="poi_lighting_tower">Lighting tower</string>
<string name="poi_telephone_exchange">Telephone exchange</string>
<string name="poi_recycling">Recycling</string>
@ -1189,6 +1194,9 @@
<string name="poi_trees_coffea">Coffee</string>
<string name="poi_trees_pomegranate">Pomegranate</string>
<string name="poi_urban">Urban</string>
<string name="poi_rural">Rural</string>
<string name="poi_enforcement_traffic_signals">Enforcement:traffic signals</string>
<string name="poi_enforcement_maxspeed">Enforcement:maxspeed</string>
<string name="poi_enforcement_maxheight">Enforcement:maxheight</string>
@ -1202,6 +1210,23 @@
<string name="poi_animal_shelter_dog_cat">Shelter for dogs and cats</string>
<string name="poi_animal_shelter_bird">Shelter for birds</string>
<string name="poi_seats">Seats</string>
<string name="poi_backrest_yes">Backrest: yes</string>
<string name="poi_backrest_no">Backrest: no</string>
<string name="poi_intermittent">Intermittent</string>
<string name="poi_building">Building</string>
<string name="poi_deadlock">Deadlock</string>
<string name="poi_generator_source_coal">Energy source: coal</string>
<string name="poi_generator_source_gas">Energy source: gas</string>
<string name="poi_generator_source_nuclear">Energy source: nuclear</string>
<string name="poi_generator_source_solar">Energy source: solar</string>
<string name="poi_generator_source_hydro">Energy source: hydro</string>
<string name="poi_generator_source_wind">Energy source: wind</string>
<string name="poi_generator_source_geothermal">Energy source: geothermal</string>
<string name="poi_generator_source_oil">Energy source: oil</string>
<string name="poi_generator_source_diesel">Energy source: diesel</string>
</resources>