diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 05620e38..23e51d02 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
-    <string name="app_launcher_name">Clock</string>
     <string name="time_zone">المنطقة الزمنية</string>
     <string name="vibrate">يهتز</string>
     <string name="no_days_selected">لا توجد أيام محددة</string>
-    <string name="clock">Clock</string>
-    <string name="timer">Timer</string>
     <string name="stopwatch">ساعة التوقيف</string>
     <string name="start_stopwatch">بدء ساعة الإيقاف</string>
     <string name="lap">اللفه</string>
@@ -28,12 +24,9 @@
     <string name="alarm_created">تم إنشاء التنبيه</string>
     <string name="alarm_snoozed">إنذار غفوة من قبل %s</string>
     <string name="no_alarms_found">لم يتم العثور على منبهات</string>
-    <string name="add_alarm">Add alarm</string>
     <string name="no_timers_found">لم يتم العثور على موقتات</string>
-    <string name="add_timer">Add timer</string>
     <string name="upcoming_alarm">التنبيه القادم</string>
     <string name="early_alarm_dismissal">الفصل المبكر للتنبيه</string>
-    <!--Timer-->
     <string name="timers_notification_msg">أجهزة ضبط الوقت قيد التشغيل</string>
     <string name="timer_single_notification_label_msg">عداد الوقت لـ %s قيد التشغيل</string>
     <string name="new_timer">مؤقت جديد</string>
@@ -45,18 +38,9 @@
         <item quantity="many">اجهزة ضبط الوقت %d قيد التشغيل</item>
         <item quantity="other">جهاز ضبط الوقت %d قيد التشغيل</item>
     </plurals>
-    <!-- Settings -->
-    <string name="clock_tab">Clock tab</string>
-    <string name="alarm_tab">Alarm tab</string>
     <string name="stopwatch_tab">تبويب ساعة الإيقاف</string>
-    <string name="timer_tab">Timer tab</string>
     <string name="show_seconds">عرض الثواني</string>
     <string name="increase_volume_gradually">زيادة الصوت تدريجيا</string>
-    <!-- FAQ -->
     <string name="faq_1_title">كيف يمكنني تغيير فرز اللفات في علامة التبويب ساعة التوقيت؟</string>
     <string name="faq_1_text">ما عليك سوى النقر فوق أي من الأعمدة ، مما يجعل الدورات مرتبة حسب العمود المحدد. بنقرات إضافية ، يمكنك التبديل بين الفرز التصاعدي والتنازلي.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index b6542be4..46c77a26 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -1,13 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Sadə Saat</string>
     <string name="app_launcher_name">Saat</string>
     <string name="time_zone">Vaxt zonası</string>
     <string name="vibrate">Titrət</string>
     <string name="no_days_selected">Gün seçilməyib</string>
-    <string name="clock">Clock</string>
     <string name="timer">Sayğac</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Dövrə</string>
     <string name="stopwatch_stopped">Saniyəölçən dayandı</string>
     <string name="timer_stopped">Sayğaç dayandı</string>
@@ -16,46 +14,14 @@
     <string name="clock_and_date">Saat və zaman</string>
     <string name="use_text_shadow">Mətn kölgəsini işlət</string>
     <string name="swipe_right_to_dismiss">Buraxmaq üçün sağa, Dondurmaq üçün sola sürüşdür.</string>
-    <string name="sort_by_creation_order">Creation order</string>
-    <string name="sort_by_alarm_time">Alarm time</string>
-    <string name="sort_by_day_and_alarm_time">Day and Alarm time</string>
-    <string name="analogue_clock">Analogue clock</string>
-    <string name="digital_clock">Digital clock</string>
-    <string name="alarm_dismissed">Alarm dismissed</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
-    <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
-    <string name="timers_notification_msg">Timers are running</string>
-    <string name="timer_single_notification_label_msg">Timer for %s is running</string>
-    <string name="new_timer">New Timer</string>
-
     <plurals name="timer_notification_msg">
         <item quantity="one">%d timer is running</item>
         <item quantity="other">%d timers are running</item>
     </plurals>
-
-    <!-- Settings -->
     <string name="clock_tab">Saat bölməsi</string>
     <string name="alarm_tab">Siqnal bölməsi</string>
     <string name="stopwatch_tab">Saniyəölçən bölməsi</string>
     <string name="timer_tab">Sayğaç bölməsi</string>
     <string name="show_seconds">Saniyələri göstər</string>
     <string name="increase_volume_gradually">Səsi aramla yüksəlt</string>
-
-    <!-- FAQ -->
-    <string name="faq_1_title">How can I change lap sorting at the stopwatch tab?</string>
-    <string name="faq_1_text">Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+    </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 73386892..2ffbccbb 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">Гадзіннік</string>
     <string name="time_zone">Гадзінны пояс</string>
     <string name="vibrate">Вібраваць</string>
@@ -23,18 +22,10 @@
     <string name="analogue_clock">Аналагавы гадзіннік</string>
     <string name="digital_clock">Лічбавы гадзіннік</string>
     <string name="alarm_dismissed">Будзільнік адхілены</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">Будзільнік адкладзены на %s</string>
     <string name="no_alarms_found">Будзільнікі не знойдзены</string>
-    <string name="add_alarm">Add alarm</string>
     <string name="no_timers_found">Таймеры не знойдзены</string>
-    <string name="add_timer">Add timer</string>
     <string name="upcoming_alarm">Маючы адбыцца будзільнік</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">Таймеры запушчаны</string>
     <string name="timer_single_notification_label_msg">Таймер для %s запушчаны</string>
     <string name="new_timer">Новы таймер</string>
@@ -44,18 +35,12 @@
         <item quantity="many">%d таймераў запушчана</item>
         <item quantity="other">%d таймераў запушчана</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Гадзіннік</string>
     <string name="alarm_tab">Будзільнік</string>
     <string name="stopwatch_tab">Секундамер</string>
     <string name="timer_tab">Таймер</string>
     <string name="show_seconds">Паказваць секунды</string>
     <string name="increase_volume_gradually">Паступова павялічваць гучнасць</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Як змяніць сартаванне кругоў на ўкладцы секундамера\?</string>
     <string name="faq_1_text">Проста націсніце на любы са слупкоў, і кругі будуць адсартаваны па дадзенаму слупку. Дадатковымі націсканнямі вы можаце пераключацца паміж сартаваннем па ўзрастанні і па змяншэнні.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index cd0c9a47..f8453941 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -28,12 +28,9 @@
     <string name="alarm_created">Алармата е създадена</string>
     <string name="alarm_snoozed">Алармата е отложена от %s</string>
     <string name="no_alarms_found">Няма намерени аларми</string>
-    <string name="add_alarm">Add alarm</string>
     <string name="no_timers_found">Няма намерени таймери</string>
-    <string name="add_timer">Add timer</string>
     <string name="upcoming_alarm">Предстояща аларма</string>
     <string name="early_alarm_dismissal">Ранно изключване на алармата</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Таймерите са включени</string>
     <string name="timer_single_notification_label_msg">Таймерът за %s е включен</string>
     <string name="new_timer">Нов таймер</string>
@@ -41,18 +38,12 @@
         <item quantity="one">%d таймер е включен</item>
         <item quantity="other">%d таймери са включени</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Часовник</string>
     <string name="alarm_tab">Аларма</string>
     <string name="stopwatch_tab">Таб \"Хронометър</string>
     <string name="timer_tab">Таймер</string>
     <string name="show_seconds">Покажи секунди</string>
     <string name="increase_volume_gradually">Постепенно увеличавай звука</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Как мога да променя сортирането на обиколките на секундомера\?</string>
     <string name="faq_1_text">Просто кликнете на някоя от колонките, това ще ги сортира по тази колонка. С допълнителни кликвания можете да превключвате между възходящо и низходящо сортиране.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 294701af..ff7eccbf 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">Rellotge</string>
     <string name="time_zone">Zona horària</string>
     <string name="vibrate">Vibra</string>
     <string name="no_days_selected">No s\'ha seleccionat cap dia</string>
-    <string name="clock">Clock</string>
     <string name="timer">Temporitzador</string>
     <string name="stopwatch">Cronòmetre</string>
     <string name="start_stopwatch">Inicia el cronòmetre</string>
@@ -28,12 +26,9 @@
     <string name="alarm_created">S\'ha creat l\'alarma</string>
     <string name="alarm_snoozed">Alarma posposada %s</string>
     <string name="no_alarms_found">No s\'ha trobat cap alarma</string>
-    <string name="add_alarm">Add alarm</string>
     <string name="no_timers_found">No s\'ha trobat cap temporitzador</string>
-    <string name="add_timer">Add timer</string>
     <string name="upcoming_alarm">Pròxima alarma</string>
     <string name="early_alarm_dismissal">Supressió d\'alarma anticipada</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Els temporitzadors estan en marxa</string>
     <string name="timer_single_notification_label_msg">El temporitzador per a %s està en marxa</string>
     <string name="new_timer">Temporitzador nou</string>
@@ -41,18 +36,12 @@
         <item quantity="one">%d temporitzador en marxa</item>
         <item quantity="other">%d temporitzadors en marxa</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Pestanya del rellotge</string>
     <string name="alarm_tab">Pestanya de l\'alarma</string>
     <string name="stopwatch_tab">Pestanya del cronòmetre</string>
     <string name="timer_tab">Pestanya del temporitzador</string>
     <string name="show_seconds">Mostra els segons</string>
     <string name="increase_volume_gradually">Augmenta el volum gradualment</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Com puc canviar l\'ordenació de les voltes a la pestanya del cronòmetre\?</string>
     <string name="faq_1_text">Només cal que feu clic a qualsevol de les columnes, això farà que les voltes s\'ordenin per la columna indicada. Amb clics addicionals, podeu alternar entre l\'ordenació ascendent i descendent.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1cefdfc0..350e8c11 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Přidat časovač</string>
     <string name="upcoming_alarm">Nadcházející budík</string>
     <string name="early_alarm_dismissal">Předčasné zrušení budíku</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Časovače běží</string>
     <string name="timer_single_notification_label_msg">Časovač pro %s běží</string>
     <string name="new_timer">Nový časovač</string>
@@ -42,18 +41,12 @@
         <item quantity="few">%d časovače běží</item>
         <item quantity="other">%d časovačů běží</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Karta hodin</string>
     <string name="alarm_tab">Karta budíku</string>
     <string name="stopwatch_tab">Karta stopek</string>
     <string name="timer_tab">Karta časovače</string>
     <string name="show_seconds">Zobrazit sekundy</string>
     <string name="increase_volume_gradually">Postupně zvyšovat hlasitost</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Jak mohu změnit pořadí mezičasů na kartě se stopkami\?</string>
     <string name="faq_1_text">Stačí kliknout na některý sloupec. To aktivuje řazení podle daného sloupce. Dalšími kliknutími na daný sloupec můžete přepínat mezi vzestupným a sestupným pořadím.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 896e897a..4fa914af 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">Cloc</string>
     <string name="time_zone">Cylchfa amser</string>
     <string name="vibrate">Dirgrynu</string>
     <string name="no_days_selected">Dim diwrnodau wedi\'u dewis</string>
-    <string name="clock">Clock</string>
     <string name="timer">Amserydd</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
-    <string name="lap">Lap</string>
     <string name="stopwatch_stopped">Cafodd y stopwats ei stopio</string>
     <string name="timer_stopped">Cafodd yr amserydd ei stopio</string>
     <string name="max_reminder_duration">Hyd atgoffa hiraf</string>
@@ -17,27 +12,6 @@
     <string name="clock_and_date">Cloc a dyddiad</string>
     <string name="use_text_shadow">Defnyddio cysgod testun</string>
     <string name="swipe_right_to_dismiss">Llithro i\'r dde i\'w ddiffodd neu i\'r chwith i\'w oedi am ychydig.</string>
-    <string name="sort_by_creation_order">Creation order</string>
-    <string name="sort_by_alarm_time">Alarm time</string>
-    <string name="sort_by_day_and_alarm_time">Day and Alarm time</string>
-    <string name="analogue_clock">Analogue clock</string>
-    <string name="digital_clock">Digital clock</string>
-    <string name="alarm_dismissed">Alarm dismissed</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
-    <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
-    <string name="timers_notification_msg">Timers are running</string>
-    <string name="timer_single_notification_label_msg">Timer for %s is running</string>
-    <string name="new_timer">New Timer</string>
     <plurals name="timer_notification_msg">
         <item quantity="zero">%d timer is running</item>
         <item quantity="one">%d timers are running</item>
@@ -46,18 +20,12 @@
         <item quantity="many">%d timers are running</item>
         <item quantity="other">%d timers are running</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Tab cloc</string>
     <string name="alarm_tab">Tab larwm</string>
     <string name="stopwatch_tab">Tab stopwats</string>
     <string name="timer_tab">Tab amserydd</string>
     <string name="show_seconds">Dangos eiliadau</string>
     <string name="increase_volume_gradually">Cynyddu uchder sain yn raddol</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Sut gallaf newid trefn lapiau yn y tab stopwats?</string>
     <string name="faq_1_text">Clifia ar unrhyw un o\'r colofnau. Mi fydd hynny\'n ail-drefnu\'r lapiau yn ôl y golofn honno. Gyda chliciau ychwanegol, bydd y drefn yn toglo rhwng esgynnol a disgynnol.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 291b94d9..ea76d975 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1,61 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">Ur</string>
     <string name="time_zone">Tidszone</string>
     <string name="vibrate">Vibrer</string>
     <string name="no_days_selected">Der er ikke valgt nogen dage</string>
-    <string name="clock">Clock</string>
     <string name="timer">Æggeur</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Mellemtid</string>
     <string name="stopwatch_stopped">Stopuret er standset</string>
     <string name="timer_stopped">Æggeuret er standset</string>
     <string name="max_reminder_duration">Længste varighed af påmindelse</string>
     <string name="time_expired">Tiden er udløbet</string>
-    <string name="clock_and_date">Clock and date</string>
     <string name="use_text_shadow">Anvend tekstskygge</string>
-    <string name="swipe_right_to_dismiss">Swipe right to Dismiss, or left to Snooze.</string>
-    <string name="sort_by_creation_order">Creation order</string>
-    <string name="sort_by_alarm_time">Alarm time</string>
-    <string name="sort_by_day_and_alarm_time">Day and Alarm time</string>
-    <string name="analogue_clock">Analogue clock</string>
-    <string name="digital_clock">Digital clock</string>
-    <string name="alarm_dismissed">Alarm dismissed</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
-    <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
-    <string name="timers_notification_msg">Timers are running</string>
-    <string name="timer_single_notification_label_msg">Timer for %s is running</string>
-    <string name="new_timer">New Timer</string>
-
     <plurals name="timer_notification_msg">
         <item quantity="one">%d timer is running</item>
         <item quantity="other">%d timers are running</item>
     </plurals>
-
-    <!-- Settings -->
     <string name="clock_tab">Ur</string>
     <string name="alarm_tab">Alarm</string>
     <string name="stopwatch_tab">Stopur</string>
     <string name="timer_tab">Æggeur</string>
     <string name="show_seconds">Vis sekunder</string>
-    <string name="increase_volume_gradually">Increase volume gradually</string>
-
-    <!-- FAQ -->
     <string name="faq_1_title">Hvordan kan jeg ændre sortering af mellemtider i stopuret?</string>
     <string name="faq_1_text">Klik på den kolonne der skal sorteres efter. Med flere klik kan du skifte mellem stigende og faldende rækkefølge.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0fbff86d..711eea53 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -6,7 +6,6 @@
     <string name="vibrate">Vibration</string>
     <string name="no_days_selected">Keine Tage ausgewählt</string>
     <string name="clock">Uhr</string>
-    <string name="timer">Timer</string>
     <string name="stopwatch">Stoppuhr</string>
     <string name="start_stopwatch">Stoppuhr starten</string>
     <string name="lap">Runde</string>
@@ -33,7 +32,6 @@
     <string name="add_timer">Timer hinzufügen</string>
     <string name="upcoming_alarm">Bevorstehender Alarm</string>
     <string name="early_alarm_dismissal">Vorzeitige Alarmunterdrückung</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Die Timer laufen</string>
     <string name="timer_single_notification_label_msg">Timer für %s läuft</string>
     <string name="new_timer">Neuer Timer</string>
@@ -41,18 +39,11 @@
         <item quantity="one">%d Timer wird ausgeführt</item>
         <item quantity="other">%d Timer werden ausgeführt</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Uhr</string>
     <string name="alarm_tab">Wecker</string>
     <string name="stopwatch_tab">Stoppuhr</string>
-    <string name="timer_tab">Timer</string>
     <string name="show_seconds">Sekunden anzeigen</string>
     <string name="increase_volume_gradually">Ansteigende Lautstärke</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Wie kann die Sortierung der Laschen der Stoppuhr geändert werden?</string>
     <string name="faq_1_text">Einfach auf eine der Spalten klicken, das wird die Sortierung entsprechend der Spalte anpassen. Weitere Klicks schalten zwischen auf- und absteigender Sortierung um.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e0f0b6e2..d1a4259d 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -33,30 +33,19 @@
     <string name="add_timer">Προσθήκη χρονόμετρου</string>
     <string name="upcoming_alarm">Επερχόμενη αφύπνιση</string>
     <string name="early_alarm_dismissal">Πρόωρη απόρριψη αφύπνισης</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">Τα χρονόμετρα σε λειτουργία</string>
     <string name="timer_single_notification_label_msg">Το χρονόμετρο για %s σε λειτουργία</string>
     <string name="new_timer">Νέο Χρονόμετρο</string>
-
     <plurals name="timer_notification_msg">
         <item quantity="one">%d χρονόμετρο σε λειτουργία</item>
         <item quantity="other">%d χρονόμετρα σε λειτουργία</item>
     </plurals>
-
-    <!-- Settings -->
     <string name="clock_tab">Ετικέτα Ρολογιού</string>
     <string name="alarm_tab">Ετικέτα Αφύπνισης</string>
     <string name="stopwatch_tab">Ετικέτα Χρονοδιακόπτη</string>
     <string name="timer_tab">Ετικέτα Χρονόμετρου</string>
     <string name="show_seconds">Εμφάνιση δευτ/των</string>
     <string name="increase_volume_gradually">Σταδιακή αύξηση έντασης</string>
-
-    <!-- FAQ -->
     <string name="faq_1_title">Πώς μπορώ να αλλάξω την ταξινόμηση γύρων στην καρτέλα χρονόμετρου;</string>
     <string name="faq_1_text">Απλά κάντε κλικ σε οποιαδήποτε από τις στήλες, ώστε οι γύροι να ταξινομηθούν κατά τη δεδομένη στήλη. Με πρόσθετα κλικ μπορείτε να κάνετε εναλλαγή μεταξύ αύξουσας και φθίνουσας ταξινόμησης.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 48ba1b6d..2b20f417 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -1,62 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
-    <string name="app_launcher_name">Clock</string>
-    <string name="time_zone">Time zone</string>
-    <string name="vibrate">Vibrate</string>
-    <string name="no_days_selected">No days selected</string>
-    <string name="clock">Clock</string>
-    <string name="timer">Timer</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
-    <string name="lap">Lap</string>
-    <string name="stopwatch_stopped">Stopwatch has been stopped</string>
-    <string name="timer_stopped">Timer has been stopped</string>
-    <string name="max_reminder_duration">Max reminder duration</string>
-    <string name="time_expired">Time expired</string>
-    <string name="clock_and_date">Clock and date</string>
-    <string name="use_text_shadow">Use text shadow</string>
-    <string name="swipe_right_to_dismiss">Swipe right to Dismiss, or left to Snooze.</string>
-    <string name="sort_by_creation_order">Creation order</string>
-    <string name="sort_by_alarm_time">Alarm time</string>
-    <string name="sort_by_day_and_alarm_time">Day and Alarm time</string>
-    <string name="analogue_clock">Analogue clock</string>
-    <string name="digital_clock">Digital clock</string>
-    <string name="alarm_dismissed">Alarm dismissed</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
-    <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
-    <string name="timers_notification_msg">Timers are running</string>
-    <string name="timer_single_notification_label_msg">Timer for %s is running</string>
-    <string name="new_timer">New Timer</string>
-
     <plurals name="timer_notification_msg">
         <item quantity="one">%d timer is running</item>
         <item quantity="other">%d timers are running</item>
     </plurals>
-
-    <!-- Settings -->
-    <string name="clock_tab">Clock tab</string>
-    <string name="alarm_tab">Alarm tab</string>
-    <string name="stopwatch_tab">Stopwatch tab</string>
-    <string name="timer_tab">Timer tab</string>
-    <string name="show_seconds">Show seconds</string>
-    <string name="increase_volume_gradually">Increase volume gradually</string>
-
-    <!-- FAQ -->
-    <string name="faq_1_title">How can I change lap sorting at the stopwatch tab?</string>
-    <string name="faq_1_text">Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+    </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 0da392d3..5d65c18b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -28,12 +28,9 @@
     <string name="alarm_created">Alarma creada</string>
     <string name="alarm_snoozed">Repetir alarma en %s</string>
     <string name="no_alarms_found">No se encontraron alarmas</string>
-    <string name="add_alarm">Add alarm</string>
     <string name="no_timers_found">No se encontraron temporizadores</string>
-    <string name="add_timer">Add timer</string>
     <string name="upcoming_alarm">Próxima alarma</string>
     <string name="early_alarm_dismissal">Supresión de la alarma anticipada</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Los temporizadores están en marcha</string>
     <string name="timer_single_notification_label_msg">El temporizador para %s está en marcha</string>
     <string name="new_timer">Nuevo Temporizador</string>
@@ -42,18 +39,12 @@
         <item quantity="many">%d temporizadores están funcionando</item>
         <item quantity="other">%d temporizadores están funcionando</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Pestaña de reloj</string>
     <string name="alarm_tab">Pestaña de alarma</string>
     <string name="stopwatch_tab">Pestaña de cronómetro</string>
     <string name="timer_tab">Pestaña de temporizador</string>
     <string name="show_seconds">Mostrar segundos</string>
     <string name="increase_volume_gradually">Aumentar volumen gradualmente</string>
-    <!-- FAQ -->
     <string name="faq_1_title">¿Cómo puedo cambiar el orden de las vueltas en la pestaña de cronómetro?</string>
     <string name="faq_1_text">Solo toca cualquiera de las columnas, eso hará que las vueltas sean ordenados por la columna seleccionada. Con toques adicionales, puedes cambiar entre ordenar ascendente o descendentemente.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 84e4ab48..d75b31b0 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -5,7 +5,6 @@
     <string name="time_zone">Ajavöönd</string>
     <string name="vibrate">Vibreeri</string>
     <string name="no_days_selected">Ühtegi päeva pole valitud</string>
-    <string name="clock">Clock</string>
     <string name="timer">Taimer</string>
     <string name="stopwatch">Stopper</string>
     <string name="start_stopwatch">Käivita stopper</string>
@@ -33,7 +32,6 @@
     <string name="add_timer">Lisa taimer</string>
     <string name="upcoming_alarm">Järgmine äratus</string>
     <string name="early_alarm_dismissal">Lõpeta äratus enneaegselt</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Taimerid töötavad</string>
     <string name="timer_single_notification_label_msg">%s taimer töötab</string>
     <string name="new_timer">Uus taimer</string>
@@ -41,18 +39,12 @@
         <item quantity="one">%d taimer töötab</item>
         <item quantity="other">%d taimerit töötavad</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Kella vahekaart</string>
     <string name="alarm_tab">Äratuskella vahekaart</string>
     <string name="stopwatch_tab">Stopperi vahekaart</string>
     <string name="timer_tab">Taimeri vahekaart</string>
     <string name="show_seconds">Näita sekundeid</string>
     <string name="increase_volume_gradually">Suurenda heli valjust järk-järgult</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Kuidas ma saan stopperis muuta ringiaegade sortimist\?</string>
     <string name="faq_1_text">Klõpsi veerul ja sellega määrad, et sortimine toimub selle veeru alusel. Mitme klõpsuga saad vahetada, kas sortimine toimub kasvavas või kahanevas suunas.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index a49844c9..44477e38 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -5,7 +5,6 @@
     <string name="time_zone">Ordu eremua</string>
     <string name="vibrate">Bibratu</string>
     <string name="no_days_selected">Ez duzu egunik hautatu</string>
-    <string name="clock">Clock</string>
     <string name="timer">Tenporizagailua</string>
     <string name="stopwatch">Kronometroa</string>
     <string name="start_stopwatch">Abiarazi kronometroa</string>
@@ -33,7 +32,6 @@
     <string name="add_timer">Gehitu tenporizadorea</string>
     <string name="upcoming_alarm">Datorren alarma</string>
     <string name="early_alarm_dismissal">Alarmaren irteera goiztiarra</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Tenporizadoreak martxan daude</string>
     <string name="timer_single_notification_label_msg">%s-ren tenporizadorea martxan da</string>
     <string name="new_timer">Tenporizadore berria</string>
@@ -41,18 +39,12 @@
         <item quantity="one">%d tenporizadorea martxan dago</item>
         <item quantity="other">%d tenporizadore martxan daude</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Erlojuaren fitxa</string>
     <string name="alarm_tab">Alarmaren fitxa</string>
     <string name="stopwatch_tab">Kronometroaren fitxa</string>
     <string name="timer_tab">Tenporizadorearen fitxa</string>
     <string name="show_seconds">Erakutsi segundoak</string>
     <string name="increase_volume_gradually">Bolumena gradualki igo</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Nola alda dezaket biren ordena kronometroaren fitxan\?</string>
     <string name="faq_1_text">Sakatu zutaberen bat, birak zutabe horren arabera ordenatzeko. Gehiagotan sakatuz ordena gorakor edo beherakorrean sailka dezakezu.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index a92f465b..3632bfc3 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Lisää ajastus</string>
     <string name="upcoming_alarm">Ajastettu herätys</string>
     <string name="early_alarm_dismissal">Aikainen herätys hylkäys</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Ajastuksia on käynnissä</string>
     <string name="timer_single_notification_label_msg">%s ajastus on käynnissä</string>
     <string name="new_timer">Uusi ajastus</string>
@@ -41,18 +40,12 @@
         <item quantity="one">%d ajastus on käynnissä</item>
         <item quantity="other">%d ajastusta on käynnissä</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Kello-välilehti</string>
     <string name="alarm_tab">Herätys-välilehti</string>
     <string name="stopwatch_tab">Ajanotto-välilehti</string>
     <string name="timer_tab">Ajastus-välilehti</string>
     <string name="show_seconds">Näytä sekunnit</string>
     <string name="increase_volume_gradually">Voimista ääntä asteittain</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Miten vaihdan kierrosten järjestystä ajanoton välilehdellä\?</string>
     <string name="faq_1_text">Napauta saraketta, jonka perusteella haluat järjestää kierrokset. Lisänapautukset vaihtavat järjestyksen nousevaksi tai laskevaksi.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 77736fc8..9a343fb2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Ajouter un minuteur</string>
     <string name="upcoming_alarm">Alarme à venir</string>
     <string name="early_alarm_dismissal">Rejet d\'alarme précoce</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Les minuteurs sont en cours d\'exécution</string>
     <string name="timer_single_notification_label_msg">Le minuteur pour %s est en cours d\'exécution</string>
     <string name="new_timer">Nouveau minuteur</string>
@@ -42,18 +41,12 @@
         <item quantity="many">%d minuteurs sont en cours d\'exécution</item>
         <item quantity="other">%d minuteurs sont en cours d\'exécution</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Onglet horloge</string>
     <string name="alarm_tab">Onglet alarme</string>
     <string name="stopwatch_tab">Onglet chronomètre</string>
     <string name="timer_tab">Onglet minuteur</string>
     <string name="show_seconds">Afficher les secondes</string>
     <string name="increase_volume_gradually">Augmenter progressivement le volume</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Comment puis-je modifier le tri des tours dans l\'onglet chronomètre \?</string>
     <string name="faq_1_text">Cliquez simplement sur l’une des colonnes afin de trier les tours selon la colonne donnée. Par des clics supplémentaires, vous basculerez entre les tris croissant et décroissant.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 76a4bb91..1c3ff879 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Engadir temporizador</string>
     <string name="upcoming_alarm">Próxima alarma</string>
     <string name="early_alarm_dismissal">Desbotar alarma anticipadamente</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Hai temporizadores activos</string>
     <string name="timer_single_notification_label_msg">O temporizador para %s está funcionando</string>
     <string name="new_timer">Novo temporizador</string>
@@ -41,18 +40,12 @@
         <item quantity="one">%d temporizador activado</item>
         <item quantity="other">%d temporizadores activados</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Ficha do reloxo</string>
     <string name="alarm_tab">Ficha da alarma</string>
     <string name="stopwatch_tab">Ficha do cronómetro</string>
     <string name="timer_tab">Ficha do temporizador</string>
     <string name="show_seconds">Mostralos segundos</string>
     <string name="increase_volume_gradually">Aumentalo volume gradualmente</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Como podo cambiala clasificación das voltas na ficha do cronómetro\?</string>
     <string name="faq_1_text">So faga clic en calquera das columnas, iso fará que se ordenen pola columna dada. Con clics adicionais, pode alternar entre clasificación ascendente e descendente.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 2f374fec..73490405 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -23,18 +23,12 @@
     <string name="analogue_clock">Analogni sat</string>
     <string name="digital_clock">Digitalni sat</string>
     <string name="alarm_dismissed">Alarm odbačen</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">Alarm odgođen za %s</string>
     <string name="no_alarms_found">Nema alarma</string>
     <string name="add_alarm">Dodaj alarm</string>
     <string name="no_timers_found">Nema brojača vremena</string>
     <string name="add_timer">Dodaj brojač vremena</string>
     <string name="upcoming_alarm">Nadolazeći alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">Brojači su pokrenuti</string>
     <string name="timer_single_notification_label_msg">Brojač za %s je pokrenut</string>
     <string name="new_timer">Novi brojač</string>
@@ -43,18 +37,12 @@
         <item quantity="few">%d brojača su pokrenuta</item>
         <item quantity="other">%d brojača je pokrenuto</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Kartica sata</string>
     <string name="alarm_tab">Kartica alarma</string>
     <string name="stopwatch_tab">Kartica štoperice</string>
     <string name="timer_tab">Kartica brojača</string>
     <string name="show_seconds">Prikaži sekunde</string>
     <string name="increase_volume_gradually">Postupno povećavaj glasnoću</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Kako mogu promijeniti razvrstavanje rundi na kartici štoperice\?</string>
     <string name="faq_1_text">Jednostavno pritisni bilo koji stupac. Time će se runde razvrstati po zadanom stupcu. Dodatnim pritiskanjem stupca možeš mijenjati između uzlaznog i silaznog razvrstavanja.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index fb449555..19430030 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">Óra</string>
     <string name="time_zone">Időzóna</string>
     <string name="vibrate">Rezgés</string>
@@ -23,18 +22,12 @@
     <string name="analogue_clock">Analóg óra</string>
     <string name="digital_clock">Digitális óra</string>
     <string name="alarm_dismissed">Riasztás eltüntetve</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">Az ébresztés ennyivel elhalasztva: %s</string>
     <string name="no_alarms_found">Nincsenek riasztások</string>
     <string name="add_alarm">Riasztás hozzáadása</string>
     <string name="no_timers_found">Nincsenek időzitők</string>
     <string name="add_timer">Időzítő hozzáadása</string>
     <string name="upcoming_alarm">Közelgő riasztás</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">Az időzítő megy</string>
     <string name="timer_single_notification_label_msg">A(z) %s időzítő fut</string>
     <string name="new_timer">Új időzítő</string>
@@ -42,18 +35,12 @@
         <item quantity="one">%d időzítő elindult</item>
         <item quantity="other">%d időzítők elindultak</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Óra fül</string>
     <string name="alarm_tab">Riasztás lap</string>
     <string name="stopwatch_tab">Stopperóra lap</string>
     <string name="timer_tab">Időzítő lap</string>
     <string name="show_seconds">Másodperc megjelenítése</string>
     <string name="increase_volume_gradually">Hangerő fokozatos növelése</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Hogyan változtathatom meg a körök rendezését a stopperóra fülön?</string>
     <string name="faq_1_text">Csak kattintson bármelyik oszlopra, ettől a körök az adott oszlop szerint lesznek rendezve. További kattintásokkal válthatsz a növekvő és csökkenő rendezés között.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index c6bc67cd..6d76204e 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">Jam</string>
     <string name="time_zone">Zona waktu</string>
     <string name="vibrate">Getar</string>
     <string name="no_days_selected">Tidak ada hari yang dipilih</string>
-    <string name="clock">Clock</string>
     <string name="timer">Pewaktu</string>
-    <string name="stopwatch">Stopwatch</string>
     <string name="start_stopwatch">Mulai stopwatch</string>
     <string name="lap">Putaran</string>
     <string name="stopwatch_stopped">Stopwatch telah berhenti</string>
@@ -23,36 +20,23 @@
     <string name="analogue_clock">Jam analog</string>
     <string name="digital_clock">Jam digital</string>
     <string name="alarm_dismissed">Alarm diabaikan</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">Alarm ditunda selama %s</string>
     <string name="no_alarms_found">Tidak ada alarm yang ditemukan</string>
-    <string name="add_alarm">Add alarm</string>
     <string name="no_timers_found">Tidak ada pewaktu yang ditemukan</string>
     <string name="add_timer">Tambahkan pewaktu</string>
     <string name="upcoming_alarm">Alarm berikut</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">Pewaktu sedang berjalan</string>
     <string name="timer_single_notification_label_msg">Pewaktu untuk %s sedang berjalan</string>
     <string name="new_timer">Pewaktu Baru</string>
     <plurals name="timer_notification_msg">
         <item quantity="other">%d pewaktu sedang berjalan</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Tab jam</string>
     <string name="alarm_tab">Tab alarm</string>
     <string name="stopwatch_tab">Tab stopwatch</string>
     <string name="timer_tab">Tab pewaktu</string>
     <string name="show_seconds">Tampilkan detik</string>
     <string name="increase_volume_gradually">Keraskan volume secara bertahap</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Bagaimana cara mengubah pengurutan putaran di tab stopwatch?</string>
     <string name="faq_1_text">Cukup klik salah satu kolom, dan putaran akan diurutkan menurut kolom tersebut, dari yang terlama ke tercepat atau yang tercepat ke terlama.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 31fb9034..45a6d193 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Aggiungi contaminuti</string>
     <string name="upcoming_alarm">Allarme imminente</string>
     <string name="early_alarm_dismissal">Arresto anticipato dell\'allarme</string>
-    <!--Timer-->
     <string name="timers_notification_msg">I contaminuti sono in funzione</string>
     <string name="timer_single_notification_label_msg">Il contaminuti per %s è in funzione</string>
     <string name="new_timer">Nuovo contaminuti</string>
@@ -42,18 +41,12 @@
         <item quantity="many">%d contaminuti sono in funzione</item>
         <item quantity="other">%d contaminuti sono in funzione</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Scheda orologio</string>
     <string name="alarm_tab">Scheda sveglia</string>
     <string name="stopwatch_tab">Scheda cronometro</string>
     <string name="timer_tab">Scheda contaminuti</string>
     <string name="show_seconds">Mostra secondi</string>
     <string name="increase_volume_gradually">Incrementa il volume gradualmente</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Come posso cambiare l\'ordinamento dei giri nel cronometro?</string>
     <string name="faq_1_text">Premendo una volta su qualsiasi colonna, i giri verranno ordinati per tale colonna. Premendo nuovamente si potrà cambiare il tipo di ordinamento, ascendente o discendente.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 2a946786..e7aef40e 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -5,10 +5,8 @@
     <string name="time_zone">אזור זמן</string>
     <string name="vibrate">לנדנד</string>
     <string name="no_days_selected">נא לבחור ימים ולבצע שוב</string>
-    <string name="clock">Clock</string>
     <string name="timer">טיימר</string>
     <string name="stopwatch">סטופר</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">הקפה</string>
     <string name="stopwatch_stopped">שעון העצר הופסק</string>
     <string name="timer_stopped">הטיימר הופסק</string>
@@ -22,19 +20,6 @@
     <string name="sort_by_day_and_alarm_time">התראה יום ושעה</string>
     <string name="analogue_clock">שעון אנלוגי</string>
     <string name="digital_clock">שעון דיגיטלי</string>
-    <string name="alarm_dismissed">Alarm dismissed</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
-    <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">‏טיימר פועל</string>
     <string name="timer_single_notification_label_msg">טיימר עבור %s פועל</string>
     <string name="new_timer">טיימר חדש</string>
@@ -44,18 +29,12 @@
         <item quantity="many">%d טיימר פועל</item>
         <item quantity="other">%d טיימרים פועלים</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">לשונית שעון</string>
     <string name="alarm_tab">לשונית התראות</string>
     <string name="stopwatch_tab">לשונית שעון עצר</string>
     <string name="timer_tab">לשונית טיימר</string>
     <string name="show_seconds">הצג שניות</string>
     <string name="increase_volume_gradually">הגבר את עוצמת הקול בהדרגה</string>
-    <!-- FAQ -->
     <string name="faq_1_title">כיצד אוכל לשנות את מיון ההקפה בכרטיסיית שעון העצר\?</string>
     <string name="faq_1_text">פשוט לחץ על כל אחת מהעמודות, זה יגרום להקפות להיות ממוינות לפי העמודה הנתונה. בלחיצות נוספות תוכל לעבור בין מיון עולה ויורד.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index d43e9bdf..eb7cc548 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -5,10 +5,7 @@
     <string name="time_zone">タイムゾーン</string>
     <string name="vibrate">バイブレーション</string>
     <string name="no_days_selected">曜日が選択されていません</string>
-    <string name="clock">Clock</string>
     <string name="timer">タイマー</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">ラップ</string>
     <string name="stopwatch_stopped">ストップウォッチが停止しました</string>
     <string name="timer_stopped">タイマーが停止しました</string>
@@ -23,36 +20,23 @@
     <string name="analogue_clock">アナログ時計</string>
     <string name="digital_clock">デジタル時計</string>
     <string name="alarm_dismissed">アラームが破棄されました</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
     <string name="no_alarms_found">アラームが見つかりません</string>
     <string name="add_alarm">アラームを追加</string>
     <string name="no_timers_found">タイマーが見つかりません</string>
     <string name="add_timer">タイマーを追加</string>
     <string name="upcoming_alarm">今後のアラーム</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">タイマーが作動中</string>
     <string name="timer_single_notification_label_msg">タイマー %s が作動中</string>
     <string name="new_timer">新しいタイマー</string>
     <plurals name="timer_notification_msg">
         <item quantity="other">%d 個のタイマーが作動中</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">時計</string>
     <string name="alarm_tab">アラーム</string>
     <string name="stopwatch_tab">ストップウォッチ</string>
     <string name="timer_tab">タイマー</string>
     <string name="show_seconds">秒を表示</string>
     <string name="increase_volume_gradually">音量を徐々に大きくする</string>
-    <!-- FAQ -->
     <string name="faq_1_title">ストップウォッチのタブでラップタイムの並べ替えを行うにはどうすればよいですか？</string>
     <string name="faq_1_text">特定の列をタップすると、その列でラップタイムが並べ替えられます。さらにもう一度タップすると、昇順と降順の切り替えを行えます。</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 834612c5..f87dddd2 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -1,13 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Paprastas Laikrodis</string>
     <string name="app_launcher_name">Laikrodis</string>
     <string name="time_zone">Laiko juosta</string>
     <string name="vibrate">Vibruoti</string>
     <string name="no_days_selected">Nepasirinkta nė vienos dienos</string>
-    <string name="clock">Clock</string>
     <string name="timer">Laikmatis</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Etapas</string>
     <string name="stopwatch_stopped">Chronometras buvo sustabdytas</string>
     <string name="timer_stopped">Laikmatis buvo sustabdytas</string>
@@ -15,48 +13,16 @@
     <string name="time_expired">Laikas pasibaigė</string>
     <string name="clock_and_date">Laikrodis ir data</string>
     <string name="use_text_shadow">Naudoti teksto šešėlį</string>
-    <string name="swipe_right_to_dismiss">Swipe right to Dismiss, or left to Snooze.</string>
-    <string name="sort_by_creation_order">Creation order</string>
-    <string name="sort_by_alarm_time">Alarm time</string>
-    <string name="sort_by_day_and_alarm_time">Day and Alarm time</string>
-    <string name="analogue_clock">Analogue clock</string>
-    <string name="digital_clock">Digital clock</string>
-    <string name="alarm_dismissed">Alarm dismissed</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
-    <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
-    <string name="timers_notification_msg">Timers are running</string>
-    <string name="timer_single_notification_label_msg">Timer for %s is running</string>
-    <string name="new_timer">New Timer</string>
-
     <plurals name="timer_notification_msg">
         <item quantity="one">%d timer is running</item>
         <item quantity="few">%d timers are running</item>
         <item quantity="other">%d timers are running</item>
     </plurals>
-
-    <!-- Settings -->
     <string name="clock_tab">Laikrodžio skirtukas</string>
     <string name="alarm_tab">Žadintuvo skirtukas</string>
     <string name="stopwatch_tab">Chronometro skirtukas</string>
     <string name="timer_tab">Laikmačio skirtukas</string>
     <string name="show_seconds">Rodyti sekundes</string>
-    <string name="increase_volume_gradually">Increase volume gradually</string>
-
-    <!-- FAQ -->
     <string name="faq_1_title">Kaip aš galiu pakeisti etapų rikiavimą chronometro auselėje?</string>
     <string name="faq_1_text">Spustelėkite ant bet kurio stulpelio, tai surikiuos etapus pagal tą stulpelį. Su papildomais paspaudimais Jūs galite pasirinkti tarp rikiavimo mažėjančia arba didėjančia tvarka.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index eb94d9b4..5feb7a54 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -8,7 +8,6 @@
     <string name="clock">ക്ലോക്ക്</string>
     <string name="timer">ടൈമർ</string>
     <string name="stopwatch">സ്റ്റോപ്പ് വാച്ച്</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">ലാപ്‌</string>
     <string name="stopwatch_stopped">സ്റ്റോപ്പ് വാച്ച് നിർത്തിയിരിക്കുന്നു</string>
     <string name="timer_stopped">ടൈമർ നിർത്തിയിരിക്കുന്നു</string>
@@ -23,18 +22,11 @@
     <string name="analogue_clock">അനലോഗ് ക്ലോക്ക്</string>
     <string name="digital_clock">ഡിജിറ്റൽ ക്ലോക്ക്</string>
     <string name="alarm_dismissed">അലാറം ഒഴിവാക്കി</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">അലാറം %s സ്‌നൂസ് ചെയ്‌തു</string>
     <string name="no_alarms_found">അലാറങ്ങളൊന്നും കണ്ടെത്തിയില്ല</string>
     <string name="add_alarm">പുതിയ അലാറം ചേർക്കുക</string>
     <string name="no_timers_found">ടൈമറുകളൊന്നും കണ്ടെത്തിയില്ല</string>
     <string name="add_timer">ടൈമർ ചേർക്കുക</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">ടൈമറുകൾ പ്രവർത്തിക്കുന്നു</string>
     <string name="timer_single_notification_label_msg">%s-നുള്ള ടൈമർ പ്രവർത്തിക്കുന്നു</string>
     <string name="new_timer">പുതിയ ടൈമർ</string>
@@ -42,18 +34,12 @@
         <item quantity="one">%d ടൈമർ പ്രവർത്തിക്കുന്നു</item>
         <item quantity="other">%d ടൈമറുകൾ പ്രവർത്തിക്കുന്നു</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">ക്ലോക്ക് ടാബ്</string>
     <string name="alarm_tab">അലാറം ടാബ്</string>
     <string name="stopwatch_tab">സ്റ്റോപ്പ് വാച്ച് ടാബ്</string>
     <string name="timer_tab">ടൈമർ ടാബ്</string>
     <string name="show_seconds">സെക്കൻഡ് കാണിക്കുക</string>
     <string name="increase_volume_gradually">വോളിയം ക്രമേണ വർദ്ധിപ്പിക്കുക</string>
-    <!-- FAQ -->
     <string name="faq_1_title">സ്റ്റോപ്പ് വാച്ച് ടാബിൽ ലാപ് സോർട്ടിംഗ് എങ്ങനെ മാറ്റാം?</string>
     <string name="faq_1_text">ഏതെങ്കിലും കോളങ്ങളിൽ ക്ലിക്കുചെയ്യുക, അത് നൽകിയ കോളം ഉപയോഗിച്ച് ലാപ്പുകൾ ക്രമീകരിക്കാൻ ഇടയാക്കും. അധിക ക്ലിക്കുകൾ ഉപയോഗിച്ച് നിങ്ങൾക്ക് അസെന്റിങ് ആയും ഡിസെൻഡിങ് ആയും ടോഗിൾ ചെയ്യാൻ സഹായിക്കും.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 12139e9c..883593c1 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -25,9 +25,6 @@
     <string name="analogue_clock">တိုင်ကပ်နာရီ</string>
     <string name="digital_clock">ဒီဂျစ်တယ်နာရီ</string>
     <string name="alarm_dismissed">နှိုးစက်အားဖယ်ရှားပြီး</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">နှိုးစက်အားရပ်တန့်ပြီး %s</string>
     <string name="no_alarms_found">နှိုးစက်မရှိပါ</string>
     <string name="add_alarm">နှိုးစက်ထည့်မည်</string>
@@ -35,31 +32,19 @@
     <string name="add_timer">အချိန်မှတ်စက်ထည့်မည်</string>
     <string name="upcoming_alarm">လာ​တော့မည့်နှိုးစက်</string>
     <string name="early_alarm_dismissal">နှိုးစက်ဖယ်ရှားခြင်း</string>
-
-    <!-- Timer -->
     <string name="timers_notification_msg">အချိန်မှတ်စက်များသွား​နေသည်</string>
     <string name="timer_single_notification_label_msg"> %s အတွက်အချိန်မှတ်စက် သည်သွား​နေသည်</string>
     <string name="new_timer">အချိန်မှတ်စက်အသစ်</string>
-
     <plurals name="timer_notification_msg">
         <item quantity="one">%d အချိန်မှတ်စက်သွား​နေသည်</item>
         <item quantity="other">%d အချိန်မှတ်စက်များသွား​နေသည်</item>
     </plurals>
-
-    <!-- Settings -->
     <string name="clock_tab">နာရီ</string>
     <string name="alarm_tab">နှိုးစက်</string>
     <string name="stopwatch_tab">စံချိန်ယူ</string>
     <string name="timer_tab">အချိန်မှတ်စက်</string>
     <string name="show_seconds">စက္ကန့်များကိုပြ</string>
     <string name="increase_volume_gradually">မြည်သံအားတစ်ဆင့်ချင်းမြှင့်ပါ</string>
-
-    <!-- FAQ -->
     <string name="faq_1_title">ငါဘယ်လိုစံချိန်ယူနာရီမှာပြန်​ကျော့ထားတယ့်စာရင်းအစီအစဥ်ကိုချိန်းနိုင်မလဲ?</string>
     <string name="faq_1_text">ကော်လံတစ်ခု​ပေါ်မှာနှိပ်ပါ သင်နှိပ်လိုက်သည့်​ကော်လံကိုတစ်ခါထပ်နှိပ်ခြင်းဖြင့် ကြီးစဥ်ငယ်လိုက် နဲ့ငယ်စဥ်ကြီးလိုက်စီနိုင်ပါတယ်။</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index dd2741da..9501d752 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">Klokke</string>
     <string name="time_zone">Tidssone</string>
     <string name="vibrate">Vibrer</string>
     <string name="no_days_selected">Ingen dager valgte</string>
-    <string name="clock">Clock</string>
-    <string name="timer">Timer</string>
     <string name="stopwatch">Stoppeklokke</string>
     <string name="start_stopwatch">Start stoppeklokke</string>
     <string name="lap">Runde</string>
@@ -23,17 +20,11 @@
     <string name="analogue_clock">Analog klokke</string>
     <string name="digital_clock">Digital klokke</string>
     <string name="alarm_dismissed">Alarm slått av</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">Alarm - Slumre %s</string>
     <string name="no_alarms_found">Ingen alarmer funnet</string>
-    <string name="add_alarm">Add alarm</string>
     <string name="no_timers_found">Ingen timere funnet</string>
-    <string name="add_timer">Add timer</string>
     <string name="upcoming_alarm">Kommende alarm</string>
     <string name="early_alarm_dismissal">Tidlig alarm-avslåing</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Timere er i gang</string>
     <string name="timer_single_notification_label_msg">Timer for %s er i gang</string>
     <string name="new_timer">Ny timer</string>
@@ -41,18 +32,9 @@
         <item quantity="one">%d timer er i gang</item>
         <item quantity="other">%d timere er i gang</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Klokke</string>
     <string name="alarm_tab">Alarm</string>
     <string name="stopwatch_tab">Stoppeklokke</string>
-    <string name="timer_tab">Timer</string>
     <string name="show_seconds">Vis sekunder</string>
     <string name="increase_volume_gradually">Øk volum gradvis</string>
-    <!-- FAQ -->
-    <string name="faq_1_title">How can I change lap sorting at the stopwatch tab?</string>
-    <string name="faq_1_text">Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+    </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0ac90edc..28ff58a8 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -6,8 +6,6 @@
     <string name="vibrate">Trillen</string>
     <string name="no_days_selected">Geen dagen geselecteerd</string>
     <string name="clock">Klok</string>
-    <string name="timer">Timer</string>
-    <string name="stopwatch">Stopwatch</string>
     <string name="start_stopwatch">Stopwatch starten</string>
     <string name="lap">Ronde</string>
     <string name="stopwatch_stopped">Stopwatch is gestopt</string>
@@ -33,7 +31,6 @@
     <string name="add_timer">Timer toevoegen</string>
     <string name="upcoming_alarm">Volgende wekker</string>
     <string name="early_alarm_dismissal">Wekker vroegtijdig uitzetten</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Timers lopen</string>
     <string name="timer_single_notification_label_msg">Timer voor %s loopt</string>
     <string name="new_timer">Nieuwe Timer</string>
@@ -41,18 +38,12 @@
         <item quantity="one">%d timer loopt</item>
         <item quantity="other">%d timers lopen</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Tab Klok</string>
     <string name="alarm_tab">Tab Wekker</string>
     <string name="stopwatch_tab">Tab Stopwatch</string>
     <string name="timer_tab">Tab Timers</string>
     <string name="show_seconds">Seconden tonen</string>
     <string name="increase_volume_gradually">Volume geleidelijk verhogen</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Hoe kan ik rondetijden sorteren in de stopwatch?</string>
     <string name="faq_1_text">Klik op een van de kolommen om de rondetijden te sorteren op basis van die kolom. Klik nogmaals op dezelfde kolom om de sorteervolgorde om te keren.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 2d5d0272..3fd35469 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -5,18 +5,9 @@
     <string name="app_name">سادی گھڑی</string>
     <string name="app_launcher_name">گھڑی</string>
     <string name="time_zone">سماں کھیتر</string>
-    <string name="vibrate">Vibrate</string>
     <string name="no_days_selected">کوئی دن نہیں چݨے اے</string>
     <string name="timer">سماں والا</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">لیپ</string>
-    <string name="stopwatch_stopped">Stopwatch has been stopped</string>
-    <string name="timer_stopped">Timer has been stopped</string>
-    <string name="max_reminder_duration">Max reminder duration</string>
-    <string name="time_expired">Time expired</string>
-    <string name="clock_and_date">Clock and date</string>
-    <string name="use_text_shadow">Use text shadow</string>
     <string name="swipe_right_to_dismiss">بند کرن لئی سجے پاسے سویپ کرو، فیر کرن لئی کھبے پاسے سویپ کرو۔</string>
     <string name="sort_by_creation_order">بݨاؤݨ دا کرم</string>
     <string name="sort_by_alarm_time">الارم سماں</string>
@@ -24,28 +15,21 @@
     <string name="analogue_clock">اینولوگ گھڑی</string>
     <string name="digital_clock">ڈیجیٹل گھڑی</string>
     <string name="alarm_dismissed">الارم بند کیتا گیا</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">؜‫%s‬ الارم نوں فیر بدلیا گیا</string>
     <string name="no_alarms_found">کوئی الارم نہیں لبھے</string>
     <string name="add_alarm">نواں الارم پایو</string>
     <string name="no_timers_found">کوئی سماں والے نہیں لبھے</string>
     <string name="add_timer">سماں والا پایو</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
     <string name="timers_notification_msg">سماں والے چالو کیتے جا رہے اے</string>
     <string name="timer_single_notification_label_msg">؜‫%s‬‬ ؜لئی سماں والا چالو کیتا جا رہا اے</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
     <plurals name="timer_notification_msg">
         <item quantity="one">؜‫%d‬؜ سماں والا چالو کیتا جا رہا اے</item>
         <item quantity="other">؜‫%d‬؜ سماں والے چالو کیتے جا رہے اے</item>
     </plurals>
     <string name="clock_tab">گھڑی دی ٹیب</string>
     <string name="alarm_tab">الارم دی ٹیب</string>
-    <string name="stopwatch_tab">Stopwatch tab</string>
     <string name="timer_tab">سماں والے دی ٹیب</string>
     <string name="show_seconds">سکنٹ ویکھو</string>
     <string name="increase_volume_gradually">ہولی ہولی آواز ودھاؤ</string>
     <string name="faq_1_title">How can I change lap sorting at the stopwatch tab\?</string>
-    <string name="faq_1_text">Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting.</string>
-</resources>
+    </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 3f1acbcf..87399e50 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Dodaj minutnik</string>
     <string name="upcoming_alarm">Nadchodzący alarm</string>
     <string name="early_alarm_dismissal">Wcześniejsze wyłączenie alarmu</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Minutniki są uruchomione</string>
     <string name="timer_single_notification_label_msg">Minutnik dla %s jest uruchomiony</string>
     <string name="new_timer">Nowy minutnik</string>
@@ -43,18 +42,12 @@
         <item quantity="many">%d minutników jest uruchomionych</item>
         <item quantity="other">%d minutników jest uruchomionych</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Karta zegara</string>
     <string name="alarm_tab">Karta alarmu</string>
     <string name="stopwatch_tab">Karta stopera</string>
     <string name="timer_tab">Karta minutnika</string>
     <string name="show_seconds">Pokazuj sekundy</string>
     <string name="increase_volume_gradually">Zwiększaj głośność stopniowo</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Jak mogę zmienić sortowanie okrążeń w karcie stopera\?</string>
     <string name="faq_1_text">Po prostu naciśnij dowolną kolumnę, co spowoduje, że okrążenia zostaną posortowane według danej kolumny. Za pomocą dodatkowych naciśnięć możesz przełączać się między sortowaniem rosnącym i malejącym.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 69f10077..1000eb45 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -23,18 +23,12 @@
     <string name="analogue_clock">Relógio analógico</string>
     <string name="digital_clock">Relógio digital</string>
     <string name="alarm_dismissed">Alarme descartado</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">Alarme adiado por %s</string>
     <string name="no_alarms_found">Nenhum alarme encontrado</string>
     <string name="add_alarm">Adicionar alarme</string>
     <string name="no_timers_found">Nenhum temporizador encontrado</string>
     <string name="add_timer">Adicionar temporizador</string>
     <string name="upcoming_alarm">Próximo alarme</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">Temporizadores em execução</string>
     <string name="timer_single_notification_label_msg">O temporizador para %s está em execução</string>
     <string name="new_timer">Novo temporizador</string>
@@ -42,18 +36,12 @@
         <item quantity="one">%d temporizador em execução</item>
         <item quantity="other">%d temporizadores em execução</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Guia Relógio</string>
     <string name="alarm_tab">Guia Alarme</string>
     <string name="stopwatch_tab">Guia Cronômetro</string>
     <string name="timer_tab">Guia Temporizador</string>
     <string name="show_seconds">Mostrar segundos</string>
     <string name="increase_volume_gradually">Aumentar volume gradualmente</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Como posso alterar a classificação das voltas na guia Cronômetro\?</string>
     <string name="faq_1_text">Basta clicar em qualquer uma das colunas e isso fará com que as voltas sejam classificadas pela coluna especificada. Com cliques adicionais, você pode alternar a ordem de classificação entre crescente e decrescente.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 7d189f2f..52316802 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -32,8 +32,6 @@
     <string name="no_timers_found">Nenhum temporizador encontrado</string>
     <string name="add_timer">Adicionar temporizador</string>
     <string name="upcoming_alarm">Próximo alarme</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Temporizadores em curso</string>
     <string name="timer_single_notification_label_msg">Temporizador para %s está em curso</string>
     <string name="new_timer">Novo temporizador</string>
@@ -42,18 +40,12 @@
         <item quantity="many">%d temporizadores em curso</item>
         <item quantity="other">%d temporizadores em curso</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Relógio</string>
     <string name="alarm_tab">Alarme</string>
     <string name="stopwatch_tab">Cronómetro</string>
     <string name="timer_tab">Temporizador</string>
     <string name="show_seconds">Mostrar segundos</string>
     <string name="increase_volume_gradually">Aumentar volume gradualmente</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Como posso alterar a ordem das voltas no Cronómetro\?</string>
     <string name="faq_1_text">Basta clicar em qualquer uma das colunas e isso fará com que as voltas sejam ordenadas pela coluna especificada. Com cliques adicionais, pode alternar a ordem de entre crescente e decrescente.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index aab3cd47..369fe94d 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -8,7 +8,6 @@
     <string name="clock">Ceas</string>
     <string name="timer">Temporizator</string>
     <string name="stopwatch">Cronometru</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Tură</string>
     <string name="stopwatch_stopped">Cronometrul a fost oprit</string>
     <string name="timer_stopped">Temporizatorul a fost oprit</string>
@@ -23,18 +22,11 @@
     <string name="analogue_clock">Ceas analogic</string>
     <string name="digital_clock">Ceas digital</string>
     <string name="alarm_dismissed">Alarmă ignorată</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">Alarma a fost amânată cu %s</string>
     <string name="no_alarms_found">Nu au fost găsite alarme</string>
     <string name="add_alarm">Adaugă alarmă</string>
     <string name="no_timers_found">Nu au fost găsite temporizatoare</string>
     <string name="add_timer">Adaugă temporizator</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
     <string name="timers_notification_msg">Temporizatoarele sunt pornite</string>
     <string name="timer_single_notification_label_msg">Temporizatorul de %s este pornit</string>
     <string name="new_timer">Temporizator nou</string>
@@ -43,18 +35,12 @@
         <item quantity="few">%d temporizatoarele sunt pornite</item>
         <item quantity="other">%d de temporizatoare sunt pornite</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Fereastră ceas</string>
     <string name="alarm_tab">Fereastră alarmă</string>
     <string name="stopwatch_tab">Fereastră cronometru</string>
     <string name="timer_tab">Fereastră temporizator</string>
     <string name="show_seconds">Arată secunde</string>
     <string name="increase_volume_gradually">Creşte volumul gradual</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Cum pot schimba sortarea turelor în fereastra cronometrului\?</string>
     <string name="faq_1_text">Apasă pe oricare coloana, asta o să facă ca turele să fie sortate după coloana selectată. Apăsările suplimentare o să comute între ordonare crescătoare şi descrescătoare.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 012da0e7..f78385e1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Добавить таймер</string>
     <string name="upcoming_alarm">Предстоящий будильник</string>
     <string name="early_alarm_dismissal">Досрочное отключение будильника</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Таймеры запущены</string>
     <string name="timer_single_notification_label_msg">Таймер для %s запущен</string>
     <string name="new_timer">Новый таймер</string>
@@ -43,18 +42,12 @@
         <item quantity="many">%d таймеров запущено</item>
         <item quantity="other">%d таймеров запущено</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Часы</string>
     <string name="alarm_tab">Будильник</string>
     <string name="stopwatch_tab">Секундомер</string>
     <string name="timer_tab">Таймер</string>
     <string name="show_seconds">Показывать секунды</string>
     <string name="increase_volume_gradually">Нарастание громкости</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Как я могу изменить сортировку кругов во вкладке секундомера?</string>
     <string name="faq_1_text">Просто нажмите на любую из колонок, и круги отсортируются по этой колонке. Дополнительными нажатиями можно переключаться между сортировкой по возрастанию и по убыванию.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 191d166a..563f6b6b 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Pridať časovač</string>
     <string name="upcoming_alarm">Nadchádzajúci budík</string>
     <string name="early_alarm_dismissal">Predčasné zrušenie budíka</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Sú spustené časovače</string>
     <string name="timer_single_notification_label_msg">Beží časovač pre %s</string>
     <string name="new_timer">Nový časovač</string>
@@ -42,18 +41,12 @@
         <item quantity="few">Bežia %d časovače</item>
         <item quantity="other">Beží %d časovačov</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Okno s časom</string>
     <string name="alarm_tab">Okno s budíkom</string>
     <string name="stopwatch_tab">Okno so stopkami</string>
     <string name="timer_tab">Okno s časovačom</string>
     <string name="show_seconds">Zobraziť sekundy</string>
     <string name="increase_volume_gradually">Zvyšovať hlasitosť postupne</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Ako viem zmeniť poradie kôl na okne so stopkami?</string>
     <string name="faq_1_text">Stačí, ak kliknete na niektorý stĺpec, to aktivuje triedenie podľa daného stĺpca. Ďalším kliknutím na daný stĺpec viete prepínať zostupné a vzostupné triedenie.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index a4bcd2ef..352dd0e0 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -8,7 +8,6 @@
     <string name="clock">Ura</string>
     <string name="timer">Časovnik</string>
     <string name="stopwatch">Štoparica</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Krog</string>
     <string name="stopwatch_stopped">Štoparica se je ustavila</string>
     <string name="timer_stopped">Časovnik je bil ustavljen</string>
@@ -23,18 +22,11 @@
     <string name="analogue_clock">Analogna ura</string>
     <string name="digital_clock">Digitalna ura</string>
     <string name="alarm_dismissed">Prekinjen alarm</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="alarm_snoozed">Alarm je odložen s strani %s</string>
     <string name="no_alarms_found">Ni alarmov</string>
     <string name="add_alarm">Dodajte alarm</string>
     <string name="no_timers_found">Ni časovnikov</string>
     <string name="add_timer">Dodajte časovnik</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!-- Timer -->
     <string name="timers_notification_msg">Tečejo časovniki</string>
     <string name="timer_single_notification_label_msg">Časovnik za %s teče</string>
     <string name="new_timer">Nov časovnik</string>
@@ -44,14 +36,12 @@
         <item quantity="few">%d tečejo nekateri časovniki</item>
         <item quantity="other">%d tečejo drugi časovniki</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Zavihek ura</string>
     <string name="alarm_tab">Zavihek alarm</string>
     <string name="stopwatch_tab">Zavihek štoparice</string>
     <string name="timer_tab">Zavihek časovnik</string>
     <string name="show_seconds">Prikaži sekunde</string>
     <string name="increase_volume_gradually">Povečajte postopno glasnost</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Kako spremenim razvrščanje krogov v zavihku štoparica\?</string>
     <string name="faq_1_text">Kliknite na izbrani stolpec, da se krogi razvrstijo stolpcu. Z dodatnimi kliki preklapljate med naraščajočim in padajočim razvrščanjem.</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index b1c786fd..3cf74c55 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -4,7 +4,6 @@
     <string name="clock">Сат</string>
     <string name="timer">Сат</string>
     <string name="stopwatch">Штоперица</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">Круг</string>
     <string name="app_name">Једноставан сат</string>
     <string name="app_launcher_name">Сат</string>
@@ -24,18 +23,13 @@
     <string name="alarm_snoozed">Аларм је одложен %s</string>
     <string name="digital_clock">Дигитални сат</string>
     <string name="alarm_dismissed">Аларм одбачен</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
     <string name="no_alarms_found">Није пронађен ниједан аларм</string>
     <string name="add_alarm">Додајте аларм</string>
     <string name="no_timers_found">Тајмери нису пронађени</string>
     <string name="add_timer">Додајте тајмер</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
     <string name="timers_notification_msg">Тајмери раде</string>
     <string name="timer_single_notification_label_msg">Тајмер за %s је покренут</string>
     <string name="new_timer">Нови тајмер</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
     <plurals name="timer_notification_msg">
         <item quantity="one">%d тајмер ради</item>
         <item quantity="few">%d тајмери раде</item>
@@ -49,4 +43,4 @@
     <string name="increase_volume_gradually">Постепено повећавајте јачину звука</string>
     <string name="faq_1_title">Како могу да променим сортирање кругова на картици штоперице\?</string>
     <string name="faq_1_text">Само кликните на било коју колону, тако да ће кругови бити сортирани према датој колони. Додатним кликовима можете се пребацивати између растућег и опадајућег сортирања.</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 2ba444f6..0c7cd9f4 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -6,7 +6,6 @@
     <string name="vibrate">Vibrera</string>
     <string name="no_days_selected">Inga dagar har valts</string>
     <string name="clock">Klocka</string>
-    <string name="timer">Timer</string>
     <string name="stopwatch">Stoppur</string>
     <string name="start_stopwatch">Starta stoppur</string>
     <string name="lap">Varv</string>
@@ -33,7 +32,6 @@
     <string name="add_timer">Lägg till timer</string>
     <string name="upcoming_alarm">Kommande alarm</string>
     <string name="early_alarm_dismissal">Tidig avstängning av alarm</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Timers är igång</string>
     <string name="timer_single_notification_label_msg">Timer för %s är igång</string>
     <string name="new_timer">Ny timer</string>
@@ -41,18 +39,12 @@
         <item quantity="one">%d timer är igång</item>
         <item quantity="other">%d timers är igång</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Fliken Klocka</string>
     <string name="alarm_tab">Fliken Alarm</string>
     <string name="stopwatch_tab">Fliken Stoppur</string>
     <string name="timer_tab">Fliken Timer</string>
     <string name="show_seconds">Visa sekunder</string>
     <string name="increase_volume_gradually">Höj volymen gradvis</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Hur kan jag ändra sortering av varv i fliken stoppur\?</string>
     <string name="faq_1_text">Klicka bara på någon av kolumnerna för att sortera varven efter den aktuella kolumnen. Med ytterligare klick kan du växla mellan stigande och fallande sortering.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 48ba1b6d..2b20f417 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -1,62 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Simple Clock</string>
-    <string name="app_launcher_name">Clock</string>
-    <string name="time_zone">Time zone</string>
-    <string name="vibrate">Vibrate</string>
-    <string name="no_days_selected">No days selected</string>
-    <string name="clock">Clock</string>
-    <string name="timer">Timer</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
-    <string name="lap">Lap</string>
-    <string name="stopwatch_stopped">Stopwatch has been stopped</string>
-    <string name="timer_stopped">Timer has been stopped</string>
-    <string name="max_reminder_duration">Max reminder duration</string>
-    <string name="time_expired">Time expired</string>
-    <string name="clock_and_date">Clock and date</string>
-    <string name="use_text_shadow">Use text shadow</string>
-    <string name="swipe_right_to_dismiss">Swipe right to Dismiss, or left to Snooze.</string>
-    <string name="sort_by_creation_order">Creation order</string>
-    <string name="sort_by_alarm_time">Alarm time</string>
-    <string name="sort_by_day_and_alarm_time">Day and Alarm time</string>
-    <string name="analogue_clock">Analogue clock</string>
-    <string name="digital_clock">Digital clock</string>
-    <string name="alarm_dismissed">Alarm dismissed</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
-    <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
-    <string name="timers_notification_msg">Timers are running</string>
-    <string name="timer_single_notification_label_msg">Timer for %s is running</string>
-    <string name="new_timer">New Timer</string>
-
     <plurals name="timer_notification_msg">
         <item quantity="one">%d timer is running</item>
         <item quantity="other">%d timers are running</item>
     </plurals>
-
-    <!-- Settings -->
-    <string name="clock_tab">Clock tab</string>
-    <string name="alarm_tab">Alarm tab</string>
-    <string name="stopwatch_tab">Stopwatch tab</string>
-    <string name="timer_tab">Timer tab</string>
-    <string name="show_seconds">Show seconds</string>
-    <string name="increase_volume_gradually">Increase volume gradually</string>
-
-    <!-- FAQ -->
-    <string name="faq_1_title">How can I change lap sorting at the stopwatch tab?</string>
-    <string name="faq_1_text">Just click on any of the columns, that will make the laps be sorted by the given column. With additional clicks you can toggle between ascending and descending sorting.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+    </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index e653e0d5..9b34ab39 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Zamanlayıcı ekle</string>
     <string name="upcoming_alarm">Yaklaşan alarm</string>
     <string name="early_alarm_dismissal">Erken alarm kapatma</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Zamanlayıcılar çalışıyor</string>
     <string name="timer_single_notification_label_msg">%s için zamanlayıcı çalışıyor</string>
     <string name="new_timer">Yeni Zamanlayıcı</string>
@@ -41,18 +40,12 @@
         <item quantity="one">%d zamanlayıcı çalışıyor</item>
         <item quantity="other">%d zamanlayıcı çalışıyor</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Saat sekmesi</string>
     <string name="alarm_tab">Alarm sekmesi</string>
     <string name="stopwatch_tab">Kronometre sekmesi</string>
     <string name="timer_tab">Zamanlayıcı sekmesi</string>
     <string name="show_seconds">Saniye göster</string>
     <string name="increase_volume_gradually">Sesi kademeli olarak artır</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Kronometre sekmesinde tur sıralamayı nasıl değiştirebilirim?</string>
     <string name="faq_1_text">Sütunların herhangi birine tıklayarak, turların belirtilen sütuna göre sıralanmasını sağlayabilirsiniz. Ek tıklamalarla, artan ve azalan sıralama arasında geçiş yapabilirsiniz.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 300c3272..ed1e97b5 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -33,7 +33,6 @@
     <string name="add_timer">Додати таймер</string>
     <string name="upcoming_alarm">Майбутній будильник</string>
     <string name="early_alarm_dismissal">Відхилення раннього будильника</string>
-    <!--Timer-->
     <string name="timers_notification_msg">Таймери працюють</string>
     <string name="timer_single_notification_label_msg">Таймер для %s працює</string>
     <string name="new_timer">Новий таймер</string>
@@ -43,18 +42,12 @@
         <item quantity="many">%d таймерів працюють</item>
         <item quantity="other">%d таймерів працюють</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">Вкладка «Годинник»</string>
     <string name="alarm_tab">Будильник</string>
     <string name="stopwatch_tab">Секундомір</string>
     <string name="timer_tab">Таймер</string>
     <string name="show_seconds">Показувати з точністю до секунд</string>
     <string name="increase_volume_gradually">Поступово підвищувати гучність</string>
-    <!-- FAQ -->
     <string name="faq_1_title">Як я можу відсортувати інтервали часу у вкладці секундоміра?</string>
     <string name="faq_1_text">Просто натисність на будь-якій з колонок, так ви відсортуєте інтервали за значеннями у даній колонці. Додатково натиснувши, ви зміните сортування за зростанням чи спаданням.</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 17108022..6cc4f744 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -33,25 +33,18 @@
     <string name="add_timer">添加计时器</string>
     <string name="upcoming_alarm">即将到来的闹铃</string>
     <string name="early_alarm_dismissal">提前取消闹铃</string>
-    <!--Timer-->
     <string name="timers_notification_msg">计时器正在运行</string>
     <string name="timer_single_notification_label_msg">%s 的计时器正在运行</string>
     <string name="new_timer">新建计时器</string>
     <plurals name="timer_notification_msg">
         <item quantity="other">%d 个计时器正在运行</item>
     </plurals>
-    <!-- Settings -->
     <string name="clock_tab">时钟页面</string>
     <string name="alarm_tab">闹钟页面</string>
     <string name="stopwatch_tab">秒表页面</string>
     <string name="timer_tab">定时器页面</string>
     <string name="show_seconds">显示秒数</string>
     <string name="increase_volume_gradually">音量渐增</string>
-    <!-- FAQ -->
     <string name="faq_1_title">秒表页面分段的排序如何更改?</string>
     <string name="faq_1_text">只要点击任一栏位，就会依据选定的栏位做排序。再多点一下，还能切换递增或者递减顺序。</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c9b2f373..9bc26e67 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,13 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">簡易時鐘</string>
     <string name="app_launcher_name">簡易時鐘</string>
     <string name="time_zone">時區</string>
     <string name="vibrate">震動</string>
     <string name="no_days_selected">未選擇哪一天</string>
-    <string name="clock">Clock</string>
     <string name="timer">計時器</string>
-    <string name="stopwatch">Stopwatch</string>
-    <string name="start_stopwatch">Start stopwatch</string>
     <string name="lap">分段</string>
     <string name="stopwatch_stopped">碼錶已停止</string>
     <string name="timer_stopped">計時器已停止</string>
@@ -16,46 +14,16 @@
     <string name="clock_and_date">時鐘和日期</string>
     <string name="use_text_shadow">使用文字陰影</string>
     <string name="swipe_right_to_dismiss">右滑關閉，或者左滑延遲。</string>
-    <string name="sort_by_creation_order">Creation order</string>
-    <string name="sort_by_alarm_time">Alarm time</string>
-    <string name="sort_by_day_and_alarm_time">Day and Alarm time</string>
-    <string name="analogue_clock">Analogue clock</string>
-    <string name="digital_clock">Digital clock</string>
-    <string name="alarm_dismissed">Alarm dismissed</string>
-    <string name="select_timer_to_dismiss">Select timer to dismiss</string>
-    <string name="select_alarm_to_dismiss">Select alarm to dismiss</string>
-    <string name="alarm_created">Alarm created</string>
-    <string name="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
-    <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-    <string name="upcoming_alarm">Upcoming alarm</string>
-    <string name="early_alarm_dismissal">Early alarm dismissal</string>
-
-    <!--Timer-->
-    <string name="timers_notification_msg">Timers are running</string>
-    <string name="timer_single_notification_label_msg">Timer for %s is running</string>
-    <string name="new_timer">New Timer</string>
-
     <plurals name="timer_notification_msg">
         <item quantity="one">%d timer is running</item>
         <item quantity="other">%d timers are running</item>
     </plurals>
-
-    <!-- Settings -->
     <string name="clock_tab">時鐘頁面</string>
     <string name="alarm_tab">鬧鐘頁面</string>
     <string name="stopwatch_tab">碼錶頁面</string>
     <string name="timer_tab">計時器頁面</string>
     <string name="show_seconds">顯示秒數</string>
     <string name="increase_volume_gradually">音量漸增</string>
-
-    <!-- FAQ -->
     <string name="faq_1_title">碼錶頁面分段的排序如何變更?</string>
     <string name="faq_1_text">只要點擊任一欄位，就會依選定的欄位做排序。再多點一下，還能切換遞增或遞減的排序。</string>
-    <!--
-        Haven't found some strings? There's more at
-        https://github.com/FossifyOrg/Commons/tree/master/commons/src/main/res
-    -->
-</resources>
+</resources>
\ No newline at end of file