Merge remote-tracking branch 'origin/master'

OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java

@@ -174,60 +174,60 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 
 		//getResources().getAssets().getLocales();
 		entrieValues = new String[]{"",
-				en,
+				"en",
-				af,
+				"af",
-				ar,
+				"ar",
-				ast,
+				"ast",
-				be,
+				"be",
-				be_BY,
+				"be_BY",
-				bg,
+				"bg",
-				ca,
+				"ca",
-				cs,
+				"cs",
-				cy,
+				"cy",
-				da,
+				"da",
-				de,
+				"de",
-				el,
+				"el",
-				en_GB,
+				"en_GB",
-				eo,
+				"eo",
-				es,
+				"es",
-				es_AR,
+				"es_AR",
-				es_US,
+				"es_US",
-				eu,
+				"eu",
-				fa,
+				"fa",
-				fi,
+				"fi",
-				fr,
+				"fr",
-				gl,
+				"gl",
-				he,
+				"he",
-				hr,
+				"hr",
-				hsb,
+				"hsb",
-				hu,
+				"hu",
-				it,
+				"it",
-				ja,
+				"ja",
-				ka,
+				"ka",
-				kab,
+				"kab",
-				kn,
+				"kn",
-				ko,
+				"ko",
-				lt,
+				"lt",
-				lv,
+				"lv",
-				mr,
+				"mr",
-				nb,
+				"nb",
-				nl,
+				"nl",
-				nn,
+				"nn",
-				pl,
+				"pl",
-				pt,
+				"pt",
-				pt_BR,
+				"pt_BR",
-				ro,
+				"ro",
-				ru,
+				"ru",
-				sc,
+				"sc",
-				sk,
+				"sk",
-				sl,
+				"sl",
-				sr,
+				"sr",
-				sv,
+				"sv",
-				tr,
+				"tr",
-				uk,
+				"uk",
-				vi,
+				"vi",
-				zh_CN,
+				"zh_CN",
-				zh_TW};
+				"zh_TW"};
 		entries = new String[]{getString(R.string.system_locale) + latinSystemDefaultSuffix,
 				getString(R.string.lang_en),
 				getString(R.string.lang_af) + incompleteSuffix,