Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-21 07:09:30 +02:00
commit f7021c5135

View file

@ -229,7 +229,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
entries = new String[]{getString(R.string.system_locale) + latinSystemDefaultSuffix, entries = new String[]{getString(R.string.system_locale) + latinSystemDefaultSuffix,
getString(R.string.lang_en), getString(R.string.lang_en),
getString(R.string.lang_af) + incompleteSuffix, getString(R.string.lang_af) + incompleteSuffix,
getString(R.string.lang_ar) + incompleteSuffix, getString(R.string.lang_ar),
getString(R.string.lang_ast) + incompleteSuffix, getString(R.string.lang_ast) + incompleteSuffix,
getString(R.string.lang_eu), getString(R.string.lang_eu),
getString(R.string.lang_be), getString(R.string.lang_be),
@ -259,9 +259,9 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
getString(R.string.lang_lv), getString(R.string.lang_lv),
getString(R.string.lang_lt), getString(R.string.lang_lt),
getString(R.string.lang_mr) + incompleteSuffix, getString(R.string.lang_mr) + incompleteSuffix,
getString(R.string.lang_nb) + incompleteSuffix, getString(R.string.lang_nb),
getString(R.string.lang_nn) + incompleteSuffix, getString(R.string.lang_nn) + incompleteSuffix,
getString(R.string.lang_fa) + incompleteSuffix, getString(R.string.lang_fa),
getString(R.string.lang_pl), getString(R.string.lang_pl),
getString(R.string.lang_pt), getString(R.string.lang_pt),
getString(R.string.lang_pt_br), getString(R.string.lang_pt_br),