diff --git a/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java b/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
index 04c3be4f..d1975f44 100644
--- a/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
+++ b/app/src/main/java/net/gsantner/opoc/preference/nonsupport/LanguagePreference.java
@@ -153,6 +153,16 @@ public class LanguagePreference extends ListPreference {
             ret = ret.substring(0, ret.indexOf(" ") + 1) + "Simplified" + ret.substring(ret.indexOf(" "));
         } else if (localeAndroidCode.equals("zh-rTW")) {
             ret = ret.substring(0, ret.indexOf(" ") + 1) + "Traditional" + ret.substring(ret.indexOf(" "));
+        } else if (localeAndroidCode.equals("sr-rRS")) {
+            ret = ret.substring(0, ret.indexOf(" ") + 1) + "Latin" + ret.substring(ret.indexOf(" "));
+        } else if (localeAndroidCode.startsWith("sr")) {
+            ret = ret.substring(0, ret.indexOf(" ") + 1) + "Cyrillic" + ret.substring(ret.indexOf(" "));
+        } else if (localeAndroidCode.equals("fil")) {
+            ret = ret.substring(0, ret.indexOf("(") + 1) + "Philippines)";
+        } else if (localeAndroidCode.equals("kmr")) {
+            ret = "Kurdish Kurmanji (کورمانجی)";
+        } else if (localeAndroidCode.equals("ckb")) {
+            ret = "Kurdish Sorani (" + ret.split("\\(")[1];
         }
 
         return ret;
diff --git a/build.gradle b/build.gradle
index 75a6ed58..dbcc3563 100644
--- a/build.gradle
+++ b/build.gradle
@@ -83,15 +83,15 @@ static String findUsedAndroidLocales() {
     Set<String> langs = new HashSet<>()
     new File('.').eachFileRecurse(groovy.io.FileType.DIRECTORIES) {
         final foldername = it.name
-        if (foldername.startsWith('values-') && !it.canonicalPath.contains("build" + File.separator + "intermediates") && !it.canonicalPath.contains("gradle" + File.separator + "daemon")) {
+        if (foldername.contains('values-') && !it.absolutePath.contains("build" + File.separator + "intermediates") && !foldername.matches(".*values-((.*[0-9])|(land)|(port)).*")) {
             new File(it.toString()).eachFileRecurse(groovy.io.FileType.FILES) {
-                if (it.name.toLowerCase().endsWith(".xml") && it.getCanonicalFile().getText('UTF-8').contains("<string")) {
+                if (it.exists() && it.name.toLowerCase().endsWith(".xml") && it.getText('UTF-8').contains("<string")) {
                     langs.add(foldername.replace("values-", ""))
                 }
             }
         }
     }
-    return '{' + langs.collect { "\"${it}\"" }.join(",") + '}'
+    return '{' + langs.sort().collect { "\"${it}\"" }.join(",") + '}'
 }
 
 ext.getGitHash = { ->