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

This commit is contained in:
Victor Shcherb 2015-05-01 17:38:33 +02:00
commit 005bae6db9
4 changed files with 35 additions and 27 deletions

File diff suppressed because one or more lines are too long

View file

@ -633,13 +633,13 @@
<string name="poi_transportation">Transport</string>
<string name="poi_man_made">Infrastructure</string>
<string name="poi_education">Éducation</string>
<string name="poi_administrative">Territoire</string>
<string name="poi_administrative">Administration</string>
<string name="poi_healthcare">Santé</string>
<string name="poi_office">Service</string>
<string name="poi_office">Tertiaire</string>
<string name="poi_sport">Sport</string>
<string name="poi_tourism">Tourisme</string>
<string name="poi_entertainment">Loisir</string>
<string name="poi_sustenance">Alimentaire</string>
<string name="poi_sustenance">Restauration</string>
<string name="poi_service">Service</string>
<string name="poi_finance">Argent</string>
<string name="poi_natural">Nature</string>
@ -662,19 +662,19 @@
<string name="poi_internet_access_service">Accès Internet : service</string>
<string name="poi_railway_buffer_stop">Heurtoir ferroviaire</string>
<string name="poi_shop_food">Magasin alimentaire</string>
<string name="poi_shop_food">Commerce alimentaire</string>
<string name="poi_road_obstacle">Route barrée</string>
<string name="poi_public_transport">Transport public</string>
<string name="poi_air_transport">Transport aérien</string>
<string name="poi_water_transport">Transport maritime</string>
<string name="poi_bicycle_transport">Transport en vélo</string>
<string name="poi_communication">Communication</string>
<string name="poi_sightseeing">Point remarquable</string>
<string name="poi_sightseeing">Site touristique</string>
<string name="poi_internet_access">Accès Internet</string>
<string name="poi_club">Club</string>
<string name="poi_cafe_and_restaurant">Café et restaurant</string>
<string name="poi_cafe_and_restaurant">Restaurant et café</string>
<string name="poi_craft">Artisanat</string>
<string name="poi_filling_station">Station de remplissage</string>
<string name="poi_filling_station">Pompe à carburant</string>
<string name="poi_personal_transport">Transport individuel</string>
<string name="poi_water_supply">Alimentation en eau potable</string>
<string name="poi_trash_disposal">Traitement des ordures ménagères</string>

View file

@ -358,7 +358,7 @@
<string name="m">m</string>
<string name="old_map_index_is_not_supported">Le format obsolète de la carte \'\'{0}\'\' n\'\'est pas supporté</string>
<string name="poi_filter_car_aid">Pour conducteurs</string>
<string name="poi_filter_closest_poi">Points d\'Intérêt les plus proches</string>
<string name="poi_filter_closest_poi">Plus proches points d\'intérêt (PI)string>
<string name="poi_filter_custom_filter">Filtre personnalisé</string>
<string name="poi_filter_food_shop">Alimentation</string>
<string name="poi_filter_for_tourists">Pour voyageurs</string>

View file

@ -217,4 +217,13 @@
<string name="poi_halt">火車站</string>
<string name="poi_railway_subway_entrance">捷運入口</string>
<string name="poi_subway_station">捷運車站</string>
<string name="poi_railway_buffer_stop">鐵路止衝擋</string>
<string name="poi_taxi">計程車站</string>
<string name="poi_airport">機場</string>
<string name="poi_helipad">直升機停機坪</string>
<string name="poi_runway">跑道</string>
<string name="poi_aeroway_terminal">機場航廈</string>
<string name="poi_aeroway_gate">登機門</string>
</resources>