Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-04-18 22:09:05 +02:00
commit 4edd69a80f
4 changed files with 7 additions and 1 deletions

View file

@ -2687,4 +2687,6 @@
<string name="poi_solarium">Солярий</string> <string name="poi_solarium">Солярий</string>
<string name="poi_sanitary_dump_station">Ассенизационная сливная станция</string>
</resources> </resources>

View file

@ -1,6 +1,8 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<resources> <resources>
<string name="map_widget_bearing">Курсовой угол</string>
<string name="map_mode">Режим карты</string>
<string name="rendering_value_thin_name">Тонкий</string> <string name="rendering_value_thin_name">Тонкий</string>
<string name="rendering_value_medium_name">Средний</string> <string name="rendering_value_medium_name">Средний</string>
<string name="rendering_value_bold_name">Толстый</string> <string name="rendering_value_bold_name">Толстый</string>

View file

@ -2688,4 +2688,6 @@
<string name="poi_solarium">Solarium</string> <string name="poi_solarium">Solarium</string>
<string name="poi_sanitary_dump_station">Sanitary dump station</string>
</resources> </resources>

View file

@ -10,7 +10,7 @@
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy 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="map_widget_bearing">Bearing</string> <string name="map_widget_bearing">Relative bearing</string>
<string name="access_disable_offroute_recalc">Don\'t change route when you are off the way</string> <string name="access_disable_offroute_recalc">Don\'t change route when you are off the way</string>
<string name="access_disable_offroute_recalc_descr">Prevent automatic route recalculation when you are quite far from the right way</string> <string name="access_disable_offroute_recalc_descr">Prevent automatic route recalculation when you are quite far from the right way</string>
<string name="access_disable_wrong_direction_recalc">Don\'t change route by wrong direction</string> <string name="access_disable_wrong_direction_recalc">Don\'t change route by wrong direction</string>