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

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

Browse source
This commit is contained in:
Victor Shcherb 2015-04-10 19:28:20 +02:00
commit 91d9f0fa6c
11 changed files with 156 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values-be/strings.xml
View file

@ -1950,4 +1950,5 @@
<string name="rendering_attr_OSMMapperAssistant_name">Памагаты картографа OSM</string>
<string name="shared_string_manage">Кіраваць</string>
<string name="shared_string_edit">Правіць</string>
</resources>
<string name="shared_string_open">Адчыніць</string>
</resources>

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

@ -787,4 +787,5 @@
<string name="poi_recreation_ground">Rekreativtområde</string>
<string name="poi_village_green">Forte</string>
<string name="poi_junction">Vejkryds</string>
</resources>

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

@ -1994,4 +1994,7 @@
<string name="shared_string_search">Søg</string>
<string name="shared_string_places">Steder</string>
<string name="rendering_attr_OSMMapperAssistant_name">OSM kortlægger assistent</string>
<string name="shared_string_open">Åben</string>
<string name="shared_string_manage">Administrer</string>
<string name="shared_string_edit">Rediger</string>
</resources>

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

@ -739,7 +739,7 @@
<string name="poi_landuse">Occupation du sol</string>
<string name="poi_fuel_diesel_yes">Gazole</string>
<string name="poi_fuel_gtl_diesel_yes">GPL</string>
<string name="poi_fuel_gtl_diesel_yes">Gazole liquéfié</string>
<string name="poi_fuel_hgv_diesel_yes">Gazole poids lourds</string>
<string name="poi_fuel_biodiesel_yes">Bio-gazole</string>
<string name="poi_fuel_lpg_yes">GPL</string>

3
OsmAnd/res/values-fr/strings.xml
View file

@ -2015,4 +2015,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
<string name="rendering_attr_OSMMapperAssistant_name">Assistant pour la cartographie OSM</string>
<string name="shared_string_manage">Gérer</string>
<string name="shared_string_edit">Modifier</string>
</resources>
<string name="shared_string_open">Ouvrir</string>
</resources>

91
OsmAnd/res/values-ja/phrases.xml
View file

@ -259,4 +259,95 @@
<string name="poi_power_plant">発電所・発電施設(Power plant)</string>
<string name="poi_power_generator">発電機(Power generator)</string>
<string name="poi_landuse">土地利用(Landuse)</string>
<string name="poi_fuel_diesel_yes">ディーゼル(Diesel)</string>
<string name="poi_fuel_gtl_diesel_yes">GTLディーゼル(GTL diesel)</string>
<string name="poi_fuel_hgv_diesel_yes">HGVディーゼル(HGV diesel)</string>
<string name="poi_fuel_biodiesel_yes">バイオディーゼル(Bio diesel)</string>
<string name="poi_fuel_lpg_yes">液化石油ガス</string>
<string name="poi_fuel_octane_80_yes">オクタン価80(Octane 80)</string>
<string name="poi_fuel_octane_91_yes">オクタン価91(Octane 91)</string>
<string name="poi_fuel_octane_92_yes">オクタン価92(Octane 92)</string>
<string name="poi_fuel_octane_95_yes">オクタン価95(Octane 95)</string>
<string name="poi_fuel_octane_98_yes">オクタン価98(Octane 98)</string>
<string name="poi_fuel_octane_100_yes">オクタン価100(Octane 100)</string>
<string name="poi_fuel_cng_yes">圧縮天然ガス</string>
<string name="poi_fuel_1_25_yes">混合油 1:25(1:25 fuel)</string>
<string name="poi_fuel_1_50_yes">混合油 1:50(1:50 fuel)</string>
<string name="poi_fuel_ethanol_yes">エタノール(Ethanol)</string>
<string name="poi_fuel_methanol_yes">メタノール(Methanol)</string>
<string name="poi_fuel_svo_yes">植物油(SVO)</string>
<string name="poi_fuel_e10_yes">E10・バイオエタノール10％混合ガソリン(E10)</string>
<string name="poi_fuel_e20_yes">E20・バイオエタノール20％混合ガソリン(E20)</string>
<string name="poi_fuel_e85_yes">E85・バイオエタノール85％混合ガソリン(E85)</string>
<string name="poi_fuel_biogas_yes">E85・バイオエタノール85％混合ガソリン(E85)</string>
<string name="poi_fuel_LH2_yes">液体水素(Liquid hydrogen)</string>
<string name="poi_fuel_electricity_yes">電気(Electricity)</string>
<string name="poi_junction">ジャンクション(Junction)</string>
<string name="poi_rest_area">PA・SA(Rest area)</string>
<string name="poi_post_office">郵便局(Post office)</string>
<string name="poi_post_box">郵便ポスト(Post box)</string>
<string name="poi_telephone">公衆電話(Telephone)</string>
<string name="poi_communication_tower">電波塔(Communication tower)</string>
<string name="poi_telephone_exchange">電話収容局・交換局(Telephone exchange)</string>
<string name="poi_recycling">リサイクル施設・資源ごみ回収所(Recycling)</string>
<string name="poi_landfill">ゴミ埋立地(Landfill)</string>
<string name="poi_waste_disposal">ゴミ捨て場(Waste disposal)</string>
<string name="poi_waste_basket">ゴミ箱(Waste basket)</string>
<string name="poi_industrial">工業地域(Industrial area)</string>
<string name="poi_quarry">採石場(Quarry)</string>
<string name="poi_vineyard">葡萄畑(Vineyard)</string>
<string name="poi_orchard">果樹園(Orchard)</string>
<string name="poi_allotments">小規模農園(Allotments)</string>
<string name="poi_forest">植林地帯(Human maintained forest)</string>
<string name="poi_farmyard">農場(Farmyard)</string>
<string name="poi_meadow">牧草地(Meadow)</string>
<string name="poi_landuse_railway">鉄道用地(Railroad area)</string>
<string name="poi_canal">運河(Canal)</string>
<string name="poi_pier">桟橋(Pier)</string>
<string name="poi_surveillance">監視区域(Surveillance)</string>
<string name="poi_observatory">観測台(Observatory)</string>
<string name="poi_astronomical_observatory">天文台(Astronomical observatory)</string>
<string name="poi_tower">塔(Tower)</string>
<string name="poi_mast">柱(Mast)</string>
<string name="poi_radar">レーダー(Radar)</string>
<string name="poi_construction">工事現場(Construction)</string>
<string name="poi_works">工場(Works)</string>
<string name="poi_mineshaft">縦坑(Mineshaft)</string>
<string name="poi_adit">坑道入口(Adit)</string>
<string name="poi_petroleum_well">油井(Petroleum well)</string>
<string name="poi_survey_point">測地基準点(Survey point)</string>
<string name="poi_windmill">風車(Windmill)</string>
<string name="poi_salt_pond">塩田(Salt pond)</string>
<string name="poi_reservoir">貯水池(Reservoir)</string>
<string name="poi_cricket_nets">クリケット練習場(Cricket nets)</string>
<string name="poi_gasometer">ガスタンク(Gasometer)</string>
<string name="poi_silo">サイロ(Silo)</string>
<string name="poi_storage_tank">貯蔵タンク(Storage tank)</string>
<string name="poi_driving_school">自動車教習所(Driving school)</string>
<string name="poi_training">訓練施設(Training facility)</string>
<string name="poi_social_facility">社会福祉施設(Social facility)</string>
<string name="poi_courthouse">裁判所(Courthouse)</string>
<string name="poi_prison">刑務所(Prison)</string>
<string name="poi_register_office">役所の市民課・住民登録所(Civil registry office)</string>
<string name="poi_government">政府機関(Government)</string>
<string name="poi_bailiff">裁判所・簡易裁判所(Bailiff)</string>
<string name="poi_prosecutor">検察官(Prosecutor)</string>
<string name="poi_pension_fund">年金基金(Pension fund)</string>
<string name="poi_tax_inspection">税務調査(Tax inspection)</string>
<string name="poi_office_administrative">地方自治体(Administrative office)</string>
<string name="poi_customs">税関(Customs)</string>
<string name="poi_town">町(Town)</string>
<string name="poi_village">村(Village)</string>
<string name="poi_hamlet">集落(Hamlet)</string>
<string name="poi_isolated_dwelling">孤立住居(Isolated dwelling)</string>
<string name="poi_suburb">区・区画(Suburb)</string>
<string name="poi_quarter">大字(Quarter)</string>
<string name="poi_neighbourhood">町丁(Neighbourhood)</string>
<string name="poi_locality">非居住地(Locality)</string>
</resources>

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

@ -2011,4 +2011,10 @@ POIの更新は利用できません</string>
<string name="shared_string_do_not_use">使用しない</string>
<string name="shared_string_show_description">説明表示</string>
<string name="shared_string_address">住所</string>
</resources>
<string name="rendering_attr_OSMMapperAssistant_name">OSM マップ作成アシスタント</string>
<string name="shared_string_manage">管理</string>
<string name="shared_string_edit">編集</string>
<string name="shared_string_places">場所</string>
<string name="shared_string_search">検索</string>
<string name="shared_string_open">開く</string>
</resources>

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

@ -735,4 +735,39 @@
<string name="poi_valley">계곡</string>
<string name="poi_water">수로</string>
<string name="poi_wood">나무</string>
<string name="poi_landuse">사유지</string>
<string name="poi_fuel_diesel_yes">디젤</string>
<string name="poi_fuel_gtl_diesel_yes">GTL 디젤</string>
<string name="poi_fuel_hgv_diesel_yes">HGV 디젤</string>
<string name="poi_fuel_biodiesel_yes">바이오 디젤</string>
<string name="poi_fuel_lpg_yes">LPG</string>
<string name="poi_fuel_octane_80_yes">옥탄가 80</string>
<string name="poi_fuel_octane_91_yes">옥탄가 91</string>
<string name="poi_fuel_octane_92_yes">옥탄가 92</string>
<string name="poi_fuel_octane_95_yes">옥탄가 95</string>
<string name="poi_fuel_octane_98_yes">옥탄가 98</string>
<string name="poi_fuel_octane_100_yes">옥탄가 100</string>
<string name="poi_fuel_cng_yes">압축천연가스(CNG)</string>
<string name="poi_fuel_1_25_yes">혼합유 1:25</string>
<string name="poi_fuel_1_50_yes">혼합유 1:50</string>
<string name="poi_fuel_ethanol_yes">에탄올</string>
<string name="poi_fuel_methanol_yes">메탄올</string>
<string name="poi_fuel_svo_yes">식물성 기름</string>
<string name="poi_fuel_e10_yes">E10</string>
<string name="poi_fuel_e20_yes">E20</string>
<string name="poi_fuel_e85_yes">E85</string>
<string name="poi_fuel_biogas_yes">E85</string>
<string name="poi_fuel_LH2_yes">액체 수소</string>
<string name="poi_fuel_electricity_yes">전기</string>
<string name="poi_junction">접합</string>
<string name="poi_industrial">산업 분야</string>
<string name="poi_farmyard">농장 구내</string>
<string name="poi_meadow">초원</string>
<string name="poi_landuse_railway">철도 지역</string>
<string name="poi_residential">주거 지역</string>
<string name="poi_recreation_ground">레크리에이션 지역</string>
<string name="poi_village_green">녹색 마을</string>
</resources>

6
OsmAnd/res/values-ko/strings.xml
View file

@ -2223,4 +2223,10 @@
<string name="shared_string_do_not_use">사용 하지 마십시오</string>
<string name="shared_string_address">주소</string>
<string name="shared_string_show_description">설명 표시</string>
<string name="shared_string_open">열기</string>
<string name="rendering_attr_OSMMapperAssistant_name">OSM 지도작성 도우미</string>
<string name="shared_string_manage">관리</string>
<string name="shared_string_edit">편집</string>
<string name="shared_string_places">장소</string>
<string name="shared_string_search">검색</string>
</resources>

4
OsmAnd/res/values-sc/strings.xml
View file

@ -1940,4 +1940,8 @@
<string name="shared_string_show_description">Ammustra descritzione</string>
<string name="shared_string_places">Logos</string>
<string name="shared_string_search">Chirca</string>
<string name="shared_string_open">Abertu</string>
<string name="shared_string_manage">Amministra</string>
<string name="shared_string_edit">Modìfica</string>
<string name="rendering_attr_OSMMapperAssistant_name">Assistente mapadura OSM</string>
</resources>

4
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -1965,4 +1965,8 @@
<string name="shared_string_show_description">顯示記述</string>
<string name="shared_string_search">搜尋</string>
<string name="shared_string_places">地點</string>
<string name="shared_string_open">開啓</string>
<string name="rendering_attr_OSMMapperAssistant_name">OSM 制圖助手</string>
<string name="shared_string_manage">管理</string>
<string name="shared_string_edit">編輯</string>
</resources>