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

This commit is contained in:
Victor Shcherb 2015-05-01 19:19:54 +02:00
commit 5b229534ac
3 changed files with 35 additions and 2 deletions

View file

@ -394,4 +394,33 @@
<string name="poi_cafe_and_restaurant">Cafè i restaurant</string> <string name="poi_cafe_and_restaurant">Cafè i restaurant</string>
<string name="poi_service">Servei</string> <string name="poi_service">Servei</string>
<string name="poi_craft">Artesania</string> <string name="poi_craft">Artesania</string>
<string name="poi_natural">Natura</string>
<string name="poi_seamark">Nàutica</string>
<string name="poi_osmwiki">Viquipèdia</string>
<string name="poi_user_defined_other">Definit per l\'usuari</string>
<string name="poi_wine">Venda de vi</string>
<string name="poi_charity">Botiga benèfica</string>
<string name="poi_kitchen">Mobles de cuina</string>
<string name="poi_medical_supply">Subministraments mèdics</string>
<string name="poi_photo">Fotografia</string>
<string name="poi_fuel:diesel">Dièsel</string>
<string name="poi_fuel:hgv_diesel">Gasoil de vehicles pesants</string>
<string name="poi_fuel:biodiesel">Gasoil biològic</string>
<string name="poi_fuel:octane_80">80 octans</string>
<string name="poi_fuel:octane_91">91 octans</string>
<string name="poi_fuel:octane_92">92 octans</string>
<string name="poi_fuel:octane_95">95 octans</string>
<string name="poi_fuel:octane_98">98 octans</string>
<string name="poi_fuel:octane_100">100 octans</string>
<string name="poi_fuel:ethanol">Etanol</string>
<string name="poi_fuel:methanol">Metanol</string>
<string name="poi_fuel:lh2">Hidrogen líquid</string>
<string name="poi_fuel:electricity">Electricitat</string>
<string name="poi_vehicle_ramp">Rampa per vehicles</string>
<string name="poi_compressed_air">Aire comprimit</string>
<string name="poi_public_transport_stop_position">Localització de parada de transport públic</string>
<string name="poi_aeroway_gate">Porta d\'embarcament</string>
</resources> </resources>

View file

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<resources><string name="offline_edition">Modifications hors-ligne</string> <resources><string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string> <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
<string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 : <string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :poi_filter_closest_poi
\n\t- Modification hors-ligne des PI \n\t- Modification hors-ligne des PI
\n\t- Option de suivi en ligne - envoyer ses coordonnées à un service web de façon périodique (lire la configuration dans les articles HowTo) \n\t- Option de suivi en ligne - envoyer ses coordonnées à un service web de façon périodique (lire la configuration dans les articles HowTo)
\n\t- Afficher l\'itinéraire en cours d\'enregistrement sur la carte \n\t- Afficher l\'itinéraire en cours d\'enregistrement sur la carte
@ -358,7 +358,7 @@
<string name="m">m</string> <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="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_car_aid">Pour conducteurs</string>
<string name="poi_filter_closest_poi">Plus proches points d\'intérêt (PI)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_custom_filter">Filtre personnalisé</string>
<string name="poi_filter_food_shop">Alimentation</string> <string name="poi_filter_food_shop">Alimentation</string>
<string name="poi_filter_for_tourists">Pour voyageurs</string> <string name="poi_filter_for_tourists">Pour voyageurs</string>

View file

@ -226,4 +226,8 @@
<string name="poi_aeroway_terminal">機場航廈</string> <string name="poi_aeroway_terminal">機場航廈</string>
<string name="poi_aeroway_gate">登機門</string> <string name="poi_aeroway_gate">登機門</string>
<string name="poi_slipway">船舶斜滑道</string>
<string name="poi_ferry_terminal">輪渡碼頭</string>
<string name="poi_lighthouse">燈塔</string>
</resources> </resources>