Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
xmd5a 2014-12-14 19:21:46 +03:00
commit a5b63a8af2
5 changed files with 172 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values-da/phrases.xml
View file

@ -644,4 +644,7 @@
<string name="poi_canadian_football">Canadisk fodbold</string> <string name="poi_canadian_football">Canadisk fodbold</string>
<string name="poi_surfing">Surfing</string> <string name="poi_surfing">Surfing</string>
<string name="poi_base">Base jumping</string> <string name="poi_base">Base jumping</string>
<string name="poi_cannon">Historisk kanon</string>
<string name="poi_harbour">Havn</string>
<string name="poi_dock">Dok</string>
</resources> </resources>

8
OsmAnd/res/values-es/strings.xml
View file

@ -1906,4 +1906,12 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
<string name="rendering_value_orange_name">Naranja</string> <string name="rendering_value_orange_name">Naranja</string>
<string name="routing_attr_no_new_routing_name">No usar v1.9 de ruteo</string> <string name="routing_attr_no_new_routing_name">No usar v1.9 de ruteo</string>
<string name="routing_attr_no_new_routing_description">No usar v1.9 de ruteo</string> <string name="routing_attr_no_new_routing_description">No usar v1.9 de ruteo</string>
<string name="rendering_value_germanRoadAtlas_name">Atlas de carreteras alemanas</string>
<string name="traffic_warning_railways">Ferrocarriles</string>
<string name="traffic_waring_pedestrian">Peatonal</string>
<string name="show_railway_warnings">Mostrar avisos de ferrocarril</string>
<string name="show_pedestrian_warnings">Mostrar avisos de peatón</string>
<string name="rendering_value_americanRoadAtlas_name">Atlas de carreteras americanas</string>
<string name="navigate_point_easting">Al este</string>
<string name="navigate_point_northing">Al norte</string>
</resources> </resources>

55
OsmAnd/res/values-fr/phrases.xml
View file

@ -37,10 +37,10 @@
<string name="poi_beach_resort">Station balnéaire</string> <string name="poi_beach_resort">Station balnéaire</string>
<string name="poi_beachvolleyball">Beach-volley</string> <string name="poi_beachvolleyball">Beach-volley</string>
<string name="poi_beacon">Signal</string> <string name="poi_beacon">Signal</string>
<string name="poi_seamark_beacon_cardinal">Marque cardinale (balise fixe)</string> <string name="poi_seamark_beacon_cardinal">Balise cardinale</string>
<string name="poi_seamark_beacon_lateral">Marque latérale (balise fixe)</string> <string name="poi_seamark_beacon_lateral">Balise latérale</string>
<string name="poi_seamark_beacon_safe_water">Marque d\'eaux saines (balise fixe)</string> <string name="poi_seamark_beacon_safe_water">Marque d\'eaux saines</string>
<string name="poi_seamark_beacon_special_purpose">Marque spéciale (balise fixe)</string> <string name="poi_seamark_beacon_special_purpose">Marque spéciale</string>
<string name="poi_beauty_salon">Salon de beauté</string> <string name="poi_beauty_salon">Salon de beauté</string>
<string name="poi_beverages">Magasin de boissons</string> <string name="poi_beverages">Magasin de boissons</string>
<string name="poi_bicycle_shop">Magasin de vélos</string> <string name="poi_bicycle_shop">Magasin de vélos</string>
@ -60,11 +60,11 @@
<string name="poi_brothel">Maison de prostitution</string> <string name="poi_brothel">Maison de prostitution</string>
<string name="poi_place_of_worship_buddhist">Bouddhisme</string> <string name="poi_place_of_worship_buddhist">Bouddhisme</string>
<string name="poi_military_bunker">Casemate</string> <string name="poi_military_bunker">Casemate</string>
<string name="poi_seamark_buoy_cardinal">Marque cardinale (balise flottante)</string> <string name="poi_seamark_buoy_cardinal">Bouée cardinale (balise flottante)</string>
<string name="poi_seamark_buoy_installation">Bouée de chargement/déchargement</string> <string name="poi_seamark_buoy_installation">Bouée de chargement / déchargement</string>
<string name="poi_seamark_buoy_isolated_danger">Marque de danger isolé (balise flottante)</string> <string name="poi_seamark_buoy_isolated_danger">Bouée de danger isolé (balise flottante)</string>
<string name="poi_seamark_buoy_lateral">Marque latérale (balise flottante)</string> <string name="poi_seamark_buoy_lateral">Bouée latérale (balise flottante)</string>
<string name="poi_seamark_buoy_safe_water">Marque d\'eaux saines (balise flottante)</string> <string name="poi_seamark_buoy_safe_water">Bouée d\'eaux saines (balise flottante)</string>
<string name="poi_seamark_uoy_special_purpose">Marque spéciale (balise flottante)</string> <string name="poi_seamark_uoy_special_purpose">Marque spéciale (balise flottante)</string>
<string name="poi_bus_station">Gare routière</string> <string name="poi_bus_station">Gare routière</string>
<string name="poi_bus_stop">Arrêt de bus</string> <string name="poi_bus_stop">Arrêt de bus</string>
@ -206,10 +206,10 @@
<string name="poi_lawyer">Juriste</string> <string name="poi_lawyer">Juriste</string>
<string name="poi_level_crossing">Passage à niveau</string> <string name="poi_level_crossing">Passage à niveau</string>
<string name="poi_library">Bibliothèque</string> <string name="poi_library">Bibliothèque</string>
<string name="poi_seamark_light">Feu</string> <string name="poi_seamark_light">Feu (amer)</string>
<string name="poi_seamark_light_float">Bateau-feu (petit)</string> <string name="poi_seamark_light_float">Bouée lumineuse (amer)</string>
<string name="poi_seamark_light_major">Feu majeur</string> <string name="poi_seamark_light_major">Feu majeur (amer)</string>
<string name="poi_seamark_light_minor">Feu mineur</string> <string name="poi_seamark_light_minor">Feu mineur (amer)</string>
<string name="poi_seamark_light_vessel">Bateau-feu</string> <string name="poi_seamark_light_vessel">Bateau-feu</string>
<string name="poi_lighthouse">Phare</string> <string name="poi_lighthouse">Phare</string>
<string name="poi_locality">Lieu-dit</string> <string name="poi_locality">Lieu-dit</string>
@ -276,7 +276,7 @@
<string name="poi_quarry">Carrière</string> <string name="poi_quarry">Carrière</string>
<string name="poi_raceway">Circuit</string> <string name="poi_raceway">Circuit</string>
<string name="poi_racquet">Sport de raquette</string> <string name="poi_racquet">Sport de raquette</string>
<string name="poi_seamark_radar_transponder">Transpondeur radar</string> <string name="poi_seamark_radar_transponder">Transpondeur radar (amer)</string>
<string name="poi_railway_halt">Gare ferroviaire (halte)</string> <string name="poi_railway_halt">Gare ferroviaire (halte)</string>
<string name="poi_railway_platform">Quai de gare</string> <string name="poi_railway_platform">Quai de gare</string>
<string name="poi_railway_station">Gare ferroviaire</string> <string name="poi_railway_station">Gare ferroviaire</string>
@ -465,8 +465,8 @@
<string name="poi_fjord">Fjord</string> <string name="poi_fjord">Fjord</string>
<string name="poi_seamark_anchorage">Mouillage</string> <string name="poi_seamark_anchorage">Mouillage</string>
<string name="poi_seamark_beacon">Balise</string> <string name="poi_seamark_beacon">Balise</string>
<string name="poi_seamark_building">Amer</string> <string name="poi_seamark_building">Bâtiment remarquable (amer)</string>
<string name="poi_seamark_buoy_special_purpose">Marque spéciale</string> <string name="poi_seamark_buoy_special_purpose">Marque spéciale (balise flottante)</string>
<string name="poi_seamark_dry_dock">Cale sèche</string> <string name="poi_seamark_dry_dock">Cale sèche</string>
<string name="poi_seamark_mooring">Mouillage</string> <string name="poi_seamark_mooring">Mouillage</string>
<string name="poi_seamark_wreck">Épave</string> <string name="poi_seamark_wreck">Épave</string>
@ -495,7 +495,7 @@
<string name="poi_orchard">Verger</string> <string name="poi_orchard">Verger</string>
<string name="poi_prosecutor">Procureur</string> <string name="poi_prosecutor">Procureur</string>
<string name="poi_administrative_office">Centre administratif</string> <string name="poi_administrative_office">Centre administratif</string>
<string name="poi_seamark_rock">Rocher, amer</string> <string name="poi_seamark_rock">Rocher (amer)</string>
<string name="poi_seamark_distance_mark">Borne</string> <string name="poi_seamark_distance_mark">Borne</string>
<string name="poi_upholsterer">Tapissier</string> <string name="poi_upholsterer">Tapissier</string>
<string name="poi_tiler">Carreleur</string> <string name="poi_tiler">Carreleur</string>
@ -576,4 +576,25 @@
<string name="poi_running_track">Piste de course</string> <string name="poi_running_track">Piste de course</string>
<string name="poi_base">Saut B.A.S.E.</string> <string name="poi_base">Saut B.A.S.E.</string>
<string name="poi_roller_skating">Roller skating</string> <string name="poi_roller_skating">Roller skating</string>
<string name="poi_cannon">Canon historique</string>
<string name="poi_club_automobile">Club automobile</string>
<string name="poi_club_history">Association du patrimoine</string>
<string name="poi_harbour">Port</string>
<string name="poi_seamark_floating_dock">Quai flottant</string>
<string name="poi_military_range">Terrain militaire</string>
<string name="poi_rune_stone">Pierre runique</string>
<string name="poi_city_gate">Porte de ville</string>
<string name="poi_club_board_games">Club de jeux de société</string>
<string name="poi_club_veterans">Association de vétérans</string>
<string name="poi_blacksmith">Forgeron</string>
<string name="poi_sweep">Ramoneur</string>
<string name="poi_tinsmith">Ferronnier</string>
<string name="poi_dock">Quai</string>
<string name="poi_mortuary">Funérarium</string>
<string name="poi_seamark_pile">Tourelle</string>
<string name="poi_seamark_anchor_berth">Zone de mouillage</string>
<string name="poi_seamark_berth">Zone</string>
<string name="poi_seamark_bridge">Pont remarquable (amer)</string>
<string name="poi_seamark_radio_station">Station radio (amer)</string>
<string name="poi_seamark_signal_station_traffic">Sémaphore</string>
</resources> </resources>

123
OsmAnd/res/values-ko/phrases.xml
View file

@ -466,7 +466,7 @@
<string name="poi_park">공원</string> <string name="poi_park">공원</string>
<string name="poi_cafe">카페</string> <string name="poi_cafe">카페</string>
<string name="poi_biergarten">Biergarten</string> <string name="poi_biergarten">비어 가든</string>
<string name="poi_restaurant">레스토랑</string> <string name="poi_restaurant">레스토랑</string>
<string name="poi_fast_food">패스트 푸드</string> <string name="poi_fast_food">패스트 푸드</string>
<string name="poi_bar">바</string> <string name="poi_bar">바</string>
@ -510,4 +510,123 @@
<string name="poi_rigger">Rigger</string> <string name="poi_rigger">Rigger</string>
<string name="poi_saddler">Saddler</string> <string name="poi_saddler">Saddler</string>
<string name="poi_sailmaker">Sailmaker</string> <string name="poi_sailmaker">Sailmaker</string>
</resources> <string name="poi_cannon">역사적인 대포</string>
<string name="poi_harbour">항구</string>
<string name="poi_sawmill">제재소</string>
<string name="poi_scaffolder">Scaffolder</string>
<string name="poi_sculptor">조각가</string>
<string name="poi_shoemaker">구두 메이커</string>
<string name="poi_stand_builder">스탠드 빌더</string>
<string name="poi_stonemason">석공</string>
<string name="poi_sun_protection_craft">태양 보호 기술</string>
<string name="poi_sweep">스윕</string>
<string name="poi_tailor">재단사</string>
<string name="poi_tiler">벽돌공</string>
<string name="poi_tinsmith">양철공</string>
<string name="poi_upholsterer">실내</string>
<string name="poi_watchmaker">시계공</string>
<string name="poi_window_construction">창문 건설</string>
<string name="poi_funeral_directors">장례 감독</string>
<string name="poi_computer_craft">컴퓨터 기술</string>
<string name="poi_beauty_salon">뷰티 살롱</string>
<string name="poi_beauty_salon_nails">네일 살롱</string>
<string name="poi_hairdresser">헤어 드레서</string>
<string name="poi_massage">마사지 살롱</string>
<string name="poi_tattoo">문신 살롱</string>
<string name="poi_dry_cleaning">드라이 클리닝</string>
<string name="poi_laundry">세탁소</string>
<string name="poi_car_rental">자동차 렌탈</string>
<string name="poi_car_sharing">자동차 공유</string>
<string name="poi_boat_sharing">공유 보트</string>
<string name="poi_dock">선창</string>
<string name="poi_toilets">화장실</string>
<string name="poi_sauna">사우나</string>
<string name="poi_brothel">굴</string>
<string name="poi_mortuary">영안실</string>
<string name="poi_crematorium">화장 하는 곳</string>
<string name="poi_internet_cafe">인터넷 카페</string>
<string name="poi_bank">은행</string>
<string name="poi_atm">현금 지급기</string>
<string name="poi_money_lender">대부업자</string>
<string name="poi_pawnbroker">전당포</string>
<string name="poi_currencyexchange">변경소</string>
<string name="poi_accountant">회계사</string>
<string name="poi_bitcoin_yes">Bitcoin 지불</string>
<string name="poi_cave_entrance">동굴 입구</string>
<string name="poi_peak">봉우리</string>
<string name="poi_saddle">안장</string>
<string name="poi_volcano">화산</string>
<string name="poi_crater">분화구</string>
<string name="poi_ridge">릿지</string>
<string name="poi_glacier">빙하</string>
<string name="poi_sinkhole">하수 구멍</string>
<string name="poi_waterfall">폭포</string>
<string name="poi_river">강</string>
<string name="poi_stream">기류</string>
<string name="poi_rapids">급류</string>
<string name="poi_stone">옥석</string>
<string name="poi_cape">케이프</string>
<string name="poi_beach">해안</string>
<string name="poi_bay">베이</string>
<string name="poi_fjord">피요르드</string>
<string name="poi_reef">리프</string>
<string name="poi_wetland">습지</string>
<string name="poi_nature_reserve">자연 보호구역</string>
<string name="poi_strait">해협</string>
<string name="poi_island">섬</string>
<string name="poi_islet">작은 섬</string>
<string name="poi_seamark_anchorage">앵커리지</string>
<string name="poi_seamark_anchor_berth">앵커 정박</string>
<string name="poi_seamark_beacon">신호</string>
<string name="poi_seamark_beacon_cardinal">심장 표지</string>
<string name="poi_seamark_beacon_lateral">측면 표지</string>
<string name="poi_seamark_beacon_safe_water">안전 수상 신호</string>
<string name="poi_seamark_beacon_special_purpose">특수 목적 신호</string>
<string name="poi_seamark_berth">부두</string>
<string name="poi_seamark_building">해안표시 빌딩</string>
<string name="poi_seamark_bridge">Seamark 다리</string>
<string name="poi_seamark_buoy_cardinal">심장 부표</string>
<string name="poi_seamark_buoy_installation">부표 설치</string>
<string name="poi_seamark_buoy_isolated_danger">부표, 고립된 위험</string>
<string name="poi_seamark_buoy_lateral">측면 부표</string>
<string name="poi_seamark_buoy_safe_water">안전 수상 부표</string>
<string name="poi_seamark_buoy_special_purpose">특수 목적 부표</string>
<string name="poi_seamark_daymark">Daymark</string>
<string name="poi_seamark_distance_mark">거리 표시</string>
<string name="poi_seamark_dry_dock">드라이 도크</string>
<string name="poi_seamark_dyke">제방</string>
<string name="poi_seamark_floating_dock">플로팅 도크</string>
<string name="poi_seamark_fog_signal">안개 신호</string>
<string name="poi_seamark_harbour_basin">항구 분지</string>
<string name="poi_seamark_harbour">항구</string>
<string name="poi_seamark_landmark">랜드마크</string>
<string name="poi_seamark_light">빛, seamark</string>
<string name="poi_seamark_light_major">주요 빛, seamark</string>
<string name="poi_seamark_light_minor">작은 빛, seamark</string>
<string name="poi_seamark_light_float">깜박이는 빛, seamark</string>
<string name="poi_seamark_light_vessel">선박 조명, seamark</string>
<string name="poi_seamark_mooring">계류</string>
<string name="poi_seamark_notice">주의 사항, seamark</string>
<string name="poi_seamark_pile">더미</string>
<string name="poi_seamark_radar_transponder">레이다 트랜스폰더, seamark</string>
<string name="poi_seamark_radio_station">무선국, seamark</string>
<string name="poi_seamark_signal_station_traffic">신호 센터, 교통</string>
<string name="poi_seamark_signal_station_warning">신호 센터, 경고</string>
<string name="poi_seamark_small_craft_facility">작은 공예 시설</string>
<string name="poi_seamark_topmark">톱 마크, seamark</string>
<string name="poi_seamark_rock">바위, seamark</string>
<string name="poi_seamark_wreck">난파선, seamark</string>
<string name="poi_military">군사 지역</string>
<string name="poi_military_airfield">군 비행장</string>
<string name="poi_military_bunker">군사 벙커</string>
<string name="poi_military_barracks">병영</string>
<string name="poi_military_danger_area">위험 지역</string>
<string name="poi_military_range">군사 지역</string>
<string name="poi_military_naval_base">해군 기지</string>
<string name="poi_military_nuclear_explosion_site">핵 폭발 사이트</string>
</resources>

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

@ -628,4 +628,6 @@
<string name="poi_bmx_sport">Веломотокросс</string> <string name="poi_bmx_sport">Веломотокросс</string>
<string name="poi_canadian_football">Канадский футбол</string> <string name="poi_canadian_football">Канадский футбол</string>
<string name="poi_surfing">Серфинг</string> <string name="poi_surfing">Серфинг</string>
<string name="poi_cannon">Исторические пушки</string>
<string name="poi_harbour">Гавань</string>
</resources> </resources>