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 2015-06-17 20:20:14 +03:00
commit 8fd350f8f7
4 changed files with 55 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -771,4 +771,43 @@
<string name="poi_hanami">Hanami</string>
<string name="poi_trail_riding_station">Refuge pour randonnée équestre</string>
</resources>
<string name="poi_wiki_place">Wikipédia</string>
<string name="poi_wiki_lang_en">Wiki anglais</string>
<string name="poi_wiki_lang_ar">Wiki arabe</string>
<string name="poi_wiki_lang_be">Wiki biélorusse</string>
<string name="poi_wiki_lang_bg">Wiki bulgare</string>
<string name="poi_wiki_lang_ca">Wiki catalan</string>
<string name="poi_wiki_lang_cs">Wiki tchèque</string>
<string name="poi_wiki_lang_da">Wiki danois</string>
<string name="poi_wiki_lang_de">Wiki allemand</string>
<string name="poi_wiki_lang_el">Wiki grecque</string>
<string name="poi_wiki_lang_et">Wiki estonien</string>
<string name="poi_wiki_lang_es">Wiki espagnol</string>
<string name="poi_wiki_lang_fi">Wiki finnois</string>
<string name="poi_wiki_lang_fr">Wiki français</string>
<string name="poi_wiki_lang_gl">Wiki galicien</string>
<string name="poi_wiki_lang_he">Wiki hébreu</string>
<string name="poi_wiki_lang_hr">Wiki croate</string>
<string name="poi_wiki_lang_ht">Wiki haïtien</string>
<string name="poi_wiki_lang_hu">Wiki hongrois</string>
<string name="poi_wiki_lang_id">Wiki indonésien</string>
<string name="poi_wiki_lang_it">Wiki italien</string>
<string name="poi_wiki_lang_ja">Wiki japonais</string>
<string name="poi_wiki_lang_ko">Wiki coréen</string>
<string name="poi_wiki_lang_lt">Wiki lithuanien</string>
<string name="poi_wiki_lang_nl">Wiki hollandais</string>
<string name="poi_wiki_lang_no">Wiki norvégien</string>
<string name="poi_wiki_lang_pl">Wiki polonais</string>
<string name="poi_wiki_lang_pt">Wiki portugais</string>
<string name="poi_wiki_lang_ro">Wiki roumain</string>
<string name="poi_wiki_lang_ru">Wiki russe</string>
<string name="poi_wiki_lang_sk">Wiki slovaque</string>
<string name="poi_wiki_lang_sl">Wiki slovène</string>
<string name="poi_wiki_lang_sr">Wiki serbe</string>
<string name="poi_wiki_lang_sv">Wiki suédois</string>
<string name="poi_wiki_lang_tr">Wiki turque</string>
<string name="poi_wiki_lang_uk">Wiki ukrainien</string>
<string name="poi_wiki_lang_vi">Wiki vietnamien</string>
<string name="poi_wiki_lang_zh">Wiki chinois</string>
</resources>

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

@ -1982,7 +1982,7 @@
<string name="use_fast_recalculation">Умный перерасчет маршрута</string>
<string name="use_fast_recalculation_desc">Перерасчет только начальной части маршрута для длительных поездок</string>
<string name="osm_edit_context_menu_delete">Удалить правки OSM</string>
<string name="rendering_value_disabled_name">Отключена</string>
<string name="rendering_value_disabled_name">Отключено</string>
<string name="rendering_value_walkingRoutesScopeOSMC_name">Раскраска в соответствии с легендой маршрута</string>
<string name="rendering_value_walkingRoutesOSMC_name">Раскраска в соответствии с OSMC</string>
<string name="osmo_share_my_location">Поделиться моим местоположением</string>

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

@ -1903,7 +1903,7 @@
<string name="lang_new">Newar/Nepal Bhasa</string>
<string name="lang_ms">Malajiska</string>
<string name="lang_ht">Haitiska</string>
<string name="lang_gl">Galisiska</string>
<string name="lang_gl">Galiciska</string>
<string name="lang_et">Estniska</string>
<string name="lang_ceb">Cebuano</string>
<string name="lang_ceb">Cebuano/Visaya</string>
</resources>

18
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -176,6 +176,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"de",
"el",
"iw",
"gl",
"he",
"hi",
"hu",
@ -190,6 +191,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"fa",
"pl",
"pt",
"pt_BR",
"ro",
"ru",
"sc",
@ -198,6 +200,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"sk",
"sl",
"es",
"es_AR",
"sv",
"zh_TW",
"tr",
@ -206,9 +209,9 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"cy"};
entries = new String[] { getString(R.string.system_locale) + latinSystemDefaultSuffix,
getString(R.string.lang_en),
getString(R.string.lang_af),
getString(R.string.lang_af) + incompleteSuffix,
getString(R.string.lang_al) + incompleteSuffix,
getString(R.string.lang_ar) + incompleteSuffix,
getString(R.string.lang_ar),
getString(R.string.lang_hy) + incompleteSuffix,
getString(R.string.lang_eu) + incompleteSuffix,
getString(R.string.lang_be),
@ -221,11 +224,12 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
getString(R.string.lang_nl),
getString(R.string.lang_fi) + incompleteSuffix,
getString(R.string.lang_fr),
getString(R.string.lang_ka),
getString(R.string.lang_ka) + incompleteSuffix,
getString(R.string.lang_de),
getString(R.string.lang_el),
getString(R.string.lang_iw),
getString(R.string.lang_he),
getString(R.string.lang_gl),
getString(R.string.lang_he) + incompleteSuffix,
getString(R.string.lang_hi) + incompleteSuffix,
getString(R.string.lang_hu),
getString(R.string.lang_id) + incompleteSuffix,
@ -235,10 +239,11 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
getString(R.string.lang_lv),
getString(R.string.lang_lt),
getString(R.string.lang_mr) + incompleteSuffix,
getString(R.string.lang_no) + incompleteSuffix,
getString(R.string.lang_nb) + incompleteSuffix,
getString(R.string.lang_fa),
getString(R.string.lang_pl),
getString(R.string.lang_pt),
getString(R.string.lang_pt_BR),
getString(R.string.lang_ro),
getString(R.string.lang_ru),
getString(R.string.lang_sc),
@ -247,9 +252,10 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
getString(R.string.lang_sk),
getString(R.string.lang_sl),
getString(R.string.lang_es),
getString(R.string.lang_es_AR),
getString(R.string.lang_sv),
getString(R.string.lang_zh_TW),
getString(R.string.lang_tr),
getString(R.string.lang_tr) + incompleteSuffix,
getString(R.string.lang_uk),
getString(R.string.lang_vi) + incompleteSuffix,
getString(R.string.lang_cy) + incompleteSuffix,};