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,
-				af,
-				ar,
-				ast,
-				be,
-				be_BY,
-				bg,
-				ca,
-				cs,
-				cy,
-				da,
-				de,
-				el,
-				en_GB,
-				eo,
-				es,
-				es_AR,
-				es_US,
-				eu,
-				fa,
-				fi,
-				fr,
-				gl,
-				he,
-				hr,
-				hsb,
-				hu,
-				it,
-				ja,
-				ka,
-				kab,
-				kn,
-				ko,
-				lt,
-				lv,
-				mr,
-				nb,
-				nl,
-				nn,
-				pl,
-				pt,
-				pt_BR,
-				ro,
-				ru,
-				sc,
-				sk,
-				sl,
-				sr,
-				sv,
-				tr,
-				uk,
-				vi,
-				zh_CN,
-				zh_TW};
+				"en",
+				"af",
+				"ar",
+				"ast",
+				"be",
+				"be_BY",
+				"bg",
+				"ca",
+				"cs",
+				"cy",
+				"da",
+				"de",
+				"el",
+				"en_GB",
+				"eo",
+				"es",
+				"es_AR",
+				"es_US",
+				"eu",
+				"fa",
+				"fi",
+				"fr",
+				"gl",
+				"he",
+				"hr",
+				"hsb",
+				"hu",
+				"it",
+				"ja",
+				"ka",
+				"kab",
+				"kn",
+				"ko",
+				"lt",
+				"lv",
+				"mr",
+				"nb",
+				"nl",
+				"nn",
+				"pl",
+				"pt",
+				"pt_BR",
+				"ro",
+				"ru",
+				"sc",
+				"sk",
+				"sl",
+				"sr",
+				"sv",
+				"tr",
+				"uk",
+				"vi",
+				"zh_CN",
+				"zh_TW"};
 		entries = new String[]{getString(R.string.system_locale) + latinSystemDefaultSuffix,
 				getString(R.string.lang_en),
 				getString(R.string.lang_af) + incompleteSuffix,