Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-11-02 15:57:53 +01:00
commit 972fbe4b6f
2 changed files with 5 additions and 3 deletions

View file

@ -1805,4 +1805,5 @@
<string name="rendering_attr_shareTaxiRoutes_name">Маршрутное такси</string> <string name="rendering_attr_shareTaxiRoutes_name">Маршрутное такси</string>
<string name="rendering_attr_trolleybusRoutes_name">Маршруты троллейбусов</string> <string name="rendering_attr_trolleybusRoutes_name">Маршруты троллейбусов</string>
<string name="rendering_attr_busRoutes_name">Маршруты автобусов</string> <string name="rendering_attr_busRoutes_name">Маршруты автобусов</string>
<string name="rendering_attr_tramTrainRoutes_name">Трамвай и поезд</string>
</resources> </resources>

View file

@ -9,20 +9,21 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated). 3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
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="rendering_attr_tramTrainRoutes_name">Tram and train</string>
<string name="tip_recent_changes_1_9_t">Changes in 1.9: <string name="tip_recent_changes_1_9_t">Changes in 1.9:
* Updated maps styles with road surface rendering, transport layers and hiking symbols * Updated maps styles with road surface rendering, transport layers and hiking symbols
* Search POI along the route * Search POI along the route
* Mark road as impassable per session * Mark road as impassable per session
* Easier to download and update maps * Easier to download and update maps
* Get visual and audio notification by approaching to waypoint * Get visual and audio notification by approaching to waypoint
* Print itinerary and turn information * Print itinerary and turn information
* Support of turn lanes * Support of turn lanes
* Support Android Wear * Support Android Wear
* Lots UI changes * Lots UI changes
* Separate zoom for Text Size on the map * Separate zoom for Text Size on the map
* Special audio notifications in case you are off the route * Special audio notifications in case you are off the route
* OsMo login functionality * OsMo login functionality
* Fix OsMo version incompatibilities * Fix OsMo version incompatibilities
</string> </string>
<string name="rendering_attr_trainLightrailRoutes_name">Train and lightrail routes</string> <string name="rendering_attr_trainLightrailRoutes_name">Train and lightrail routes</string>
<string name="rendering_attr_tramRoutes_name">Tram routes</string> <string name="rendering_attr_tramRoutes_name">Tram routes</string>