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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-07-22 21:07:50 +02:00
commit 35a1d3e77a
2 changed files with 70 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/res/values/strings.xml
View file

@ -212,12 +212,15 @@
<string name="lang_pt_br">Portuguese (Brazil)</string>
<string name="lang_en">English</string>
<string name="lang_af">Afrikaans</string>
<string name="lang_al">Albanian</string>
<string name="lang_ar">Arabic</string>
<string name="lang_hy">Armenian</string>
<string name="lang_eu">Basque</string>
<string name="lang_be">Belarusian</string>
<string name="lang_bs">Bosnian</string>
<string name="lang_bg">Bulgarian</string>
<string name="lang_ca">Catalan</string>
<string name="lang_hr">Croatian</string>
<string name="lang_cs">Czech</string>
<string name="lang_da">Danish</string>
<string name="lang_nl">Dutch</string>
@ -242,10 +245,14 @@
<string name="lang_pt">Portuguese</string>
<string name="lang_ro">Romanian</string>
<string name="lang_ru">Russian</string>
<string name="lang_sc">Sardinian</string>
<string name="lang_sr">Serbian</string>
<string name="lang_zh_CN">Simplified Chinese</string>
<string name="lang_sk">Slovak</string>
<string name="lang_sl">Slovenian</string>
<string name="lang_es">Spanish</string>
<string name="lang_sv">Swedish</string>
<string name="lang_zh_TW">Traditional Chinese</string>
<string name="lang_tr">Turkish</string>
<string name="lang_uk">Ukrainian</string>
<string name="lang_vi">Vietnamese</string>

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

@ -167,20 +167,70 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
}
registerListPreference(settings.METRIC_SYSTEM, screen, entries, mvls);
// See language list and statistics at: https://hosted.weblate.org/projects/osmand/main/
String incompleteSuffix = " (" + getString(R.string.incomplete_locale) + ")";
//getResources().getAssets().getLocales();
entrieValues = new String[] { "", "en", "af", "hy", "eu", "be", "bs", "bg", "ca", "cs", "da", "nl", "fi", "fr",
"ka", "de", "el", "iw", "he", "hi", "hu", "id", "it", "ja", "ko", "lv", "lt", "mr", "no", "pl", "pt",
"ro", "ru", "sk", "sl", "es", "sv", "tr", "uk", "vi", "cy" };
entrieValues = new String[] { "",
"en",
"af",
"al",
"ar",
"hy",
"eu",
"be",
"bs",
"bg",
"ca",
"hr",
"cs",
"da",
"nl",
"fi",
"fr",
"ka",
"de",
"el",
"iw",
"he",
"hi",
"hu",
"id",
"it",
"ja",
"ko",
"lv",
"lt",
"mr",
"nb",
"fa",
"pl",
"pt",
"ro",
"ru",
"sc",
"sr",
"zh-rCN",
"sk",
"sl",
"es",
"sv",
"zh-rTW",
"tr",
"uk",
"vi",
"cy"};
entries = new String[] { getString(R.string.system_locale),
getString(R.string.lang_en),
getString(R.string.lang_af),
getString(R.string.lang_al) + incompleteSuffix,
getString(R.string.lang_ar) + incompleteSuffix,
getString(R.string.lang_hy) + incompleteSuffix,
getString(R.string.lang_eu) + incompleteSuffix,
getString(R.string.lang_be) + incompleteSuffix,
getString(R.string.lang_be),
getString(R.string.lang_bs) + incompleteSuffix,
getString(R.string.lang_bg) + incompleteSuffix,
getString(R.string.lang_ca),
getString(R.string.lang_hr) + incompleteSuffix,
getString(R.string.lang_cs),
getString(R.string.lang_da),
getString(R.string.lang_nl),
@ -196,22 +246,27 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
getString(R.string.lang_id) + incompleteSuffix,
getString(R.string.lang_it),
getString(R.string.lang_ja) + incompleteSuffix,
getString(R.string.lang_ko) + incompleteSuffix,
getString(R.string.lang_ko),
getString(R.string.lang_lv),
getString(R.string.lang_lt),
getString(R.string.lang_mr),
getString(R.string.lang_mr) + incompleteSuffix,
getString(R.string.lang_no) + incompleteSuffix,
getString(R.string.lang_fa),
getString(R.string.lang_pl),
getString(R.string.lang_pt),
getString(R.string.lang_ro),
getString(R.string.lang_ru),
getString(R.string.lang_sc) + incompleteSuffix,
getString(R.string.lang_sr) + incompleteSuffix,
getString(R.string.lang_zh_CN) + incompleteSuffix,
getString(R.string.lang_sk),
getString(R.string.lang_sl),
getString(R.string.lang_es),
getString(R.string.lang_sv),
getString(R.string.lang_zh_TW),
getString(R.string.lang_tr),
getString(R.string.lang_uk),
getString(R.string.lang_vi),
getString(R.string.lang_vi) + incompleteSuffix,
getString(R.string.lang_cy) + incompleteSuffix,};
registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues);
}