diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml
index 11935b49b..177a12a98 100644
--- a/app/src/main/res/values-de/preferences_values.xml
+++ b/app/src/main/res/values-de/preferences_values.xml
@@ -29,6 +29,10 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetic</item>
+        <item>By date</item>
+    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7e2877674..c33c273ab 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -154,6 +154,8 @@
     <string name="attendance_excused_lateness">Entschuldigte Verspätung</string>
     <string name="attendance_unexcused_lateness">Unentschuldigte Verspätung</string>
     <string name="attendance_present">Anwesend</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
     <string name="attendance_number">Lektion Nummer</string>
     <string name="attendance_no_items">Keine Einträgen</string>
     <plurals name="attendance_number_absences">
@@ -222,6 +224,32 @@
         <item quantity="one">Du hast %1$d Eintrag bekommen</item>
         <item quantity="other">Du hast %1$d Eintragen bekommen</item>
     </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
     <!--Homework-->
     <string name="homework_no_items">Keine Informationen über Hausaufgaben</string>
     <string name="homework_mark_as_done">Gemacht</string>
@@ -327,9 +355,12 @@
     <string name="pref_view_app_theme">Thema der Anwendung</string>
     <string name="pref_view_expand_grade">Noten erweitern</string>
     <string name="pref_view_timetable_show_timers">Aktuelle Lektion im Stundenplan markieren</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects in timetable</string>
     <string name="pref_view_grade_statistics_list">Liste der Diagramme in Klassenbewertungen anzeigen</string>
     <string name="pref_view_timetable_show_whole_class">Unterricht der ganzen Klasse anzeigen</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades in Grades</string>
     <string name="pref_view_grade_color_scheme">Farbschema der Noten</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting in \"Grades\"</string>
     <string name="pref_view_app_language">App Sprache</string>
     <string name="pref_notify_header">Benachrichtigungen</string>
     <string name="pref_notify_switch">Benachrichtigungen anzeigen</string>
diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml
index a41abf350..b8c7e4f64 100644
--- a/app/src/main/res/values-ru/preferences_values.xml
+++ b/app/src/main/res/values-ru/preferences_values.xml
@@ -29,6 +29,10 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetic</item>
+        <item>By date</item>
+    </string-array>
     <string-array name="grade_color_scheme_entries">
         <item>Dzienniczek+</item>
         <item>Wulkanowy</item>
@@ -36,8 +40,8 @@
     </string-array>
     <string-array name="grade_average_mode_entries">
         <item>Средняя оценка со 2 семестра</item>
-        <item>Average of grades from both semesters</item>
-        <item>Average of grades from the whole year</item>
+        <item>Средняя оценка с двух семестров</item>
+        <item>Средняя оценок со всего года</item>
     </string-array>
     <string-array name="timetable_show_whole_class_entries">
         <item>Не показывать</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7052fbc9c..a4870b847 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -108,16 +108,16 @@
         <item quantity="other">Новые оценки</item>
     </plurals>
     <plurals name="grade_new_items_predicted">
-        <item quantity="one">New predicted grade</item>
+        <item quantity="one">Новая ожидаемая оценка</item>
         <item quantity="few">New predicted grades</item>
         <item quantity="many">New predicted grades</item>
-        <item quantity="other">New predicted grades</item>
+        <item quantity="other">Новые ожидаемые оценки</item>
     </plurals>
     <plurals name="grade_new_items_final">
-        <item quantity="one">New final grade</item>
+        <item quantity="one">Новая итоговая оценка</item>
         <item quantity="few">New final grades</item>
         <item quantity="many">New final grades</item>
-        <item quantity="other">New final grades</item>
+        <item quantity="other">Новые итоговые оценки</item>
     </plurals>
     <plurals name="grade_notify_new_items">
         <item quantity="one">Вы получили %1$d оценку</item>
@@ -126,16 +126,16 @@
         <item quantity="other">Вы получили %1$d оценок</item>
     </plurals>
     <plurals name="grade_notify_new_items_predicted">
-        <item quantity="one">You received %1$d predicted grade</item>
-        <item quantity="few">You received %1$d predicted grades</item>
+        <item quantity="one">Вы получили %1$d ожидаемую оценку</item>
+        <item quantity="few">Вы получили %1$d ожидаемые оценки</item>
         <item quantity="many">You received %1$d predicted grades</item>
         <item quantity="other">You received %1$d predicted grades</item>
     </plurals>
     <plurals name="grade_notify_new_items_final">
-        <item quantity="one">You received %1$d final grade</item>
+        <item quantity="one">Вы получили %1$d финальную оценку</item>
         <item quantity="few">You received %1$d final grades</item>
         <item quantity="many">You received %1$d final grades</item>
-        <item quantity="other">You received %1$d final grades</item>
+        <item quantity="other">Вы получили %1$d финальные оценки</item>
     </plurals>
     <!--Timetable-->
     <string name="timetable_lesson">Урок</string>
@@ -168,6 +168,8 @@
     <string name="attendance_excused_lateness">Опоздание по уважительным причинам</string>
     <string name="attendance_unexcused_lateness">Опоздание по неуважительным причинам</string>
     <string name="attendance_present">Присутствие</string>
+    <string name="attendance_deleted">Удалено</string>
+    <string name="attendance_unknown">Неизвестно</string>
     <string name="attendance_number">Урок №</string>
     <string name="attendance_no_items">Данные не найдены</string>
     <plurals name="attendance_number_absences">
@@ -204,8 +206,8 @@
     <string name="message_move_to_bin">Перенести в корзину</string>
     <string name="message_delete_forever">Удалить навсегда</string>
     <string name="message_delete_success">Сообщение успешно удалено</string>
-    <string name="message_share">Share</string>
-    <string name="message_print">Print</string>
+    <string name="message_share">Поделиться</string>
+    <string name="message_print">Печать</string>
     <string name="message_subject">Тема</string>
     <string name="message_content">Текст</string>
     <string name="message_send_successful">Сообщение успешно отправлено</string>
@@ -250,6 +252,44 @@
         <item quantity="many">Вы получили %1$d предупреждений</item>
         <item quantity="other">Вы получили %1$d предупреждений</item>
     </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="few">%d praises</item>
+        <item quantity="many">%d praises</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="few">New praises</item>
+        <item quantity="many">New praises</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="few">You received %1$d praises</item>
+        <item quantity="many">You received %1$d praises</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="few">%d neutral notes</item>
+        <item quantity="many">%d neutral notes</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="few">New neutral notes</item>
+        <item quantity="many">New neutral notes</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="few">You received %1$d neutral notes</item>
+        <item quantity="many">You received %1$d neutral notes</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
     <!--Homework-->
     <string name="homework_no_items">Нет домашних заданий</string>
     <string name="homework_mark_as_done">сделанный</string>
@@ -291,10 +331,10 @@
     <string name="account_logout">Выйти</string>
     <string name="account_confirm">Вы точно хотите выйти из данного аккаунта?</string>
     <string name="account_logout_student">Выйти</string>
-    <string name="account_type_student">Student account</string>
-    <string name="account_type_parent">Parent account</string>
-    <string name="account_login_mobile_api">Mobile API mode</string>
-    <string name="account_login_hybrid">Hybrid mode</string>
+    <string name="account_type_student">Профиль ученика</string>
+    <string name="account_type_parent">Профиль родителя</string>
+    <string name="account_login_mobile_api">Режим Mobile API</string>
+    <string name="account_login_hybrid">Гибридный режим</string>
     <!--About-->
     <string name="about_version">Версия приложения</string>
     <string name="about_contributor">Разработчики</string>
@@ -353,11 +393,14 @@
     <string name="pref_view_grade_average_force_calc">Принудительно высчитать среднюю оценку через приложение</string>
     <string name="pref_view_present">Показывать присутствия в посещаемости</string>
     <string name="pref_view_app_theme">Тема приложения</string>
-    <string name="pref_view_expand_grade">Больше оценок</string>
+    <string name="pref_view_expand_grade">Разворачивать оценки</string>
     <string name="pref_view_timetable_show_timers">Отмечать текущий урок в расписании</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects in timetable</string>
     <string name="pref_view_grade_statistics_list">Показывать диаграммы в оценках класса</string>
     <string name="pref_view_timetable_show_whole_class">Показать уроки всего класса</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades in Grades</string>
     <string name="pref_view_grade_color_scheme">Схема цветов оценок</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting in \"Grades\"</string>
     <string name="pref_view_app_language">Язык приложения</string>
     <string name="pref_notify_header">Уведомления</string>
     <string name="pref_notify_switch">Показывать уведомления</string>
diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml
index 9942621a5..7e7d3cbff 100644
--- a/app/src/main/res/values-uk/preferences_values.xml
+++ b/app/src/main/res/values-uk/preferences_values.xml
@@ -29,6 +29,10 @@
         <item>0,5</item>
         <item>0,75</item>
     </string-array>
+    <string-array name="grade_sorting_mode_entries">
+        <item>Alphabetic</item>
+        <item>By date</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/strings.xml b/app/src/main/res/values-uk/strings.xml
index 15fe203d5..ed10d24d4 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -168,6 +168,8 @@
     <string name="attendance_excused_lateness">Спізнення з поважних причин</string>
     <string name="attendance_unexcused_lateness">Спізнення з не поважних причин</string>
     <string name="attendance_present">Присутність</string>
+    <string name="attendance_deleted">Deleted</string>
+    <string name="attendance_unknown">Unknown</string>
     <string name="attendance_number">Номер уроку</string>
     <string name="attendance_no_items">Брак записів</string>
     <plurals name="attendance_number_absences">
@@ -250,6 +252,44 @@
         <item quantity="many">%1$d нових зауважень</item>
         <item quantity="other">%1$d нових зауважень</item>
     </plurals>
+    <!--Praise-->
+    <plurals name="praise_number_item">
+        <item quantity="one">%d praise</item>
+        <item quantity="few">%d praises</item>
+        <item quantity="many">%d praises</item>
+        <item quantity="other">%d praises</item>
+    </plurals>
+    <plurals name="praise_new_items">
+        <item quantity="one">New praise</item>
+        <item quantity="few">New praises</item>
+        <item quantity="many">New praises</item>
+        <item quantity="other">New praises</item>
+    </plurals>
+    <plurals name="praise_notify_new_items">
+        <item quantity="one">You received %1$d praise</item>
+        <item quantity="few">You received %1$d praises</item>
+        <item quantity="many">You received %1$d praises</item>
+        <item quantity="other">You received %1$d praises</item>
+    </plurals>
+    <!--Neutral notes-->
+    <plurals name="neutral_note_number_item">
+        <item quantity="one">%d neutral note</item>
+        <item quantity="few">%d neutral notes</item>
+        <item quantity="many">%d neutral notes</item>
+        <item quantity="other">%d neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_new_items">
+        <item quantity="one">New neutral note</item>
+        <item quantity="few">New neutral notes</item>
+        <item quantity="many">New neutral notes</item>
+        <item quantity="other">New neutral notes</item>
+    </plurals>
+    <plurals name="neutral_note_notify_new_items">
+        <item quantity="one">You received %1$d neutral note</item>
+        <item quantity="few">You received %1$d neutral notes</item>
+        <item quantity="many">You received %1$d neutral notes</item>
+        <item quantity="other">You received %1$d neutral notes</item>
+    </plurals>
     <!--Homework-->
     <string name="homework_no_items">Брак домашніх завдань</string>
     <string name="homework_mark_as_done">Позначити як зроблене</string>
@@ -355,9 +395,12 @@
     <string name="pref_view_app_theme">Тема додатку</string>
     <string name="pref_view_expand_grade">Більше оцінок</string>
     <string name="pref_view_timetable_show_timers">Позначити поточний урок у розкладі</string>
+    <string name="pref_view_timetable_show_groups">Show groups next to subjects in timetable</string>
     <string name="pref_view_grade_statistics_list">Показувати діаграми в оцінках класу</string>
     <string name="pref_view_timetable_show_whole_class">Показати уроки всього класу</string>
+    <string name="pref_view_subjects_without_grades">Show subjects without grades in Grades</string>
     <string name="pref_view_grade_color_scheme">Схема кольорів оцінок</string>
+    <string name="pref_view_grade_sorting_mode">Subjects sorting in \"Grades\"</string>
     <string name="pref_view_app_language">Мова додатку</string>
     <string name="pref_notify_header">Повідомлення</string>
     <string name="pref_notify_switch">Показувати повідомлення</string>