Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-06-18 09:51:20 +02:00
commit de9a50f950

View file

@ -191,18 +191,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"fa",
"pl",
"pt",
"pt_br",
"ro",
"ru",
"sc",
"sr",
"zh_CN",
"sk",
"sl",
"es",
"es_ar",
"sv",
"zh_TW",
"tr",
"uk",
"vi",
@ -243,18 +239,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
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),
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_es_ar),
getString(R.string.lang_sv),
getString(R.string.lang_zh_TW),
getString(R.string.lang_tr) + incompleteSuffix,
getString(R.string.lang_uk),
getString(R.string.lang_vi) + incompleteSuffix,