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

This commit is contained in:
Victor Shcherb 2015-11-02 09:42:07 +01:00
commit 98b92608e4
2 changed files with 25 additions and 0 deletions

View file

@ -943,4 +943,11 @@
<string name="poi_denomination_reformed">改革派(Reformed)</string> <string name="poi_denomination_reformed">改革派(Reformed)</string>
<string name="poi_denomination_seventh_day_adventist">セブンスデーアドベンチスト・安息日再臨派(Seventh day adventist)</string> <string name="poi_denomination_seventh_day_adventist">セブンスデーアドベンチスト・安息日再臨派(Seventh day adventist)</string>
<string name="poi_denomination_new_apostolic">新使徒教会(New apostolic)</string> <string name="poi_denomination_new_apostolic">新使徒教会(New apostolic)</string>
<string name="poi_denomination_church_of_england">英国聖公会(Church of england)</string>
<string name="poi_denomination_episcopal">米国聖公会(Episcopal)</string>
<string name="poi_denomination_shia">シーア派(Shia)</string>
<string name="poi_denomination_united">カナダ連合教会(United)</string>
<string name="poi_denomination_greek_catholic">東方典礼カトリック教会(Greek catholic)</string>
<string name="poi_denomination_united_reformed">アメリカ・オランダ改革派(United reformed)</string>
<string name="poi_denomination_church_of_scotland">スコットランド国教会(Church of Scotland)</string>
</resources> </resources>

View file

@ -2120,4 +2120,22 @@
<string name="poi_sauna_yes">三溫暖服務</string> <string name="poi_sauna_yes">三溫暖服務</string>
<string name="poi_solarium_yes">日光浴服務</string> <string name="poi_solarium_yes">日光浴服務</string>
<string name="poi_tents_yes">允許宿營</string>
<string name="poi_tents_no">不允許宿營</string>
<string name="poi_openfire_yes">允許用火</string>
<string name="poi_openfire_no">不允許用火</string>
<string name="poi_backcountry_yes">野外露營</string>
<string name="poi_backcountry_no">野外露營:否</string>
<string name="poi_scout_yes">偵察營:是</string>
<string name="poi_scout_no">偵察營:否</string>
<string name="poi_group_only_yes">只有群組:是</string>
<string name="poi_group_only_no">只有群組:否</string>
<string name="poi_washing_machine_yes">清洗機:有</string>
<string name="poi_washing_machine_no">清洗機:無</string>
<string name="poi_shower_yes">淋浴:有</string>
<string name="poi_shower_no">淋浴:無</string>
<string name="poi_shower_hot">淋浴:熱的</string>
<string name="poi_shower_outdoor">淋浴:戶外</string>
<string name="poi_shower_cold">淋浴:冷的</string>
<string name="poi_shower_indoor">淋浴:室內</string>
</resources> </resources>