diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index df4d0eda..03211be9 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -23,9 +23,9 @@
     <string name="digital_clock">Rellotge digital</string>
     <string name="alarm_dismissed">Alarma descartada</string>
     <string name="alarm_snoozed">Alarma posposada %s</string>
-    <string name="no_alarms_found">No alarms found</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 timers found</string>
+    <string name="no_timers_found">No s\'ha trobat cap temporitzador</string>
     <string name="add_timer">Add timer</string>
     <!--Timer-->
     <string name="timers_notification_msg">Els temporitzadors estan en marxa</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 2c7f2763..dd49e2c6 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -23,10 +23,10 @@
     <string name="digital_clock">Digitální hodiny</string>
     <string name="alarm_dismissed">Budík zrušen</string>
     <string name="alarm_snoozed">Budík odložen na %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="no_alarms_found">Nenalezeny žádné budíky</string>
+    <string name="add_alarm">Přidat budík</string>
+    <string name="no_timers_found">Nenalezeny žádné časovače</string>
+    <string name="add_timer">Přidat časovač</string>
     <!--Timer-->
     <string name="timers_notification_msg">Časovače běží</string>
     <string name="timer_single_notification_label_msg">Časovač pro %s běží</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4bbaff84..7fe9142b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -23,10 +23,10 @@
     <string name="digital_clock">Digitale Uhr</string>
     <string name="alarm_dismissed">Alarm abgewiesen</string>
     <string name="alarm_snoozed">Alarm zurückgestellt von %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="no_alarms_found">Keine Alarme gefunden</string>
+    <string name="add_alarm">Alarm hinzufügen</string>
+    <string name="no_timers_found">Keine Timer gefunden</string>
+    <string name="add_timer">Timer hinzufügen</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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b4464a7f..9189f187 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -23,16 +23,17 @@
     <string name="digital_clock">Horloge numérique</string>
     <string name="alarm_dismissed">Alarme ignorée</string>
     <string name="alarm_snoozed">Alarme ignorée par %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="no_alarms_found">Aucune alarme trouvée</string>
+    <string name="add_alarm">Ajouter une alarme</string>
+    <string name="no_timers_found">Aucune minuterie trouvée</string>
+    <string name="add_timer">Ajouter une minuterie</string>
     <!--Timer-->
     <string name="timers_notification_msg">Les minuteries sont en marche</string>
     <string name="timer_single_notification_label_msg">La minuterie de %s est en marche</string>
     <string name="new_timer">Nouvelle minuterie</string>
     <plurals name="timer_notification_msg">
         <item quantity="one">%d minuterie est en marche</item>
+        <item quantity="many">%d minuteries sont en marche</item>
         <item quantity="other">%d minuteries sont en marche</item>
     </plurals>
     <!-- Settings -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index eeafb0ff..8ad3f47a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -23,16 +23,17 @@
     <string name="digital_clock">Orologio digitale</string>
     <string name="alarm_dismissed">Allarme disattivato</string>
     <string name="alarm_snoozed">Allarme posticipato da %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="no_alarms_found">Nessun allarme trovato</string>
+    <string name="add_alarm">Aggiungi allarme</string>
+    <string name="no_timers_found">Nessun contaminuti trovato</string>
+    <string name="add_timer">Aggiungi contaminuti</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>
     <plurals name="timer_notification_msg">
         <item quantity="one">%d contaminuti è in funzione</item>
+        <item quantity="many">%d contaminuti sono in funzione</item>
         <item quantity="other">%d contaminuti sono in funzione</item>
     </plurals>
     <!-- Settings -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 48e7d747..517b2c0a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">時計</string>
@@ -15,28 +16,25 @@
     <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="sort_by_creation_order">作成順</string>
+    <string name="sort_by_alarm_time">アラーム時刻</string>
+    <string name="sort_by_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="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="add_alarm">アラームを追加</string>
     <string name="no_timers_found">No timers found</string>
-    <string name="add_timer">Add timer</string>
-
+    <string name="add_timer">タイマーを追加</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>
@@ -44,7 +42,6 @@
     <string name="timer_tab">タイマー</string>
     <string name="show_seconds">秒を表示</string>
     <string name="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>
@@ -52,4 +49,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</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 c148bfcf..f515846b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -23,10 +23,10 @@
     <string name="digital_clock">Zegar cyfrowy</string>
     <string name="alarm_dismissed">Alarm odrzucony</string>
     <string name="alarm_snoozed">Alarm odłożony o %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="no_alarms_found">Nie znaleziono alarmów</string>
+    <string name="add_alarm">Dodaj alarm</string>
+    <string name="no_timers_found">Nie znaleziono minutników</string>
+    <string name="add_timer">Dodaj minutnik</string>
     <!--Timer-->
     <string name="timers_notification_msg">Minutniki są uruchomione</string>
     <string name="timer_single_notification_label_msg">Minutnik dla %s jest uruchomiony</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f8f26181..6db32731 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Simple Clock</string>
     <string name="app_launcher_name">Ceas</string>
@@ -6,7 +7,7 @@
     <string name="no_days_selected">Nici o zi selectată</string>
     <string name="clock">Clock</string>
     <string name="timer">Temporizator</string>
-    <string name="stopwatch">Stopwatch</string>
+    <string name="stopwatch">Cronometru</string>
     <string name="lap">O tură</string>
     <string name="stopwatch_stopped">Cronometrul a fost oprit</string>
     <string name="timer_stopped">Temporizatorul a fost oprit</string>
@@ -17,26 +18,24 @@
     <string name="swipe_right_to_dismiss">Glisează în dreapta pentru a înlătura, sau stânga pentru a amâna.</string>
     <string name="sort_by_creation_order">Data creării</string>
     <string name="sort_by_alarm_time">Ora alarmei</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="alarm_snoozed">Alarm snoozed by %s</string>
-    <string name="no_alarms_found">No alarms found</string>
+    <string name="sort_by_day_and_alarm_time">Ziua și ora alarmei</string>
+    <string name="analogue_clock">Ceas analogic</string>
+    <string name="digital_clock">Ceas digital</string>
+    <string name="alarm_dismissed">Alarmă respinsă</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">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
+    <string name="no_timers_found">Nu au fost găsite temporizatoare</string>
     <string name="add_timer">Add timer</string>
-
     <!--Timer-->
     <string name="timers_notification_msg">Temporizatoarele sunt în funcţiune</string>
     <string name="timer_single_notification_label_msg">Temporizatorul pentru %s este în funcţiune</string>
     <string name="new_timer">Temporizator nou</string>
-
     <plurals name="timer_notification_msg">
-        <item quantity="one">%d Temporizatorul este în funcţiune</item>
-        <item quantity="other">%d Temporizatoarele sunt în funcţiune</item>
+        <item quantity="one">%d temporizator este în funcţiune</item>
+        <item quantity="few">%d temporizatoare sunt în funcţiune</item>
+        <item quantity="other">%d de temporizatoare sunt în funcţiune</item>
     </plurals>
-
     <!-- Settings -->
     <string name="clock_tab">Ceas</string>
     <string name="alarm_tab">Alarmă</string>
@@ -44,7 +43,6 @@
     <string name="timer_tab">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 fila cronometrului?</string>
     <string name="faq_1_text">Doar 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>
@@ -52,4 +50,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-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 ff57b785..5399dd1f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -23,9 +23,9 @@
     <string name="digital_clock">Цифровые часы</string>
     <string name="alarm_dismissed">Будильник отключён</string>
     <string name="alarm_snoozed">Будильник отложен на %s</string>
-    <string name="no_alarms_found">No alarms found</string>
+    <string name="no_alarms_found">Будильники отсутствуют</string>
     <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
+    <string name="no_timers_found">Таймеры отсутствуют</string>
     <string name="add_timer">Add timer</string>
     <!--Timer-->
     <string name="timers_notification_msg">Таймеры запущены</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 62099d13..01b3ce2e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -23,9 +23,9 @@
     <string name="digital_clock">Dijital saat</string>
     <string name="alarm_dismissed">Alarm kapatıldı</string>
     <string name="alarm_snoozed">Alarm %s ertelendi</string>
-    <string name="no_alarms_found">No alarms found</string>
+    <string name="no_alarms_found">Alarm bulunamadı</string>
     <string name="add_alarm">Add alarm</string>
-    <string name="no_timers_found">No timers found</string>
+    <string name="no_timers_found">Zamanlayıcı bulunamadı</string>
     <string name="add_timer">Add timer</string>
     <!--Timer-->
     <string name="timers_notification_msg">Zamanlayıcılar çalışıyor</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 33cbf91a..10f1885c 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -5,7 +5,7 @@
     <string name="time_zone">时区</string>
     <string name="vibrate">震动</string>
     <string name="no_days_selected">未选择哪一天</string>
-    <string name="clock">Clock</string>
+    <string name="clock">时钟</string>
     <string name="timer">定时器</string>
     <string name="stopwatch">秒表</string>
     <string name="lap">分段</string>
@@ -23,10 +23,10 @@
     <string name="digital_clock">数字时钟</string>
     <string name="alarm_dismissed">闹钟已停止</string>
     <string name="alarm_snoozed">闹钟延后了 %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="no_alarms_found">未找到闹铃</string>
+    <string name="add_alarm">添加闹钟</string>
+    <string name="no_timers_found">未找到计时器</string>
+    <string name="add_timer">添加计时器</string>
     <!--Timer-->
     <string name="timers_notification_msg">计时器正在运行</string>
     <string name="timer_single_notification_label_msg">%s 的计时器正在运行</string>
diff --git a/fastlane/metadata/android/cs-CZ/full_description.txt b/fastlane/metadata/android/cs-CZ/full_description.txt
index ca20411f..687e6bca 100644
--- a/fastlane/metadata/android/cs-CZ/full_description.txt
+++ b/fastlane/metadata/android/cs-CZ/full_description.txt
@@ -24,4 +24,4 @@ Reddit:
 https://www.reddit.com/r/SimpleMobileTools
 
 Telegram:
-https://t.me/SimpleMobileTools
\ No newline at end of file
+https://t.me/SimpleMobileTools
diff --git a/fastlane/metadata/android/cs-CZ/short_description.txt b/fastlane/metadata/android/cs-CZ/short_description.txt
index a7625d34..5f09bd25 100644
--- a/fastlane/metadata/android/cs-CZ/short_description.txt
+++ b/fastlane/metadata/android/cs-CZ/short_description.txt
@@ -1 +1 @@
-Kombinace hezkého widgetu hodin, budíku, stopek a časovače
\ No newline at end of file
+Kombinace hezkého widgetu hodin, budíku, stopek a časovače
diff --git a/fastlane/metadata/android/cs-CZ/title.txt b/fastlane/metadata/android/cs-CZ/title.txt
index 8bb87694..4c7818ff 100644
--- a/fastlane/metadata/android/cs-CZ/title.txt
+++ b/fastlane/metadata/android/cs-CZ/title.txt
@@ -1 +1 @@
-Jednoduché hodiny
\ No newline at end of file
+Jednoduché hodiny
diff --git a/fastlane/metadata/android/cs-CZ/video.txt b/fastlane/metadata/android/cs-CZ/video.txt
index e69de29b..8d1c8b69 100644
--- a/fastlane/metadata/android/cs-CZ/video.txt
+++ b/fastlane/metadata/android/cs-CZ/video.txt
@@ -0,0 +1 @@
+ 
diff --git a/fastlane/metadata/android/es-ES/video.txt b/fastlane/metadata/android/es-ES/video.txt
deleted file mode 100644
index b25411c0..00000000
--- a/fastlane/metadata/android/es-ES/video.txt
+++ /dev/null
@@ -1 +0,0 @@
-video.txt
diff --git a/fastlane/metadata/android/it-IT/full_description.txt b/fastlane/metadata/android/it-IT/full_description.txt
index fd5c765a..de56cf31 100644
--- a/fastlane/metadata/android/it-IT/full_description.txt
+++ b/fastlane/metadata/android/it-IT/full_description.txt
@@ -24,4 +24,4 @@ Reddit:
 https://www.reddit.com/r/SimpleMobileTools
 
 Telegram:
-https://t.me/SimpleMobileTools
\ No newline at end of file
+https://t.me/SimpleMobileTools
diff --git a/fastlane/metadata/android/it-IT/short_description.txt b/fastlane/metadata/android/it-IT/short_description.txt
index 791f1216..fae67c74 100644
--- a/fastlane/metadata/android/it-IT/short_description.txt
+++ b/fastlane/metadata/android/it-IT/short_description.txt
@@ -1 +1 @@
-Bellissimo orologio con widget, sveglia, cronometro, senza pubblicità
\ No newline at end of file
+Pacchetto di splendido widget dell'orologio, sveglia, cronometro e timer
diff --git a/fastlane/metadata/android/it-IT/title.txt b/fastlane/metadata/android/it-IT/title.txt
index ea0e7523..da07c967 100644
--- a/fastlane/metadata/android/it-IT/title.txt
+++ b/fastlane/metadata/android/it-IT/title.txt
@@ -1 +1 @@
-Orologio Semplice
\ No newline at end of file
+Orologio Semplice
diff --git a/fastlane/metadata/android/it-IT/video.txt b/fastlane/metadata/android/it-IT/video.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/fastlane/metadata/android/tr-TR/full_description.txt b/fastlane/metadata/android/tr-TR/full_description.txt
index e6dc72a6..990008ce 100644
--- a/fastlane/metadata/android/tr-TR/full_description.txt
+++ b/fastlane/metadata/android/tr-TR/full_description.txt
@@ -22,4 +22,4 @@ Reddit:
 https://www.reddit.com/r/SimpleMobileTools
 
 Telegram:
-https://t.me/SimpleMobileTools
\ No newline at end of file
+https://t.me/SimpleMobileTools
diff --git a/fastlane/metadata/android/tr-TR/short_description.txt b/fastlane/metadata/android/tr-TR/short_description.txt
index c6e779c1..9693cce2 100644
--- a/fastlane/metadata/android/tr-TR/short_description.txt
+++ b/fastlane/metadata/android/tr-TR/short_description.txt
@@ -1 +1 @@
-Güzel bir saat widget'ı, çalar saat kronometre zamanlayıcı reklamsız kombinasyon
\ No newline at end of file
+Güzel bir saat widget'ı, çalar saat kronometre zamanlayıcı reklamsız kombinasyon
diff --git a/fastlane/metadata/android/tr-TR/title.txt b/fastlane/metadata/android/tr-TR/title.txt
index 1877e7d8..edf96680 100644
--- a/fastlane/metadata/android/tr-TR/title.txt
+++ b/fastlane/metadata/android/tr-TR/title.txt
@@ -1 +1 @@
-Basit Saat
\ No newline at end of file
+Basit Saat
diff --git a/fastlane/metadata/android/tr-TR/video.txt b/fastlane/metadata/android/tr-TR/video.txt
deleted file mode 100644
index e69de29b..00000000