diff --git a/uhabits-android/src/main/res/values-ar-rSA/strings.xml b/uhabits-android/src/main/res/values-ar-rSA/strings.xml
index 8296066c4..ae82ed8f9 100644
--- a/uhabits-android/src/main/res/values-ar-rSA/strings.xml
+++ b/uhabits-android/src/main/res/values-ar-rSA/strings.xml
@@ -59,11 +59,11 @@
     <string name="interval_always_ask">اسأل دائماً   </string>
     <string name="interval_custom">مخصص...   </string>
     <string name="pref_toggle_title">تبديل وضعية العادة بضغطة قصيرة   </string>
-    <string name="pref_toggle_description">وضع علامات الاختيار الموجودة بنقرة واحدة بدلاً من الصحافة وعقد. أكثر ملاءمة، ولكن قد يتسبب في تبديل عرضي.   </string>
+    <string name="pref_toggle_description_2">ضع علامات اختيار بنقرة واحدة بدلاً من الضغط مع الاستمرار.</string>
     <string name="pref_rate_this_app">تقييم هذا التطبيق على جوجل بلاي   </string>
     <string name="pref_send_feedback">أرسل الملاحظات إلى المطور   </string>
     <string name="pref_view_source_code">إفحص التعليمات البرمجية على GitHub   </string>
-    <string name="links">روابط   </string>
+    <string name="links">روابط </string>
     <string name="name">اسم  </string>
     <string name="settings">إعدادات</string>
     <string name="select_snooze_delay">حدد تأخير الغفوة   </string>
@@ -103,7 +103,7 @@
     <string name="generate_bug_report">توليد تقرير الاعطال. </string>
     <string name="troubleshooting">استكشاف الأخطاء وإصلاحها. </string>
     <string name="help_translate">المساعدة في ترجمة هذا البرنامج. </string>
-    <string name="night_mode" comment="dark_theme">الوضع الليلي. </string>
+    <string name="night_mode">الوضع الليلي. </string>
     <string name="use_pure_black">استخدام أسود نقي في الوضع الليلي. </string>
     <string name="pure_black_description">يستبدل خلفيات رمادية مع أسود نقي في الوضع الليلي. يقلل من استهلاك البطارية في الهواتف مع شاشة AMOLED. .</string>
     <string name="interface_preferences">السطح البيني. </string>
@@ -113,7 +113,7 @@
     <string name="week">أسبوع. </string>
     <string name="month">شهر. </string>
     <string name="quarter">ربع سنه. </string>
-    <string name="year">عام. </string>
+    <string name="year">عام</string>
     <string name="total">المجموع. </string>
     <string name="yes_or_no">نعم أو لا </string>
     <string name="every_x_days">كل %d أيام </string>
@@ -123,6 +123,7 @@
     <string name="none">صامت </string>
     <string name="filter">تصنيف </string>
     <string name="hide_completed">إخفاء المكتملة </string>
+    <string name="hide_entered">إخفاء المُدخل</string>
     <string name="hide_archived">إخفاء المؤرشفة </string>
     <string name="sticky_notifications">جعل الإشعارات ثابتة </string>
     <string name="sticky_notifications_description">منع الإشعارات من تمريرها بعيداً. </string>
@@ -142,9 +143,12 @@
     <string name="by_status">حسب الحالة</string>
     <string name="export">استخراج </string>
     <string name="long_press_to_edit">اضغط مع الاستمرار لتغيرالقيمه</string>
-    <string name="change_value">تغيير القيمة </string>
+    <string name="value">القيمة</string>
     <string name="calendar">التقويم </string>
     <string name="unit">الوحدة </string>
+    <string name="target_type">نوع الهدف</string>
+    <string name="target_type_at_least">على الأقل</string>
+    <string name="target_type_at_most">على الأكثر</string>
     <string name="example_question_boolean">على سبيل المثال هل تمرنت اليوم؟ </string>
     <string name="question">السؤال </string>
     <string name="target">الهدف </string>
@@ -166,6 +170,7 @@
     <string name="measurable_example">مثال، كم ميلاً قطعته اليوم؟ كم عدد الصفحات التي قرأتها؟</string>
     <string name="x_times_per_week">%d مرة في الأسبوع</string>
     <string name="x_times_per_month">%d مرة في الشهر</string>
+    <string name="x_times_per_y_days">%d مرات في %d أيام</string>
     <string name="yes_or_no_short_example">مثال: التمرين</string>
     <string name="color">اللون</string>
     <string name="example_target">مثال: 15</string>
@@ -189,5 +194,4 @@
     <string name="activity_not_found">لم يتم العثور على تطبيق لإتمام هذا الإجراء</string>
     <string name="pref_midnight_delay_title">تمديد اليوم بضع ساعات بعد منتصف الليل</string>
     <string name="pref_midnight_delay_description">انتظر حتى 3:00 صباحاً لعرض يوم جديد. مفيد إذا كنت عادة تذهب إلى السكون بعد منتصف الليل. يتطلب إعادة تشغيل التطبيق.</string>
-    <string name="x_times_per_y_days">%d مرات في %d أيام</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-bg-rBG/strings.xml b/uhabits-android/src/main/res/values-bg-rBG/strings.xml
index 208e3f386..e68ce594b 100644
--- a/uhabits-android/src/main/res/values-bg-rBG/strings.xml
+++ b/uhabits-android/src/main/res/values-bg-rBG/strings.xml
@@ -56,7 +56,6 @@
     <string name="interval_8_hour">8 часа</string>
     <string name="interval_24_hour">24 часа</string>
     <string name="pref_toggle_title">Маркиране с кратко натискане</string>
-    <string name="pref_toggle_description">Поставяне на отметки с кратко натискане вместо с натискане и задържане. По-удобно, но може да доведе до неволно маркиране.</string>
     <string name="pref_rate_this_app">Оценяване на това приложение в Google Play</string>
     <string name="pref_send_feedback">Изпращане на отзиви към разработчика</string>
     <string name="pref_view_source_code">Преглед на програмния код в GitHub</string>
@@ -99,7 +98,7 @@
     <string name="generate_bug_report">Генериране на доклад за грешки</string>
     <string name="troubleshooting">Отстраняване на проблеми</string>
     <string name="help_translate">Помагане за превода на това приложение</string>
-    <string name="night_mode" comment="dark_theme">Нощен режим</string>
+    <string name="night_mode">Нощен режим</string>
     <string name="use_pure_black">Използване на чисто черно при нощен режим</string>
     <string name="pure_black_description">Заменя сивите фонове с чисто черни при нощен режим. Намаля разхода на батерията при телефони с AMOLED дисплеи.</string>
     <string name="interface_preferences">Интерфейс</string>
diff --git a/uhabits-android/src/main/res/values-ca-rES/strings.xml b/uhabits-android/src/main/res/values-ca-rES/strings.xml
index 0f3c94d7f..ec2979478 100644
--- a/uhabits-android/src/main/res/values-ca-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-ca-rES/strings.xml
@@ -67,7 +67,6 @@
     <string name="interval_always_ask">Pregunta sempre</string>
     <string name="interval_custom">Personalitza...</string>
     <string name="pref_toggle_title">Activar/desactivar repeticions prement curt</string>
-    <string name="pref_toggle_description">Posar les marques de verificació amb un sol toc enlloc de prémer i mantenir. Més adequat, però pot causar activacions accidentals.</string>
     <string name="pref_rate_this_app">Valora aquesta app a Google Play</string>
     <string name="pref_send_feedback">Enviar resposta al desenvolupador</string>
     <string name="pref_view_source_code">Veure codi font a Github</string>
@@ -119,7 +118,7 @@
     <string name="generate_bug_report">Generar informe d\'error</string>
     <string name="troubleshooting">Resolució de problemes</string>
     <string name="help_translate">Ajuda a traduïr aquesta app</string>
-    <string name="night_mode" comment="dark_theme">Mode nocturn</string>
+    <string name="night_mode">Mode nocturn</string>
     <string name="use_pure_black">Utilitzar negre pur en el mode nocturn</string>
     <string name="pure_black_description">Reemplaça fons grisos per negre pur en el mode nocturn. Redueix consum de bateria en telèfons amb pantalla AMOLED.</string>
     <string name="interface_preferences">Interfície</string>
@@ -158,7 +157,6 @@
     <string name="by_status">Per estat</string>
     <string name="export">Exportar</string>
     <string name="long_press_to_edit">Prémer i mantenir per a canviar el valor</string>
-    <string name="change_value">Canviar el valor</string>
     <string name="calendar">Calendari</string>
     <string name="unit">Unitat</string>
     <string name="example_question_boolean">p.e. Has fet exercici avui?</string>
@@ -182,6 +180,7 @@
     <string name="measurable_example">p.e. Quants quilòmetres has fet hui? Quantes pàgines has llegit?</string>
     <string name="x_times_per_week">%d vegades per setmana</string>
     <string name="x_times_per_month">%d vegades al mes</string>
+    <string name="x_times_per_y_days">%d vegades en %d dies</string>
     <string name="yes_or_no_short_example">Ex. Exercici</string>
     <string name="color">Color</string>
     <string name="example_target">ex. 15</string>
@@ -205,5 +204,4 @@
     <string name="activity_not_found">No s\'ha trobat cap aplicació per a gestionar aquesta acció</string>
     <string name="pref_midnight_delay_title">Ampliar el dia unes hores després de la mitjanit</string>
     <string name="pref_midnight_delay_description">Esperar fins a les 3:00 per mostrar un nou dia. Útil si normalment vas a dormir després de la mitjanit. Requereix el reinici de l\'aplicació.</string>
-    <string name="x_times_per_y_days">%d vegades en %d dies</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-cs-rCZ/strings.xml b/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
index 3f8f9075d..222fd3c2a 100644
--- a/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
+++ b/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
@@ -59,7 +59,6 @@
     <string name="interval_always_ask">Vždy se ptát</string>
     <string name="interval_custom">Vlastní...</string>
     <string name="pref_toggle_title">Označte opakování krátkým stisknutím</string>
-    <string name="pref_toggle_description">Praktičtější, ale může způsobit nechtěné označení.</string>
     <string name="pref_rate_this_app">Ohodnoťte nás v Google Play</string>
     <string name="pref_send_feedback">Zpětná vazba vývojáři</string>
     <string name="pref_view_source_code">Zobrazit zdroj. kód na GitHub</string>
@@ -103,7 +102,7 @@
     <string name="generate_bug_report">Generovat výpis chyb</string>
     <string name="troubleshooting">Řešení problémů</string>
     <string name="help_translate">Pomozte s překladem aplikace</string>
-    <string name="night_mode" comment="dark_theme">Temný motiv</string>
+    <string name="night_mode">Temný motiv</string>
     <string name="use_pure_black">Zobrazit čistě černou v temném motivu</string>
     <string name="pure_black_description">Nahrazuje v temném motivu šedé pozadí čistou černou. Snižuje spotřebu baterie v telefonech s AMOLED displejem.</string>
     <string name="interface_preferences">Rozhraní</string>
@@ -142,7 +141,6 @@
     <string name="by_status">Podle statusu</string>
     <string name="export">Export</string>
     <string name="long_press_to_edit">Stiskněte a držte pro změnu hodnoty</string>
-    <string name="change_value">Změnit hodnotu</string>
     <string name="calendar">Kalendář</string>
     <string name="unit">Jednotka</string>
     <string name="example_question_boolean">Např. Cvičil jsi dnes?</string>
@@ -166,6 +164,7 @@
     <string name="measurable_example">Např. Kolik kilometrů jsi dnes uběhl? Kolik stránek jsi dnes přečetl?</string>
     <string name="x_times_per_week">%d krát týdně</string>
     <string name="x_times_per_month">%d krát za měsíc</string>
+    <string name="x_times_per_y_days">%d krát za %d dní</string>
     <string name="yes_or_no_short_example">Např. Cvičení</string>
     <string name="color">Barva</string>
     <string name="example_target">Např. 15</string>
@@ -189,5 +188,4 @@
     <string name="activity_not_found">Pro daný krok nebyla nalezena aplikace</string>
     <string name="pref_midnight_delay_title">Po půlnoci prodloužit den o několik hodin</string>
     <string name="pref_midnight_delay_description">Počkat do 3:00 ráno pro zobrazení nového dne. Užitečné, pokud chodíte spát po půlnoci. Vyžaduje restartování aplikace. </string>
-    <string name="x_times_per_y_days">%d krát za %d dní</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-da-rDK/strings.xml b/uhabits-android/src/main/res/values-da-rDK/strings.xml
index 4ac0418d9..fdf19c6a8 100644
--- a/uhabits-android/src/main/res/values-da-rDK/strings.xml
+++ b/uhabits-android/src/main/res/values-da-rDK/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Spørg altid</string>
     <string name="interval_custom">Brugerdefineret...</string>
     <string name="pref_toggle_title">Tjek vaner med kort tryk</string>
-    <string name="pref_toggle_description">Sæt tjekmærker med et enkelt tryk i stedet for tryk-og-hold. Mere bekvemmeligt, men kan forårsage uhensigtede tryk.</string>
     <string name="pref_rate_this_app">Bedøm denne app på Google Play</string>
     <string name="pref_send_feedback">Send feedback til udvikleren</string>
     <string name="pref_view_source_code">Se kildekoden på GitHub</string>
@@ -136,7 +135,7 @@
     <string name="generate_bug_report">Generer fejlrapport</string>
     <string name="troubleshooting">Fejlfinding</string>
     <string name="help_translate">Hjælpe med at oversætte denne app</string>
-    <string name="night_mode" comment="dark_theme">Nat-tilstand</string>
+    <string name="night_mode">Nat-tilstand</string>
     <string name="use_pure_black">Brug ren sort i nat-tilstand</string>
     <string name="pure_black_description">Erstatter grå baggrunde med ren sort i nat-tilstand. Reducerer batteriforbruget i telefoner med AMOLED skærm.</string>
     <string name="interface_preferences">Grænseflade</string>
@@ -175,7 +174,6 @@
     <string name="by_status">Efter status</string>
     <string name="export">Eksporter</string>
     <string name="long_press_to_edit">Tryk-og-hold for at ændre værdien</string>
-    <string name="change_value">Skift værdi</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Enhed</string>
     <string name="example_question_boolean">f.eks. Har du trænet i dag?</string>
@@ -199,6 +197,7 @@
     <string name="measurable_example">f.eks Hvor mange kilometer kørte du i dag? Hvor mange sider læste du?</string>
     <string name="x_times_per_week">%d gange om ugen</string>
     <string name="x_times_per_month">%d gange om måneden</string>
+    <string name="x_times_per_y_days">%d gange på %d dage</string>
     <string name="yes_or_no_short_example">f.eks. Motion</string>
     <string name="color">Farve</string>
     <string name="example_target">f.eks. 15</string>
@@ -222,5 +221,4 @@
     <string name="activity_not_found">Ingen app fundet til at understøtte denne handling</string>
     <string name="pref_midnight_delay_title">Forlæng dagen et par timer efter midnat</string>
     <string name="pref_midnight_delay_description">Vent til 3:00 for at vise en ny dag. Nyttigt, hvis du typisk går i seng efter midnat. Kræver genstart af app.</string>
-    <string name="x_times_per_y_days">%d gange på %d dage</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-de-rDE/strings.xml b/uhabits-android/src/main/res/values-de-rDE/strings.xml
index e88a55d43..c4d852e5c 100644
--- a/uhabits-android/src/main/res/values-de-rDE/strings.xml
+++ b/uhabits-android/src/main/res/values-de-rDE/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Immer fragen</string>
     <string name="interval_custom">Benutzerdefiniert...</string>
     <string name="pref_toggle_title">Markierung durch kurzes Tippen ändern</string>
-    <string name="pref_toggle_description">Abhaken durch einfaches Tippen, anstatt durch Tippen und Halten. Bequemer, kann aber eine falsche Auswahl verursachen.</string>
     <string name="pref_rate_this_app">Bewerte diese App auf Google Play</string>
     <string name="pref_send_feedback">Sende dem Entwickler Feedback</string>
     <string name="pref_view_source_code">Zeige den Quellcode auf GitHub</string>
@@ -127,7 +126,7 @@
     <string name="generate_bug_report">Erstelle einen Fehlerbericht</string>
     <string name="troubleshooting">Fehlerbehebung</string>
     <string name="help_translate">Hilf mit, diese App zu übersetzen</string>
-    <string name="night_mode" comment="dark_theme">Nachtmodus</string>
+    <string name="night_mode">Nachtmodus</string>
     <string name="use_pure_black">Verwende reines Schwarz im Nachtmodus</string>
     <string name="pure_black_description">Ersetzt im Nachtmodus das Grau des Hintergrunds durch Schwarz. Reduziert den Stromverbrauch von Smartphones mit AMOLED Displays.</string>
     <string name="interface_preferences">Oberfläche</string>
@@ -166,7 +165,6 @@
     <string name="by_status">Nach Zustand</string>
     <string name="export">Exportieren</string>
     <string name="long_press_to_edit">Gedrückt halten, um den Wert zu ändern</string>
-    <string name="change_value">Wert ändern</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Einheit</string>
     <string name="example_question_boolean">z.B. Hast du heute trainiert?</string>
@@ -190,6 +188,7 @@
     <string name="measurable_example">z.B. Wie viele Kilometer bist du heute gelaufen? Wie viele Seiten hast du gelesen?</string>
     <string name="x_times_per_week">%d mal pro Woche</string>
     <string name="x_times_per_month">%d mal pro Monat</string>
+    <string name="x_times_per_y_days">%d Mal in %d Tagen</string>
     <string name="yes_or_no_short_example">z.B. Übung</string>
     <string name="color">Farbe</string>
     <string name="example_target">z.B. 15</string>
@@ -213,5 +212,4 @@
     <string name="activity_not_found">Für diese Aktion wurde keine App gefunden.</string>
     <string name="pref_midnight_delay_title">Verlängere den Tag um ein paar Stunden nach Mitternacht</string>
     <string name="pref_midnight_delay_description">Bis 3:00 Uhr warten, bevor ein neuer Tag angezeigt wird. Nützlich, wenn du normalerweise nach Mitternacht schlafen gehst. Benötigt einen Neustart der App.</string>
-    <string name="x_times_per_y_days">%d Mal in %d Tagen</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-el-rGR/strings.xml b/uhabits-android/src/main/res/values-el-rGR/strings.xml
index 02976fe08..3457ddac7 100644
--- a/uhabits-android/src/main/res/values-el-rGR/strings.xml
+++ b/uhabits-android/src/main/res/values-el-rGR/strings.xml
@@ -58,7 +58,6 @@
     <string name="interval_always_ask">Να ερωτούμαι πάντα</string>
     <string name="interval_custom">Προσαρμογή</string>
     <string name="pref_toggle_title">Κάντε εναλλαγή των επαναλήψεων με σύντομο πάτημα</string>
-    <string name="pref_toggle_description">Βολικότερο, αλλά ίσως προκαλέσει ακούσιες εναλλαγές.</string>
     <string name="pref_rate_this_app">Βαθμολογήστε αυτή την εφαρμογή στο Google Play</string>
     <string name="pref_send_feedback">Στείλετε σχόλια</string>
     <string name="pref_view_source_code">Δείτε τον πηγαίο κώδικα στο GitHub</string>
@@ -102,7 +101,7 @@
     <string name="generate_bug_report">Παραγωγή αναφοράς bug.</string>
     <string name="troubleshooting">Αντιμετ.Προβλημάτων</string>
     <string name="help_translate">Βοηθήστε στην μετάφραση</string>
-    <string name="night_mode" comment="dark_theme">Νυχτ.Λειτ.</string>
+    <string name="night_mode">Νυχτ.Λειτ.</string>
     <string name="use_pure_black">Χρήση απόλυτου μαύρου στη νυχτ.λειτουργία</string>
     <string name="pure_black_description">Αντικαθιστά τα γκρί υπόβαθρα με απόλυτα μαύρα σε νυχτ.λειτουργία. Μειώνει την κατανάλωση μπαταρίας σε συσκευές με οθόνη AMOLED.</string>
     <string name="interface_preferences">Διεπιφάνεια</string>
@@ -140,7 +139,6 @@
     <string name="by_score">Με σκορ</string>
     <string name="export">Εξαγωγή</string>
     <string name="long_press_to_edit">Πατήστε και κρατήστε πατημένο για να αλλάξετε την τιμή</string>
-    <string name="change_value">Αλλαγή τιμής</string>
     <string name="calendar">Ημερολόγιο</string>
     <string name="unit">Μονάδα</string>
     <string name="example_question_boolean">π.χ. Ασκήθηκες σήμερα;</string>
@@ -163,6 +161,7 @@
     <string name="measurable">Μετρήσιμο</string>
     <string name="x_times_per_week">%d φορές την εβδομάδα</string>
     <string name="x_times_per_month">%d φορές το μήνα</string>
+    <string name="x_times_per_y_days">%d φορές την %d ημέρες</string>
     <string name="yes_or_no_short_example">π.χ. Σωματική άσκηση</string>
     <string name="color">Χρώμα</string>
     <string name="example_target">π.χ. 15</string>
@@ -172,5 +171,4 @@
     <string name="every_month">Κάθε μήνα</string>
     <string name="validation_cannot_be_blank">Δεν μπορεί να είναι κενό</string>
     <string name="today">Σήμερα</string>
-    <string name="x_times_per_y_days">%d φορές την %d ημέρες</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-eo-rUY/strings.xml b/uhabits-android/src/main/res/values-eo-rUY/strings.xml
index 780529432..cfbf83e9b 100644
--- a/uhabits-android/src/main/res/values-eo-rUY/strings.xml
+++ b/uhabits-android/src/main/res/values-eo-rUY/strings.xml
@@ -58,7 +58,6 @@
     <string name="interval_always_ask">Ĉiam demandu</string>
     <string name="interval_custom">Kutimo</string>
     <string name="pref_toggle_title">Ŝalti per mallonga gazetaro</string>
-    <string name="pref_toggle_description">Metu markilojn per sola frapeto anstataŭ premi kaj teni. Pli oportune, sed eble kaŭzas hazardajn ŝanĝojn.</string>
     <string name="pref_rate_this_app">Taksu ĉi tiun aplikaĵon en Google Play</string>
     <string name="pref_send_feedback">Sendu reagojn al programisto</string>
     <string name="pref_view_source_code">Vidu fontkodon ĉe GitHub</string>
@@ -102,7 +101,7 @@
     <string name="generate_bug_report">Generu raporton pri eraroj</string>
     <string name="troubleshooting">Problemserĉado</string>
     <string name="help_translate">Helpu traduki ĉi tiun aplikon</string>
-    <string name="night_mode" comment="dark_theme">Nokta reĝimo</string>
+    <string name="night_mode">Nokta reĝimo</string>
     <string name="use_pure_black">Uzu puran nigron en malhela temo</string>
     <string name="pure_black_description">Anstataŭigas grizajn fonojn per pura nigra en malhela temo. Reduktas baterian uzon en telefonoj kun AMOLED-ekrano.</string>
     <string name="interface_preferences">Intervizago</string>
@@ -140,7 +139,6 @@
     <string name="by_score">Laŭ poentaro</string>
     <string name="export">Eksporti</string>
     <string name="long_press_to_edit">Premu kaj tenu por ŝanĝi la valoron</string>
-    <string name="change_value">Ŝanĝi valoron</string>
     <string name="calendar">Kalendaro:</string>
     <string name="unit">Unueco</string>
     <string name="example_question_boolean">ekz. Ĉu vi ekzercis hodiaŭ?</string>
diff --git a/uhabits-android/src/main/res/values-es-rES/strings.xml b/uhabits-android/src/main/res/values-es-rES/strings.xml
index a114b5117..47bbd9fb4 100644
--- a/uhabits-android/src/main/res/values-es-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-es-rES/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">Preguntar siempre</string>
     <string name="interval_custom">Personalizar...</string>
     <string name="pref_toggle_title">Marca las repeticiones con una pulsación corta</string>
-    <string name="pref_toggle_description">Más cómodo, pero puede causar marcas accidentales.</string>
+    <string name="pref_toggle_description_2">Ponga marcas de verificación con un solo toque en lugar de mantener presionado.</string>
     <string name="pref_rate_this_app">Valora esta aplicación en Google Play</string>
     <string name="pref_send_feedback">Enviar sugerencias al desarrollador</string>
     <string name="pref_view_source_code">Ver código fuente en GitHub</string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">Generar reporte de errores</string>
     <string name="troubleshooting">Solución de problemas</string>
     <string name="help_translate">Ayuda a traducir esta app</string>
-    <string name="night_mode" comment="dark_theme">Modo nocturno</string>
+    <string name="night_mode">Modo nocturno</string>
     <string name="use_pure_black">Utilizar color negro en modo nocturno</string>
     <string name="pure_black_description">Reemplaza fondos grises por color negro en modo nocturno. Reduce el consumo de batería en teléfonos con pantalla AMOLED.</string>
     <string name="interface_preferences">Interfície</string>
@@ -147,6 +147,7 @@
     <string name="none">Ninguno</string>
     <string name="filter">Filtrar</string>
     <string name="hide_completed">Ocultar completos</string>
+    <string name="hide_entered">Ocultar ingresado</string>
     <string name="hide_archived">Ocultar archivados</string>
     <string name="sticky_notifications">Hacer notificaciones fijas</string>
     <string name="sticky_notifications_description">Evita que las notificaciones sean descartadas.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">Por estado</string>
     <string name="export">Exportar</string>
     <string name="long_press_to_edit">Mantenga presionado para cambiar el valor</string>
-    <string name="change_value">Cambiar valor</string>
+    <string name="value">Valor</string>
     <string name="calendar">Calendario</string>
     <string name="unit">Unidad</string>
+    <string name="target_type">Tipo de objetivo</string>
+    <string name="target_type_at_least">Al menos</string>
+    <string name="target_type_at_most">Como máximo</string>
     <string name="example_question_boolean">ej. ¿Has ejercitado hoy?</string>
     <string name="question">Pregunta</string>
     <string name="target">Objetivo</string>
@@ -190,6 +194,7 @@
     <string name="measurable_example">ej. ¿Cuántas millas ha corrido hoy? ¿Cuántas páginas ha leído?</string>
     <string name="x_times_per_week">%d veces por semana</string>
     <string name="x_times_per_month">%d veces al mes</string>
+    <string name="x_times_per_y_days">%d veces en %d días</string>
     <string name="yes_or_no_short_example">ej. Ejercicio</string>
     <string name="color">Color</string>
     <string name="example_target">ej. 15</string>
@@ -213,5 +218,4 @@
     <string name="activity_not_found">No se encontró ninguna aplicación que admita esta acción</string>
     <string name="pref_midnight_delay_title">Ampliar día unas horas después de medianoche</string>
     <string name="pref_midnight_delay_description">Esperar hasta las 3:00 AM para mostrar un nuevo día. Útil si normalmente vas a dormir después de medianoche. Requiere reiniciar la aplicación.</string>
-    <string name="x_times_per_y_days">%d veces cada %d días</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-eu-rES/strings.xml b/uhabits-android/src/main/res/values-eu-rES/strings.xml
index e52cea7c5..68a984267 100644
--- a/uhabits-android/src/main/res/values-eu-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-eu-rES/strings.xml
@@ -36,6 +36,7 @@
     <string name="save">Gorde</string>
     <string name="streaks">Boladak</string>
     <string name="no_habits_found">Ez duzu ohitura aktiborik</string>
+    <string name="no_habits_left_to_do">Gaurkoz amaitu duzu!</string>
     <string name="long_press_to_toggle">Sakatu eta mantendu markatu edo desmarkatzeko</string>
     <string name="reminder_off">Itzalita</string>
     <string name="create_habit">Ohitura sortu</string>
@@ -58,7 +59,6 @@
     <string name="interval_always_ask">Galdetu beti</string>
     <string name="interval_custom">Pertsonalizatua...</string>
     <string name="pref_toggle_title">Ukitze laburrarekin markatu</string>
-    <string name="pref_toggle_description">Ukitze bakar batekin marka jartzen du ukitu eta mantendu egin beharrean. Erosoagoa, baina nahi gabeko markak ekar litzake.</string>
     <string name="pref_rate_this_app">Aplikazio hau Google Playen puntuatu</string>
     <string name="pref_send_feedback">Zure iritzia garatzaileari bidali</string>
     <string name="pref_view_source_code">Iturburu kodea GitHuben ikusi</string>
@@ -69,6 +69,10 @@
     <string name="hint_title">Ba al zenekien?</string>
     <string name="hint_drag">Sarrerak berrantolatzeko, sakatu eta mantendu ohituraren izena, ondoren mugi ezazu leku aproposera.</string>
     <string name="hint_landscape">Egun gehiago ikus ditzakezu zure gailua paisai moduan jarriz.</string>
+    <plurals name="delete_habits_title">
+        <item quantity="one">Ohiturak ezabatu</item>
+        <item quantity="other">Ohiturak ezabatu</item>
+    </plurals>
     <string name="habit_not_found">Ohitura ezabatua / ez aurkitua</string>
     <string name="weekends">Asteburuak</string>
     <string name="any_weekday">Astelehenetik ostiralera</string>
@@ -102,7 +106,7 @@
     <string name="generate_bug_report">Akats txostena sortu</string>
     <string name="troubleshooting">Arazoen konponketa</string>
     <string name="help_translate">Lagundu aplikazio hau itzultzen</string>
-    <string name="night_mode" comment="dark_theme">Azal iluna</string>
+    <string name="night_mode">Azal iluna</string>
     <string name="use_pure_black">erabili beltz hutsa azal ilunean</string>
     <string name="pure_black_description">Atzeko plano grisak beltz hutsez aldatzen ditu azal ilunean. Bateriaren erabilera gutxitzen du AMOLED duten gailuetan.</string>
     <string name="interface_preferences">Interfazea</string>
@@ -138,11 +142,13 @@
     <string name="by_name">Izenaren arabera</string>
     <string name="by_color">Kolorearen arabera</string>
     <string name="by_score">Puntuen arabera</string>
+    <string name="by_status">Egoeraren arabera</string>
     <string name="export">Esportatu</string>
     <string name="long_press_to_edit">Sakatu luze balioa aldatzeko</string>
-    <string name="change_value">Aldatu balioa</string>
+    <string name="value">Balioa</string>
     <string name="calendar">Egutegia</string>
     <string name="unit">Unitatea</string>
+    <string name="target_type_at_most">Gehienez</string>
     <string name="example_question_boolean">adib. ariketa egin al duzu gaur?</string>
     <string name="question">Galdera</string>
     <string name="target">Helburua</string>
@@ -163,6 +169,7 @@
     <string name="measurable">Neurgarria</string>
     <string name="x_times_per_week">Astean %d aldiz</string>
     <string name="x_times_per_month">Hilean %d aldiz</string>
+    <string name="x_times_per_y_days">%d aldiz %d egunetan</string>
     <string name="yes_or_no_short_example">adib. Ariketa</string>
     <string name="color">Kolorea</string>
     <string name="example_target">adib. 15</string>
@@ -172,5 +179,8 @@
     <string name="every_month">Hilabetero</string>
     <string name="validation_cannot_be_blank">Ezin da hutsik egon</string>
     <string name="today">Gaur</string>
-    <string name="x_times_per_y_days">%d aldiz %d egunetan</string>
+    <string name="no_habits">Ez da ohiturarik aurkitu</string>
+    <string name="pref_unknown_title">Adierazi galdera ikurra falta diren datuetan</string>
+    <string name="you_are_now_a_developer">Garatzailea zara!</string>
+    <string name="activity_not_found">Ez da aurkitu akzio hau gauzatu dezakeen aplikaziorik</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-fa-rIR/strings.xml b/uhabits-android/src/main/res/values-fa-rIR/strings.xml
index be4f29cf5..ae6c915cf 100644
--- a/uhabits-android/src/main/res/values-fa-rIR/strings.xml
+++ b/uhabits-android/src/main/res/values-fa-rIR/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">همیشه پرسیده شود </string>
     <string name="interval_custom">سفارشی‌سازی </string>
     <string name="pref_toggle_title">با اشاره‌ی کوتاه‌مدت وضعیت عادت را تغییر بده</string>
-    <string name="pref_toggle_description">تیک زدن با تک‌ضربه در مقابل ضربه‌زدن و نگه‌داشتن راحت‌تر است ولی ممکن است باعث شود اشتباهی عادتی را تیک بزنید. </string>
+    <string name="pref_toggle_description_2">به جای فشار دادن و نگه‌داشتن، با یک ضربه تیک بزنید.</string>
     <string name="pref_rate_this_app">به این برنامه در گوگل‌پلی امتیاز بدهید </string>
     <string name="pref_send_feedback">ارسال بازخورد به توسعه‌دهنده</string>
     <string name="pref_view_source_code">دیدن منبع برنامه در گیت‌هاب </string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">ایجاد گزارش مشکلات</string>
     <string name="troubleshooting">ایرادیابی</string>
     <string name="help_translate">کمک برای ترجمه این برنامه</string>
-    <string name="night_mode" comment="dark_theme">حالت تیره</string>
+    <string name="night_mode">حالت تیره</string>
     <string name="use_pure_black">استفاده از رنگ سیاه خالص در حالت تیره</string>
     <string name="pure_black_description">جایگزینی پس‌زمینه خاکستری با سیاه خالص در حالت تیره. استفاده از باتری را در گوشی‌های با صفحه نمایش AMOLED کاهش می‌دهد.</string>
     <string name="interface_preferences">رابط کاربری</string>
@@ -147,6 +147,7 @@
     <string name="none">هیچ‌کدام</string>
     <string name="filter">فیلتر</string>
     <string name="hide_completed">مخفی کردن کامل‌شده‌ها</string>
+    <string name="hide_entered">پنهان کردن مقادیر</string>
     <string name="hide_archived">مخفی کردن بایگانی‌شده‌ها</string>
     <string name="sticky_notifications">چسبناک کردن اعلان‌ها</string>
     <string name="sticky_notifications_description">از رد کردن اعلان با کشیدن جلوگیری می‌کند.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">براساس وضعیت</string>
     <string name="export">خروجی گرفتن</string>
     <string name="long_press_to_edit">فشار دهید و نگه دارید تا مقدار را تغییر دهید</string>
-    <string name="change_value">تغییر مقدار</string>
+    <string name="value">مقدار</string>
     <string name="calendar">تقویم</string>
     <string name="unit">واحد</string>
+    <string name="target_type">نوع داده هدف</string>
+    <string name="target_type_at_least">حداقل</string>
+    <string name="target_type_at_most">حداکثر</string>
     <string name="example_question_boolean">مثلا آیا امروز ورزش کردید؟</string>
     <string name="question">سوال</string>
     <string name="target">هدف</string>
@@ -190,6 +194,7 @@
     <string name="measurable_example">مثلاً امروز چند کیلومتر دویدید؟ چند صفحه مطالعه کردید؟</string>
     <string name="x_times_per_week">%d بار در هفته</string>
     <string name="x_times_per_month">%d بار در ماه</string>
+    <string name="x_times_per_y_days">%d بار در هر %d روز</string>
     <string name="yes_or_no_short_example">مثلاً ورزش کنید</string>
     <string name="color">رنگ</string>
     <string name="example_target">مثلاً 15</string>
@@ -213,5 +218,4 @@
     <string name="activity_not_found">هیچ برنامه‌ای برای انجام این کار یافت نشد.</string>
     <string name="pref_midnight_delay_title">تمدید کردن روز تا چند ساعت بعد از نیمه‌شب</string>
     <string name="pref_midnight_delay_description">تا ساعت ۳ نیمه‌شب برای نمایش یک روز جدید صبر می‌کند. اگر معمولاً بعد از نیمه‌شب می‌خوابید، برای شما می‌تواند مفید باشد. نیازمند راه‌اندازی مجدد برنامه است.</string>
-    <string name="x_times_per_y_days">%d بار در هر %d روز</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-fi-rFI/strings.xml b/uhabits-android/src/main/res/values-fi-rFI/strings.xml
index 7af22bb7f..867aec122 100644
--- a/uhabits-android/src/main/res/values-fi-rFI/strings.xml
+++ b/uhabits-android/src/main/res/values-fi-rFI/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">Kysy aina</string>
     <string name="interval_custom">Muu</string>
     <string name="pref_toggle_title">Vaihda merkintää lyhyellä painalluksella</string>
-    <string name="pref_toggle_description">Tee merkit yhdellä painalluksella pitkän painalluksen sijaan. Kätevämpi, mutta saattaa aiheuttaa vahingossa painamista.</string>
+    <string name="pref_toggle_description_2">Lisää valinnat yhdellä napautuksella pitkään painettuna pitämisen sijaan.</string>
     <string name="pref_rate_this_app">Arvostele Google Playssä</string>
     <string name="pref_send_feedback">Lähetä palautetta kehittäjälle</string>
     <string name="pref_view_source_code">Katso lähdekoodi GitHubissa</string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">Luo virheraportti</string>
     <string name="troubleshooting">Apua</string>
     <string name="help_translate">Auta kääntämään tämä sovellus</string>
-    <string name="night_mode" comment="dark_theme">Yötila</string>
+    <string name="night_mode">Yötila</string>
     <string name="use_pure_black">Käytä puhdasta mustaa yötilassa</string>
     <string name="pure_black_description">Korvaa harmaat taustat puhtaalla mustalla tummalla teemalla. Vähentää akun käyttöä puhelimissa AMOLED-näytöllä.</string>
     <string name="interface_preferences">Käyttöliittymä</string>
@@ -147,6 +147,7 @@
     <string name="none">Ei mitään</string>
     <string name="filter">Suodata</string>
     <string name="hide_completed">Piilota suoritetut</string>
+    <string name="hide_entered">Piilota syötetty</string>
     <string name="hide_archived">Piilota arkistoidut</string>
     <string name="sticky_notifications">Tee ilmoituksesta kiinnitettyjä</string>
     <string name="sticky_notifications_description">Estää ilmoitusten pois pyyhkäisemisen.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">Tilan mukaan</string>
     <string name="export">Vie</string>
     <string name="long_press_to_edit">Pidä painettuna muuttaaksesi arvoa</string>
-    <string name="change_value">Muuta arvo</string>
+    <string name="value">Arvo</string>
     <string name="calendar">Kalenteri</string>
     <string name="unit">Yksikkö</string>
+    <string name="target_type">Kohdetyyppi</string>
+    <string name="target_type_at_least">Vähintään</string>
+    <string name="target_type_at_most">Enintään</string>
     <string name="example_question_boolean">esim. Harrastitko tänään liikuntaa?</string>
     <string name="question">Kysymys</string>
     <string name="target">Tavoite</string>
@@ -190,6 +194,7 @@
     <string name="measurable_example">esim. Montako kilometriä juoksit tänään? Montako sivua luit?</string>
     <string name="x_times_per_week">%d kertaa viikossa</string>
     <string name="x_times_per_month">%d kertaa kuukaudessa</string>
+    <string name="x_times_per_y_days">%d kertaa %d päivässä</string>
     <string name="yes_or_no_short_example">Esim. kuntoilu</string>
     <string name="color">Väri</string>
     <string name="example_target">Esim. 15</string>
@@ -213,5 +218,4 @@
     <string name="activity_not_found">Tälle toiminnolle ei löytynyt yhtään sovellusta</string>
     <string name="pref_midnight_delay_title">Pidennä päivää muutama tunti keskiyön jälkeen</string>
     <string name="pref_midnight_delay_description">Odota kello 3.00 asti ennen uuden päivän näyttämistä. Hyödyllinen jos menet nukkumaan yleensä keskiyön jälkeen. Vaatii sovelluksen uudelleenkäynnistyksen.</string>
-    <string name="x_times_per_y_days">%d kertaa %d päivässä</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-fr-rFR/strings.xml b/uhabits-android/src/main/res/values-fr-rFR/strings.xml
index a5aa2b42b..69672682b 100644
--- a/uhabits-android/src/main/res/values-fr-rFR/strings.xml
+++ b/uhabits-android/src/main/res/values-fr-rFR/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">Toujours demander</string>
     <string name="interval_custom">Personnaliser...</string>
     <string name="pref_toggle_title">Valider l\'habitude avec un appui court</string>
-    <string name="pref_toggle_description">Valide l\'habitude avec un appui court plutôt qu\'un appuie long. Plus pratique, mais peut causer des activations accidentelles.</string>
+    <string name="pref_toggle_description_2">Cochez les cases d\'un simple appuie au lieu de les maintenir</string>
     <string name="pref_rate_this_app">Notez cette app sur le Google Play Store</string>
     <string name="pref_send_feedback">Envoyez un avis au développeur</string>
     <string name="pref_view_source_code">Voir le code source sur GitHub</string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">Générer un rapport de bug.</string>
     <string name="troubleshooting">Résolution de problèmes</string>
     <string name="help_translate">Aider à traduire cette application</string>
-    <string name="night_mode" comment="dark_theme">Mode Nuit</string>
+    <string name="night_mode">Mode Nuit</string>
     <string name="use_pure_black">Utiliser un noir pur dans le mode nuit</string>
     <string name="pure_black_description">Remplace le fond gris par un noir pur dans le mode nuit ; cela réduit l’usage de la batterie des appareils ayant un écran AMOLED.</string>
     <string name="interface_preferences">Interface</string>
@@ -147,6 +147,7 @@
     <string name="none">Aucun</string>
     <string name="filter">Filtre</string>
     <string name="hide_completed">Cacher les habitudes complétées</string>
+    <string name="hide_entered">Cacher les entrées</string>
     <string name="hide_archived">Cacher les habitudes archivées</string>
     <string name="sticky_notifications">Rendre les notifications persistantes</string>
     <string name="sticky_notifications_description">Évite que les notifications ne soient enlevées.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">Par statut</string>
     <string name="export">Exporter</string>
     <string name="long_press_to_edit">Appuyez et maintenez pour changer la valeur</string>
-    <string name="change_value">Modifier la valeur</string>
+    <string name="value">Valeur</string>
     <string name="calendar">Calendrier</string>
     <string name="unit">Unité</string>
+    <string name="target_type">Type d\'objectif</string>
+    <string name="target_type_at_least">Au moins</string>
+    <string name="target_type_at_most">Au plus</string>
     <string name="example_question_boolean">Par ex., avez-vous fait de l\'exercice aujourd\'hui?</string>
     <string name="question">Question</string>
     <string name="target">Cible</string>
@@ -191,6 +195,7 @@
 Combien de pages avez-vous lu ?</string>
     <string name="x_times_per_week">%d fois par semaine</string>
     <string name="x_times_per_month">%d fois par mois</string>
+    <string name="x_times_per_y_days">%d fois en %d jours</string>
     <string name="yes_or_no_short_example">Par ex, Entrainement</string>
     <string name="color">Couleur</string>
     <string name="example_target">Par ex, 15</string>
@@ -214,5 +219,4 @@ Combien de pages avez-vous lu ?</string>
     <string name="activity_not_found">Aucune application trouvée pour faire cette action</string>
     <string name="pref_midnight_delay_title">Prolonger les jours de quelques heures après minuit </string>
     <string name="pref_midnight_delay_description">Attendre jusqu\'à trois heures du matin pour changer de jour. Très utile si vous avez l\'habitude d\'aller dormir après minuit. (Redémarrage nécessaire)</string>
-    <string name="x_times_per_y_days">%d fois en %d jours</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-hi-rIN/strings.xml b/uhabits-android/src/main/res/values-hi-rIN/strings.xml
index ad5c412b2..916cf90d0 100644
--- a/uhabits-android/src/main/res/values-hi-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-hi-rIN/strings.xml
@@ -75,8 +75,6 @@
     <string name="interval_always_ask">हमेशा पूछें</string>
     <string name="interval_custom">अपने तरीके से बनाएं</string>
     <string name="pref_toggle_title">टॉगल पुनरावृत्ति  हल्का दबाने से</string>
-    <string name="pref_toggle_description">\"
-अधिक सुविधाजनक है, लेकिन आकस्मिक टॉगल  हो सकता है ।\"</string>
     <string name="pref_rate_this_app">\"
 गूगले प्ले पर इस ऐप्लिकेशन को रेट करें\"</string>
     <string name="pref_send_feedback">डेवेलपर को प्रतिक्रिया भेजें </string>
@@ -149,7 +147,7 @@
 समस्या निवारण\"</string>
     <string name="help_translate">\"
 इस एप्लिकेशन का अनुवाद करने में मदद करें\"</string>
-    <string name="night_mode" comment="dark_theme">नाइट मोड</string>
+    <string name="night_mode">नाइट मोड</string>
     <string name="use_pure_black">नाइट मोड मे पूरा काला यूज़ करें</string>
     <string name="pure_black_description">\"
 रात मोड में शुद्ध काले रंग के साथ ग्रे पृष्ठभूमि में बदलें.  अमोलेड प्रदर्शन के साथ फोन में बैटरी उपयोग कम कर देता है ।\"</string>
@@ -193,7 +191,6 @@
     <string name="by_status">स्थिति से</string>
     <string name="export">एक्सपोर्ट करे</string>
     <string name="long_press_to_edit">बदलने के लिए दबाकर रखें</string>
-    <string name="change_value">वैल्यू बदलें</string>
     <string name="calendar">कैलेंडर</string>
     <string name="unit">इकाई</string>
     <string name="example_question_boolean">जैसे आपने आज व्यायाम किया?</string>
@@ -219,6 +216,7 @@
 प्रति सप्ताह %d बार\"</string>
     <string name="x_times_per_month">\"
 प्रति माह %d बार\"</string>
+    <string name="x_times_per_y_days">%d बार %d दिन</string>
     <string name="yes_or_no_short_example">जैसे व्यायाम</string>
     <string name="color">रंग</string>
     <string name="example_target">जैसे १५</string>
@@ -242,5 +240,4 @@
     <string name="activity_not_found">इस कार्रवाई को संभालने के लिए कोई ऐप नहीं मिला</string>
     <string name="pref_midnight_delay_title">मध्यरात्रि से कुछ घंटे बाद तक दिन बढ़ाएँ</string>
     <string name="pref_midnight_delay_description">नया दिन दिखाने के लिए सुबह 3:00 बजे तक प्रतीक्षा करें। उपयोगी अगर आप आमतौर पर आधी रात के बाद सोने जाते हैं। ऐप पुनरारंभ की आवश्यकता होगी।</string>
-    <string name="x_times_per_y_days">%d बार %d दिन</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-hr-rHR/strings.xml b/uhabits-android/src/main/res/values-hr-rHR/strings.xml
index 2087e9384..950eb1b46 100644
--- a/uhabits-android/src/main/res/values-hr-rHR/strings.xml
+++ b/uhabits-android/src/main/res/values-hr-rHR/strings.xml
@@ -56,7 +56,6 @@
     <string name="interval_8_hour">8 sati</string>
     <string name="interval_24_hour">24 sata</string>
     <string name="pref_toggle_title">Označi ponavljanja sa kratkim pritisk.</string>
-    <string name="pref_toggle_description">Zgodnije je, no može uzrokovati slučajna označavanja.</string>
     <string name="pref_rate_this_app">Ocijeni ovu aplikaciju na Google Playu</string>
     <string name="pref_send_feedback">Pošalji povratne informacije raz. programeru</string>
     <string name="pref_view_source_code">Pogledaj izvorni kod na GitHubu</string>
@@ -99,7 +98,7 @@
     <string name="generate_bug_report">Generiraj izvješće o pogreški</string>
     <string name="troubleshooting">Rješavanje problema</string>
     <string name="help_translate">Pomozi prevesti ovu aplikaciju</string>
-    <string name="night_mode" comment="dark_theme">Noćni način</string>
+    <string name="night_mode">Noćni način</string>
     <string name="use_pure_black">Koristi crnu boju za noćni način</string>
     <string name="pure_black_description">Zamjenjuje sivu pozadinu sa crnom u noćnom načinu. To smanjuje potrošnju bateriju na uređajima s AMOLED zaslonima.</string>
     <string name="interface_preferences">Sučelje</string>
diff --git a/uhabits-android/src/main/res/values-hu-rHU/strings.xml b/uhabits-android/src/main/res/values-hu-rHU/strings.xml
index ea34bb80c..ec0953246 100644
--- a/uhabits-android/src/main/res/values-hu-rHU/strings.xml
+++ b/uhabits-android/src/main/res/values-hu-rHU/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Mindig rákérdez</string>
     <string name="interval_custom">Egyedi...</string>
     <string name="pref_toggle_title">Bejelölés rövid koppintással</string>
-    <string name="pref_toggle_description">Bejelölés koppintással nyomva tartás helyett. Kényelmesebb, de véletlen bejelöléseket okozhat.</string>
     <string name="pref_rate_this_app">Értékeld az alkalmazást a Google Play-en</string>
     <string name="pref_send_feedback">Visszajelzés küldése a fejlesztőnek</string>
     <string name="pref_view_source_code">Forráskód megtekintése a GitHub-on</string>
@@ -132,7 +131,7 @@
     <string name="generate_bug_report">Hibabejelentés generálása</string>
     <string name="troubleshooting">Hibaelhárítás</string>
     <string name="help_translate">Segíts lefordítani ezt az alkalmazást</string>
-    <string name="night_mode" comment="dark_theme">Éjszakai mód</string>
+    <string name="night_mode">Éjszakai mód</string>
     <string name="use_pure_black">Fekete használata éjszakai módban</string>
     <string name="pure_black_description">A szürke hátteret tiszta feketére cseréli éjszakai módban. Csökkenti az energiafelhasználást AMOLED kijelzős telefonokon.</string>
     <string name="interface_preferences">Kezelőfelület</string>
@@ -171,7 +170,6 @@
     <string name="by_status">Állapot szerint</string>
     <string name="export">Exportálás</string>
     <string name="long_press_to_edit">Az érték módosításához tartsd lenyomva</string>
-    <string name="change_value">Érték módosítása</string>
     <string name="calendar">Naptár</string>
     <string name="unit">Egység</string>
     <string name="example_question_boolean">pl. Edzettél ma?</string>
@@ -195,6 +193,7 @@
     <string name="measurable_example">pl. Hány kilométert futottál ma? Hány oldalt olvastál el?</string>
     <string name="x_times_per_week">Heti %d alkalommal</string>
     <string name="x_times_per_month">Havi %d alkalommal</string>
+    <string name="x_times_per_y_days">%d alk. / %d nap</string>
     <string name="yes_or_no_short_example">pl. Edzés</string>
     <string name="color">Szín</string>
     <string name="example_target">pl. 15</string>
@@ -218,5 +217,4 @@
     <string name="activity_not_found">Ezen művelet elvégzéséhez nem található alkalmazás.</string>
     <string name="pref_midnight_delay_title">A nap meghosszabbítása éjfél után néhány órával</string>
     <string name="pref_midnight_delay_description">Várjon hajnali 3 -ig, hogy új napot mutasson. Hasznos, ha általában éjfél után fekszik le. Az alkalmazás újraindítását igényli.</string>
-    <string name="x_times_per_y_days">%d alk. / %d nap</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-hy-rAM/strings.xml b/uhabits-android/src/main/res/values-hy-rAM/strings.xml
index 1b8fab4ed..dc98ed87d 100644
--- a/uhabits-android/src/main/res/values-hy-rAM/strings.xml
+++ b/uhabits-android/src/main/res/values-hy-rAM/strings.xml
@@ -59,7 +59,7 @@
     <string name="frequency">Հաճախություն</string>
     <string name="every_day">Ամեն օր</string>
     <string name="every_week">Ամեն շաբաթ</string>
-    <string name="night_mode" comment="dark_theme">Մուգ տեսք</string>
+    <string name="night_mode">Մուգ տեսք</string>
     <string name="day">Օր</string>
     <string name="week">Շաբաթ</string>
     <string name="month">Ամիս</string>
diff --git a/uhabits-android/src/main/res/values-in-rID/strings.xml b/uhabits-android/src/main/res/values-in-rID/strings.xml
index d31957099..fc5d023b6 100644
--- a/uhabits-android/src/main/res/values-in-rID/strings.xml
+++ b/uhabits-android/src/main/res/values-in-rID/strings.xml
@@ -71,7 +71,7 @@
     <string name="interval_always_ask">Selalu bertanya</string>
     <string name="interval_custom">Kustom...</string>
     <string name="pref_toggle_title">Tandai dengan cepat</string>
-    <string name="pref_toggle_description">Beri tanda centang dengan sekali ketuk bukan tekan-dan-tahan. Lebih nyaman, tapi dapat menyebabkan kesalahan penandaan.</string>
+    <string name="pref_toggle_description_2">Beri tanda centang dengan satu ketukan alih-alih tekan dan tahan.</string>
     <string name="pref_rate_this_app">Berikan rating aplikasi ini di Google Play</string>
     <string name="pref_send_feedback">Kirimkan umpan balik kepada Developer</string>
     <string name="pref_view_source_code">Lihat kode program di GitHub</string>
@@ -130,7 +130,7 @@
     <string name="generate_bug_report">Membuat laporan masalah</string>
     <string name="troubleshooting">Troubleshoot</string>
     <string name="help_translate">Bantu menerjemahkan aplikasi ini</string>
-    <string name="night_mode" comment="dark_theme">Mode malam</string>
+    <string name="night_mode">Mode malam</string>
     <string name="use_pure_black">Gunakan warna hitam pekat pada mode malam</string>
     <string name="pure_black_description">Ganti warna latar abu-abu dengan warna hitam pada mode malam. Mengurangi penggunaan baterai pada layar AMOLED.</string>
     <string name="interface_preferences">Antarmuka</string>
@@ -169,7 +169,6 @@
     <string name="by_status">Berdasarkan status</string>
     <string name="export">Ekspor</string>
     <string name="long_press_to_edit">Tekan-dan-tahan untuk mengubah nilai</string>
-    <string name="change_value">Ubah nilai (value)</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Unit</string>
     <string name="example_question_boolean">mis. Apakah kamu sudah berolahraga hari ini?</string>
@@ -193,6 +192,7 @@
     <string name="measurable_example">mis. Berapa km kamu berlari hari ini? Berapa lembar yang sudah kamu baca?</string>
     <string name="x_times_per_week">%d kali per minggu</string>
     <string name="x_times_per_month">%d kali per bulan</string>
+    <string name="x_times_per_y_days">%d kali dalam %d hari</string>
     <string name="yes_or_no_short_example">mis. Olahraga</string>
     <string name="color">Warna</string>
     <string name="example_target">mis. 15</string>
@@ -216,5 +216,4 @@
     <string name="activity_not_found">Aplikasi untuk mendukung tindakan ini tidak ditemukan</string>
     <string name="pref_midnight_delay_title">Perpanjang hari beberapa jam setelah tengah malam</string>
     <string name="pref_midnight_delay_description">Tunggu sampai jam 3 pagi untuk menampilkan hari yang baru. Berguna jika kamu biasanya tidur setelah tengah malam. Aplikasi perlu dimulai ulang.</string>
-    <string name="x_times_per_y_days">%d kali dalam %d hari</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-it-rIT/strings.xml b/uhabits-android/src/main/res/values-it-rIT/strings.xml
index bb754082d..bc1dd2885 100644
--- a/uhabits-android/src/main/res/values-it-rIT/strings.xml
+++ b/uhabits-android/src/main/res/values-it-rIT/strings.xml
@@ -75,7 +75,7 @@
     <string name="interval_always_ask">Chiedi sempre</string>
     <string name="interval_custom">Personalizza...</string>
     <string name="pref_toggle_title">Spunta le ripetizioni velocemente</string>
-    <string name="pref_toggle_description">Metti le spunte con un tocco singolo invece che tenendo premuto. Più comodo, ma potrebbe causare delle spunte accidentali.</string>
+    <string name="pref_toggle_description_2">Metti i segni di spunta con un tocco rapido invece di tenere premuto.</string>
     <string name="pref_rate_this_app">Valuta quest\'app su Google Play</string>
     <string name="pref_send_feedback">Manda un feedback allo sviluppatore</string>
     <string name="pref_view_source_code">Vedi il codice sorgente su GitHub</string>
@@ -127,7 +127,7 @@
     <string name="generate_bug_report">Genera bug report</string>
     <string name="troubleshooting">Risoluzione dei problemi</string>
     <string name="help_translate">Aiuta a tradurre questa app</string>
-    <string name="night_mode" comment="dark_theme">Modalità notte</string>
+    <string name="night_mode">Modalità notte</string>
     <string name="use_pure_black">Usa nero puro nella modalità notte</string>
     <string name="pure_black_description">Sostituisce gli sfondi grigi con sfondi neri nella modalità notte. Riduce il consumo di batteria nei dispositivi con schermo AMOLED.</string>
     <string name="interface_preferences">Interfaccia</string>
@@ -147,6 +147,7 @@
     <string name="none">Nessuno</string>
     <string name="filter">Filtra</string>
     <string name="hide_completed">Nascondi completati</string>
+    <string name="hide_entered">Nascondi inserito</string>
     <string name="hide_archived">Nascondi archiviati</string>
     <string name="sticky_notifications">Notifiche non rimuovibili</string>
     <string name="sticky_notifications_description">Impedisce di poter rimuovere le notifiche.</string>
@@ -166,9 +167,12 @@
     <string name="by_status">Per stato</string>
     <string name="export">Esporta</string>
     <string name="long_press_to_edit">Tieni premuto per cambiare il valore</string>
-    <string name="change_value">Cambia valore</string>
+    <string name="value">Valore</string>
     <string name="calendar">Calendario</string>
     <string name="unit">Unità</string>
+    <string name="target_type">Tipo di destinazione</string>
+    <string name="target_type_at_least">Almeno</string>
+    <string name="target_type_at_most">Al massimo</string>
     <string name="example_question_boolean">ad es. Ti sei allenato oggi?</string>
     <string name="question">Domanda</string>
     <string name="target">Obiettivo</string>
@@ -190,6 +194,7 @@
     <string name="measurable_example">es. Quanti chilometri hai percorso oggi? Quante pagine hai letto?</string>
     <string name="x_times_per_week">%d volte a settimana</string>
     <string name="x_times_per_month">%d volte al mese</string>
+    <string name="x_times_per_y_days">%d volte in %d giorni</string>
     <string name="yes_or_no_short_example">ad es. Esercizio</string>
     <string name="color">Colore</string>
     <string name="example_target">ad es. 15</string>
@@ -212,5 +217,4 @@
     <string name="activity_not_found">Nessuna app disponibile per gestire questa azione</string>
     <string name="pref_midnight_delay_title">Prolunga il giorno di alcune ore dopo la mezzanotte</string>
     <string name="pref_midnight_delay_description">Attendere fino alle 3:00 per mostrare il nuovo giorno. Utile se solitamente vai a dormire dopo mezzanotte. È necessario riavviare l\'app.</string>
-    <string name="x_times_per_y_days">%d volte in %d giorni</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-iw-rIL/strings.xml b/uhabits-android/src/main/res/values-iw-rIL/strings.xml
index 411ac876a..ccc172e07 100644
--- a/uhabits-android/src/main/res/values-iw-rIL/strings.xml
+++ b/uhabits-android/src/main/res/values-iw-rIL/strings.xml
@@ -83,7 +83,6 @@
     <string name="interval_always_ask">תמיד לשאול</string>
     <string name="interval_custom">התאמה אישית...</string>
     <string name="pref_toggle_title">סימון הרגלים בלחיצה קצרה</string>
-    <string name="pref_toggle_description">סימון יעדים בהקשה קצרה במקום בלחיצה ממושכת. זה נוח יותר, אך יכול להוביל לסימוני הרגלים בטעות.</string>
     <string name="pref_rate_this_app">דירוג היישום ב־Google Play</string>
     <string name="pref_send_feedback">שליחת משוב למפתחים</string>
     <string name="pref_view_source_code">צפייה בקוד המקור ב־GitHub</string>
@@ -139,7 +138,7 @@
     <string name="generate_bug_report">יצירת דו״ח תקלה</string>
     <string name="troubleshooting">פתרון תקלות</string>
     <string name="help_translate">עזרה בתרגום היישום</string>
-    <string name="night_mode" comment="dark_theme">ערכת נושא כהה</string>
+    <string name="night_mode">ערכת נושא כהה</string>
     <string name="use_pure_black">רקע שחור מוחלט בערכת הנושא הכהה</string>
     <string name="pure_black_description">להחלפת הרקע האפור בערכת הנושא הכהה לשחור מוחלט. זה מפחית את צריכת הסוללה במכשירים עם תצוגת AMOLED.</string>
     <string name="interface_preferences">ממשק</string>
@@ -178,7 +177,6 @@
     <string name="by_status">לפי מצב</string>
     <string name="export">ייצוא</string>
     <string name="long_press_to_edit">לחיצה והחזקה ישנו את הערך</string>
-    <string name="change_value">שינוי ערך</string>
     <string name="calendar">לוח שנה</string>
     <string name="unit">יחידה</string>
     <string name="example_question_boolean">למשל: האם התעמלת היום?</string>
@@ -202,6 +200,7 @@
     <string name="measurable_example">למשל: כמה קילומטרים רצת היום? כמה עמודים קראת?</string>
     <string name="x_times_per_week">%d פעמים בשבוע</string>
     <string name="x_times_per_month">%d פעמים בחודש</string>
+    <string name="x_times_per_y_days">%d פעמים ב- %d ימים</string>
     <string name="yes_or_no_short_example">למשל: התעמלות</string>
     <string name="color">צבע</string>
     <string name="example_target">למשל: 15</string>
@@ -225,5 +224,4 @@
     <string name="activity_not_found">לא נמצא יישום שתומך בפעולה זו</string>
     <string name="pref_midnight_delay_title">הארכת היום בכמה שעות לאחר החצות</string>
     <string name="pref_midnight_delay_description">לחכות עד 3:00 כדי להציג יום חדש. שימושי אם לרוב הולכים לישון לאחר החצות. דורש הפעלה מחדש של היישום.</string>
-    <string name="x_times_per_y_days">%d פעמים ב- %d ימים</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-ja-rJP/strings.xml b/uhabits-android/src/main/res/values-ja-rJP/strings.xml
index a54c6f9f9..c016c08d6 100644
--- a/uhabits-android/src/main/res/values-ja-rJP/strings.xml
+++ b/uhabits-android/src/main/res/values-ja-rJP/strings.xml
@@ -71,7 +71,6 @@
     <string name="interval_always_ask">毎回選択する</string>
     <string name="interval_custom">カスタム...</string>
     <string name="pref_toggle_title">タップでチェックをON/OFF</string>
-    <string name="pref_toggle_description">長押しではなくシングルタップでチェックを付けます。より便利ですが、誤って切り替えが起こる可能性があります。</string>
     <string name="pref_rate_this_app">Google Play でこのアプリを評価</string>
     <string name="pref_send_feedback">開発者にフィードバックを送信</string>
     <string name="pref_view_source_code">GitHub でソースコードを参照</string>
@@ -121,7 +120,7 @@
     <string name="generate_bug_report">バグレポートの作成</string>
     <string name="troubleshooting">トラブルシューティング</string>
     <string name="help_translate">このアプリの翻訳を支援する</string>
-    <string name="night_mode" comment="dark_theme">ダークテーマ</string>
+    <string name="night_mode">ダークテーマ</string>
     <string name="use_pure_black">ダークテーマで完全な黒を使用する</string>
     <string name="pure_black_description">夜間モードで灰色の背景を完全な黒で置き換えます。AMOLED ディスプレイの電話でバッテリー使用量を抑えます。</string>
     <string name="interface_preferences">インターフェース</string>
@@ -160,7 +159,6 @@
     <string name="by_status">ステータス順</string>
     <string name="export">エクスポート</string>
     <string name="long_press_to_edit">長押しすると値を変更できます</string>
-    <string name="change_value">値を変更する</string>
     <string name="calendar">カレンダー</string>
     <string name="unit">単位</string>
     <string name="example_question_boolean">例：今日は運動しましたか？</string>
@@ -184,6 +182,7 @@
     <string name="measurable_example">例：今日は何キロ走ったの？何ページ読んだの？</string>
     <string name="x_times_per_week">1 週間に %d 回</string>
     <string name="x_times_per_month">1 か月に %d 回</string>
+    <string name="x_times_per_y_days">%d 回 %d 日</string>
     <string name="yes_or_no_short_example">例：運動</string>
     <string name="color">色</string>
     <string name="example_target">例：15</string>
@@ -198,5 +197,4 @@
     <string name="pref_skip_title">スキップ日を有効にする</string>
     <string name="you_are_now_a_developer">これで開発者になりました!</string>
     <string name="activity_not_found">この操作を行うアプリが見つかりませんでした。</string>
-    <string name="x_times_per_y_days">%d 回 %d 日</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-ko-rKR/strings.xml b/uhabits-android/src/main/res/values-ko-rKR/strings.xml
index b81b7b556..5394968e1 100644
--- a/uhabits-android/src/main/res/values-ko-rKR/strings.xml
+++ b/uhabits-android/src/main/res/values-ko-rKR/strings.xml
@@ -71,7 +71,6 @@
     <string name="interval_always_ask">항상 묻기</string>
     <string name="interval_custom">사용자 지정.</string>
     <string name="pref_toggle_title">짧게 눌러서 전환하기</string>
-    <string name="pref_toggle_description">길게 누르고 있는 대신에 짧은 탭 한 번으로 체크합니다. 더 편리하지만, 실수로 전환될 수도 있습니다.</string>
     <string name="pref_rate_this_app">Google Play에서 평가</string>
     <string name="pref_send_feedback">개발자에게 피드백 보내기</string>
     <string name="pref_view_source_code">Github에서 소스보기</string>
@@ -121,7 +120,7 @@
     <string name="generate_bug_report">오류보고서 작성하기</string>
     <string name="troubleshooting">문제 해결</string>
     <string name="help_translate">이 앱의 번역을 도와주세요</string>
-    <string name="night_mode" comment="dark_theme">야간 모드</string>
+    <string name="night_mode">야간 모드</string>
     <string name="use_pure_black">야간 모드에서 검정색 사용하기</string>
     <string name="pure_black_description">야간 모드의 회색 배경을 검정색으로 대체합니다. AMOLED 디스플레이를 사용하는 기기에서 배터리 사용량을 감소시킵니다.</string>
     <string name="interface_preferences">인터페이스</string>
@@ -160,7 +159,6 @@
     <string name="by_status">상태별로</string>
     <string name="export">내보내기</string>
     <string name="long_press_to_edit">길게 누르면 값이 변경됩니다.</string>
-    <string name="change_value">값 변경</string>
     <string name="calendar">캘린더</string>
     <string name="unit">단위</string>
     <string name="example_question_boolean">예 : 오늘 운동을 했습니까?</string>
@@ -184,10 +182,10 @@
     <string name="measurable_example">예) 오늘 몇 마일을 달렸습니까? 몇 페이지를 읽었습니까?</string>
     <string name="x_times_per_week">일주일에 몇 번</string>
     <string name="x_times_per_month">한 달에 몇 번</string>
+    <string name="x_times_per_y_days">%d 번 %d 일 동안</string>
     <string name="yes_or_no_short_example">예) 운동</string>
     <string name="color">색</string>
     <string name="example_target">예) 15</string>
     <string name="every_month">매월</string>
     <string name="today">오늘</string>
-    <string name="x_times_per_y_days">%d 번 %d 일 동안</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-nl-rNL/strings.xml b/uhabits-android/src/main/res/values-nl-rNL/strings.xml
index 5e1636a89..c7314dcf7 100644
--- a/uhabits-android/src/main/res/values-nl-rNL/strings.xml
+++ b/uhabits-android/src/main/res/values-nl-rNL/strings.xml
@@ -71,7 +71,6 @@
     <string name="interval_always_ask">Altijd vragen</string>
     <string name="interval_custom">Aangepast...</string>
     <string name="pref_toggle_title">Wijzig herhalingen door kort indrukken</string>
-    <string name="pref_toggle_description">Zet vinkjes met een enkel tikje in plaats van ingedrukt houden. Handiger, maar kan onbedoelde wijzigingen veroorzaken.</string>
     <string name="pref_rate_this_app">Beoordeel deze app in Google Play</string>
     <string name="pref_send_feedback">Stuur feedback aan de ontwikkelaar</string>
     <string name="pref_view_source_code">Bekijk de broncode op GitHub</string>
@@ -115,7 +114,7 @@
     <string name="generate_bug_report">Genereer foutenrapport</string>
     <string name="troubleshooting">Probleemoplossing</string>
     <string name="help_translate">Help deze app te vertalen</string>
-    <string name="night_mode" comment="dark_theme">Nachtmodus</string>
+    <string name="night_mode">Nachtmodus</string>
     <string name="use_pure_black">Gebruik puur zwart bij het donkere thema</string>
     <string name="pure_black_description">Vervangt grijze achtergronden door puur zwart in het donkere thema. Vermindert batterijgebruik bij telefoons met AMOLED scherm.</string>
     <string name="interface_preferences">Interface</string>
@@ -154,9 +153,11 @@
     <string name="by_status">Per status</string>
     <string name="export">Exporteren</string>
     <string name="long_press_to_edit">Ingedrukt houden om de waarde te wijzigen</string>
-    <string name="change_value">Waarde wijzigen</string>
+    <string name="value">Waarde</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Eenheid</string>
+    <string name="target_type_at_least">Minimaal</string>
+    <string name="target_type_at_most">Maximaal</string>
     <string name="example_question_boolean">bijv. Heb je vandaag gesport?</string>
     <string name="question">Vraag</string>
     <string name="target">Doel</string>
@@ -178,6 +179,7 @@
     <string name="measurable_example">bijv. Hoeveel kilometer heb je vandaag gelopen? Hoeveel pagina\'s heb je gelezen?</string>
     <string name="x_times_per_week">%d keer per week</string>
     <string name="x_times_per_month">%d keer per maand</string>
+    <string name="x_times_per_y_days">%d keer in  %d dagen</string>
     <string name="yes_or_no_short_example">bijv. Sporten</string>
     <string name="color">Kleur</string>
     <string name="example_target">bijv. 15</string>
@@ -201,5 +203,4 @@
     <string name="activity_not_found">Er is geen app gevonden om deze actie uit te voeren.</string>
     <string name="pref_midnight_delay_title">Verleng de dag tot een paar uur na middernacht</string>
     <string name="pref_midnight_delay_description">Wacht tot 3:00 uur om een nieuwe dag te beginnen. Handig als je normaal gesproken na middernacht gaat slapen. Dit vereist het opnieuw opstarten van de app.</string>
-    <string name="x_times_per_y_days">%d keer in  %d dagen</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-no-rNO/strings.xml b/uhabits-android/src/main/res/values-no-rNO/strings.xml
index 987260ab1..16d054db8 100644
--- a/uhabits-android/src/main/res/values-no-rNO/strings.xml
+++ b/uhabits-android/src/main/res/values-no-rNO/strings.xml
@@ -57,7 +57,6 @@
     <string name="interval_24_hour">1 døgn</string>
     <string name="interval_custom">Egendefinert...</string>
     <string name="pref_toggle_title">Veksl med enkelttrykk</string>
-    <string name="pref_toggle_description">Sett på haker med et enkelttrykk i stedet for å tykke og holde. Mer praktisk, men kan forårsake utilsiktede vekslinger.</string>
     <string name="pref_rate_this_app">Vurdér denne appen på Google Play</string>
     <string name="pref_send_feedback">Send tilbakemelding til utviklerne</string>
     <string name="pref_view_source_code">Vis kildekode på GitHub</string>
@@ -100,7 +99,7 @@
     <string name="generate_bug_report">Generér feilrapport</string>
     <string name="troubleshooting">Feilsøkning</string>
     <string name="help_translate">Hjelp med å oversette denne appen</string>
-    <string name="night_mode" comment="dark_theme">Nattmodus</string>
+    <string name="night_mode">Nattmodus</string>
     <string name="use_pure_black">Bruk batterisparing i nattmodus</string>
     <string name="pure_black_description">Bytter ut grå bakgunner med helt svarte i nattmodus. Reduserer betteribruk hos telefoner med AMOLED-skjerm.</string>
     <string name="interface_preferences">Grensesnitt</string>
@@ -135,7 +134,6 @@
     <string name="by_color">Etter farge</string>
     <string name="by_score">Etter poengsum</string>
     <string name="export">Eksportér</string>
-    <string name="change_value">Endre verdi</string>
     <string name="question">Spørsmål</string>
     <string name="x_times_per_y_days">%d ganger på %d dager</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-pl-rPL/strings.xml b/uhabits-android/src/main/res/values-pl-rPL/strings.xml
index e4707582a..f658155cf 100644
--- a/uhabits-android/src/main/res/values-pl-rPL/strings.xml
+++ b/uhabits-android/src/main/res/values-pl-rPL/strings.xml
@@ -83,7 +83,7 @@
     <string name="interval_always_ask">Zawsze pytaj</string>
     <string name="interval_custom">Własne ustawienia...</string>
     <string name="pref_toggle_title">Przełącz powtarzanie krótkim naciśnięciem</string>
-    <string name="pref_toggle_description">Wygodniejsze, ale może spowodować przypadkowe przełączenia.</string>
+    <string name="pref_toggle_description_2">Umieść znaczniki wyboru jednym dotknięciem zamiast naciśnięcia i przytrzymania.</string>
     <string name="pref_rate_this_app">Oceń tę aplikację w Google Play</string>
     <string name="pref_send_feedback">Prześlij uwagi do programisty</string>
     <string name="pref_view_source_code">Zobacz kod źródłowy na GitHub\'ie</string>
@@ -139,7 +139,7 @@
     <string name="generate_bug_report">Wygeneruj raport o błędach</string>
     <string name="troubleshooting">Rozwiązywanie problemów</string>
     <string name="help_translate">Pomóż w tłumaczeniu tej aplikacji</string>
-    <string name="night_mode" comment="dark_theme">Tryb nocny</string>
+    <string name="night_mode">Tryb nocny</string>
     <string name="use_pure_black">Używaj pełnej czerni w trybie nocnym</string>
     <string name="pure_black_description">Zamienia szare tła na pełną czerń w trybie nocnym. Zmniejsza zużycie baterii w telefonach z ekranem AMOLED.</string>
     <string name="interface_preferences">Interfejs</string>
@@ -159,6 +159,7 @@
     <string name="none">Brak</string>
     <string name="filter">Filtruj</string>
     <string name="hide_completed">Ukryj zakończone</string>
+    <string name="hide_entered">Ukryj wprowadzone</string>
     <string name="hide_archived">Ukryj archiwizowane</string>
     <string name="sticky_notifications">Przypinaj powiadomienia</string>
     <string name="sticky_notifications_description">Zapobiega usunięciu powiadomień.</string>
@@ -178,9 +179,12 @@
     <string name="by_status">Według statusu</string>
     <string name="export">Eksportuj</string>
     <string name="long_press_to_edit">Naciśnij i przytrzymaj, aby zmienić wartość</string>
-    <string name="change_value">Zmień wartość</string>
+    <string name="value">Wartość</string>
     <string name="calendar">Kalendarz</string>
     <string name="unit">Jednostka</string>
+    <string name="target_type">Rodzaj celu:</string>
+    <string name="target_type_at_least">Co najmniej</string>
+    <string name="target_type_at_most">Maksymalnie</string>
     <string name="example_question_boolean">np. Czy ćwiczyłeś dzisiaj?</string>
     <string name="question">Pytanie</string>
     <string name="target">Cel</string>
@@ -202,6 +206,7 @@
     <string name="measurable_example">np. Ile mil przejechałeś dzisiaj? Ile stron przeczytałeś?</string>
     <string name="x_times_per_week">%d razy w tygodniu</string>
     <string name="x_times_per_month">%d razy w miesiącu</string>
+    <string name="x_times_per_y_days">%d razy w ciągu %d dni</string>
     <string name="yes_or_no_short_example">np. ćwiczenia</string>
     <string name="color">Kolor</string>
     <string name="example_target">np. 15</string>
@@ -225,5 +230,4 @@
     <string name="activity_not_found">Nie znaleziono aplikacji obsługującej to działanie</string>
     <string name="pref_midnight_delay_title">Przedłuż dzień o kilka godzin po północy</string>
     <string name="pref_midnight_delay_description">Poczekaj do 3:00, aby pokazać nowy dzień. Przydatne, jeśli zwykle kładziesz się spać po północy. Wymaga ponownego uruchomienia aplikacji.</string>
-    <string name="x_times_per_y_days">%d razy w %d dni</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-pt-rBR/strings.xml b/uhabits-android/src/main/res/values-pt-rBR/strings.xml
index e415667cb..6d3f95856 100644
--- a/uhabits-android/src/main/res/values-pt-rBR/strings.xml
+++ b/uhabits-android/src/main/res/values-pt-rBR/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Perguntar sempre</string>
     <string name="interval_custom">Personalizar...</string>
     <string name="pref_toggle_title">Marcar repetições com um toque curto</string>
-    <string name="pref_toggle_description">Mais conveniente, mas pode causar marcações acidentais</string>
     <string name="pref_rate_this_app">Avaliar esse app no Google Play</string>
     <string name="pref_send_feedback">Mandar sugestões para o desenvolvedor</string>
     <string name="pref_view_source_code">Ver código-fonte no GitHub</string>
@@ -127,7 +126,7 @@
     <string name="generate_bug_report">Gerar relatório de erros.</string>
     <string name="troubleshooting">Solução de problemas</string>
     <string name="help_translate">Ajude a traduzir este app</string>
-    <string name="night_mode" comment="dark_theme">Modo noturno</string>
+    <string name="night_mode">Modo noturno</string>
     <string name="use_pure_black">Usar preto em modo noturno</string>
     <string name="pure_black_description">Substitui os tons de cinza por preto puro em modo noturno. Economiza bateria em telefones com tela AMOLED.</string>
     <string name="interface_preferences">Interface</string>
@@ -166,7 +165,6 @@
     <string name="by_status">Por status</string>
     <string name="export">Exportar</string>
     <string name="long_press_to_edit">Pressione e segure para alterar o valor</string>
-    <string name="change_value">Alterar valor</string>
     <string name="calendar">Calendário</string>
     <string name="unit">Unidade</string>
     <string name="example_question_boolean">ex.: Você se exercitou hoje?</string>
@@ -190,6 +188,7 @@
     <string name="measurable_example">ex.: Quantos km você correu hoje? Quantas páginas você leu?</string>
     <string name="x_times_per_week">%d vezes por semana</string>
     <string name="x_times_per_month">%d vezes por mês</string>
+    <string name="x_times_per_y_days">%d vezes em %d dias</string>
     <string name="yes_or_no_short_example">ex: Exercício</string>
     <string name="color">Cor</string>
     <string name="example_target">Ex: 15</string>
@@ -213,5 +212,4 @@
     <string name="activity_not_found">Nenhum app encontrado para executar esta ação</string>
     <string name="pref_midnight_delay_title">Prolongar dia algumas horas depois da meia-noite</string>
     <string name="pref_midnight_delay_description">Espere até às 3:00 para mostrar um novo dia. Útil se você costuma dormir depois da meia-noite. Requer reinicialização do aplicativo.</string>
-    <string name="x_times_per_y_days">%d vezes em %d dias</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-pt-rPT/strings.xml b/uhabits-android/src/main/res/values-pt-rPT/strings.xml
index 72f5b153c..374fded4c 100644
--- a/uhabits-android/src/main/res/values-pt-rPT/strings.xml
+++ b/uhabits-android/src/main/res/values-pt-rPT/strings.xml
@@ -58,7 +58,6 @@
     <string name="interval_always_ask">Perguntar sempre</string>
     <string name="interval_custom">Personalizar...</string>
     <string name="pref_toggle_title">Toque para alternar entre repetições</string>
-    <string name="pref_toggle_description">Mais conveniente, mas pode causar toques acidentais</string>
     <string name="pref_rate_this_app">Avaliar a app no Google Play</string>
     <string name="pref_send_feedback">Enviar feedback ao programador</string>
     <string name="pref_view_source_code">Ver código-fonte no GitHub</string>
@@ -102,7 +101,7 @@
     <string name="generate_bug_report">Gerar relatório de erros</string>
     <string name="troubleshooting">Resolução de problemas</string>
     <string name="help_translate">Ajude a traduzir esta aplicação</string>
-    <string name="night_mode" comment="dark_theme">Modo noturno</string>
+    <string name="night_mode">Modo noturno</string>
     <string name="use_pure_black">Usar preto puro no modo noturno</string>
     <string name="pure_black_description">Substitui os fundos cinzentos por pretos puros no modo noturno. Reduz a utilização da bateria em telemóveis com ecrã AMOLED.</string>
     <string name="interface_preferences">Interface</string>
@@ -140,7 +139,6 @@
     <string name="by_score">Por pontuação</string>
     <string name="export">Exportar</string>
     <string name="long_press_to_edit">Pressione e segure para alterar o valor</string>
-    <string name="change_value">Alterar o valor</string>
     <string name="calendar">Calendário</string>
     <string name="unit">Unidade</string>
     <string name="example_question_boolean">ex.: Você se exercitou hoje?</string>
@@ -163,6 +161,7 @@
     <string name="measurable">Mensurável</string>
     <string name="x_times_per_week">%d vezes por semana</string>
     <string name="x_times_per_month">%d vezes por mês</string>
+    <string name="x_times_per_y_days">%d vezes em %d dias</string>
     <string name="yes_or_no_short_example">ex. Exercício</string>
     <string name="color">Cor</string>
     <string name="example_target">ex. 15</string>
@@ -172,5 +171,4 @@
     <string name="every_month">Todos os meses</string>
     <string name="validation_cannot_be_blank">Não pode ficar em branco</string>
     <string name="today">Hoje</string>
-    <string name="x_times_per_y_days">%d vezes em %d dias</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-ro-rRO/strings.xml b/uhabits-android/src/main/res/values-ro-rRO/strings.xml
index 15160d59e..0062c1147 100644
--- a/uhabits-android/src/main/res/values-ro-rRO/strings.xml
+++ b/uhabits-android/src/main/res/values-ro-rRO/strings.xml
@@ -58,7 +58,6 @@
     <string name="interval_always_ask">Intreaba mereu</string>
     <string name="interval_custom">Diferit...</string>
     <string name="pref_toggle_title">Comută repetițiile printr-o apăsare scurtă</string>
-    <string name="pref_toggle_description">Mai convenabil, dar poate cauza comutări accidentale.</string>
     <string name="pref_rate_this_app">Evaluează aplicația pe Magazin Play</string>
     <string name="pref_send_feedback">Trimite păreri dezvoltatorului</string>
     <string name="pref_view_source_code">Vezi codul sursă pe GitHub</string>
@@ -102,7 +101,7 @@
     <string name="generate_bug_report">Generează raport de erori</string>
     <string name="troubleshooting">Depanare</string>
     <string name="help_translate">Ajută la traducerea aplicației</string>
-    <string name="night_mode" comment="dark_theme">Mod întunecat</string>
+    <string name="night_mode">Mod întunecat</string>
     <string name="use_pure_black">Utilizează modul întunecat</string>
     <string name="pure_black_description">Înlocuiește fundalurile gri cu negru pur în modul întunecat. Reduce utilizarea bateriei la telefoanele cu ecran AMOLED.</string>
     <string name="interface_preferences">Interfață</string>
@@ -140,7 +139,6 @@
     <string name="by_score">După scor</string>
     <string name="export">Exportă</string>
     <string name="long_press_to_edit">Ține apăsat pentru a modifica valoarea</string>
-    <string name="change_value">Modifică valoarea</string>
     <string name="calendar">Calendar</string>
     <string name="unit">Unități</string>
     <string name="example_question_boolean">ex.: Ai îndeplinit exerciții fizice azi?</string>
diff --git a/uhabits-android/src/main/res/values-ru-rRU/strings.xml b/uhabits-android/src/main/res/values-ru-rRU/strings.xml
index b27277c44..1916cb0a1 100644
--- a/uhabits-android/src/main/res/values-ru-rRU/strings.xml
+++ b/uhabits-android/src/main/res/values-ru-rRU/strings.xml
@@ -83,7 +83,7 @@
     <string name="interval_always_ask">Всегда спрашивать</string>
     <string name="interval_custom">Настроить...</string>
     <string name="pref_toggle_title">Отмечать коротким нажатием</string>
-    <string name="pref_toggle_description">Ставить галочки коротким нажатием вместо удержания. Удобнее, но может стать причиной случайных отметок.</string>
+    <string name="pref_toggle_description_2">Ставить галочки одним касанием вместо нажатия и удерживания.</string>
     <string name="pref_rate_this_app">Оценить приложение в Google Play</string>
     <string name="pref_send_feedback">Отправить сообщение разработчику</string>
     <string name="pref_view_source_code">Посмотреть исходный код на GitHub</string>
@@ -139,7 +139,7 @@
     <string name="generate_bug_report">Сгенерировать отчёт об ошибке</string>
     <string name="troubleshooting">Устранение неполадок</string>
     <string name="help_translate">Помогите перевести это приложение</string>
-    <string name="night_mode" comment="dark_theme">Ночной режим</string>
+    <string name="night_mode">Ночной режим</string>
     <string name="use_pure_black">Использовать подлинный чёрный в ночном режиме</string>
     <string name="pure_black_description">Заменяет серый фон на подлинный чёрный в ночном режиме. Сокращает расход батареи в телефонах с дисплеем AMOLED.</string>
     <string name="interface_preferences">Интерфейс</string>
@@ -159,6 +159,7 @@
     <string name="none">Без звука</string>
     <string name="filter">Фильтр</string>
     <string name="hide_completed">Скрыть завершённые</string>
+    <string name="hide_entered">Скрыть введённые</string>
     <string name="hide_archived">Скрыть архивированные</string>
     <string name="sticky_notifications">Сделать уведомления \"липкими\"</string>
     <string name="sticky_notifications_description">Предотвращает смахивание уведомлений.</string>
@@ -178,9 +179,12 @@
     <string name="by_status">По статусу</string>
     <string name="export">Экспортировать</string>
     <string name="long_press_to_edit">Нажмите и удерживайте, чтобы изменить значение</string>
-    <string name="change_value">Изменить значение</string>
+    <string name="value">Значение</string>
     <string name="calendar">Календарь</string>
     <string name="unit">Ед. изм.</string>
+    <string name="target_type">Тип цели</string>
+    <string name="target_type_at_least">Не меньше</string>
+    <string name="target_type_at_most">Не больше</string>
     <string name="example_question_boolean">напр.: Вы упражнялись сегодня?</string>
     <string name="question">Вопрос</string>
     <string name="target">Цель</string>
@@ -202,6 +206,7 @@
     <string name="measurable_example">напр.: Сколько км вы пробежали сегодня? Сколько страниц прочитали?</string>
     <string name="x_times_per_week">%d раз в неделю</string>
     <string name="x_times_per_month">%d раз в месяц</string>
+    <string name="x_times_per_y_days">%d раз в %d дней</string>
     <string name="yes_or_no_short_example">напр.: Поупражняться</string>
     <string name="color">Цвет</string>
     <string name="example_target">напр.: 15</string>
@@ -225,5 +230,4 @@
     <string name="activity_not_found">Не найдено приложения для обработки данного действия</string>
     <string name="pref_midnight_delay_title">Продлить день на несколько часов после полуночи</string>
     <string name="pref_midnight_delay_description">Подождать до 3:00 перед показом нового дня. Полезно, если вы обычно ложитесь спать после полуночи. Требуется перезапуск приложения.</string>
-    <string name="x_times_per_y_days">%d раз в %d дней</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-sk-rSK/strings.xml b/uhabits-android/src/main/res/values-sk-rSK/strings.xml
index 83f5bff3f..6838ff94d 100644
--- a/uhabits-android/src/main/res/values-sk-rSK/strings.xml
+++ b/uhabits-android/src/main/res/values-sk-rSK/strings.xml
@@ -65,7 +65,6 @@
     <string name="interval_always_ask">Vždy sa spýtať</string>
     <string name="interval_custom">Vlastné ...</string>
     <string name="pref_toggle_title">Prepnúť krátkym stlačením</string>
-    <string name="pref_toggle_description">Pridajte začiarknutie jediným klepnutím namiesto stlačenia a podržania. Je to pohodlnejšie, ale môže dôjsť k náhodným prepnutiam.</string>
     <string name="pref_rate_this_app">Ohodnoťte túto aplikáciu na Google Play</string>
     <string name="pref_send_feedback">Odošlite spätnú väzbu vývojárovi</string>
     <string name="pref_view_source_code">Zobraziť zdrojový kód na stránke GitHub</string>
@@ -109,7 +108,7 @@
     <string name="generate_bug_report">Vygenerujte hlásenie o chybe</string>
     <string name="troubleshooting">Riešenie problémov</string>
     <string name="help_translate">Pomôžte preložiť túto aplikáciu</string>
-    <string name="night_mode" comment="dark_theme">Tmavá téma</string>
+    <string name="night_mode">Tmavá téma</string>
     <string name="use_pure_black">Použite čisto čiernu farbu v tmavej téme</string>
     <string name="pure_black_description">Nahrádza sivé pozadie čisto čiernym v tmavej téme. Znižuje spotrebu batérie v telefónoch s displejom AMOLED.</string>
     <string name="interface_preferences">Rozhranie</string>
@@ -148,7 +147,6 @@
     <string name="by_status">Podľa stavu</string>
     <string name="export">Exportovať</string>
     <string name="long_press_to_edit">Stlačením a podržaním zmeníte hodnotu</string>
-    <string name="change_value">Zmeniť hodnotu</string>
     <string name="calendar">Kalendár</string>
     <string name="unit">Jednotka</string>
     <string name="example_question_boolean">napr. Cvičili ste dnes?</string>
diff --git a/uhabits-android/src/main/res/values-sl-rSI/strings.xml b/uhabits-android/src/main/res/values-sl-rSI/strings.xml
index 8c5267be2..6e1f450d5 100644
--- a/uhabits-android/src/main/res/values-sl-rSI/strings.xml
+++ b/uhabits-android/src/main/res/values-sl-rSI/strings.xml
@@ -56,7 +56,6 @@
     <string name="interval_8_hour">8 ur</string>
     <string name="interval_24_hour">24 ur</string>
     <string name="pref_toggle_title">Preklopi ponovitve s kratkim pritiskom</string>
-    <string name="pref_toggle_description">Bolj priročno ampak lahko povzroči nenamerne preklapljanje.</string>
     <string name="pref_rate_this_app">Oceni to aplikacijo na Google Play</string>
     <string name="pref_send_feedback">Pošlji povratne informacije razvijalcem</string>
     <string name="pref_view_source_code">Poglej izvorno kodo na GitHub</string>
@@ -99,7 +98,7 @@
     <string name="generate_bug_report">Ustvari poročilo o napakah</string>
     <string name="troubleshooting">Odpravljanje napak</string>
     <string name="help_translate">Pomagajte prevesti to aplikacijo</string>
-    <string name="night_mode" comment="dark_theme">Nočni način</string>
+    <string name="night_mode">Nočni način</string>
     <string name="use_pure_black">Uporabite popolno črnino v nočnem načinu</string>
     <string name="pure_black_description">Zamenja siva ozadja s popolno črnino v nočnem načinu. Zmanjša porabo baterije na telefonih z AMOLED zasloni.</string>
     <string name="interface_preferences">Vmesnik</string>
diff --git a/uhabits-android/src/main/res/values-sr-rCS/strings.xml b/uhabits-android/src/main/res/values-sr-rCS/strings.xml
index 0c6758362..fd7a8fcbf 100644
--- a/uhabits-android/src/main/res/values-sr-rCS/strings.xml
+++ b/uhabits-android/src/main/res/values-sr-rCS/strings.xml
@@ -79,7 +79,6 @@
     <string name="interval_always_ask">Uvek pitaj</string>
     <string name="interval_custom">Prilagođeno...</string>
     <string name="pref_toggle_title">Menjaj stanje dodirom</string>
-    <string name="pref_toggle_description">Stavlja kvačice dodirom umesto dugog pritiska. Zgodnije, ali može slučajno doći do prebacivanja.</string>
     <string name="pref_rate_this_app">Oceni aplikaciju</string>
     <string name="pref_send_feedback">Povratne informacije</string>
     <string name="pref_view_source_code">Izvorni kôd na Githabu</string>
@@ -133,7 +132,7 @@
     <string name="generate_bug_report">Napravi izveštaj o grešci</string>
     <string name="troubleshooting">Rešavanje problema</string>
     <string name="help_translate">Pomozite prevođenje</string>
-    <string name="night_mode" comment="dark_theme">Tamna tema</string>
+    <string name="night_mode">Tamna tema</string>
     <string name="use_pure_black">Čista crna u tamnoj temi</string>
     <string name="pure_black_description">Menja sivu pozadinu sa čistom crnom u tamnoj temi. Smanjuje potrošnju baterije kod telefona sa AMOLED ekranom.</string>
     <string name="interface_preferences">Sučelje</string>
@@ -172,7 +171,6 @@
     <string name="by_status">po stanju</string>
     <string name="export">Izvoz</string>
     <string name="long_press_to_edit">Dug pritisak za promenu vrednosti</string>
-    <string name="change_value">Izmeni vrednost</string>
     <string name="calendar">Kalendar</string>
     <string name="unit">Jedinica</string>
     <string name="example_question_boolean">npr. Da li ste vežbali danas?</string>
diff --git a/uhabits-android/src/main/res/values-sr-rSP/strings.xml b/uhabits-android/src/main/res/values-sr-rSP/strings.xml
index d4a5d0b9d..cb73a795e 100644
--- a/uhabits-android/src/main/res/values-sr-rSP/strings.xml
+++ b/uhabits-android/src/main/res/values-sr-rSP/strings.xml
@@ -79,7 +79,6 @@
     <string name="interval_always_ask">Увек питај</string>
     <string name="interval_custom">Прилагођено...</string>
     <string name="pref_toggle_title">Мењај стање додиром</string>
-    <string name="pref_toggle_description">Ставља квачице додиром уместо дугог притиска. Згодније, али може случајно доћи до пребацивања.</string>
     <string name="pref_rate_this_app">Оцени апликацију</string>
     <string name="pref_send_feedback">Повратне информације</string>
     <string name="pref_view_source_code">Изворни кôд на Гитхабу</string>
@@ -133,7 +132,7 @@
     <string name="generate_bug_report">Направи извештај о грешци</string>
     <string name="troubleshooting">Решавање проблема</string>
     <string name="help_translate">Помозите превођење</string>
-    <string name="night_mode" comment="dark_theme">Тамна тема</string>
+    <string name="night_mode">Тамна тема</string>
     <string name="use_pure_black">Чиста црна у тамној теми</string>
     <string name="pure_black_description">Мења сиву позадину са чистом црном у тамној теми. Смањује потрошњу батерије код телефона са АМОЛЕД екраном.</string>
     <string name="interface_preferences">Сучеље</string>
@@ -172,7 +171,6 @@
     <string name="by_status">по стању</string>
     <string name="export">Извоз</string>
     <string name="long_press_to_edit">Дуг притисак за промену вредности</string>
-    <string name="change_value">Измени вредност</string>
     <string name="calendar">Календар</string>
     <string name="unit">Јединица</string>
     <string name="example_question_boolean">нпр. Да ли сте вежбали данас?</string>
@@ -196,6 +194,7 @@
     <string name="measurable_example">нпр. Колико сте километара претрчали данас? Колико сте страница прочитали?</string>
     <string name="x_times_per_week">%d пута недељно</string>
     <string name="x_times_per_month">%d пута месечно</string>
+    <string name="x_times_per_y_days">%d пута у %d дана</string>
     <string name="yes_or_no_short_example">нпр. вежбање</string>
     <string name="color">Боја</string>
     <string name="example_target">нпр. 15</string>
@@ -219,5 +218,4 @@
     <string name="activity_not_found">Нема апликације која подржава ову радњу</string>
     <string name="pref_midnight_delay_title">Продужите дан неколико сати иза поноћи</string>
     <string name="pref_midnight_delay_description">Чека до 03:00 да покаже нови дан. Корисно ако обично идете на спавање после поноћи. Захтева поновно покретање.</string>
-    <string name="x_times_per_y_days">%d пута у %d дана</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-sv-rSE/strings.xml b/uhabits-android/src/main/res/values-sv-rSE/strings.xml
index 856c5a719..26fb08024 100644
--- a/uhabits-android/src/main/res/values-sv-rSE/strings.xml
+++ b/uhabits-android/src/main/res/values-sv-rSE/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Fråga alltid</string>
     <string name="interval_custom">Anpassad...</string>
     <string name="pref_toggle_title">Växla med snabb tryckning</string>
-    <string name="pref_toggle_description">Markera genom att trycka snabbt istället för att hålla ner. Mer bekvämt, men kan orsaka oavsiktliga aktiveringar.</string>
     <string name="pref_rate_this_app">Betygsätt oss på Google Play</string>
     <string name="pref_send_feedback">Skicka feedback till utvecklarna</string>
     <string name="pref_view_source_code">Visa källkod på GitHub</string>
@@ -136,7 +135,7 @@
     <string name="generate_bug_report">Generera felrapport</string>
     <string name="troubleshooting">Felsökning</string>
     <string name="help_translate">Hjälp till att översätta appen</string>
-    <string name="night_mode" comment="dark_theme">Nattläge</string>
+    <string name="night_mode">Nattläge</string>
     <string name="use_pure_black">Använd svart färg i nattläge</string>
     <string name="pure_black_description">Ersätter gråa bakgrunder med svart färg i nattläge. Reducerar batterianvändningen för telefoner med AMOLED-skärm.</string>
     <string name="interface_preferences">Gränssnitt</string>
@@ -175,7 +174,6 @@
     <string name="by_status">Efter status</string>
     <string name="export">Exportera</string>
     <string name="long_press_to_edit">Tryck och håll ned för att ändra värdet</string>
-    <string name="change_value">Ändra värde</string>
     <string name="calendar">Kalender</string>
     <string name="unit">Enhet</string>
     <string name="example_question_boolean">t.ex. Tränade du idag?</string>
@@ -199,6 +197,7 @@
     <string name="measurable_example">t.ex. Hur många kilometer sprang du idag? Hur många sidor läste du?</string>
     <string name="x_times_per_week">%d gånger per vecka</string>
     <string name="x_times_per_month">%d gånger per månad</string>
+    <string name="x_times_per_y_days">%d gånger i %d dagar</string>
     <string name="yes_or_no_short_example">t.ex. Träna</string>
     <string name="color">Färg</string>
     <string name="example_target">t.ex. 15</string>
@@ -222,5 +221,4 @@
     <string name="activity_not_found">Ingen app som stödjer åtgärden hittades.</string>
     <string name="pref_midnight_delay_title">Förläng dagen några timmar efter midnatt</string>
     <string name="pref_midnight_delay_description">Vänta till 3:00 innan en ny dag visas. Användbart om du vanligtvis går och lägger dig efter midnatt. Kräver omstart av appen.</string>
-    <string name="x_times_per_y_days">%d gånger i %d dagar</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-ta-rIN/strings.xml b/uhabits-android/src/main/res/values-ta-rIN/strings.xml
index 2872e0d8a..3b1c16a18 100644
--- a/uhabits-android/src/main/res/values-ta-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-ta-rIN/strings.xml
@@ -57,7 +57,6 @@
     <string name="interval_24_hour">24 மணி நேரம்</string>
     <string name="interval_always_ask">எப்போதும் கேள்</string>
     <string name="pref_toggle_title">சிறிய அழுத்தலின் மூலம் தாவு</string>
-    <string name="pref_toggle_description">சரிப் பார்ப்பு குறி யை இட அழுத்தி பிடிப்பதற்கு பதில் ஒரு முறை தட்டலாம். இது முன்னதை விட எளிமையானது. ஆனால் இது தற்செயலான தாவல்களுக்கு வழி வகுக்கும்.</string>
     <string name="pref_rate_this_app">Google Play-ல் இந்த செயலியை மதிப்பிட</string>
     <string name="pref_send_feedback">இந்த செயலியை மேம்படுத்த உங்கள் கருத்துகளை பகிர</string>
     <string name="pref_view_source_code">இந்த செயலியின் மூல நிரலை GitHub வலைதளத்தில் பார்க்கவும்</string>
@@ -100,7 +99,7 @@
     <string name="generate_bug_report">பிழை அறிக்கை உருவாக்கு</string>
     <string name="troubleshooting">பழுது இடமறிதல்</string>
     <string name="help_translate">இந்த செயலியை மற்ற மொழிகளில் மொழிபெயர்க்க உதவி செய்யவும்</string>
-    <string name="night_mode" comment="dark_theme">இருள் வண்ண பாங்கு</string>
+    <string name="night_mode">இருள் வண்ண பாங்கு</string>
     <string name="use_pure_black">இருள் பாங்கில் முழு கருப்பு நிறத்தை பயண்படுத்து</string>
     <string name="pure_black_description">இதன் மூலம் செயலியில் உள்ள பழுப்பு பின்புலங்கள் நீக்கப்பட்டு முழுவதும் கருப்பு நிற பின்புலங்களாக மாற்றப்படும். இது AMOLED திரை கொண்ட கைப்பேசிகளில் மின்கல பயன்பாட்டை குறைக்கும்.</string>
     <string name="interface_preferences">இடைமுகம்</string>
diff --git a/uhabits-android/src/main/res/values-te-rIN/strings.xml b/uhabits-android/src/main/res/values-te-rIN/strings.xml
index 5784d3bf7..56acf23a0 100644
--- a/uhabits-android/src/main/res/values-te-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-te-rIN/strings.xml
@@ -18,7 +18,7 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="app_name">Loop Habit Tracker</string>
+    <string name="app_name">Datasheet </string>
     <string name="main_activity_title">అలవాట్లు</string>
     <string name="action_settings">సెట్టింగులు</string>
     <string name="edit">మార్చు</string>
diff --git a/uhabits-android/src/main/res/values-tr-rTR/strings.xml b/uhabits-android/src/main/res/values-tr-rTR/strings.xml
index 5e46fa24d..ac985b368 100644
--- a/uhabits-android/src/main/res/values-tr-rTR/strings.xml
+++ b/uhabits-android/src/main/res/values-tr-rTR/strings.xml
@@ -75,7 +75,6 @@
     <string name="interval_always_ask">Her zaman sor</string>
     <string name="interval_custom">Özel...</string>
     <string name="pref_toggle_title">Tek dokunuşla işaretle</string>
-    <string name="pref_toggle_description">Alışkanlıkları tek bir dokunuşla işaretle. Basılı tutarak işaretlmekten daha kolaydır ancak alışkanlıkların yanlışlıkla işaretlenmesine yol açabilir.</string>
     <string name="pref_rate_this_app">Google Play\'de uygulamayı oyla</string>
     <string name="pref_send_feedback">Geliştiriciye geri bildirim gönder</string>
     <string name="pref_view_source_code">Github\'da kaynak kodunu görüntüle</string>
@@ -127,7 +126,7 @@
     <string name="generate_bug_report">Hata raporu oluştur</string>
     <string name="troubleshooting">Sorun Giderme</string>
     <string name="help_translate">Bu uygulamanın çevirisinde yardım et</string>
-    <string name="night_mode" comment="dark_theme">Gece modu</string>
+    <string name="night_mode">Gece modu</string>
     <string name="use_pure_black">Gece modunda saf siyah kullan</string>
     <string name="pure_black_description">Gece modunda gri arkaplanı saf siyah ile değiştirir. AMOLED ekranlı cihazlarda pil kullanımını azaltır.</string>
     <string name="interface_preferences">Arayüz</string>
@@ -166,7 +165,6 @@
     <string name="by_status">Duruma göre</string>
     <string name="export">Dışarı aktar</string>
     <string name="long_press_to_edit">Değeri değiştirmek için basılı tut</string>
-    <string name="change_value">Değeri değiştir</string>
     <string name="calendar">Takvim</string>
     <string name="unit">Birim</string>
     <string name="example_question_boolean">örn: Bugün egzersiz yaptın mı?</string>
@@ -190,6 +188,7 @@
     <string name="measurable_example">örn: Bugün kaç km koştun? Bugün kaç sayfa kitap okudun?</string>
     <string name="x_times_per_week">Haftada %d kez</string>
     <string name="x_times_per_month">Ayda %d kez</string>
+    <string name="x_times_per_y_days">%d defa / %d gün</string>
     <string name="yes_or_no_short_example">örn: Egzersiz</string>
     <string name="color">Renk</string>
     <string name="example_target">örn: 15</string>
@@ -213,5 +212,4 @@
     <string name="activity_not_found">Bu işlemi gerçekleştirebilecek bir uygulama bulunamadı.</string>
     <string name="pref_midnight_delay_title">Yeni günü gece yarısından birkaç saat sonra başlat</string>
     <string name="pref_midnight_delay_description">Yeni gün saat 03:00\'ten sonra başlar. Geç saatlerde uyuyanlar için kullanışlıdır. Uygulamanın yeniden başlatılmasını gerektirir.</string>
-    <string name="x_times_per_y_days">%d defa / %d gün</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-uk-rUA/strings.xml b/uhabits-android/src/main/res/values-uk-rUA/strings.xml
index 8cd03746f..0b5865660 100644
--- a/uhabits-android/src/main/res/values-uk-rUA/strings.xml
+++ b/uhabits-android/src/main/res/values-uk-rUA/strings.xml
@@ -83,7 +83,6 @@
     <string name="interval_always_ask">Завжди запитувати</string>
     <string name="interval_custom">Налаштувати...</string>
     <string name="pref_toggle_title">Відзначати коротким натисканням</string>
-    <string name="pref_toggle_description">Ставити пташки коротким натисканням, замість утримування. Дещо зручніше, але може стати причиною випадкових натискань.</string>
     <string name="pref_rate_this_app">Оцінити цю програму в Google Play</string>
     <string name="pref_send_feedback">Надіслати відгук розробникові</string>
     <string name="pref_view_source_code">Подивитися вихідний код на GitHub</string>
@@ -148,7 +147,7 @@
     <string name="generate_bug_report">Створити звіт про помилку</string>
     <string name="troubleshooting">Усунення несправностей</string>
     <string name="help_translate">Допоможіть перекласти цю програму</string>
-    <string name="night_mode" comment="dark_theme">Нічний режим</string>
+    <string name="night_mode">Нічний режим</string>
     <string name="use_pure_black">Користати цілком чорне тло у нічному режимі</string>
     <string name="pure_black_description">Замінює сіре тло на цілком чорне у нічному режимі. Зменшує використання батареї в телефонах із дисплеєм AMOLED.</string>
     <string name="interface_preferences">Оболонка</string>
@@ -187,7 +186,7 @@
     <string name="by_status">За станом</string>
     <string name="export">Експортувати</string>
     <string name="long_press_to_edit">Натисніть і утримуйте, аби змінити значення</string>
-    <string name="change_value">Змінити значення</string>
+    <string name="value">Значення</string>
     <string name="calendar">Календар</string>
     <string name="unit">Одиниця</string>
     <string name="example_question_boolean">напр.: Ви робили сьогодні вправи?</string>
@@ -211,6 +210,7 @@
     <string name="measurable_example">напр.: Скільки кілометрів ви сьогодні пробігли? Скільки сторінок прочитали?</string>
     <string name="x_times_per_week">%d разів на тиждень</string>
     <string name="x_times_per_month">%d разів на місяць</string>
+    <string name="x_times_per_y_days">%d разів за %d днів</string>
     <string name="yes_or_no_short_example">напр., вправа</string>
     <string name="color">Колір</string>
     <string name="example_target">напр., 15</string>
@@ -234,5 +234,4 @@
     <string name="activity_not_found">Не знайдено програми для підтримки цієї дії</string>
     <string name="pref_midnight_delay_title">Продовжити день на кілька годин після опівночі</string>
     <string name="pref_midnight_delay_description">Почекати до 3:00 перед показом нового дня. Корисно, якщо ви зазвичай лягаєте спати після опівночі. Потрібно перезапустити програму.</string>
-    <string name="x_times_per_y_days">%d разів за %d днів</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-vi-rVN/strings.xml b/uhabits-android/src/main/res/values-vi-rVN/strings.xml
index 102191cc3..98d03b750 100644
--- a/uhabits-android/src/main/res/values-vi-rVN/strings.xml
+++ b/uhabits-android/src/main/res/values-vi-rVN/strings.xml
@@ -71,7 +71,7 @@
     <string name="interval_always_ask">Luôn hỏi</string>
     <string name="interval_custom">Tùy chỉnh...</string>
     <string name="pref_toggle_title">Bấm nhanh để chuyển trạng thái</string>
-    <string name="pref_toggle_description">Chỉ cần chạm một lần để đánh dấu thay cho việc nhấn giữ. Tiện lợi hơn nhưng có thể đánh dấu sai.</string>
+    <string name="pref_toggle_description_2">Đặt dấu kiểm bằng một lần nhấn thay vì nhấn và giữ.</string>
     <string name="pref_rate_this_app">Đánh giá ứng dụng trên Google Play</string>
     <string name="pref_send_feedback">Gửi phản hồi cho nhà phát triển</string>
     <string name="pref_view_source_code">Xem mã nguồn trên Github</string>
@@ -121,7 +121,7 @@
     <string name="generate_bug_report">Tạo báo cáo lỗi</string>
     <string name="troubleshooting">Xử lí sự cố</string>
     <string name="help_translate">Giúp dịch ứng dụng</string>
-    <string name="night_mode" comment="dark_theme">Chế độ ban đêm</string>
+    <string name="night_mode">Chế độ ban đêm</string>
     <string name="use_pure_black">Sử dụng màu đen thuần trong chế độ ban đêm</string>
     <string name="pure_black_description">Thay thế nền màu xám bởi màu đen thuần trong chế độ ban đêm. Giảm thiểu việc sử dụng pin của điện thoại có màn hình AMOLED.</string>
     <string name="interface_preferences">Giao diện</string>
@@ -141,6 +141,7 @@
     <string name="none">Không có</string>
     <string name="filter">Lọc</string>
     <string name="hide_completed">Ẩn mục đã hoàn thành</string>
+    <string name="hide_entered">Ẩn đã nhập</string>
     <string name="hide_archived">Ẩn mục đã lưu trữ</string>
     <string name="sticky_notifications">Gửi thông báo cố định</string>
     <string name="sticky_notifications_description">Không cho các thông báo bị vuốt ngang mất.</string>
@@ -160,9 +161,12 @@
     <string name="by_status">Theo trạng thái</string>
     <string name="export">Xuất dữ liệu ra</string>
     <string name="long_press_to_edit">Nhấn và giữ để thay đổi giá trị</string>
-    <string name="change_value">Thay đổi giá trị</string>
+    <string name="value">Giá trị</string>
     <string name="calendar">Lịch</string>
     <string name="unit">Đơn vị</string>
+    <string name="target_type">Loại mục tiêu</string>
+    <string name="target_type_at_least">Ít nhất</string>
+    <string name="target_type_at_most">Nhiều nhất</string>
     <string name="example_question_boolean">v.d. Hôm nay bạn đã tập thể dục chưa?</string>
     <string name="question">Câu hỏi</string>
     <string name="target">Mục tiêu</string>
@@ -184,6 +188,7 @@
     <string name="measurable_example">Ví dụ: Hôm nay bạn đã chạy bao nhiêu dặm? Bạn đã đọc bao nhiêu trang?</string>
     <string name="x_times_per_week">%d lần mỗi tuần</string>
     <string name="x_times_per_month">%d lần mỗi tháng</string>
+    <string name="x_times_per_y_days">%d lần trong %d ngày</string>
     <string name="yes_or_no_short_example">Ví dụ: Tập thể dục</string>
     <string name="color">Màu sắc</string>
     <string name="example_target">Ví dụ: 15</string>
@@ -207,5 +212,4 @@
     <string name="activity_not_found">Không tìm thấy ứng dụng nào để hỗ trợ hành động này</string>
     <string name="pref_midnight_delay_title">Kéo dài ngày thêm một vài giờ sau nửa đêm</string>
     <string name="pref_midnight_delay_description">Chờ đến 3:00 sáng để hiện một ngày mới. Rất hữu ích nếu bạn thường đi ngủ sau nửa đêm. Yêu cầu khởi động lại ứng dụng.</string>
-    <string name="x_times_per_y_days">%d lần trong %d ngày</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-zh-rCN/strings.xml b/uhabits-android/src/main/res/values-zh-rCN/strings.xml
index 589587d72..ec3ff280c 100644
--- a/uhabits-android/src/main/res/values-zh-rCN/strings.xml
+++ b/uhabits-android/src/main/res/values-zh-rCN/strings.xml
@@ -71,7 +71,7 @@
     <string name="interval_always_ask">总是询问</string>
     <string name="interval_custom">自定义</string>
     <string name="pref_toggle_title">短按切换</string>
-    <string name="pref_toggle_description">更加方便，但有可能造成意外记录</string>
+    <string name="pref_toggle_description_2">只需轻按一下即可放置复选标记，而不是按住。</string>
     <string name="pref_rate_this_app">去 Play 商店评价此应用</string>
     <string name="pref_send_feedback">发送反馈给开发者</string>
     <string name="pref_view_source_code">在 GitHub 上查看源代码</string>
@@ -121,7 +121,7 @@
     <string name="generate_bug_report">生成错误报告</string>
     <string name="troubleshooting">故障排除</string>
     <string name="help_translate">帮助翻译本应用</string>
-    <string name="night_mode" comment="dark_theme">深色主题</string>
+    <string name="night_mode">深色主题</string>
     <string name="use_pure_black">在深色主题中使用纯黑色</string>
     <string name="pure_black_description">以纯黑色背景代替深色主题中的灰色背景。
 这可以降低 AMOLED 屏幕手机的耗电量。</string>
@@ -142,6 +142,7 @@
     <string name="none">无</string>
     <string name="filter">筛选</string>
     <string name="hide_completed">隐藏已完成</string>
+    <string name="hide_entered">隐藏已输入</string>
     <string name="hide_archived">隐藏已存档</string>
     <string name="sticky_notifications">使通知持久</string>
     <string name="sticky_notifications_description">防止通知被滑掉。</string>
@@ -160,10 +161,13 @@
     <string name="by_score">按分数</string>
     <string name="by_status">按状态</string>
     <string name="export">导出</string>
-    <string name="long_press_to_edit">长按可更改值</string>
-    <string name="change_value">更改值</string>
+    <string name="long_press_to_edit">长按即可更改值</string>
+    <string name="value">值</string>
     <string name="calendar">日历</string>
     <string name="unit">单位</string>
+    <string name="target_type">目标类型</string>
+    <string name="target_type_at_least">至少</string>
+    <string name="target_type_at_most">至多</string>
     <string name="example_question_boolean">例如：你今天锻炼了吗？</string>
     <string name="question">问题</string>
     <string name="target">目标</string>
@@ -185,6 +189,7 @@
     <string name="measurable_example">例如：今天你跑了几公里？你读了几页书？</string>
     <string name="x_times_per_week">每周 %d 次</string>
     <string name="x_times_per_month">每月 %d 次</string>
+    <string name="x_times_per_y_days">每 %d 天 %d 次</string>
     <string name="yes_or_no_short_example">例如：锻炼</string>
     <string name="color">颜色</string>
     <string name="example_target">例如：15</string>
@@ -208,5 +213,4 @@
     <string name="activity_not_found">找不到支持此操作的应用</string>
     <string name="pref_midnight_delay_title">将一天延长到午夜后的几个小时</string>
     <string name="pref_midnight_delay_description">凌晨 3 点后再显示新的一天。如果你通常在午夜后入睡，这会很有用。重启应用后生效。</string>
-    <string name="x_times_per_y_days">%d 次每 %d 天</string>
 </resources>
diff --git a/uhabits-android/src/main/res/values-zh-rTW/strings.xml b/uhabits-android/src/main/res/values-zh-rTW/strings.xml
index f2e2d04c3..2d425ec82 100644
--- a/uhabits-android/src/main/res/values-zh-rTW/strings.xml
+++ b/uhabits-android/src/main/res/values-zh-rTW/strings.xml
@@ -71,7 +71,6 @@
     <string name="interval_always_ask">每次都詢問</string>
     <string name="interval_custom">自訂</string>
     <string name="pref_toggle_title">換成輕碰來記錄習慣</string>
-    <string name="pref_toggle_description">雖然更方便，但有可能變成不小心就點到</string>
     <string name="pref_rate_this_app">在 Google Play 上評價這個 App</string>
     <string name="pref_send_feedback">傳送改進意見給開發者</string>
     <string name="pref_view_source_code">在 GitHub 上查看原始碼</string>
@@ -125,7 +124,7 @@
     <string name="generate_bug_report">製作錯誤報告</string>
     <string name="troubleshooting">問題排除</string>
     <string name="help_translate">協助翻譯本程式</string>
-    <string name="night_mode" comment="dark_theme">夜間模式</string>
+    <string name="night_mode">夜間模式</string>
     <string name="use_pure_black">在夜間模式中使用深色設定</string>
     <string name="pure_black_description">在夜間模式中，使用黑色背景取代灰色背景。這樣可以減少 AMOLED 螢幕手機的電量消耗。</string>
     <string name="interface_preferences">介面</string>
@@ -164,7 +163,6 @@
     <string name="by_status">依據狀態</string>
     <string name="export">匯出</string>
     <string name="long_press_to_edit">持續按住來改換數值</string>
-    <string name="change_value">更改數值</string>
     <string name="calendar">日曆</string>
     <string name="unit">單位</string>
     <string name="example_question_boolean">例如：你今天運動了嗎？</string>
@@ -188,6 +186,7 @@
     <string name="measurable_example">例如：今天你跑了幾英哩？你讀了幾頁書？</string>
     <string name="x_times_per_week">每周 %d 次</string>
     <string name="x_times_per_month">每月 %d 次</string>
+    <string name="x_times_per_y_days">%d 次每 %d 日</string>
     <string name="yes_or_no_short_example">例如：運動</string>
     <string name="color">顏色</string>
     <string name="example_target">例如：15</string>
@@ -211,5 +210,4 @@
     <string name="activity_not_found">找不到可以處理這個動作的應用程式。</string>
     <string name="pref_midnight_delay_title">將一天延長到午夜過後幾個小時</string>
     <string name="pref_midnight_delay_description">凌晨3點後再顯示新的一天。如果你通常在午夜以後才睡，這能幫上忙。重新啟動後才生效。</string>
-    <string name="x_times_per_y_days">%d 次每 %d 日</string>
 </resources>