diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 64ae57f9a7..65ca57705e 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,45 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="lang_en">English</string>
+	<string name="lang_af">Afrikaans</string>
+	<string name="lang_hy">Armenian</string>
+	<string name="lang_eu">Basque</string>
+	<string name="lang_be">Belarusian</string>
+	<string name="lang_bs">Bosnian</string>
+	<string name="lang_bg">Bulgarian</string>
+	<string name="lang_ca">Catalan</string>
+	<string name="lang_cs">Czech</string>
+	<string name="lang_da">Danish</string>
+	<string name="lang_nl">Dutch</string>
+	<string name="lang_fi">Finnish</string>
+	<string name="lang_fr">French</string>
+	<string name="lang_ka">Georgian</string>
+	<string name="lang_de">German</string>
+	<string name="lang_el">Greek</string>
+	<string name="lang_iw">Hebrew</string>
+	<string name="lang_hi">Hindi</string>
+	<string name="lang_hu">Hungarian</string>
+	<string name="lang_id">Indonesian</string>
+	<string name="lang_it">Italian</string>
+	<string name="lang_ja">Japanese</string>
+	<string name="lang_ko">Korean</string>
+	<string name="lang_lv">Latvian</string>
+	<string name="lang_lt">Lithuanian</string>
+	<string name="lang_mr">Marathi</string>
+	<string name="lang_no">Norwegian</string>
+	<string name="lang_pl">Polish</string>
+	<string name="lang_pt">Portuguese</string>
+	<string name="lang_ro">Romanian</string>
+	<string name="lang_ru">Russian</string>
+	<string name="lang_sk">Slovak</string>
+	<string name="lang_sl">Slovenian</string>
+	<string name="lang_es">Spanish</string>
+	<string name="lang_sv">Swedish</string>
+	<string name="lang_tr">Turkish</string>
+	<string name="lang_uk">Ukrainian</string>
+	<string name="lang_vi">Vietnamese</string>
+	<string name="lang_cy">Welsh</string>
     <string name="index_name_italy">Europe - Italy</string>
     <string name="index_name_gb">Europe - Great Britain</string>
     <string name="calculate_osmand_route_without_internet">Calculate OsmAnd route segment without internet</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index 657ebb850c..356b2785c4 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -167,13 +167,45 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
 				"sl", "es", "sv", "tr", "uk", "vi",
 				"cy" };
 		entries = new String[] { getString(R.string.system_locale), 
-				"English", "Afrikaans", "Armenian" + incompleteSuffix, "Basque" + incompleteSuffix, "Belarusian" + incompleteSuffix, "Bosnian" + incompleteSuffix, "Bulgarian" + incompleteSuffix,
-				"Catalan", "Czech", "Danish", "Dutch", "Finnish" + incompleteSuffix, "French", "Georgian",
-				"German", "Greek", "Hebrew", "Hindi" + incompleteSuffix, "Hungarian", "Indonesian" + incompleteSuffix,
-				"Italian", "Japanese" + incompleteSuffix, "Korean" + incompleteSuffix, "Latvian", "Lithuanian", "Marathi" +incompleteSuffix,
-				"Norwegian" + incompleteSuffix, "Polish", "Portuguese", "Romanian", "Russian", "Slovak",
-				"Slovenian", "Spanish", "Swedish", "Turkish" , "Ukrainian" , "Vietnamese",
-				"Welsh" + incompleteSuffix };
+				getString(R.string.lang_en),
+				getString(R.string.lang_af),
+				getString(R.string.lang_hy) + incompleteSuffix,
+				getString(R.string.lang_eu) + incompleteSuffix,
+				getString(R.string.lang_be) + incompleteSuffix,
+				getString(R.string.lang_bs) + incompleteSuffix,
+				getString(R.string.lang_bg) + incompleteSuffix,
+				getString(R.string.lang_ca),
+				getString(R.string.lang_cs),
+				getString(R.string.lang_da),
+				getString(R.string.lang_nl),
+				getString(R.string.lang_fi) + incompleteSuffix,
+				getString(R.string.lang_fr),
+				getString(R.string.lang_ka),
+				getString(R.string.lang_de),
+				getString(R.string.lang_el),
+				getString(R.string.lang_iw),
+				getString(R.string.lang_hi) + incompleteSuffix,
+				getString(R.string.lang_hu),
+				getString(R.string.lang_id) + incompleteSuffix,
+				getString(R.string.lang_it),
+				getString(R.string.lang_ja) + incompleteSuffix,
+				getString(R.string.lang_ko) + incompleteSuffix,
+				getString(R.string.lang_lv),
+				getString(R.string.lang_lt),
+				getString(R.string.lang_mr),
+				getString(R.string.lang_no) + incompleteSuffix,
+				getString(R.string.lang_pl),
+				getString(R.string.lang_pt),
+				getString(R.string.lang_ro),
+				getString(R.string.lang_ru),
+				getString(R.string.lang_sk),
+				getString(R.string.lang_sl),
+				getString(R.string.lang_es),
+				getString(R.string.lang_sv),
+				getString(R.string.lang_tr),
+				getString(R.string.lang_uk),
+				getString(R.string.lang_vi),
+				getString(R.string.lang_cy) + incompleteSuffix,};
 		registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues);
 
 		
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java b/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
index 68978c06e0..d95388aff5 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadIndexAdapter.java
@@ -128,7 +128,7 @@ public class DownloadIndexAdapter extends OsmandBaseExpandableListAdapter implem
 					boolean add = true;
 					String indexLC = osmandRegions.getDownloadNameIndexLowercase(item.getBasename());
 					if(indexLC == null) {
-						item.getVisibleName(c, osmandRegions).toLowerCase();
+						indexLC = item.getVisibleName(c, osmandRegions).toLowerCase();
 					}
 					for(List<String> or : conds) {
 						boolean tadd = true;