diff --git a/android_app/app/src/main/res/values/arrays.xml b/android_app/app/src/main/res/values/arrays.xml
index 6f15d964..ef6da3d5 100644
--- a/android_app/app/src/main/res/values/arrays.xml
+++ b/android_app/app/src/main/res/values/arrays.xml
@@ -2,24 +2,26 @@
 <resources>
     <string-array name="language_entries">
         <item>@string/language_default</item>
-        <item>@string/language_brazilian_portuguese</item>
-        <item>@string/language_catalan</item>
-        <item>@string/language_czech</item>
-        <item>@string/language_dutch</item>
-        <item>@string/language_english</item>
-        <item>@string/language_french</item>
-        <item>@string/language_german</item>
-        <item>@string/language_japanese</item>
-        <item>@string/language_norwegian_bokmal</item>
-        <item>@string/language_polish</item>
-        <item>@string/language_slovak</item>
-        <item>@string/language_spanish</item>
-        <item>@string/language_swedish</item>
-        <item>@string/language_turkish</item>
+        <!-- Keep the list below alphabetically sorted -->
+        <item>Brazilian Portuguese</item>
+        <item>Catalan (català)</item>
+        <item>Czech (čeština)</item>
+        <item>Dutch (Nederlands)</item>
+        <item>English</item>
+        <item>French (français)</item>
+        <item>German (Deutsch)</item>
+        <item>Japanese (日本語 (にほんご))</item>
+        <item>Norwegian Bokmål (Norsk)</item>
+        <item>Polish (język polski)</item>
+        <item>Slovak (Slovenčina)</item>
+        <item>Spanish (Español)</item>
+        <item>Swedish (Svenska)</item>
+        <item>Turkish (Türkçe)</item>
     </string-array>
 
     <string-array name="language_values">
         <item>default</item>
+        <!-- The order below should match the langage order above -->
         <item>pt-BR</item>
         <item>ca</item>
         <item>cs</item>
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 6fc5d9dc..99b9d15e 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -201,20 +201,6 @@
     <string name="label_estimation_formula">Estimation formula</string>
     <string name="language_default">System default</string>
     <string name="label_language">Language</string>
-    <string name="language_brazilian_portuguese" translatable="false">Brazilian Portuguese</string>
-    <string name="language_catalan" translatable="false">Catalan (català)</string>
-    <string name="language_czech" translatable="false">Czech (čeština)</string>
-    <string name="language_dutch" translatable="false">Dutch (Nederlands)</string>
-    <string name="language_english" translatable="false">English</string>
-    <string name="language_french" translatable="false">French (français)</string>
-    <string name="language_german" translatable="false">German (Deutsch)</string>
-    <string name="language_japanese" translatable="false">Japanese (日本語 (にほんご))</string>
-    <string name="language_norwegian_bokmal" translatable="false">Norwegian Bokmål (Norsk)</string>
-    <string name="language_polish" translatable="false">Polish (język polski)</string>
-    <string name="language_slovak" translatable="false">Slovak (Slovenčina)</string>
-    <string name="language_spanish" translatable="false">Spanish (Español)</string>
-    <string name="language_swedish" translatable="false">Swedish (Svenska)</string>
-    <string name="language_turkish" translatable="false">Turkish (Türkçe)</string>
     <string name="theme_light">Light</string>
     <string name="theme_dark">Dark</string>
     <string name="label_contribute_translation">Contribute translation</string>