Merge branch 'r2.1' of github.com:osmandapp/Osmand into r2.1

This commit is contained in:
Victor Shcherb 2015-06-18 23:56:21 +02:00
commit 9794de3c58

View file

@ -194,12 +194,10 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"ru",
"sc",
"sr",
"zh_CN",
"sk",
"sl",
"es",
"sv",
"zh_TW",
"tr",
"uk",
"vi",
@ -243,12 +241,10 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
getString(R.string.lang_ru),
getString(R.string.lang_sc),
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) + incompleteSuffix,