diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml
index 1590c47ab..5d6c5e8c5 100644
--- a/app/src/main/res/values-cs/preferences_values.xml
+++ b/app/src/main/res/values-cs/preferences_values.xml
@@ -31,11 +31,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Abecedně</item>
-        <item>Podle data</item>
-        <item>Podle průměru</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
diff --git a/app/src/main/res/values-da-rDK/preferences_values.xml b/app/src/main/res/values-da-rDK/preferences_values.xml
deleted file mode 100644
index 5aff12dec..000000000
--- a/app/src/main/res/values-da-rDK/preferences_values.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Black (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>System language</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,00</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetically</item>
-        <item>By date</item>
-        <item>By average</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Grade colors in register</item>
-    </string-array>
-    <string-array name="default_expand_grade_entries">
-        <item>Up to 1 at once</item>
-        <item>Always expanded</item>
-        <item>Unlimited expansions</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Average of grades only from selected semester</item>
-        <item>Average of averages from both semesters</item>
-        <item>Average of grades from the whole year</item>
-    </string-array>
-    <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
-    </string-array>
-    <string-array name="dashboard_tile_entries">
-        <item>Lucky number</item>
-        <item>Unread messages</item>
-        <item>Attendance</item>
-        <item>Lessons</item>
-        <item>Grades</item>
-        <item>Homework</item>
-        <item>School announcements</item>
-        <item>Exams</item>
-        <item>Conferences</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index d1001c74b..17c19e7d1 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -31,11 +31,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetisch</item>
-        <item>Nach Datum</item>
-        <item>Nach Durchschnitt</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
diff --git a/app/src/main/res/values-es-rES/preferences_values.xml b/app/src/main/res/values-es-rES/preferences_values.xml
deleted file mode 100644
index 5aff12dec..000000000
--- a/app/src/main/res/values-es-rES/preferences_values.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Black (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>System language</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,00</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetically</item>
-        <item>By date</item>
-        <item>By average</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Grade colors in register</item>
-    </string-array>
-    <string-array name="default_expand_grade_entries">
-        <item>Up to 1 at once</item>
-        <item>Always expanded</item>
-        <item>Unlimited expansions</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Average of grades only from selected semester</item>
-        <item>Average of averages from both semesters</item>
-        <item>Average of grades from the whole year</item>
-    </string-array>
-    <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
-    </string-array>
-    <string-array name="dashboard_tile_entries">
-        <item>Lucky number</item>
-        <item>Unread messages</item>
-        <item>Attendance</item>
-        <item>Lessons</item>
-        <item>Grades</item>
-        <item>Homework</item>
-        <item>School announcements</item>
-        <item>Exams</item>
-        <item>Conferences</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-it-rIT/preferences_values.xml b/app/src/main/res/values-it-rIT/preferences_values.xml
deleted file mode 100644
index 5aff12dec..000000000
--- a/app/src/main/res/values-it-rIT/preferences_values.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="app_theme_entries" tools:ignore="InconsistentArrays">
-        <item>Light</item>
-        <item>Dark</item>
-        <item>Black (AMOLED)</item>
-    </string-array>
-    <string-array name="app_language_entries">
-        <item>System language</item>
-        <item>Polski</item>
-        <item>English</item>
-        <item>Pусский</item>
-        <item>Українська</item>
-        <item>Deutsch</item>
-        <item>Čeština</item>
-        <item>Slovenčina</item>
-    </string-array>
-    <string-array name="services_interval_entries">
-        <item>15 minutes</item>
-        <item>30 minutes</item>
-        <item>1 hour</item>
-        <item>2 hours</item>
-        <item>6 hours</item>
-        <item>12 hours</item>
-        <item>24 hours</item>
-    </string-array>
-    <string-array name="grade_modifier_entries">
-        <item>0,00</item>
-        <item>0,25</item>
-        <item>0,33</item>
-        <item>0,5</item>
-        <item>0,75</item>
-    </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alphabetically</item>
-        <item>By date</item>
-        <item>By average</item>
-    </string-array>
-    <string-array name="grade_color_scheme_entries">
-        <item>Dzienniczek+</item>
-        <item>Wulkanowy</item>
-        <item>Grade colors in register</item>
-    </string-array>
-    <string-array name="default_expand_grade_entries">
-        <item>Up to 1 at once</item>
-        <item>Always expanded</item>
-        <item>Unlimited expansions</item>
-    </string-array>
-    <string-array name="grade_average_mode_entries">
-        <item>Average of grades only from selected semester</item>
-        <item>Average of averages from both semesters</item>
-        <item>Average of grades from the whole year</item>
-    </string-array>
-    <string-array name="timetable_show_gaps_entries">
-        <item>Don\'t show</item>
-        <item>Only between lessons</item>
-        <item>Before and between lessons</item>
-    </string-array>
-    <string-array name="dashboard_tile_entries">
-        <item>Lucky number</item>
-        <item>Unread messages</item>
-        <item>Attendance</item>
-        <item>Lessons</item>
-        <item>Grades</item>
-        <item>Homework</item>
-        <item>School announcements</item>
-        <item>Exams</item>
-        <item>Conferences</item>
-    </string-array>
-</resources>
diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml
index 2f2432e98..70b812944 100644
--- a/app/src/main/res/values-pl/preferences_values.xml
+++ b/app/src/main/res/values-pl/preferences_values.xml
@@ -31,11 +31,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Alfabetycznie</item>
-        <item>Według daty</item>
-        <item>Według średniej</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index df3629c02..16b337a76 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -31,11 +31,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>В алфавитном порядке</item>
-        <item>По дате</item>
-        <item>По средней</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml
index 6cd221540..c9862751e 100644
--- a/app/src/main/res/values-sk/preferences_values.xml
+++ b/app/src/main/res/values-sk/preferences_values.xml
@@ -31,11 +31,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>Abecedne</item>
-        <item>Podľa dátumu</item>
-        <item>Podľa priemeru</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index c02efb54a..f0cfdd122 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -31,11 +31,6 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
-    <string-array name="grade_sorting_mode_entries">
-        <item>За алфавітом</item>
-        <item>За датою</item>
-        <item>За середньою</item>
-    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml
index 920482020..b588ea5e1 100644
--- a/app/src/main/res/values/preferences_values.xml
+++ b/app/src/main/res/values/preferences_values.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <string name="general_alphabetically">Alphabetically</string>
+    <string name="sort_alphabetically">Alphabetically</string>
+    <string name="sort_by_date">By date</string>
+    <string name="sort_by_average">By average</string>
+    <string name="sort_by_attendance_percentage">By attendance percentage</string>
+    <string name="sort_by_subject_attendance_balance">By subject attendance balance</string>
 
     <string-array name="startup_tab_entries" translatable="false">
         <item>@string/dashboard_title</item>
@@ -82,10 +86,10 @@
         <item>0.75</item>
     </string-array>
 
-    <string-array name="attendance_calculator_sorting_mode_entries">
-        <item>@string/general_alphabetically</item>
-        <item>By attendance percentage</item>
-        <item>By subject attendance balance</item>
+    <string-array name="attendance_calculator_sorting_mode_entries" translatable="false">
+        <item>@string/sort_alphabetically</item>
+        <item>@string/sort_by_attendance_percentage</item>
+        <item>@string/sort_by_subject_attendance_balance</item>
     </string-array>
     <string-array name="attendance_calculator_sorting_mode_values" translatable="false">
         <item>alphabetic</item>
@@ -93,10 +97,10 @@
         <item>lesson_balance</item>
     </string-array>
 
-    <string-array name="grade_sorting_mode_entries">
-        <item>@string/general_alphabetically</item>
-        <item>By date</item>
-        <item>By average</item>
+    <string-array name="grade_sorting_mode_entries" translatable="false">
+        <item>@string/sort_alphabetically</item>
+        <item>@string/sort_by_date</item>
+        <item>@string/sort_by_average</item>
     </string-array>
     <string-array name="grade_sorting_mode_values" translatable="false">
         <item>alphabetic</item>