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

This commit is contained in:
Chumva 2019-12-09 09:00:15 +02:00
commit e0f0669cf0

View file

@ -331,7 +331,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
ctx.getString(R.string.lang_cy) + incompleteSuffix,
ctx.getString(R.string.lang_da),
ctx.getString(R.string.lang_de),
ctx.getString(R.string.lang_el) + incompleteSuffix,
ctx.getString(R.string.lang_el),
ctx.getString(R.string.lang_en_gb),
ctx.getString(R.string.lang_eo),
ctx.getString(R.string.lang_es),
@ -342,7 +342,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
ctx.getString(R.string.lang_fi) + incompleteSuffix,
ctx.getString(R.string.lang_fr),
ctx.getString(R.string.lang_gl),
ctx.getString(R.string.lang_he) + incompleteSuffix,
ctx.getString(R.string.lang_he),
ctx.getString(R.string.lang_hr) + incompleteSuffix,
ctx.getString(R.string.lang_hsb) + incompleteSuffix,
ctx.getString(R.string.lang_hu),
@ -356,7 +356,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
ctx.getString(R.string.lang_ko),
ctx.getString(R.string.lang_lt),
ctx.getString(R.string.lang_lv),
ctx.getString(R.string.lang_ml) + incompleteSuffix,
ctx.getString(R.string.lang_ml),
ctx.getString(R.string.lang_mr) + incompleteSuffix,
ctx.getString(R.string.lang_nb),
ctx.getString(R.string.lang_nl),
@ -370,7 +370,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
ctx.getString(R.string.lang_sc),
ctx.getString(R.string.lang_sk),
ctx.getString(R.string.lang_sl),
ctx.getString(R.string.lang_sr) + incompleteSuffix,
ctx.getString(R.string.lang_sr),
ctx.getString(R.string.lang_sr_latn) + incompleteSuffix,
ctx.getString(R.string.lang_sv),
ctx.getString(R.string.lang_tr),