diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 352bb4735..9b4fc54f6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
   AndroidTest:
     needs: Build
     runs-on: macOS-10.15
-    timeout-minutes: 45
+    timeout-minutes: 60
     strategy:
       matrix:
         api: [
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2602177f..e87ad34a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.0.2] - 2021-05-23
+
+### Changed
+- Make checkmark widget resizable
+
+### Fixed
+- Fix crash caused by numerical habits with zero target (@iSoron, #903)
+- Fix small issues with font size (@iSoron)
+- Allow fractional target values (@sumanabhi, #911)
+- Fix IllegalStateException in androidx.customview.view (@iSoron, #906)
+- Fix crash when selecting habit frequency in some languages (@iSoron, #926)
+- Fix IllegalArgumentException in RingView (@iSoron, #904)
+
 ## [2.0.1] - 2021-05-09
 
 ### Added
diff --git a/build.sh b/build.sh
index da9194029..b865429de 100755
--- a/build.sh
+++ b/build.sh
@@ -133,6 +133,9 @@ android_test() {
             log_error "Some $size instrumented tests failed."
             log_error "Saving logcat: $OUT_LOGCAT..."
             $ADB logcat -d > $OUT_LOGCAT
+            log_error "Fetching test screenshots..."
+            $ADB pull /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots ${ANDROID_OUTPUTS_DIR}/
+            $ADB shell rm -r /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots/
             return 1
         fi
         log_info "$size tests passed."
@@ -198,13 +201,6 @@ android_build() {
     return 0
 }
 
-android_fetch_images() {
-    log_info "Fetching images"
-    rm -rf ${ANDROID_OUTPUTS_DIR}/test-screenshots
-    $ADB pull /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots ${ANDROID_OUTPUTS_DIR}/
-    $ADB shell rm -r /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots/
-}
-
 android_accept_images() {
     find ${ANDROID_OUTPUTS_DIR}/test-screenshots -name '*.expected*' -delete
     rsync -av ${ANDROID_OUTPUTS_DIR}/test-screenshots/ uhabits-android/src/androidTest/assets/
@@ -233,18 +229,14 @@ CI/CD script for Loop Habit Tracker.
 
 Usage:
     build.sh build [options]
-    build.sh clean [options]
     build.sh android-tests <API> [options]
     build.sh android-tests-parallel <API> <API>... [options]
-    build.sh android-fetch-images [options]
     build.sh android-accept-images [options]
 
 Commands:
     build                   Build the app and run small tests
-    clean                   Remove all build directories
     android-tests           Run medium and large Android tests on an emulator
     android-tests-parallel  Tests multiple API levels simultaneously
-    android-fetch-images    Fetch failed view test images from device
     android-accept-images   Copy fetched images to corresponding assets folder
 
 Options:
@@ -274,19 +266,17 @@ main() {
     case "$1" in
         build)
             shift; _parse_opts "$@"
+            clean
             core_build
             android_build
             ;;
-        clean)
-            clean
-            ;;
         android-tests)
             shift; _parse_opts "$@"
             if [ -z $1 ]; then
                 _print_usage
                 exit 1
             fi
-            for attempt in {1..3}; do
+            for attempt in {1..5}; do
                 log_info "Running Android tests (attempt $attempt)..."
                 android_test $1 && return 0
             done
@@ -297,9 +287,6 @@ main() {
             shift; _parse_opts "$@"
             android_test_parallel $*
             ;;
-        android-fetch-images)
-            android_fetch_images
-            ;;
         android-accept-images)
             android_accept_images
             ;;
diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index 4d05305d6..34438726c 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -37,8 +37,8 @@ android {
     compileSdkVersion(30)
 
     defaultConfig {
-        versionCode(20001)
-        versionName("2.0.1")
+        versionCode(20002)
+        versionName("2.0.2")
         minSdkVersion(23)
         targetSdkVersion(30)
         applicationId("org.isoron.uhabits")
diff --git a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png
index 42147c832..561cf25f8 100644
Binary files a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png and b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png
index 46ac8fd03..9548f9994 100644
Binary files a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png and b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png differ
diff --git a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png
index 68b695bca..5d29f56c8 100644
Binary files a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png and b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png differ
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt
index 37538e758..f3a842f04 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt
@@ -50,7 +50,7 @@ class CheckmarkWidgetViewTest : BaseViewTest() {
             name = habit.name
         }
         view.refresh()
-        measureView(view, dpToPixels(100), dpToPixels(200))
+        measureView(view, dpToPixels(100), dpToPixels(125))
     }
 
     @Test
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.kt
index 5f8a09395..41c5f5602 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.kt
@@ -41,7 +41,7 @@ class BundleSavedState : AbsSavedState {
     }
 
     companion object {
-        val CREATOR: Parcelable.Creator<BundleSavedState> =
+        @JvmField val CREATOR: Parcelable.Creator<BundleSavedState> =
             object : ClassLoaderCreator<BundleSavedState> {
                 override fun createFromParcel(
                     source: Parcel,
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt
index 8f552f50b..4a3b10679 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.kt
@@ -41,6 +41,7 @@ import org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome
 import org.isoron.uhabits.utils.InterfaceUtils.spToPixels
 import org.isoron.uhabits.utils.PaletteUtils.getAndroidTestColor
 import org.isoron.uhabits.utils.StyledResources
+import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToLong
 
@@ -48,7 +49,7 @@ class RingView : View {
     private var color: Int
     private var precision: Float
     private var percentage: Float
-    private var diameter = 0
+    private var diameter = 1
     private var thickness: Float
     private var rect: RectF? = null
     private var pRing: TextPaint? = null
@@ -169,7 +170,7 @@ class RingView : View {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
         val width = MeasureSpec.getSize(widthMeasureSpec)
         val height = MeasureSpec.getSize(heightMeasureSpec)
-        diameter = min(height, width)
+        diameter = max(1, min(height, width))
         pRing!!.textSize = textSize
         em = pRing!!.measureText("M")
         setMeasuredDimension(diameter, diameter)
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.kt
index b03c748c1..1d19cbedb 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/TargetChart.kt
@@ -117,7 +117,11 @@ class TargetChart : View {
         barRect[rect.left + stop + padding, rect.top + baseSize * 0.05f, rect.right - padding] =
             rect.bottom - baseSize * 0.05f
         canvas.drawRoundRect(barRect, round, round, paint!!)
-        var percentage = (values[row] / targets[row]).toFloat()
+        var percentage = if (targets[row] > 0) {
+            (values[row] / targets[row]).toFloat()
+        } else {
+            1.0f
+        }
         percentage = min(1.0f, percentage)
 
         // Draw completed box
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
index 913449df1..8fa15a8f0 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt
@@ -153,7 +153,7 @@ class CheckmarkButtonView(
                 paint.style = Paint.Style.FILL
             }
 
-            paint.textSize = when (value) {
+            paint.textSize = when (id) {
                 UNKNOWN -> dim(R.dimen.smallerTextSize)
                 else -> dim(R.dimen.smallTextSize)
             }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
index db37cb273..1799b39c3 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.kt
@@ -120,14 +120,7 @@ class CheckmarkWidgetView : HabitWidgetView {
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         val width = MeasureSpec.getSize(widthMeasureSpec)
         val height = MeasureSpec.getSize(heightMeasureSpec)
-        var w = width.toFloat()
-        var h = width * 1.25f
-        val scale = min(width / w, height / h)
-        w *= scale
-        h *= scale
-        val newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(w.toInt(), MeasureSpec.EXACTLY)
-        val newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(h.toInt(), MeasureSpec.EXACTLY)
-        var textSize = 0.15f * h
+        var textSize = 0.15f * height
         val maxTextSize = getDimension(context, R.dimen.smallerTextSize)
         textSize = min(textSize, maxTextSize)
         label.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
@@ -137,7 +130,7 @@ class CheckmarkWidgetView : HabitWidgetView {
             ring.setTextSize(textSize)
         }
         ring.setThickness(0.15f * textSize)
-        super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec)
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
     }
 
     private fun init() {
diff --git a/uhabits-android/src/main/play/listings/de-rDE/full-description.txt b/uhabits-android/src/main/play/listings/de-rDE/full-description.txt
index 56eb25d16..d3705a7a8 100644
--- a/uhabits-android/src/main/play/listings/de-rDE/full-description.txt
+++ b/uhabits-android/src/main/play/listings/de-rDE/full-description.txt
@@ -1,4 +1,4 @@
-Loop Habit Tracker hilft dir dabei, positive Gewohnheiten in dein Leben zu integrieren und sie dauerhaft zu verfolgen. Detaillierte Diagramme und Statistiken geben Aufschluss darüber, wie sich die Gewohnheiten über die Zeit verändern und verbessern. Die App ist werbefrei, open source und respektiert die Privatsphäre.
+Loop Habit Tracker hilft dir dabei gute Gewohnheiten zu erlangen und sie ein Leben lang zu pflegen. Detaillierte Diagramme und Statistiken geben Aufschluss darüber, wie sich die Gewohnheiten über die Zeit verändern und verbessern. Die App ist werbefrei, open source und respektiert die Privatsphäre.
 
 <b>Schöne, minimalistisch und übersichtliche Benutzeroberfläche</b>
 Loop hat eine elegante und minimalistische Benutzeroberfläche, die selbst für Erstnutzer eine einfache Verwendung möglich macht. Dank vieler Geschwindigkeitsoptimierungen funktioniert die App auch auf älteren Geräten einwandfrei.
diff --git a/uhabits-android/src/main/play/listings/de-rDE/short-description.txt b/uhabits-android/src/main/play/listings/de-rDE/short-description.txt
index de6c251de..229fed76b 100644
--- a/uhabits-android/src/main/play/listings/de-rDE/short-description.txt
+++ b/uhabits-android/src/main/play/listings/de-rDE/short-description.txt
@@ -1 +1 @@
-Erstelle gute Gewohnheiten und verfolge ihren Fortschritt (ohne Werbung)
+Erlange gute Gewohnheiten und verfolge dessen Fortschritte (ohne Werbung)
diff --git a/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt b/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt
index c5ee5b657..413cca2f2 100644
--- a/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt
+++ b/uhabits-android/src/main/play/listings/ru-rRU/full-description.txt
@@ -1,9 +1,9 @@
 Трекер привычек Loop помогает вам создавать и поддерживать долгосрочные позитивные привычки в своей жизни. Подробные графики и статистика дадут вам чёткое представление о том, как ваши привычки улучшились с течением времени. Приложение полностью без рекламы, с открытым исходным кодом и с уважением к вашей конфиденциальности.
 
 <b>Красивый, минималистичный и лёгкий интерфейс</b>
-У Loop изящный и минималистичный интерфейс, который очень прост в использовании даже для начинающих пользователей. Высокооптимизированное для скорости, приложение хорошо работает даже на старых телефонах.
+У Loop изящный и минималистичный интерфейс, который очень прост в использовании даже для начинающих пользователей. Оптимизированное по скорости приложение хорошо работает даже на старых телефонах.
 
-<b>Показатель привычек</b>
+<b>Показатель устойчивости привычки</b>
 У Loop есть продвинутая формула для расчёта силы ваших привычек. Каждое повторение делает вашу привычку сильнее, а каждый пропущенный день - слабее. Однако несколько пропущенных дней после долгой полосы не погубят ваш прогресс в отличие от многих других приложений типа "не разрывай цепь".
 
 <b>Гибкий график</b>
diff --git a/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt b/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt
index 19e5087dc..a67e3d034 100644
--- a/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt
+++ b/uhabits-android/src/main/play/listings/zh-rCN/full-description.txt
@@ -1,4 +1,4 @@
-Loop 习惯记录（以下简称“Loop”）可以帮助您建立好习惯且随着时间记录你的进步。 详细的图表和统计数据，可以使您更清楚地看到自己的进步。 该应用是完全无广告的开源软件，并且它尊重您的隐私。
+Loop 习惯记录（以下简称“Loop”）可以帮助您建立好习惯且随着时间记录你的进步。 详细的图表和统计数据，可以使您更清楚地看到自己的进步。 这是一个完全无广告的开源应用，它尊重您的隐私。
 
 <b>优雅、简约、轻巧</b>
 Loop 具有优雅而简约的界面，即使对于初次使用的用户，也非常易于使用。 该应用针对速度进行了高度优化，即使在较旧的手机上也可以正常运行。
@@ -12,7 +12,7 @@ Loop 有高级的公式来计算您习惯的强度。 多多重复会使你的
 <b>提醒</b>
 设定通知以提醒您完成习惯。 每一种习惯都有属于自己的通知，您可以选定当天的某个时间提醒该习惯。 同时从通知中轻松地检查或取消您的习惯。
 
-<b>小部件</b>
+<b>微件</b>
 当您解锁手机时， 多彩的小部件可让您直接从主屏幕记录自己的习惯，而无需打开应用程序。
 
 <b>掌控您的数据</b>
@@ -22,7 +22,7 @@ Loop 有高级的公式来计算您习惯的强度。 多多重复会使你的
 想记录多少习惯都没问题！ Loop 对您的习惯没有任何限制， 所有用户均可使用所有功能， 并且没有应用内购买。
 
 <b>完全无广告的开源软件</b>
-此应用程序中永远没有任何广告，烦人的通知或侵入性权限， 应用程序是完全开源的，完整的代码在GPLv3。
+本应用永远都不会有广告和烦人的通知，也不会索取侵入性权限。 本应用是完全开源的（GPLv3）。
 
 <b>脱机工作并尊重您的隐私</b>
 Loop 不需要网络连接或在线帐户注册。 您的用户数据永远不会发送给任何人， 包括开发人员和任何第三方都无法访问它。
diff --git a/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt b/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt
index 70ff5eff1..8df04da02 100644
--- a/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt
+++ b/uhabits-android/src/main/play/listings/zh-rCN/short-description.txt
@@ -1 +1 @@
-建立好习惯且随着时间记录你的进步（无广告）
+养成好习惯且随着时间记录你的进步（无广告）
diff --git a/uhabits-android/src/main/play/release-notes/en-US/default.txt b/uhabits-android/src/main/play/release-notes/en-US/default.txt
index 6aaae23bc..70bb26533 100644
--- a/uhabits-android/src/main/play/release-notes/en-US/default.txt
+++ b/uhabits-android/src/main/play/release-notes/en-US/default.txt
@@ -1,3 +1,5 @@
+2.0.2:
+* Bug fixes
 2.0:
 * Track numeric habits (e.g. how many pages did you read?)
 * Skip days without breaking your streak
diff --git a/uhabits-android/src/main/res/layout/activity_edit_habit.xml b/uhabits-android/src/main/res/layout/activity_edit_habit.xml
index 94af404e7..b3a33c373 100644
--- a/uhabits-android/src/main/res/layout/activity_edit_habit.xml
+++ b/uhabits-android/src/main/res/layout/activity_edit_habit.xml
@@ -185,7 +185,7 @@
                             style="@style/FormInput"
                             android:id="@+id/targetInput"
                             android:maxLines="1"
-                            android:inputType="number"
+                            android:inputType="numberDecimal"
                             android:hint="@string/example_target"/>
                     </LinearLayout>
                 </FrameLayout>
@@ -248,4 +248,4 @@
         </LinearLayout>
     </ScrollView>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/uhabits-android/src/main/res/values-af-rZA/strings.xml b/uhabits-android/src/main/res/values-af-rZA/strings.xml
index c84d8b77a..90c8a1697 100644
--- a/uhabits-android/src/main/res/values-af-rZA/strings.xml
+++ b/uhabits-android/src/main/res/values-af-rZA/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop - Gewoonte Boekhouer</string>
     <string name="main_activity_title">Gewoontes</string>
     <string name="action_settings">Instellings</string>
@@ -30,12 +28,7 @@
     <string name="add_habit">Voeg gewoonte by</string>
     <string name="color_picker_default_title">Verander kleur</string>
     <string name="toast_habit_created">Gewoonte geskep</string>
-    <string name="toast_habit_deleted">Gewoontes verwyder</string>
-    <string name="toast_habit_changed">Gewoonte verander</string>
-    <string name="toast_habit_archived">Gewoontes geargiveer</string>
-    <string name="toast_habit_unarchived">Gewoontes gedeargiveer</string>
     <string name="overview">Oorsig</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Welkom</string>
     <string name="interval_15_minutes">15 minute</string>
     <string name="interval_30_minutes">30 minute</string>
@@ -45,6 +38,4 @@
     <string name="interval_8_hour">8 ure</string>
     <string name="interval_24_hour">24 ure</string>
     <string name="settings">Instellings</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
 </resources>
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 c42d558d7..530f1c3d5 100644
--- a/uhabits-android/src/main/res/values-ar-rSA/strings.xml
+++ b/uhabits-android/src/main/res/values-ar-rSA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">عادات</string>
     <string name="action_settings">إعدادات</string>
@@ -28,19 +28,15 @@
     <string name="add_habit">إضافة عادة</string>
     <string name="color_picker_default_title">تغيير اللون</string>
     <string name="toast_habit_created">تم إنشاء عادة</string>
-    <string name="toast_habit_deleted">تم حذف العادات</string>
-    <string name="toast_habit_changed">تم تغيير عادة</string>
-    <string name="toast_habit_archived">تم أرشفه العادات   </string>
-    <string name="toast_habit_unarchived">تم الغاء ارشفه العادات   </string>
     <string name="overview">نظرة عامة</string>
     <string name="habit_strength">قوة العادة</string>
     <string name="history">السجل</string>
     <string name="clear">إزالة</string>
-    <string name="days">أيام</string>
     <string name="reminder">تذكير</string>
     <string name="save">حفظ</string>
     <string name="streaks">الإنجازات   </string>
     <string name="no_habits_found"> لا يوجد لديك عادات مفعله</string>
+    <string name="no_habits_left_to_do">لقد أنهيت ألعمل لليوم</string>
     <string name="long_press_to_toggle">إلمس و إستمر لتحقق أو ازل.   </string>
     <string name="reminder_off">إيقاف</string>
     <string name="create_habit">انشاء العادة</string>
@@ -64,20 +60,16 @@
     <string name="interval_custom">مخصص...   </string>
     <string name="pref_toggle_title">تبديل وضعية العادة بضغطة قصيرة   </string>
     <string name="pref_toggle_description">وضع علامات الاختيار الموجودة بنقرة واحدة بدلاً من الصحافة وعقد. أكثر ملاءمة، ولكن قد يتسبب في تبديل عرضي.   </string>
-    <string name="pref_snooze_interval_title">فترتي الغفوى على التذكير   </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="name">اسم  </string>
     <string name="settings">إعدادات</string>
-    <string name="snooze_interval">فترتي الغفوه   </string>
     <string name="select_snooze_delay">حدد تأخير الغفوة   </string>
     <string name="hint_title">هل كنت تعلم؟  </string>
     <string name="hint_drag">لإعادة ترتيب القوائم، أضغط اسم من هذه العادة، ثم اسحبه إلى المكان الصحيح.   </string>
     <string name="hint_landscape">يمكنك ان ترى المزيد أيام عن طريق وضع الهاتف في وضع أفقي.   </string>
-    <string name="delete_habits">حذف عادات   </string>
-    <string name="delete_habits_message">سيتم حذف عادات بشكل دائم. هذا العمل لا يمكن التراجع عنه.   </string>
     <string name="habit_not_found">العادة حذفت/لم يتم العثور عليها   </string>
     <string name="weekends">عطلة نهاية الأسبوع  </string>
     <string name="any_weekday">أيام الأسبوع. </string>
@@ -111,7 +103,7 @@
     <string name="generate_bug_report">توليد تقرير الاعطال. </string>
     <string name="troubleshooting">استكشاف الأخطاء وإصلاحها. </string>
     <string name="help_translate">المساعدة في ترجمة هذا البرنامج. </string>
-    <string name="night_mode">الوضع الليلي. </string>
+    <string name="night_mode" comment="dark_theme">الوضع الليلي. </string>
     <string name="use_pure_black">استخدام أسود نقي في الوضع الليلي. </string>
     <string name="pure_black_description">يستبدل خلفيات رمادية مع أسود نقي في الوضع الليلي. يقلل من استهلاك البطارية في الهواتف مع شاشة AMOLED. .</string>
     <string name="interface_preferences">السطح البيني. </string>
@@ -147,6 +139,7 @@
     <string name="by_name">حسب الإسم </string>
     <string name="by_color">حسب اللون </string>
     <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>
@@ -170,16 +163,25 @@
     <string name="example_notes">(اختياري)</string>
     <string name="yes_or_no_example">مثلا: هل استيقظت باكرا اليوم؟ هل مارست الرياضة؟ هل لعبت الشطرنج؟</string>
     <string name="measurable">قابل للقياس</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">مثلا: كم كيلومتراً قطعته اليوم؟ كم صفحة قرأتها؟ كم عدد السعرات الحرارية التي أكلتها؟</string>
+    <string name="measurable_example">مثال، كم ميلاً قطعته اليوم؟ كم عدد الصفحات التي قرأتها؟</string>
     <string name="x_times_per_week">%d مرة في الأسبوع</string>
     <string name="x_times_per_month">%d مرة في الشهر</string>
     <string name="yes_or_no_short_example">مثال: التمرين</string>
     <string name="color">اللون</string>
     <string name="example_target">مثال: 15</string>
     <string name="measurable_short_example">مثلا: الجري</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">مثلا: كم كيلومترًا جريته اليوم؟</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">مثلا: كيلومترات</string>
+    <string name="measurable_question_example">مثلا: كم كيلومترًا جريته اليوم؟</string>
+    <string name="measurable_units_example">مثلا: كيلومترات</string>
     <string name="every_month">كل شهر</string>
     <string name="validation_cannot_be_blank">لا يمكن أن يكون الإسم فارغًا</string>
     <string name="today">اليوم</string>
+    <string name="enter">ادخل</string>
+    <string name="no_habits">لا توجد عادات</string>
+    <string name="no_numerical_habits">لا توجد عادات قابلة للقياس</string>
+    <string name="no_boolean_habits">لا توجد عادات تجاوب بنعم أو لا</string>
+    <string name="increment">زيادة</string>
+    <string name="decrement">إنقاص</string>
+    <string name="pref_skip_title">تمكين أيام التخطي</string>
+    <string name="pref_skip_description">بدّل مرتين لإضافة تخطي بدلاً من علامة اختيار. التخطيات تحافظ على درجاتك دون تغيير أو خسارة سلسلة الانتصارات.</string>
+    <string name="pref_unknown_title">إظهار علامات الاستفهام للبيانات المفقودة</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 c3019dc28..50010bb83 100644
--- a/uhabits-android/src/main/res/values-bg-rBG/strings.xml
+++ b/uhabits-android/src/main/res/values-bg-rBG/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Следене на навици</string>
     <string name="main_activity_title">Навици</string>
     <string name="action_settings">Настройки</string>
@@ -30,16 +28,10 @@
     <string name="add_habit">Добавяне на навик</string>
     <string name="color_picker_default_title">Промяна на цвят</string>
     <string name="toast_habit_created">Навикът е създаден</string>
-    <string name="toast_habit_deleted">Навиците са изтрити</string>
-    <string name="toast_habit_changed">Навикът е променен</string>
-    <string name="toast_habit_archived">Навиците са архивирани</string>
-    <string name="toast_habit_unarchived">Навиците са разархивирани</string>
     <string name="overview">Обзор</string>
     <string name="habit_strength">Сила на навика</string>
     <string name="history">История</string>
     <string name="clear">Изчистване</string>
-    <string name="times_every">пъти в период от</string>
-    <string name="days">дни</string>
     <string name="reminder">Напомняне</string>
     <string name="save">Запазване</string>
     <string name="streaks">Поредици</string>
@@ -50,7 +42,6 @@
     <string name="edit_habit">Редактиране на навик</string>
     <string name="check">Поставяне на отметка</string>
     <string name="snooze">По-късно</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Добре дошли</string>
     <string name="intro_description_1">Loop Следене на навици ви помага да създавате и поддържате добри навици.</string>
     <string name="intro_title_2">Създайте нови навици</string>
@@ -75,8 +66,6 @@
     <string name="hint_title">Знаете ли че?</string>
     <string name="hint_drag">За да пренаредите записите, натиснете и задръжте върху името на навика и го придърпайте до правилното място.</string>
     <string name="hint_landscape">Може да виждате повече дни като обърнете телефона си в хоризонтално положение.</string>
-    <string name="delete_habits">Изтриване на навици</string>
-    <string name="delete_habits_message">Навиците ще се изтрият перманентно. Това действие не може да бъде отменено.</string>
     <string name="habit_not_found">Навикът е изтрит / не е намерен</string>
     <string name="weekends">Събота и неделя</string>
     <string name="any_weekday">От понеделник до петък</string>
@@ -110,7 +99,7 @@
     <string name="generate_bug_report">Генериране на доклад за грешки</string>
     <string name="troubleshooting">Отстраняване на проблеми</string>
     <string name="help_translate">Помагане за превода на това приложение</string>
-    <string name="night_mode">Нощен режим</string>
+    <string name="night_mode" comment="dark_theme">Нощен режим</string>
     <string name="use_pure_black">Използване на чисто черно при нощен режим</string>
     <string name="pure_black_description">Заменя сивите фонове с чисто черни при нощен режим. Намаля разхода на батерията при телефони с AMOLED дисплеи.</string>
     <string name="interface_preferences">Интерфейс</string>
@@ -122,8 +111,6 @@
     <string name="quarter">Тримесечие</string>
     <string name="year">Година</string>
     <string name="total">Общо</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
     <string name="every_x_days">На всеки %d дни</string>
     <string name="every_x_weeks">На всеки %d седмици</string>
     <string name="score">Сила</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 b91390b53..512d544d5 100644
--- a/uhabits-android/src/main/res/values-ca-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-ca-rES/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop - Hàbit Rastrejador</string>
     <string name="main_activity_title">Hàbits</string>
     <string name="action_settings">Configuració</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Afegir hàbit</string>
     <string name="color_picker_default_title">Canviar color</string>
     <string name="toast_habit_created">Hàbit creat.</string>
-    <string name="toast_habit_deleted">Hàbits esborrats.</string>
-    <string name="toast_habit_changed">Hàbit modificat.</string>
-    <string name="toast_habit_archived">Hàbits arxivats.</string>
-    <string name="toast_habit_unarchived">Hàbits trets de l\'arxiu.</string>
     <string name="overview">Visió general</string>
     <string name="habit_strength">Fortalesa de l\'hàbit</string>
     <string name="history">Història</string>
     <string name="clear">Netejar</string>
-    <string name="days">dies</string>
     <string name="reminder">Recordatori</string>
     <string name="save">Desar</string>
     <string name="streaks">Ratxa</string>
@@ -64,20 +59,16 @@
     <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_snooze_interval_title">Interval d\'endarreriment en recordatoris</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>
     <string name="links">Enllaços</string>
     <string name="name">Nom</string>
     <string name="settings">Ajustaments</string>
-    <string name="snooze_interval">Interval d\'endarreriment</string>
     <string name="select_snooze_delay">Selecciona el retard de l\'endarreriment</string>
     <string name="hint_title">Ho sabies?</string>
     <string name="hint_drag">Per a ordenar les entrades, prem i mantè sobre el nom de l\'hàbit, després arrossega\'l al lloc correcte.</string>
     <string name="hint_landscape">Pots veure més dies posant el teu telèfon en orientació apaisada.</string>
-    <string name="delete_habits">Esborrar hàbits</string>
-    <string name="delete_habits_message">Els hàbits seran esborrats permanentment. Aquesta acció no es pot desfer.</string>
     <string name="habit_not_found">Hàbit suprimit / no trobat</string>
     <string name="weekends">Caps de setmana</string>
     <string name="any_weekday">Dilluns a divendres</string>
@@ -111,7 +102,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">Mode nocturn</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -170,15 +161,14 @@
     <string name="example_notes">Opcional</string>
     <string name="yes_or_no_example">Per exemple, us heu despertat aviat? Heu fet exercici? Heu jugat a escacs?</string>
     <string name="measurable">Mesurable</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">Per exemple, quants quilòmetres heu recorregut avui? Quantes pàgines heu llegit? Quantes calories heu menjat?</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="yes_or_no_short_example">Ex. Exercici</string>
     <string name="color">Color</string>
     <string name="example_target">ex. 15</string>
     <string name="measurable_short_example">Per exemple: córrer</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">Per exemple, quants quilòmetres heu recorregut avui?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">per exemple, quilòmetres</string>
+    <string name="measurable_question_example">Per exemple, quants quilòmetres heu recorregut avui?</string>
+    <string name="measurable_units_example">per exemple, quilòmetres</string>
     <string name="every_month">Cada mes</string>
     <string name="validation_cannot_be_blank">No es pot deixar en blanc</string>
     <string name="today">Avui</string>
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 d30d49a3f..2dda93958 100644
--- a/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
+++ b/uhabits-android/src/main/res/values-cs-rCZ/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">Zvyky</string>
     <string name="action_settings">Nastavení</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Přidat zvyk</string>
     <string name="color_picker_default_title">Změnit barvu</string>
     <string name="toast_habit_created">Zvyk vytvořen.</string>
-    <string name="toast_habit_deleted">Zvyky smazány.</string>
-    <string name="toast_habit_changed">Zvyk změněn.</string>
-    <string name="toast_habit_archived">Archivováno.</string>
-    <string name="toast_habit_unarchived">Zvyky obnoveny.</string>
     <string name="overview">Přehled</string>
     <string name="habit_strength">Síla zvyku</string>
     <string name="history">Historie</string>
     <string name="clear">Smazat</string>
-    <string name="days">dní</string>
     <string name="reminder">Připomenutí</string>
     <string name="save">Uložit</string>
     <string name="streaks">Série</string>
@@ -64,20 +59,16 @@
     <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_snooze_interval_title">Doba odložení upomínky</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>
     <string name="links">Odkazy</string>
     <string name="name">Jméno</string>
     <string name="settings">Nastavení</string>
-    <string name="snooze_interval">Interval odkladu</string>
     <string name="select_snooze_delay">Nastavit délku odložení</string>
     <string name="hint_title">Věděli jste?</string>
     <string name="hint_drag">Přeřazení záznamů proveď stisknutím a podržením názvu zvyku a poté přesunutím na správné místo.</string>
     <string name="hint_landscape">Můžeš vidět více dnů otočením telefonu na šířku.</string>
-    <string name="delete_habits">Smazat zvyky</string>
-    <string name="delete_habits_message">Označené zvyky budou navždy odstraněny. Toto nelze vzít zpět.</string>
     <string name="habit_not_found">Zvyk smazán / nenalezen</string>
     <string name="weekends">Víkendy</string>
     <string name="any_weekday">Pondělí až pátek</string>
@@ -111,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">Noční téma</string>
+    <string name="night_mode" comment="dark_theme">Noční téma</string>
     <string name="use_pure_black">Zobrazit čistě černou v nočním tématu</string>
     <string name="pure_black_description">Nahradí šedé pozadí čistou černou v nočním tématu. Snižuje spotřebu baterie v telefonech s AMOLED displejem.</string>
     <string name="interface_preferences">Rozhraní</string>
@@ -170,15 +161,14 @@
     <string name="example_notes">(nepovinné)</string>
     <string name="yes_or_no_example">např. Vzbudil ses dnes brzy? Cvičil jsi dnes? Hrál jsi šachy?</string>
     <string name="measurable">Měřitelný</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">např. Kolik kilometrů jsi dnes uběhl? Kolik stránek jsi přečetl? Kolik kalorií jsi snědl?</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="yes_or_no_short_example">např. Cvičení</string>
     <string name="color">Barva</string>
     <string name="example_target">např. 15</string>
     <string name="measurable_short_example">např. Běh</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">Např. kolik mil jste dnes uběhl?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">např. míle</string>
+    <string name="measurable_question_example">Např. kolik mil jste dnes uběhl?</string>
+    <string name="measurable_units_example">např. míle</string>
     <string name="every_month">Každý měsíc</string>
     <string name="validation_cannot_be_blank">Musíte vyplnit</string>
     <string name="today">Dnes</string>
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 c59eae038..779054665 100644
--- a/uhabits-android/src/main/res/values-da-rDK/strings.xml
+++ b/uhabits-android/src/main/res/values-da-rDK/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Vane Tracker</string>
     <string name="main_activity_title">Vaner</string>
     <string name="action_settings">Indstillinger</string>
@@ -30,27 +28,37 @@
     <string name="add_habit">Tilføj vane</string>
     <string name="color_picker_default_title">Skift farve</string>
     <string name="toast_habit_created">Vanen er skabt.</string>
-    <string name="toast_habit_deleted">Vaner slettet</string>
-    <string name="toast_habit_changed">Vanen er ændret</string>
-    <string name="toast_habit_archived">Vanerne er arkiveret</string>
-    <string name="toast_habit_unarchived">Vanerne er fjernet fra arkivet</string>
+    <plurals name="toast_habits_changed">
+        <item quantity="one">Vanen er ændret</item>
+        <item quantity="other">Vanerne er ændret</item>
+    </plurals>
+    <plurals name="toast_habits_deleted">
+        <item quantity="one">Vanen er slettet</item>
+        <item quantity="other">Vanerne er slettet</item>
+    </plurals>
+    <plurals name="toast_habits_archived">
+        <item quantity="one">Vanen er arkiveret</item>
+        <item quantity="other">Vanerne er arkiveret</item>
+    </plurals>
+    <plurals name="toast_habits_unarchived">
+        <item quantity="one">Vane taget ud fra arkiv</item>
+        <item quantity="other">Vaner taget ud fra arkiv</item>
+    </plurals>
     <string name="overview">Overblik</string>
     <string name="habit_strength">Vanestyrke</string>
     <string name="history">Historie</string>
     <string name="clear">Ryd</string>
-    <string name="times_every">gange på</string>
-    <string name="days">dage</string>
     <string name="reminder">Påmindelse</string>
     <string name="save">Gem</string>
     <string name="streaks">Streaks</string>
     <string name="no_habits_found">Du har ingen aktive vaner</string>
+    <string name="no_habits_left_to_do">Du har klaret alt for i dag!</string>
     <string name="long_press_to_toggle">Tryk og hold nede for at afkrydse</string>
     <string name="reminder_off">Fra</string>
     <string name="create_habit">Opret vane</string>
     <string name="edit_habit">Rediger vane</string>
     <string name="check">Afkryds</string>
     <string name="snooze">Senere</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Velkommen</string>
     <string name="intro_description_1">Loop Habit Tracker hjælper dig med at holde gode vaner.</string>
     <string name="intro_title_2">Skab nogle nye vaner</string>
@@ -64,6 +72,8 @@
     <string name="interval_4_hour">4 timer</string>
     <string name="interval_8_hour">8 timer</string>
     <string name="interval_24_hour">24 timer</string>
+    <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>
@@ -72,11 +82,18 @@
     <string name="links">Henvisninger</string>
     <string name="name">Navn</string>
     <string name="settings">Indstillinger</string>
+    <string name="select_snooze_delay">Vælg snooze-forsinkelse</string>
     <string name="hint_title">Vidste du?</string>
     <string name="hint_drag">For at omarrangere poster, tryk og hold på navnet på den vane, og træk den til det korrekte sted.</string>
     <string name="hint_landscape">Du kan se flere dage ved at sætte telefonen i liggende tilstand.</string>
-    <string name="delete_habits">Slet vaner</string>
-    <string name="delete_habits_message">Vanerne vil blive slettet permanent. Denne handling kan ikke fortrydes.</string>
+    <plurals name="delete_habits_title">
+        <item quantity="one">Slet vane?</item>
+        <item quantity="other">Slet vaner?</item>
+    </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="one">Vanen vil blive slettet permanent. Denne handling kan ikke fortrydes.</item>
+        <item quantity="other">Vanerne vil blive slettet permanent. Denne handling kan ikke fortrydes.</item>
+    </plurals>
     <string name="habit_not_found">Vane slettet / ikke fundet</string>
     <string name="weekends">Weekender</string>
     <string name="any_weekday">Mandag til Fredag</string>
@@ -87,13 +104,22 @@
     <string name="clear_label">Fjern</string>
     <string name="select_hours">Vælg timer</string>
     <string name="select_minutes">Vælg minutter</string>
+    <string-array name="hints">
+        <item>hints</item>
+        <item>hints</item>
+    </string-array>
     <string name="about">Om</string>
     <string name="translators">Oversættere</string>
     <string name="developers">Udviklere</string>
     <string name="version_n">Version %s</string>
     <string name="frequency">Hyppighed</string>
     <string name="checkmark">Afkrydsning</string>
-    <string name="best_streaks">Bedste striber</string>
+    <string name="checkmark_stack_widget" formatted="false">Afkryds stakkontrol</string>
+    <string name="frequency_stack_widget" formatted="false">Frekvens stakkontrol</string>
+    <string name="score_stack_widget" formatted="false">Score stakkontrol</string>
+    <string name="history_stack_widget" formatted="false">Historik stakkontrol</string>
+    <string name="streaks_stack_widget" formatted="false">Uafbrudt række stakkontrol</string>
+    <string name="best_streaks">Bedste streak</string>
     <string name="every_day">Hver dag</string>
     <string name="every_week">Hver uge</string>
     <string name="help">Hjælp &amp; FAQ</string>
@@ -110,7 +136,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">Nat-tilstand</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -122,8 +148,7 @@
     <string name="quarter">Kvartal</string>
     <string name="year">År</string>
     <string name="total">I alt</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="yes_or_no">Ja eller nej</string>
     <string name="every_x_days">Hver %d dage</string>
     <string name="every_x_weeks">Hver %d uger</string>
     <string name="score">Point</string>
@@ -134,6 +159,8 @@
     <string name="hide_archived">Skjul arkiverede</string>
     <string name="sticky_notifications">Fastgør notifikationer</string>
     <string name="sticky_notifications_description">Forhindrer notifikationer i at blive swipet væk.</string>
+    <string name="led_notifications">Notifikationslys</string>
+    <string name="led_notifications_description">Viser et blinkende lys til påmindelser. Kun tilgængelig i telefoner med LED-notifikationslyskilder.</string>
     <string name="repair_database">Reparer database</string>
     <string name="database_repaired">Database repareret.</string>
     <string name="uncheck">Fjern afkrydsning</string>
@@ -145,5 +172,54 @@
     <string name="by_name">Efter navn</string>
     <string name="by_color">Efter farve</string>
     <string name="by_score">Efter score</string>
+    <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>
+    <string name="question">Spørgsmål</string>
+    <string name="target">Mål</string>
+    <string name="yes">Ja</string>
+    <string name="no">Nej</string>
+    <string name="customize_notification_summary">Skift lyd-, vibrations-, lys- og andre notifikationsindstillinger</string>
+    <string name="customize_notification">Tilpas notifikationer</string>
+    <string name="pref_view_privacy">Se privatlivspolitik</string>
+    <string name="view_all_contributors">Se alle bidragsydere&#8230;</string>
+    <string name="database">Database</string>
+    <string name="widget_opacity_title">Gennemsigtighed af widget</string>
+    <string name="widget_opacity_description">Gør widgets mere gennemsigtige eller mere uigennemsigtige på din startskærm.</string>
+    <string name="first_day_of_the_week">Første dag i ugen</string>
+    <string name="default_reminder_question">Har du fuldført denne vane i dag?</string>
+    <string name="notes">Noter</string>
+    <string name="example_notes">(Valgfrit)</string>
+    <string name="yes_or_no_example">F.eks. vågnede du tidligt i dag? Har du motioneret? Spillede du skak?</string>
+    <string name="measurable">Målbar</string>
+    <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="yes_or_no_short_example">f.eks. Motion</string>
+    <string name="color">Farve</string>
+    <string name="example_target">f.eks. 15</string>
+    <string name="measurable_short_example">f.eks. Løb</string>
+    <string name="measurable_question_example">F.eks. Hvor mange kilometer har du løbet i dag?</string>
+    <string name="measurable_units_example">f.eks. kilometer</string>
+    <string name="every_month">Hver måned</string>
+    <string name="validation_cannot_be_blank">skal udfyldes</string>
+    <string name="today">I dag</string>
+    <string name="enter">Angiv</string>
+    <string name="no_habits">Ingen vaner fundet</string>
+    <string name="no_numerical_habits">Ingen målbare vaner fundet</string>
+    <string name="no_boolean_habits">Ingen ja-eller-nej vaner fundet</string>
+    <string name="increment">Forøgelse</string>
+    <string name="decrement">Formindskelse</string>
+    <string name="pref_skip_title">Slå overspring af dage til</string>
+    <string name="pref_skip_description">Skift to gange for at tilføje et overspring i stedet for et flueben. Spring over holder din score uændret og bryder ikke din række.</string>
+    <string name="pref_unknown_title">Vis spørgsmålstegn for manglende data</string>
+    <string name="pref_unknown_description">Differentiér dage uden data fra faktiske udeladelser. For at indtaste en udeladelse, skiftes to gange.</string>
+    <string name="you_are_now_a_developer">Du er nu udvikler</string>
+    <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>
 </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 d78a16617..aa21bfd11 100644
--- a/uhabits-android/src/main/res/values-de-rDE/strings.xml
+++ b/uhabits-android/src/main/res/values-de-rDE/strings.xml
@@ -99,7 +99,7 @@
     <string name="any_weekday">Montag bis Freitag</string>
     <string name="any_day">Jeden Tag</string>
     <string name="select_weekdays">Tage auswählen</string>
-    <string name="export_to_csv">Daten als CSV exportieren</string>
+    <string name="export_to_csv">Exportiere als CSV</string>
     <string name="done_label">Fertig</string>
     <string name="clear_label">Löschen</string>
     <string name="select_hours">Stunden auswählen</string>
@@ -118,18 +118,18 @@
     <string name="could_not_import">Fehler beim Importieren der Daten.</string>
     <string name="file_not_recognized">Datei nicht erkannt.</string>
     <string name="habits_imported">Gewohnheiten erfolgreich importiert.</string>
-    <string name="import_data">Importiere Daten</string>
+    <string name="import_data">Daten importieren</string>
     <string name="export_full_backup">Exportiere vollständige Sicherung</string>
-    <string name="import_data_summary">Unterstützt vollständige Sicherungen dieser App, sowie von Tickmate, HabitBull und Rewire erzeugte Sicherungen. Siehe FAQ für weitere Informationen.</string>
+    <string name="import_data_summary">Unterstützt vollständige Sicherungen dieser App, als auch von Tickmate, HabitBull und Rewire. Siehe FAQ für weitere Informationen.</string>
     <string name="export_as_csv_summary">Erstellt Dateien, die von Tabellenkalkulationsprogrammen wie Microsoft Excel oder LibreOffice Calc geöffnet werden können. Diese Dateien können nicht wieder importiert werden.</string>
     <string name="export_full_backup_summary">Erstellt eine Datei, die alle deine Daten enthält. Diese Datei kann wieder importiert werden.</string>
     <string name="bug_report_failed">Fehler beim Erstellen eines Fehlerberichts.</string>
     <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">Nachtmodus</string>
+    <string name="night_mode" comment="dark_theme">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 ein reines Schwarz. Reduziert den Stromverbrauch von Smartphones mit einem AMOLED Display.</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>
     <string name="reverse_days">Kehre die Tagesreihenfolge um</string>
     <string name="reverse_days_description">Zeigt die Tage im Hauptfenster in umgekehrter Reihenfolge an.</string>
@@ -211,6 +211,6 @@
     <string name="pref_unknown_description">Tage ohne Daten von tatsächlichen Lücken unterscheiden. Um eine Lücke einzutragen zweimal markieren.</string>
     <string name="you_are_now_a_developer">Du bist nun ein Entwickler</string>
     <string name="activity_not_found">Für diese Aktion wurde keine App gefunden.</string>
-    <string name="pref_midnight_delay_title">Den Tag um ein paar Stunden nach Mitternacht verlängern</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>
 </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 7e324667a..8bd41559e 100644
--- a/uhabits-android/src/main/res/values-el-rGR/strings.xml
+++ b/uhabits-android/src/main/res/values-el-rGR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop - Καταγραφή Συνηθειών</string>
     <string name="main_activity_title">Συνήθειες</string>
     <string name="action_settings">Ρυθμίσεις</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Νέα συνήθεια</string>
     <string name="color_picker_default_title">Αλλαγή χρώματος</string>
     <string name="toast_habit_created">Η συνήθεια δημιουργήθηκε</string>
-    <string name="toast_habit_deleted">Οι συνήθειες διαγράφηκαν</string>
-    <string name="toast_habit_changed">Η συνήθεια άλλαξε</string>
-    <string name="toast_habit_archived">Η συνήθεια αρχειοθετήθηκε.</string>
-    <string name="toast_habit_unarchived">Έγινε αφαίρεση αρχειοθέτησης.</string>
     <string name="overview">Επισκόπηση</string>
     <string name="habit_strength">Δύναμη συνήθειας</string>
     <string name="history">Ιστορικό</string>
     <string name="clear">Εκκαθάριση</string>
-    <string name="days">ημέρες</string>
     <string name="reminder">Υπενθύμιση</string>
     <string name="save">Αποθήκευση</string>
     <string name="streaks">Σερί</string>
@@ -64,20 +59,16 @@
     <string name="interval_custom">Προσαρμογή</string>
     <string name="pref_toggle_title">Κάντε εναλλαγή των επαναλήψεων με σύντομο πάτημα</string>
     <string name="pref_toggle_description">Βολικότερο, αλλά ίσως προκαλέσει ακούσιες εναλλαγές.</string>
-    <string name="pref_snooze_interval_title">Διάστημα αναβολής υπενθυμίσεων</string>
     <string name="pref_rate_this_app">Βαθμολογήστε αυτή την εφαρμογή στο Google Play</string>
     <string name="pref_send_feedback">Στείλετε σχόλια</string>
     <string name="pref_view_source_code">Δείτε τον πηγαίο κώδικα στο GitHub</string>
     <string name="links">Σύνδεσμοι</string>
     <string name="name">Όνομα</string>
     <string name="settings">Ρυθμίσεις</string>
-    <string name="snooze_interval">Διάστημα αναβολής</string>
     <string name="select_snooze_delay">Επιλογή καθυστέρησης αναβολής</string>
     <string name="hint_title">Γνωρίζατε;</string>
     <string name="hint_drag">Αναδιατάξετε τις συνήθειες πατώντας παρατεταμένα στο όνομα και σύροντας στην σωστή θέση.</string>
     <string name="hint_landscape">Μπορείτε να δείτε περισσότερες ημέρες στην οριζόντια προβολή.</string>
-    <string name="delete_habits">Διαγραφή συνηθειών</string>
-    <string name="delete_habits_message">Οι συνήθειες θα διαγραφτούν οριστικά. Αυτό δεν μπορεί να αναιρεθεί.</string>
     <string name="habit_not_found">Η συνήθεια διαγράφηκε / δεν βρέθηκε</string>
     <string name="weekends">Σαββατοκύριακα</string>
     <string name="any_weekday">Δευτέρα μέχρι Παρασκευή</string>
@@ -111,7 +102,7 @@
     <string name="generate_bug_report">Παραγωγή αναφοράς bug.</string>
     <string name="troubleshooting">Αντιμετ.Προβλημάτων</string>
     <string name="help_translate">Βοηθήστε στην μετάφραση</string>
-    <string name="night_mode">Νυχτ.Λειτ.</string>
+    <string name="night_mode" comment="dark_theme">Νυχτ.Λειτ.</string>
     <string name="use_pure_black">Χρήση απόλυτου μαύρου στη νυχτ.λειτουργία</string>
     <string name="pure_black_description">Αντικαθιστά τα γκρί υπόβαθρα με απόλυτα μαύρα σε νυχτ.λειτουργία. Μειώνει την κατανάλωση μπαταρίας σε συσκευές με οθόνη AMOLED.</string>
     <string name="interface_preferences">Διεπιφάνεια</string>
@@ -170,15 +161,14 @@
     <string name="example_notes">(Προαιρετικό)</string>
     <string name="yes_or_no_example">π.χ. Ξύπνησες νωρίς σήμερα; Ασκήθηκες; Έπαιξες σκάκι;</string>
     <string name="measurable">Μετρήσιμο</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">π.χ. Πόσα χιλιόμετρα έτρεξες Πόσες σελίδες διάβασες; Πόσες θερμίδες έφαγες;</string>
     <string name="x_times_per_week">%d φορές την εβδομάδα</string>
     <string name="x_times_per_month">%d φορές το μήνα</string>
     <string name="yes_or_no_short_example">π.χ. Σωματική άσκηση</string>
     <string name="color">Χρώμα</string>
     <string name="example_target">π.χ. 15</string>
     <string name="measurable_short_example">π.χ. Τρέξιμο</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">π.χ. Πόσα χιλιόμετρα έτρεξες σήμερα?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">π.χ. χιλιόμετρα</string>
+    <string name="measurable_question_example">π.χ. Πόσα χιλιόμετρα έτρεξες σήμερα?</string>
+    <string name="measurable_units_example">π.χ. χιλιόμετρα</string>
     <string name="every_month">Κάθε μήνα</string>
     <string name="validation_cannot_be_blank">Δεν μπορεί να είναι κενό</string>
     <string name="today">Σήμερα</string>
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 081b4f1ad..780529432 100644
--- a/uhabits-android/src/main/res/values-eo-rUY/strings.xml
+++ b/uhabits-android/src/main/res/values-eo-rUY/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">Kutimoj</string>
     <string name="action_settings">Agordoj</string>
@@ -29,27 +27,56 @@
     <string name="unarchive">Elarĥivigi</string>
     <string name="add_habit">Aldonu kutimon</string>
     <string name="color_picker_default_title">Ŝanĝi koloron</string>
-    <string name="toast_habit_changed">Kutimo ŝanĝita</string>
-    <string name="toast_habit_archived">Kutimo arĥivita</string>
+    <string name="toast_habit_created">Kutimo kreita</string>
+    <string name="overview">Generala vidado</string>
     <string name="habit_strength">Kutimo forteco</string>
-    <string name="days">tagoj</string>
+    <string name="history">Historio</string>
+    <string name="clear">Liberigi</string>
     <string name="reminder">Memorigaĵoj</string>
     <string name="save">Konservi</string>
     <string name="streaks">Strioj</string>
+    <string name="no_habits_found">Vi ne havas aktivajn kutimojn</string>
+    <string name="long_press_to_toggle">Premu kaj tenu por kontroli aŭ malmarki</string>
     <string name="reminder_off">Neaktiva</string>
+    <string name="create_habit">Krei kutimon</string>
+    <string name="edit_habit">Eldoni kutimon</string>
+    <string name="check">Kontrolu</string>
     <string name="snooze">Poste</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Bonvenon</string>
+    <string name="intro_description_1">Loop Habit Tracker helpas vin krei kaj konservi bonajn kutimojn.</string>
+    <string name="intro_title_2">Krei kelkajn novajn kutimojn</string>
+    <string name="intro_description_2">Ĉiutage, post plenumi vian kutimon, metu markostampon en la app.</string>
+    <string name="intro_title_4">Por atenti vian progreson:</string>
+    <string name="intro_description_4">Detalaj grafikaĵoj montras al vi kiel viaj kutimoj pliboniĝis kun la tempo.</string>
     <string name="interval_15_minutes">15 minutoj</string>
     <string name="interval_30_minutes">30 minutoj</string>
+    <string name="interval_1_hour">1 horo</string>
+    <string name="interval_2_hour">2 horoj</string>
+    <string name="interval_4_hour">4 horoj</string>
+    <string name="interval_8_hour">4 horoj</string>
+    <string name="interval_24_hour">24 horoj</string>
+    <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>
+    <string name="links">Ligilo</string>
+    <string name="name">Nomo</string>
     <string name="settings">Agordoj</string>
-    <string name="delete_habits">Forigi kutimojn</string>
+    <string name="select_snooze_delay">Elektu dormetigas prokrasti</string>
+    <string name="hint_title">Ĉu vi sciis?</string>
+    <string name="hint_drag">Por reordigi la enskribojn, premi kaj tenu la nomon de la kutimo, poste trenu ĝin al la ĝusta loko.</string>
+    <string name="hint_landscape">Vi povas vidi pliajn tagojn enmetante vian telefonon en pejzaĝa reĝimo.</string>
+    <string name="habit_not_found">Kutimo forigita / ne trovita</string>
     <string name="weekends">Semajnfinoj</string>
     <string name="any_weekday">Lundo al vendredo</string>
     <string name="any_day">Io semajntago</string>
     <string name="select_weekdays">Elekti tagojn</string>
     <string name="export_to_csv">Eksporti kiel CSV</string>
     <string name="done_label">Farite</string>
+    <string name="clear_label">Liberigi</string>
     <string name="select_hours">Elekti horojn</string>
     <string name="select_minutes">Elekti minutojn</string>
     <string name="about">Pri programo</string>
@@ -57,29 +84,73 @@
     <string name="developers">Evoluigantoj</string>
     <string name="version_n">Versio %s</string>
     <string name="frequency">Frekvenco</string>
+    <string name="checkmark">Markobutono</string>
+    <string name="best_streaks">Plej bonaj strioj</string>
     <string name="every_day">Ĉiu tago</string>
     <string name="every_week">Ĉiu semajno</string>
     <string name="help">Helpo &amp; Ofte Demandite</string>
+    <string name="could_not_export">Malsukcesis eksporti datumojn.</string>
+    <string name="could_not_import">Malsukcesis importi datumojn.</string>
     <string name="file_not_recognized">Dosiero ne rekonita.</string>
+    <string name="habits_imported">Kutimoj importitaj sukcese.</string>
+    <string name="import_data">Importi datumojn</string>
+    <string name="export_full_backup">Eksporti plenan sekurkopion</string>
+    <string name="import_data_summary">Elportas plenajn sekurkopiojn eksportitajn de ĉi tiu aplikaĵo, same kiel dosierojn generitajn de Tickmate, HabitBull aŭ Rewire. Vidu DPO por pliaj informoj.</string>
+    <string name="export_as_csv_summary">Generas dosierojn, kiujn oni povas malfermi per kalkultabelaj programoj kiel Microsoft Excel aŭ OpenOffice Calc. Ĉi tiu dosiero ne povas esti importita reen.</string>
+    <string name="export_full_backup_summary">Generas dosieron, kiu enhavas ĉiujn viajn datumojn. Ĉi tiu dosiero povas esti importita reen.</string>
+    <string name="bug_report_failed">Malsukcesis generi raporton pri eraroj.</string>
+    <string name="generate_bug_report">Generu raporton pri eraroj</string>
     <string name="troubleshooting">Problemserĉado</string>
-    <string name="night_mode">Nokta reĝimo</string>
+    <string name="help_translate">Helpu traduki ĉi tiun aplikon</string>
+    <string name="night_mode" comment="dark_theme">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>
+    <string name="reverse_days">Reversa ordo de tagoj</string>
+    <string name="reverse_days_description">Montri tagojn en inversa ordo sur la ĉefa ekrano.</string>
     <string name="day">Tago</string>
     <string name="week">Semajno</string>
     <string name="month">Monato</string>
     <string name="quarter">Jarkvarono</string>
     <string name="year">Jaro</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="total">Totalo</string>
+    <string name="yes_or_no">Jes aŭ ne</string>
+    <string name="every_x_days">Ĉiujn %d tagojn</string>
+    <string name="every_x_weeks">Ĉiuj %d semajnoj</string>
+    <string name="score">Poentaroj</string>
+    <string name="reminder_sound">rememor-sonorilo</string>
     <string name="none">Nenio</string>
     <string name="filter">Filtrilo</string>
     <string name="hide_completed">Kaŝi kompletajn</string>
     <string name="hide_archived">Kaŝi arĥivitajn</string>
+    <string name="sticky_notifications">Faru sciigojn gluaj</string>
+    <string name="sticky_notifications_description">Malhelpas, ke sciigoj estu forglititaj.</string>
+    <string name="led_notifications">Atentiga lumo</string>
+    <string name="led_notifications_description">Montras palpebrumantan lumon por memorigiloj. Nur havebla en telefonoj kun LED-sciigaj lumoj.</string>
     <string name="repair_database">Ripari datumbazon</string>
     <string name="database_repaired">Datumbazon riparita.</string>
+    <string name="uncheck">Malmarku</string>
+    <string name="toggle">Ŝalti</string>
     <string name="action">Ago</string>
     <string name="habit">Kutimo</string>
     <string name="sort">Enkursigi</string>
+    <string name="manually">Mane</string>
     <string name="by_name">Laŭ nomo</string>
     <string name="by_color">Laŭ koloro</string>
+    <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>
+    <string name="question">Demando</string>
+    <string name="target">Celo</string>
+    <string name="yes">Jes</string>
+    <string name="no">Ne</string>
+    <string name="customize_notification_summary">Ŝanĝu sonon, vibron, lumon kaj aliajn sciigajn agordojn</string>
+    <string name="customize_notification">Adaptitaj sciigoj</string>
+    <string name="pref_view_privacy">Vidu privatecan politikon</string>
+    <string name="view_all_contributors">Rigardi ĉiujn kontribuantojn&#8230;</string>
+    <string name="database">Datumbazo</string>
 </resources>
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 c65099808..bda1b680e 100644
--- a/uhabits-android/src/main/res/values-es-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-es-rES/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Analizador de Hábitos</string>
     <string name="main_activity_title">Hábitos</string>
     <string name="action_settings">Configuración</string>
@@ -28,19 +28,23 @@
     <string name="add_habit">Agregar hábito</string>
     <string name="color_picker_default_title">Cambiar color</string>
     <string name="toast_habit_created">Hábito creado</string>
-    <string name="toast_habit_deleted">Hábitos eliminados</string>
-    <string name="toast_habit_changed">Hábito cambiado</string>
-    <string name="toast_habit_archived">Hábitos archivados</string>
-    <string name="toast_habit_unarchived">Hábitos desarchivados</string>
+    <plurals name="toast_habits_deleted">
+        <item quantity="one">Español</item>
+        <item quantity="other">Spanish</item>
+    </plurals>
+    <plurals name="toast_habits_unarchived">
+        <item quantity="one">Hábito desarchivado</item>
+        <item quantity="other">Hábitos desarchivados</item>
+    </plurals>
     <string name="overview">Resumen</string>
     <string name="habit_strength">Fuerza del hábito</string>
     <string name="history">Historial</string>
     <string name="clear">Borrar</string>
-    <string name="days">días</string>
     <string name="reminder">Recordatorio</string>
     <string name="save">Guardar</string>
     <string name="streaks">Rachas</string>
     <string name="no_habits_found">No tienes hábitos activos</string>
+    <string name="no_habits_left_to_do">¡Ya terminaste todo por hoy!</string>
     <string name="long_press_to_toggle">Mantener apretado para marcar o desmarcar</string>
     <string name="reminder_off">Apagado</string>
     <string name="create_habit">Crear hábito</string>
@@ -64,20 +68,24 @@
     <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_snooze_interval_title">Tiempo de espera al aplazar recordatorios</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>
     <string name="links">Enlaces</string>
     <string name="name">Nombre</string>
     <string name="settings">Configuración</string>
-    <string name="snooze_interval">Intervalo de espera</string>
     <string name="select_snooze_delay">Seleccione el retardo de la interrupción</string>
     <string name="hint_title">¿Sabías qué?</string>
     <string name="hint_drag">Para reordenar las entradas, mantén la pulsado sobre el nombre del hábito, después arrástralo a su posición correcta.</string>
     <string name="hint_landscape">Puedes ver más días al poner tu teléfono en modo horizontal.</string>
-    <string name="delete_habits">Eliminar Hábitos</string>
-    <string name="delete_habits_message">Los hábitos serán eliminados permanentemente. Esta acción no se puede deshacer.</string>
+    <plurals name="delete_habits_title">
+        <item quantity="one">¿Eliminar hábito?</item>
+        <item quantity="other">¿Eliminar hábitos?</item>
+    </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="one">El hábito se eliminará permanentemente. Esta acción no se puede deshacer.</item>
+        <item quantity="other">Los hábitos se eliminarán permanentemente. Esta acción no se puede deshacer.</item>
+    </plurals>
     <string name="habit_not_found">Hábito eliminado / no encontrado</string>
     <string name="weekends">Fines de semana</string>
     <string name="any_weekday">De lunes a viernes</string>
@@ -111,7 +119,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">Modo nocturno</string>
+    <string name="night_mode" comment="dark_theme">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 +155,7 @@
     <string name="by_name">Por nombre</string>
     <string name="by_color">Por color</string>
     <string name="by_score">Por puntuación</string>
+    <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>
@@ -170,16 +179,30 @@
     <string name="example_notes">(Opcional)</string>
     <string name="yes_or_no_example">por ejemplo, ¿te despertaste temprano hoy? ¿Hiciste ejercicio? ¿Jugaste al ajedrez?</string>
     <string name="measurable">Medible</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">por ejemplo, ¿cuántos quilómetros has corrido hoy? ¿Cuántas páginas has leído? ¿Cuántas calorías has comido?</string>
+    <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="yes_or_no_short_example">ej. Ejercicio</string>
     <string name="color">Color</string>
     <string name="example_target">ej. 15</string>
     <string name="measurable_short_example">por ejemplo, correr</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">ej. ¿Cuántos quilómetros has corrido hoy?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">ej. millas</string>
+    <string name="measurable_question_example">ej. ¿Cuántos quilómetros has corrido hoy?</string>
+    <string name="measurable_units_example">ej. millas</string>
     <string name="every_month">Cada mes</string>
     <string name="validation_cannot_be_blank">No puede estar en blanco</string>
     <string name="today">Hoy</string>
+    <string name="enter">Introducir</string>
+    <string name="no_habits">No se encontraron hábitos</string>
+    <string name="no_numerical_habits">No se encontraron hábitos medibles</string>
+    <string name="no_boolean_habits">No se encontraron hábitos de sí o no</string>
+    <string name="increment">Incrementar</string>
+    <string name="decrement">Decrementar</string>
+    <string name="pref_skip_title">Habilitar días libres</string>
+    <string name="pref_skip_description">Alternar dos veces para agregar un salto en lugar de una marca de verificación. Los saltos mantienen su puntaje sin cambios y no rompen su racha.</string>
+    <string name="pref_unknown_title">Mostrar interrogantes para datos faltantes</string>
+    <string name="pref_unknown_description">Diferenciar los días sin datos de los lapsos reales. Para ingresar un lapso, alternar dos veces.</string>
+    <string name="you_are_now_a_developer">Ahora eres desarrollador</string>
+    <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>
 </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 fc92b5725..cdffcab40 100644
--- a/uhabits-android/src/main/res/values-eu-rES/strings.xml
+++ b/uhabits-android/src/main/res/values-eu-rES/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">Ohiturak</string>
     <string name="action_settings">Ezarpenak</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Gehitu ohitura</string>
     <string name="color_picker_default_title">Kolorea aldatu</string>
     <string name="toast_habit_created">Ohitura sortu da</string>
-    <string name="toast_habit_deleted">Ohiturak ezabatu dira</string>
-    <string name="toast_habit_changed">Ohitura aldatu egin da</string>
-    <string name="toast_habit_archived">Ohiturak artxibatu dira</string>
-    <string name="toast_habit_unarchived">Ohiturak desartxibatu dira</string>
     <string name="overview">Ikuspegi orokorra</string>
     <string name="habit_strength">Ohituraren indarra</string>
     <string name="history">Historia</string>
     <string name="clear">Garbitu</string>
-    <string name="days">egunetan</string>
     <string name="reminder">Oroigarria</string>
     <string name="save">Gorde</string>
     <string name="streaks">Boladak</string>
@@ -64,20 +59,16 @@
     <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_snooze_interval_title">Atzeratze tartea oroigarrietan</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>
     <string name="links">Loturak</string>
     <string name="name">Izena</string>
     <string name="settings">Ezarpenak</string>
-    <string name="snooze_interval">Atzeratze tartea</string>
     <string name="select_snooze_delay">Aukeratu atzerapen denbora</string>
     <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>
-    <string name="delete_habits">Ohiturak ezabatu</string>
-    <string name="delete_habits_message">Ohiturak betirako ezabatuko dira. Ekintza hau ezin da desegin.</string>
     <string name="habit_not_found">Ohitura ezabatua / ez aurkitua</string>
     <string name="weekends">Asteburuak</string>
     <string name="any_weekday">Astelehenetik ostiralera</string>
@@ -111,7 +102,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">Azal iluna</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -170,15 +161,14 @@
     <string name="example_notes">(Aukerazkoa)</string>
     <string name="yes_or_no_example">adib. Gaur goiz esnatu zara? Ariketa fisikoa egin al duzu? Xakean jolastu al duzu?</string>
     <string name="measurable">Neurgarria</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">adib. Zenbat kilometro egin dituzu korrika gaur? Zenbat orrialde irakurri dituzu? Zenbat kaloria jan dituzu?</string>
     <string name="x_times_per_week">Astean %d aldiz</string>
     <string name="x_times_per_month">Hilean %d aldiz</string>
     <string name="yes_or_no_short_example">adib. Ariketa</string>
     <string name="color">Kolorea</string>
     <string name="example_target">adib. 15</string>
     <string name="measurable_short_example">adib. Korrika egin</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">adib. Zenbat kilometro egin dituzu korrika gaur?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">adib. Kilometroak</string>
+    <string name="measurable_question_example">adib. Zenbat kilometro egin dituzu korrika gaur?</string>
+    <string name="measurable_units_example">adib. Kilometroak</string>
     <string name="every_month">Hilabetero</string>
     <string name="validation_cannot_be_blank">Ezin da hutsik egon</string>
     <string name="today">Gaur</string>
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 635c6f5b9..1d6149503 100644
--- a/uhabits-android/src/main/res/values-fa-rIR/strings.xml
+++ b/uhabits-android/src/main/res/values-fa-rIR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">عادت‌ها</string>
     <string name="action_settings">تنظیمات</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">افزودن عادت</string>
     <string name="color_picker_default_title">تغییر رنگ</string>
     <string name="toast_habit_created">عادت ایجاد شد</string>
-    <string name="toast_habit_deleted">عادت حذف شد</string>
-    <string name="toast_habit_changed">عادت تغییر کرد.</string>
-    <string name="toast_habit_archived">عادت‌ها بایگانی شدند</string>
-    <string name="toast_habit_unarchived">عادت‌ها از بایگانی خارج شدند</string>
     <string name="overview">مرور</string>
     <string name="habit_strength">قدرت عادت</string>
     <string name="history">تاریخچه </string>
     <string name="clear">پاک کردن</string>
-    <string name="days">روز ها</string>
     <string name="reminder">یادآور</string>
     <string name="save">ذخیره</string>
     <string name="streaks">روزهای پیوسته</string>
@@ -64,20 +59,16 @@
     <string name="interval_custom">سفارشی سازی </string>
     <string name="pref_toggle_title">با اشاره‌ی کوتاه‌مدت وضعیت عادت را تغییر بده</string>
     <string name="pref_toggle_description">تیک زدن با تک‌ضربه در مقابل ضربه‌زدن و نگه‌داشتن راحت‌تر است ولی ممکن است باعث شود اشتباهی عادتی را تیک بزنید. </string>
-    <string name="pref_snooze_interval_title">بازه به تعویق انداختن یادآورها </string>
     <string name="pref_rate_this_app">به این برنامه در گوگل‌پلی امتیاز بدهید </string>
     <string name="pref_send_feedback">ارسال بازخورد به توسعه‌دهنده</string>
     <string name="pref_view_source_code">دیدن منبع برنامه در گیت‌هاب </string>
     <string name="links">لینک‌ها</string>
     <string name="name">نام</string>
     <string name="settings">تنظیمات</string>
-    <string name="snooze_interval">بازه به تعویق انداختن </string>
     <string name="select_snooze_delay">تأخیر تعویق را انتخاب کنید </string>
     <string name="hint_title">آیا می دانستید؟ </string>
     <string name="hint_drag">برای جابجایی عناوین، انگشتتان را روی نام عادت مورد نظر بگذارید و نگه دارید، سپس آن را به محل صحیح بکشید. </string>
     <string name="hint_landscape">با قرار دادن گوشی در حالت افقی می‌توانید روزهای بیشتری را ببینید. </string>
-    <string name="delete_habits">حذف عادت‌ها </string>
-    <string name="delete_habits_message">عادت‌ها برای همیشه حذف خواهد شد. این عمل قابل بازگشت نیست. </string>
     <string name="habit_not_found">عادت حذف شده/ پیدا نشد </string>
     <string name="weekends">آخر هفته‌ها </string>
     <string name="any_weekday">دوشنبه تا جمعه </string>
@@ -111,7 +102,7 @@
     <string name="generate_bug_report">ایجاد گزارش مشکلات</string>
     <string name="troubleshooting">ایرادیابی</string>
     <string name="help_translate">کمک برای ترجمه این برنامه</string>
-    <string name="night_mode">حالت شب</string>
+    <string name="night_mode" comment="dark_theme">حالت شب</string>
     <string name="use_pure_black">استفاده از رنگ سیاه خالص در حالت شبانه</string>
     <string name="pure_black_description">جایگزینی پس زمینه خاکستری با سیاه خالص در حالت شب. استفاده از باتری در گوشی‌های با صفحه نمایش AMOLED را کاهش می‌دهد.</string>
     <string name="interface_preferences">رابط کاربری</string>
@@ -170,15 +161,14 @@
     <string name="example_notes">(اختیاری)</string>
     <string name="yes_or_no_example">آیا امروز زود بیدار شدید؟ ورزش کردی؟ شطرنج بازی کردی؟</string>
     <string name="measurable">قابل اندازه گیری</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">امروز چند مایل را طی کردید؟ چند صفحه خواندید؟ چند کالری خوردید؟</string>
     <string name="x_times_per_week">%d بار در هفته</string>
     <string name="x_times_per_month">%d بار در ماه</string>
     <string name="yes_or_no_short_example">مثلاً ورزش کنید</string>
     <string name="color">رنگ</string>
     <string name="example_target">مثلاً 15</string>
     <string name="measurable_short_example">مثلاً اجرا کنید</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">امروز چند مایل را طی کردید؟</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">مایل ها</string>
+    <string name="measurable_question_example">امروز چند مایل را طی کردید؟</string>
+    <string name="measurable_units_example">مایل ها</string>
     <string name="every_month">هر ماه</string>
     <string name="validation_cannot_be_blank">نمیتواند خالی باشد</string>
     <string name="today">امروز</string>
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 9186ddad3..df75a879d 100644
--- a/uhabits-android/src/main/res/values-fi-rFI/strings.xml
+++ b/uhabits-android/src/main/res/values-fi-rFI/strings.xml
@@ -17,28 +17,21 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">Rutiinit</string>
     <string name="action_settings">Asetukset</string>
     <string name="edit">Muokkaa</string>
     <string name="delete">Poista</string>
     <string name="archive">Arkistoi</string>
+    <string name="unarchive">Kumoa arkistointi</string>
     <string name="add_habit">Lisää rutiini</string>
     <string name="color_picker_default_title">Vaihda väriä</string>
     <string name="toast_habit_created">Rutiini luotu</string>
-    <string name="toast_habit_deleted">Rutiinit poistettu</string>
-    <string name="toast_habit_changed">Rutiini muutettu</string>
-    <string name="toast_habit_archived">Rutiinit arkistoitu</string>
-    <string name="toast_habit_unarchived">Rutiinit palautettu arkistosta</string>
     <string name="overview">Yleiskatsaus</string>
     <string name="habit_strength">Rutiinin vahvuus</string>
     <string name="history">Historia</string>
     <string name="clear">Tyhjennä</string>
-    <string name="times_every">kertaa</string>
-    <string name="days">päivässä</string>
     <string name="reminder">Muistutus</string>
     <string name="save">Tallenna</string>
     <string name="streaks">Pisimmät toistot</string>
@@ -49,7 +42,6 @@
     <string name="edit_habit">Muokkaa rutiinia</string>
     <string name="check">Tehty</string>
     <string name="snooze">Lykkää</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Tervetuloa</string>
     <string name="intro_description_1">Loop Habit Tracker auttaa sinua luomaan ja ylläpitämään hyviä rutiineja.</string>
     <string name="intro_title_2">Merkitse uusia rutiineja</string>
@@ -63,6 +55,7 @@
     <string name="interval_4_hour">4 tuntia</string>
     <string name="interval_8_hour">8 tuntia</string>
     <string name="interval_24_hour">24 tuntia</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_rate_this_app">Arvostele Google Playssä</string>
@@ -72,21 +65,62 @@
     <string name="name">Nimi</string>
     <string name="settings">Asetukset</string>
     <string name="hint_title">Tiesitkö?</string>
+    <string name="hint_drag">Muokkaa merkintöjen järjestystä: valitse tavan nimi ja vedä se oikeaan paikkaan.</string>
+    <string name="hint_landscape">Näe lisää päiviä kääntämällä puhelimesi pitkittäin.</string>
+    <string name="habit_not_found">Tapa on poistettu tai sitä ei löydy</string>
+    <string name="weekends">Viikonloppuisin</string>
+    <string name="any_weekday">Maanantaista perjantaihin</string>
+    <string name="any_day">Mikä tahansa viikonpäivä</string>
+    <string name="export_to_csv">Vie CSV-muodossa</string>
     <string name="done_label">Valmis</string>
     <string name="clear_label">Tyhjennä</string>
+    <string name="select_minutes">Valitse minuutit</string>
+    <string name="about">Tietoa sovelluksesta</string>
     <string name="translators">Kääntäjät</string>
     <string name="developers">Kehittäjät</string>
     <string name="version_n">Versio %s</string>
+    <string name="frequency">Toistuvuus</string>
     <string name="every_day">Joka päivä</string>
     <string name="every_week">Joka viikko</string>
-    <string name="night_mode">Yötila</string>
+    <string name="help">Ohjeita ja usein kysyttyä</string>
+    <string name="bug_report_failed">Virheraportin luonti epäonnistui.</string>
+    <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="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>
+    <string name="reverse_days_description">Näytä päivät käänteisessä järjestyksessä päänäytöllä.</string>
     <string name="day">Päivä</string>
     <string name="week">Viikko</string>
     <string name="month">Kuukausi</string>
     <string name="quarter">Kvartaali</string>
     <string name="year">Vuosi</string>
     <string name="total">Yhteensä</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="yes_or_no">Kyllä vai ei?</string>
+    <string name="every_x_days">%d päivän välein</string>
+    <string name="every_x_weeks">%d viikon välein</string>
+    <string name="score">Tulos</string>
+    <string name="reminder_sound">Muistutusääni</string>
+    <string name="filter">Suodata</string>
+    <string name="hide_completed">Piilota suoritetut</string>
+    <string name="hide_archived">Piilota arkistoidut</string>
+    <string name="first_day_of_the_week">Viikon ensimmäinen päivä</string>
+    <string name="default_reminder_question">Oletko suorittanut tämän tavan tänään?</string>
+    <string name="notes">Muistiinpanot</string>
+    <string name="example_notes">(Valinnainen)</string>
+    <string name="yes_or_no_example">Esim. heräsitkö tänään aikaisin? Kuntoilitko? Pelasitko sakkia?</string>
+    <string name="measurable">Mitattava</string>
+    <string name="x_times_per_week">%d kertaa viikossa</string>
+    <string name="x_times_per_month">%d kertaa kuukaudessa</string>
+    <string name="yes_or_no_short_example">Esim. kuntoilu</string>
+    <string name="color">Väri</string>
+    <string name="example_target">Esim. 15</string>
+    <string name="measurable_short_example">Esim. juokse</string>
+    <string name="measurable_question_example">Esim. kuinka monta kilometriä juoksit tänään?</string>
+    <string name="measurable_units_example">Esim. kilometriä</string>
+    <string name="every_month">Joka kuukausi</string>
+    <string name="validation_cannot_be_blank">Tätä ei voi jättää tyhjäksi</string>
+    <string name="today">Tänään</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 25d07bc5b..6371e45d1 100644
--- a/uhabits-android/src/main/res/values-fr-rFR/strings.xml
+++ b/uhabits-android/src/main/res/values-fr-rFR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop - Suivi d\'habitudes</string>
     <string name="main_activity_title">Habitudes</string>
     <string name="action_settings">Paramètres</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Ajouter une habitude</string>
     <string name="color_picker_default_title">Changer la couleur</string>
     <string name="toast_habit_created">Habitude créée</string>
-    <string name="toast_habit_deleted">Habitudes supprimées</string>
-    <string name="toast_habit_changed">Habitude changée</string>
-    <string name="toast_habit_archived">Habitudes archivées</string>
-    <string name="toast_habit_unarchived">Habitudes désarchivées</string>
     <string name="overview">Vue d\'ensemble</string>
     <string name="habit_strength">Force de l\'habitude</string>
     <string name="history">Historique</string>
     <string name="clear">Supprimer</string>
-    <string name="days">jours</string>
     <string name="reminder">Rappel</string>
     <string name="save">Sauvegarder</string>
     <string name="streaks">Séries</string>
@@ -64,20 +59,16 @@
     <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_snooze_interval_title">Intervalle de report des rappels</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>
     <string name="links">Liens</string>
     <string name="name">Nom</string>
     <string name="settings">Paramètres</string>
-    <string name="snooze_interval">Intervalle de report</string>
     <string name="select_snooze_delay">Définir le délai de répétition</string>
     <string name="hint_title">Le saviez-vous ?</string>
     <string name="hint_drag">Pour réordonner les habitudes, faites un appui long sur le nom de l\'habitude et placez-la à la bonne place.</string>
     <string name="hint_landscape">Vous pouvez voir plus de jours en mettant votre téléphone en mode paysage.</string>
-    <string name="delete_habits">Supprimer des habitudes</string>
-    <string name="delete_habits_message">Les habitudes seront supprimées définitivement. Cette action est irréversible.</string>
     <string name="habit_not_found">Habitude supprimée / introuvable</string>
     <string name="weekends">Weekends</string>
     <string name="any_weekday">Du lundi au vendredi</string>
@@ -111,7 +102,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">Mode Nuit</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -170,15 +161,14 @@
     <string name="example_notes">(Facultatif) </string>
     <string name="yes_or_no_example">Par exemple, vous êtes-vous réveillé tôt aujourd\'hui ? Avez-vous fait de l\'exercice ? Avez-vous joué aux échecs ? </string>
     <string name="measurable">Quantifiable</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">Par exemple, combien de km avez-vous couru aujourd\'hui ? Combien de pages avez-vous lu ? Combien de calories avez-vous mangé ? </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="yes_or_no_short_example">Par ex, Entrainement</string>
     <string name="color">Couleur</string>
     <string name="example_target">Par ex, 15</string>
     <string name="measurable_short_example">Par ex, Courir</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">Par ex, Combien de km avez-vous couru aujourd\'hui? </string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">Par ex, km</string>
+    <string name="measurable_question_example">Par ex, Combien de km avez-vous couru aujourd\'hui? </string>
+    <string name="measurable_units_example">Par ex, km</string>
     <string name="every_month">Tous les mois</string>
     <string name="validation_cannot_be_blank">Ne peut pas être vide</string>
     <string name="today">Aujourd\'hui</string>
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 2b9c83ccd..5aac909ed 100644
--- a/uhabits-android/src/main/res/values-hi-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-hi-rIN/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop - आदत पर नजर</string>
     <string name="main_activity_title">आदतें</string>
     <string name="action_settings">सेटिंग्स</string>
@@ -30,16 +28,10 @@
     <string name="add_habit">आदत जोड़ें</string>
     <string name="color_picker_default_title">रंग बदलें</string>
     <string name="toast_habit_created">आदत बनायी गई</string>
-    <string name="toast_habit_deleted">आदत हटाई गई</string>
-    <string name="toast_habit_changed">आदत बहाल</string>
-    <string name="toast_habit_archived">आदत  संग्रहीत</string>
-    <string name="toast_habit_unarchived">आदत असंग्रहीत</string>
     <string name="overview">अवलोकन</string>
     <string name="habit_strength">आदत शक्ति</string>
     <string name="history">पूर्वलेख</string>
     <string name="clear">साफ करें</string>
-    <string name="times_every">बार</string>
-    <string name="days">दिन</string>
     <string name="reminder">अनुस्मारक</string>
     <string name="save">सहेजें</string>
     <string name="streaks">प्रवर्ति</string>
@@ -47,12 +39,10 @@
 \"</string>
     <string name="long_press_to_toggle">चेक या अनचेक करने के लिए दबाएँ व दबाएँ रखें </string>
     <string name="reminder_off">बंद</string>
-    <string name="create_habit">आदत उत्पन्न करें</string>
-    <string name="edit_habit">आदत संपादित करें</string>
-    <string name="check">\"
-चेक\"</string>
+    <string name="create_habit">नयी आदत बनाएं </string>
+    <string name="edit_habit">आदत में बद्लाव करें </string>
+    <string name="check">अंकित करें</string>
     <string name="snooze">बाद में</string>
-    <!-- App introduction -->
     <string name="intro_title_1">\"
 स्वागत हे\"</string>
     <string name="intro_description_1">लूप हैबिट ट्रैकर नई और अच्छी आदतों को बनाए रखने मे मदद करता है ।</string>
@@ -62,13 +52,15 @@
 अपनी प्रगति को ट्रैक करें\"</string>
     <string name="intro_description_4">\"
 विस्तृत रेखांकन आपको बताएंगे कि कैसे अपनी आदतों में समय के साथ सुधार करें\"</string>
-    <string name="interval_15_minutes">15 मिनिट</string>
-    <string name="interval_30_minutes">30 मिनिट</string>
-    <string name="interval_1_hour">1 घंटा</string>
-    <string name="interval_2_hour">2 घंटा</string>
+    <string name="interval_15_minutes">१५ मिनट</string>
+    <string name="interval_30_minutes">३० मिनट</string>
+    <string name="interval_1_hour">१ घंटा</string>
+    <string name="interval_2_hour">२ घंटे</string>
     <string name="interval_4_hour">4 घंटा</string>
     <string name="interval_8_hour">8 घंटा</string>
     <string name="interval_24_hour">24 घंटे</string>
+    <string name="interval_always_ask">हमेशा पूछें</string>
+    <string name="interval_custom">अपने तरीके से बनाएं</string>
     <string name="pref_toggle_title">टॉगल पुनरावृत्ति  हल्का दबाने से</string>
     <string name="pref_toggle_description">\"
 अधिक सुविधाजनक है, लेकिन आकस्मिक टॉगल  हो सकता है ।\"</string>
@@ -79,14 +71,12 @@
     <string name="links">लिंक</string>
     <string name="name">नाम</string>
     <string name="settings">सेटिंग्स</string>
+    <string name="select_snooze_delay">स्नूज़ देरी का चयन करें</string>
     <string name="hint_title">क्या आप जानते .?</string>
     <string name="hint_drag">\"
 प्रविष्टियों को पुनर्व्यवस्थित करने के लिए, आदत के नाम पर प्रेस करें और सही जगह पर खींचें।\"</string>
     <string name="hint_landscape">\"
  अपने फोन को लांडसकपे मोड मे रख कर आप अधिक दिनों से देख सकते हैं\"</string>
-    <string name="delete_habits">आदत हटाएँ</string>
-    <string name="delete_habits_message">\"
-आदतों को स्थायी रूप से हटा दिया जाएगा। इस क्रिया को पूर्ववत नहीं किया जा सकता है।\"</string>
     <string name="habit_not_found">आदत हटाई गई / नहीं मिली</string>
     <string name="weekends">\"
 सप्ताहांत\"</string>
@@ -138,7 +128,7 @@
 समस्या निवारण\"</string>
     <string name="help_translate">\"
 इस एप्लिकेशन का अनुवाद करने में मदद करें\"</string>
-    <string name="night_mode">नाइट मोड</string>
+    <string name="night_mode" comment="dark_theme">नाइट मोड</string>
     <string name="use_pure_black">नाइट मोड मे पूरा काला यूज़ करें</string>
     <string name="pure_black_description">\"
 रात मोड में शुद्ध काले रंग के साथ ग्रे पृष्ठभूमि में बदलें.  अमोलेड प्रदर्शन के साथ फोन में बैटरी उपयोग कम कर देता है ।\"</string>
@@ -152,8 +142,7 @@
     <string name="quarter">तिमाही</string>
     <string name="year">साल</string>
     <string name="total">कुल</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="yes_or_no">हाँ या नहीं</string>
     <string name="every_x_days">\"
 हर %d दिन\"</string>
     <string name="every_x_weeks">\"
@@ -167,6 +156,7 @@
     <string name="hide_archived">संग्रहीत छुपाएं</string>
     <string name="sticky_notifications">सुचनाए स्थयी रखे</string>
     <string name="sticky_notifications_description">नोटिफिकेशन को स्वाइप करने से रोकता है!</string>
+    <string name="led_notifications">नोटिफिकेशन लाइट</string>
     <string name="repair_database">डेटाबेस को रिपेयर करें</string>
     <string name="database_repaired">डेटाबेस रिपेयर सफल</string>
     <string name="uncheck">निशान हटाएँ</string>
@@ -179,4 +169,25 @@
     <string name="by_color">रंग द्वारा</string>
     <string name="by_score">स्कोर से</string>
     <string name="export">एक्सपोर्ट करे</string>
+    <string name="change_value">वैल्यू बदलें</string>
+    <string name="calendar">कैलेंडर</string>
+    <string name="unit">इकाई</string>
+    <string name="example_question_boolean">जैसे आपने आज व्यायाम किया?</string>
+    <string name="question">प्रश्न</string>
+    <string name="target">लक्ष्य</string>
+    <string name="yes">हाँ</string>
+    <string name="no">नहीं</string>
+    <string name="customize_notification_summary">ध्वनि, कंपन, प्रकाश और अन्य अधिसूचना सेटिंग्स बदलें</string>
+    <string name="customize_notification">सूचनाएं कस्टमाइज़ करें</string>
+    <string name="pref_view_privacy">गोपनीयता नीति देखें</string>
+    <string name="view_all_contributors">सभी योगदानकर्ता देखें&#8230;</string>
+    <string name="database">डेटाबेस</string>
+    <string name="widget_opacity_title">विजेट अपारदर्शिता</string>
+    <string name="widget_opacity_description">आपके होम स्क्रीन में अधिक पारदर्शी या अधिक अपारदर्शी बनाता है।</string>
+    <string name="first_day_of_the_week">सप्ताह का पहला दिन</string>
+    <string name="default_reminder_question">क्या आपने आज यह आदत पूरी कर ली है?</string>
+    <string name="notes">नोट्स</string>
+    <string name="example_notes">वैकल्पिक</string>
+    <string name="yes_or_no_example">उदा। क्या आप आज जल्दी उठ गए? क्या आपने व्यायाम किया? क्या आपने शतरंज खेला?</string>
+    <string name="measurable">मापें</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 9b75191ab..fab62ad07 100644
--- a/uhabits-android/src/main/res/values-hr-rHR/strings.xml
+++ b/uhabits-android/src/main/res/values-hr-rHR/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">Navike</string>
     <string name="action_settings">Postavke</string>
@@ -30,16 +28,10 @@
     <string name="add_habit">Dodaj naviku</string>
     <string name="color_picker_default_title">Promijeni boju</string>
     <string name="toast_habit_created">Navika je stvorena</string>
-    <string name="toast_habit_deleted">Navike su izbrisane</string>
-    <string name="toast_habit_changed">Navika je promijenjena</string>
-    <string name="toast_habit_archived">Navike su arhivirane</string>
-    <string name="toast_habit_unarchived">Navike su dearhivirane</string>
     <string name="overview">Pregled</string>
     <string name="habit_strength">Snaga navike</string>
     <string name="history">Povijest</string>
     <string name="clear">Očisti</string>
-    <string name="times_every">puta u</string>
-    <string name="days">dani</string>
     <string name="reminder">Podsjetnik</string>
     <string name="save">Spremi</string>
     <string name="streaks">Niz</string>
@@ -50,7 +42,6 @@
     <string name="edit_habit">Uredi naviku</string>
     <string name="check">Potvrdi</string>
     <string name="snooze">Kasnije</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Dobrodošli</string>
     <string name="intro_description_1">Loop Habit Tracker vam pomaže stvoriti i održavati dobre navike.</string>
     <string name="intro_title_2">Stvorite neke nove navike</string>
@@ -75,8 +66,6 @@
     <string name="hint_title">Jeste li znali?</string>
     <string name="hint_drag">Za razmještanje unosa, pritisnite i držite naziv navike, pa ih premjestite na točno mjesto.</string>
     <string name="hint_landscape">Možete vidjeti više dana prebacivanjem uređaja u vodoravnu orijentaciju.</string>
-    <string name="delete_habits">Izbriši Navike</string>
-    <string name="delete_habits_message">Navike će biti trajno izbrisane. Ova radnja se ne može poništiti.</string>
     <string name="habit_not_found">Navika je izbrisana / nije pronađena</string>
     <string name="weekends">Vikendi</string>
     <string name="any_weekday">Ponedjeljak do Petak</string>
@@ -110,7 +99,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">Noćni način</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -122,8 +111,6 @@
     <string name="quarter">Četvrtina</string>
     <string name="year">Godina</string>
     <string name="total">Ukupno</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
     <string name="every_x_days">Svaka %d dana</string>
     <string name="every_x_weeks">Svaka %d tjedna</string>
     <string name="score">Rezultat</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 5ff950ea2..7cba2c6ed 100644
--- a/uhabits-android/src/main/res/values-hu-rHU/strings.xml
+++ b/uhabits-android/src/main/res/values-hu-rHU/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Szokásrögzítő</string>
     <string name="main_activity_title">Szokások</string>
     <string name="action_settings">Beállítások</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Új szokás</string>
     <string name="color_picker_default_title">Szín módosítása</string>
     <string name="toast_habit_created">Szokás létrehozva</string>
-    <string name="toast_habit_deleted">Szokás törölve</string>
-    <string name="toast_habit_changed">Szokás módosítva</string>
-    <string name="toast_habit_archived">Szokás archiválva</string>
-    <string name="toast_habit_unarchived">Szokás újraaktiválva</string>
     <string name="overview">Áttekintés</string>
     <string name="habit_strength">Szokás erőssége</string>
     <string name="history">Napló</string>
     <string name="clear">Törlés</string>
-    <string name="days">nap</string>
     <string name="reminder">Emlékeztető</string>
     <string name="save">Mentés</string>
     <string name="streaks">Szériák</string>
@@ -64,20 +59,16 @@
     <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_snooze_interval_title">Szundi időtartama emlékeztetőnél</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>
     <string name="links">Linkek</string>
     <string name="name">Megnevezés</string>
     <string name="settings">Beállítások</string>
-    <string name="snooze_interval">Szundi időtartama</string>
     <string name="select_snooze_delay">Szundi beállítása</string>
     <string name="hint_title">Tudtad?</string>
     <string name="hint_drag">Az elemek újrarendezéséhez a koppints a szokás nevére, majd húzd a megfelelő helyre.</string>
     <string name="hint_landscape">Több nap válik láthatóvá, ha fekvő módba állítod a telefonod kijelzőjét.</string>
-    <string name="delete_habits">Szokások törlése</string>
-    <string name="delete_habits_message">A szokások véglegesen törölve lesznek. A műveletet nem lehet visszavonni.</string>
     <string name="habit_not_found">Szokás törölve / nem található</string>
     <string name="weekends">Hétvégente</string>
     <string name="any_weekday">Hétfőtől péntekig</string>
@@ -116,7 +107,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">Éjszakai mód</string>
+    <string name="night_mode" comment="dark_theme">É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>
@@ -175,15 +166,14 @@
     <string name="example_notes">(opcionális)</string>
     <string name="yes_or_no_example">pl. Korán keltél ma fel? Edzettél? Sakkoztál?</string>
     <string name="measurable">Mérhető</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">pl. Hány kilométert futottál ma? Hány oldalt olvastál? Hány kalória volt amit ma ettél?</string>
     <string name="x_times_per_week">Heti %d alkalommal</string>
     <string name="x_times_per_month">Havi %d alkalommal</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>
     <string name="measurable_short_example">pl. Futás</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">pl. Hány kilométert futottál ma?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">pl. kilométer</string>
+    <string name="measurable_question_example">pl. Hány kilométert futottál ma?</string>
+    <string name="measurable_units_example">pl. kilométer</string>
     <string name="every_month">Minden hónapban</string>
     <string name="validation_cannot_be_blank">Nem lehet üres</string>
     <string name="today">Ma</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 7bb1ee792..8a75b12ac 100644
--- a/uhabits-android/src/main/res/values-in-rID/strings.xml
+++ b/uhabits-android/src/main/res/values-in-rID/strings.xml
@@ -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">Mode malam</string>
+    <string name="night_mode" comment="dark_theme">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>
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 7ee88457d..87f145b9f 100644
--- a/uhabits-android/src/main/res/values-it-rIT/strings.xml
+++ b/uhabits-android/src/main/res/values-it-rIT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop - Tracciatore di Abitudine</string>
     <string name="main_activity_title">Abitudini</string>
     <string name="action_settings">Impostazioni</string>
@@ -28,19 +28,31 @@
     <string name="add_habit">Aggiungi abitudine</string>
     <string name="color_picker_default_title">Cambia colore</string>
     <string name="toast_habit_created">Abitudine creata</string>
-    <string name="toast_habit_deleted">Abitudine rimossa</string>
-    <string name="toast_habit_changed">Abitudine modificata</string>
-    <string name="toast_habit_archived">Abitudine archiviata</string>
-    <string name="toast_habit_unarchived">Abitudine ripristinata</string>
+    <plurals name="toast_habits_changed">
+        <item quantity="one">Abitudine modificata</item>
+        <item quantity="other">Abitudini modificate</item>
+    </plurals>
+    <plurals name="toast_habits_deleted">
+        <item quantity="one">Abitudine eliminata</item>
+        <item quantity="other">Abitudini eliminate</item>
+    </plurals>
+    <plurals name="toast_habits_archived">
+        <item quantity="one">Abitudine archiviata</item>
+        <item quantity="other">Abitudini archiviate</item>
+    </plurals>
+    <plurals name="toast_habits_unarchived">
+        <item quantity="one">Abitudine non archiviata</item>
+        <item quantity="other">Abitudini non archiviate</item>
+    </plurals>
     <string name="overview">Panoramica</string>
     <string name="habit_strength">Forza dell\'abitudine</string>
     <string name="history">Cronologia</string>
     <string name="clear">Annulla</string>
-    <string name="days">giorni</string>
     <string name="reminder">Promemoria</string>
     <string name="save">Salva</string>
     <string name="streaks">Serie</string>
     <string name="no_habits_found">Non hai abitudini attive</string>
+    <string name="no_habits_left_to_do">Hai finito tutto per oggi! </string>
     <string name="long_press_to_toggle">Tieni premuto per completare o annullare</string>
     <string name="reminder_off">Disabilitato</string>
     <string name="create_habit">Crea abitudine</string>
@@ -64,20 +76,24 @@
     <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_snooze_interval_title">Intervallo di ritardo dei promemoria</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>
     <string name="links">Links</string>
     <string name="name">Nome</string>
     <string name="settings">Impostazioni</string>
-    <string name="snooze_interval">Snooze</string>
     <string name="select_snooze_delay">Seleziona ritardo posticipo</string>
     <string name="hint_title">Lo sapevi?</string>
     <string name="hint_drag">Per riordinare le voci, tieni premuto sul nome dell\'abitudine, poi spostala nella posizione corretta.</string>
     <string name="hint_landscape">Puoi vedere più giorni mettendo il tuo telefono orizzontale.</string>
-    <string name="delete_habits">Elimina abitudine</string>
-    <string name="delete_habits_message">L\'abitudine verrà cancellata definitivamente. Non sarà possibile annullare.</string>
+    <plurals name="delete_habits_title">
+        <item quantity="one">Eliminare l\'abitudine?</item>
+        <item quantity="other">Eliminare le abitudini?</item>
+    </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="one">L\'abitudine verrà eliminata definitivamente. Questa azione non può essere annullata.</item>
+        <item quantity="other">Le abitudini verranno eliminate definitivamente. Questa azione non può essere annullata.</item>
+    </plurals>
     <string name="habit_not_found">Abitudine cancellata / non trovata</string>
     <string name="weekends">Weekend</string>
     <string name="any_weekday">Giorni feriali</string>
@@ -111,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">Modalità notte</string>
+    <string name="night_mode" comment="dark_theme">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 +163,7 @@
     <string name="by_name">Per nome</string>
     <string name="by_color">Per colore</string>
     <string name="by_score">Per punteggio</string>
+    <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>
@@ -170,16 +187,28 @@
     <string name="example_notes">(Opzionale)</string>
     <string name="yes_or_no_example">ad es. Ti sei svegliato presto oggi? Hai fatto esercizio? Hai giocato a scacchi?</string>
     <string name="measurable">Misurabile</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">ad es. Quanti chilometri hai corso oggi? Quante pagine hai letto? Quante calorie hai mangiato?</string>
-    <string name="x_times_per_week">%s volte a settimana</string>
+    <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="yes_or_no_short_example">ad es. Esercizio</string>
     <string name="color">Colore</string>
     <string name="example_target">ad es. 15</string>
     <string name="measurable_short_example">ad es. Correre</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">ad es. Quanti chilometri hai corso oggi?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">ad es: Chilometri</string>
+    <string name="measurable_question_example">ad es. Quanti chilometri hai corso oggi?</string>
+    <string name="measurable_units_example">ad es: Chilometri</string>
     <string name="every_month">Ogni mese</string>
     <string name="validation_cannot_be_blank">Non può essere lasciato vuoto</string>
     <string name="today">Oggi</string>
+    <string name="enter">Inserisci</string>
+    <string name="no_habits">Nessuna abitudine trovata</string>
+    <string name="no_numerical_habits">Nessuna abitudine misurabile trovata</string>
+    <string name="no_boolean_habits">Nessuna abitudine sì/no trovata</string>
+    <string name="increment">Incremento</string>
+    <string name="decrement">Decremento</string>
+    <string name="pref_skip_title">Abilita salta giorni</string>
+    <string name="pref_unknown_title">Mostra punti interrogativi per i dati mancanti</string>
+    <string name="you_are_now_a_developer">Ora sei uno sviluppatore</string>
+    <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>
 </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 ad0d1a9d5..ca3a212b6 100644
--- a/uhabits-android/src/main/res/values-iw-rIL/strings.xml
+++ b/uhabits-android/src/main/res/values-iw-rIL/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">הרגלים</string>
     <string name="action_settings">הגדרות</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">הרגל חדש</string>
     <string name="color_picker_default_title">שינוי צבע</string>
     <string name="toast_habit_created">הרגל נוצר</string>
-    <string name="toast_habit_deleted">הרגלים נמחקו</string>
-    <string name="toast_habit_changed">הרגל השתנה</string>
-    <string name="toast_habit_archived">הרגלים הועברו לארכיון</string>
-    <string name="toast_habit_unarchived">הרגלים הוצאו מארכיון</string>
     <string name="overview">סקירה כללית</string>
     <string name="habit_strength">חוזק ההרגל</string>
     <string name="history">היסטוריה</string>
     <string name="clear">ניקוי</string>
-    <string name="days">ימים</string>
     <string name="reminder">תזכורת</string>
     <string name="save">שמירה</string>
     <string name="streaks">רצף</string>
@@ -64,20 +59,16 @@
     <string name="interval_custom">התאמה אישית...</string>
     <string name="pref_toggle_title">סימון הרגלים בלחיצה קצרה</string>
     <string name="pref_toggle_description">סמנו יעדים בהקשה קצרה במקום לחיצה ממושכת. נוח יותר, אך יכול להוביל ללחיצות לא מכוונות.</string>
-    <string name="pref_snooze_interval_title">מרווח נדנוד לתזכורות</string>
     <string name="pref_rate_this_app">דירוג היישום ב־Google Play</string>
     <string name="pref_send_feedback">שליחת משוב למפתחים</string>
     <string name="pref_view_source_code">צפייה בקוד המקור ב־GitHub</string>
     <string name="links">קישורים</string>
     <string name="name">שם</string>
     <string name="settings">הגדרות</string>
-    <string name="snooze_interval">זמן בין נדנודים</string>
     <string name="select_snooze_delay">הגדר זמן לדחיית תזכורת</string>
     <string name="hint_title">הידעת?</string>
     <string name="hint_drag">לשינוי סדר ההרגלים, יש ללחוץ לחיצה ארוכה על ההרגל ולגרור אותו למקום הרצוי.</string>
     <string name="hint_landscape">ניתן לראות ימים נוספים ע\"י סיבוב המסך לתצוגה רוחבית.</string>
-    <string name="delete_habits">מחיקת הרגלים</string>
-    <string name="delete_habits_message">ההרגלים יימחקו לצמיתות. פעולה זו אינה ניתנת לביטול.</string>
     <string name="habit_not_found">הרגל נמחק / לא נמצא</string>
     <string name="weekends">סופי שבוע</string>
     <string name="any_weekday">ימי חול</string>
@@ -111,7 +102,7 @@
     <string name="generate_bug_report">הפקת דוח שגיאות</string>
     <string name="troubleshooting">פתרון תקלות</string>
     <string name="help_translate">עזרו לנו לתרגם את האפליקציה</string>
-    <string name="night_mode">מצב לילה</string>
+    <string name="night_mode" comment="dark_theme">מצב לילה</string>
     <string name="use_pure_black">רקע שחור למצב לילה</string>
     <string name="pure_black_description">החלפת הרקע האפור במצב לילה לשחור מוחלט. מפחית בזבוז סוללה במכשירים עם תצוגת AMOLED.</string>
     <string name="interface_preferences">ממשק</string>
@@ -170,15 +161,14 @@
     <string name="example_notes">(רשות)</string>
     <string name="yes_or_no_example">למשל: האם התעוררת מוקדם היום? האם עשית פעילות גופנית? האם שיחקת שחמט?</string>
     <string name="measurable">ניתנים למדידה</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">למשל: כמה קילומטרים רצת היום? כמה עמודים קראת? כמה קלוריות צברת?</string>
     <string name="x_times_per_week">%d פעמים בשבוע</string>
     <string name="x_times_per_month">%d פעמים בחודש</string>
     <string name="yes_or_no_short_example">למשל פעילות גופנית</string>
     <string name="color">צבע</string>
     <string name="example_target">למשל 15</string>
     <string name="measurable_short_example">למשל ריצה</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">למשל: כמה קילומטרים רצת היום?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">למשל קילומטרים</string>
+    <string name="measurable_question_example">למשל: כמה קילומטרים רצת היום?</string>
+    <string name="measurable_units_example">למשל קילומטרים</string>
     <string name="every_month">כל חודש</string>
     <string name="validation_cannot_be_blank">לא יכול להיות ריק</string>
     <string name="today">היום</string>
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 2fd14886e..8bc270988 100644
--- a/uhabits-android/src/main/res/values-ja-rJP/strings.xml
+++ b/uhabits-android/src/main/res/values-ja-rJP/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">ループ習慣トラッカー</string>
     <string name="main_activity_title">習慣</string>
     <string name="action_settings">設定</string>
@@ -28,19 +28,24 @@
     <string name="add_habit">習慣を追加</string>
     <string name="color_picker_default_title">色の変更</string>
     <string name="toast_habit_created">習慣を作成しました</string>
-    <string name="toast_habit_deleted">習慣を削除しました</string>
-    <string name="toast_habit_changed">習慣を変更しました</string>
-    <string name="toast_habit_archived">習慣をアーカイブしました</string>
-    <string name="toast_habit_unarchived">習慣のアーカイブを解除しました</string>
+    <plurals name="toast_habits_changed">
+        <item quantity="other">習慣を変更しました</item>
+    </plurals>
+    <plurals name="toast_habits_deleted">
+        <item quantity="other">習慣を削除しました</item>
+    </plurals>
+    <plurals name="toast_habits_archived">
+        <item quantity="other">習慣をアーカイブしました</item>
+    </plurals>
     <string name="overview">概要</string>
     <string name="habit_strength">習慣の強さ</string>
     <string name="history">履歴</string>
     <string name="clear">クリア</string>
-    <string name="days">日</string>
     <string name="reminder">リマインダー</string>
     <string name="save">保存</string>
     <string name="streaks">連続記録</string>
     <string name="no_habits_found">習慣はありません</string>
+    <string name="no_habits_left_to_do">今日は終わり！</string>
     <string name="long_press_to_toggle">長押しするとチェックを付けたり外したりできます</string>
     <string name="reminder_off">オフ</string>
     <string name="create_habit">習慣を作成</string>
@@ -64,20 +69,22 @@
     <string name="interval_custom">カスタム...</string>
     <string name="pref_toggle_title">タップでチェックをON/OFF</string>
     <string name="pref_toggle_description">長押しではなくシングルタップでチェックを付けます。より便利ですが、誤って切り替えが起こる可能性があります。</string>
-    <string name="pref_snooze_interval_title">リマインダーのスヌーズ間隔</string>
     <string name="pref_rate_this_app">Google Play でこのアプリを評価</string>
     <string name="pref_send_feedback">開発者にフィードバックを送信</string>
     <string name="pref_view_source_code">GitHub でソースコードを参照</string>
     <string name="links">リンク</string>
     <string name="name">タイトル</string>
     <string name="settings">設定</string>
-    <string name="snooze_interval">スヌーズ間隔</string>
     <string name="select_snooze_delay">スヌーズの遅延時間を設定</string>
     <string name="hint_title">ご存知ですか?</string>
     <string name="hint_drag">エントリーを並べ替えるには、習慣の名前を長押しして、正しい場所にドラッグしてください。</string>
     <string name="hint_landscape">お使いの携帯電話を横置きモードにすることで、より多くの日数を見ることができます。</string>
-    <string name="delete_habits">習慣を削除</string>
-    <string name="delete_habits_message">習慣は完全に削除されます。この操作を元に戻すことはできません。</string>
+    <plurals name="delete_habits_title">
+        <item quantity="other">習慣を削除</item>
+    </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="other">習慣は完全に削除されます。この操作を元に戻すことはできません。</item>
+    </plurals>
     <string name="habit_not_found">習慣が削除されているか、見つかりませんでした</string>
     <string name="weekends">週末</string>
     <string name="any_weekday">月曜日から金曜日</string>
@@ -111,7 +118,7 @@
     <string name="generate_bug_report">バグレポートの作成</string>
     <string name="troubleshooting">トラブルシューティング</string>
     <string name="help_translate">このアプリの翻訳を支援する</string>
-    <string name="night_mode">ダークテーマ</string>
+    <string name="night_mode" comment="dark_theme">ダークテーマ</string>
     <string name="use_pure_black">ダークテーマで完全な黒を使用する</string>
     <string name="pure_black_description">夜間モードで灰色の背景を完全な黒で置き換えます。AMOLED ディスプレイの電話でバッテリー使用量を抑えます。</string>
     <string name="interface_preferences">インターフェース</string>
@@ -147,6 +154,7 @@
     <string name="by_name">名前で並び替え</string>
     <string name="by_color">色で並び替え</string>
     <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>
@@ -170,16 +178,17 @@
     <string name="example_notes">（省略可）</string>
     <string name="yes_or_no_example">例：今日は早く起きましたか？運動しましたか？チェスをしましたか？</string>
     <string name="measurable">数えられるもの</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">例：今日は何km走りましたか? 何ページ本を読みましたか? 何kcal食べましたか?</string>
+    <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="yes_or_no_short_example">例：運動</string>
     <string name="color">色</string>
     <string name="example_target">例：15</string>
     <string name="measurable_short_example">例：ランニング</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">例：今日は何km走りましたか?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">例：km</string>
+    <string name="measurable_question_example">例：今日は何km走りましたか?</string>
+    <string name="measurable_units_example">例：km</string>
     <string name="every_month">毎月</string>
     <string name="validation_cannot_be_blank">空白にはできません</string>
     <string name="today">今日</string>
+    <string name="no_habits">習慣が見つかりませんでした</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 2ddac9155..77a169a99 100644
--- a/uhabits-android/src/main/res/values-ko-rKR/strings.xml
+++ b/uhabits-android/src/main/res/values-ko-rKR/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop 습관제조기</string>
     <string name="main_activity_title">습관</string>
     <string name="action_settings">설정</string>
@@ -30,16 +28,10 @@
     <string name="add_habit">습관 추가하기</string>
     <string name="color_picker_default_title">색상 변경</string>
     <string name="toast_habit_created">습관이 생성되었습니다.</string>
-    <string name="toast_habit_deleted">습관이 삭제되었습니다.</string>
-    <string name="toast_habit_changed">습관이 수정되었습니다.</string>
-    <string name="toast_habit_archived">습관이 보관되었습니다.</string>
-    <string name="toast_habit_unarchived">습관 보관이 해제되었습니다.</string>
-    <string name="overview">개요</string>
+    <string name="overview">한눈에 보기</string>
     <string name="habit_strength">습관 강도</string>
     <string name="history">이력</string>
-    <string name="clear">지우기</string>
-    <string name="times_every">번</string>
-    <string name="days">일 동안</string>
+    <string name="clear">취소</string>
     <string name="reminder">알림</string>
     <string name="save">저장</string>
     <string name="streaks">연속</string>
@@ -50,7 +42,6 @@
     <string name="edit_habit">습관 수정하기</string>
     <string name="check">완료</string>
     <string name="snooze">나중에</string>
-    <!-- App introduction -->
     <string name="intro_title_1">환영합니다</string>
     <string name="intro_description_1">Loop은 당신이 좋은 습관을 만들고 유지하도록 도와줍니다.</string>
     <string name="intro_title_2">새로운 습관을 만들어 보세요.</string>
@@ -64,6 +55,8 @@
     <string name="interval_4_hour">4시간</string>
     <string name="interval_8_hour">8시간</string>
     <string name="interval_24_hour">24시간</string>
+    <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>
@@ -72,11 +65,10 @@
     <string name="links">링크</string>
     <string name="name">제목</string>
     <string name="settings">설정</string>
+    <string name="select_snooze_delay">일시중지 시간 설정</string>
     <string name="hint_title">아시나요?</string>
     <string name="hint_drag">목록의 순서를 재배치하려면, 습관의 제목을 길게 누르고 다른 위치로 드래그하면 됩니다.</string>
     <string name="hint_landscape">가로 모드에서는 더 많은 날짜를 볼 수 있습니다.</string>
-    <string name="delete_habits">습관 삭제</string>
-    <string name="delete_habits_message">습관을 영구적으로 삭제합니다. 이 작업은 취소할 수 없습니다.</string>
     <string name="habit_not_found">습관 삭제 / 찾을 수 없음</string>
     <string name="weekends">주말</string>
     <string name="any_weekday">주중</string>
@@ -96,7 +88,7 @@
     <string name="best_streaks">최고 연속 기록</string>
     <string name="every_day">매일</string>
     <string name="every_week">매주</string>
-    <string name="help">도움 &amp; FAQ</string>
+    <string name="help">도움&amp; FAQ</string>
     <string name="could_not_export">데이터 내보내기에 실패했습니다.</string>
     <string name="could_not_import">데이터 가져오기에 실패했습니다.</string>
     <string name="file_not_recognized">파일을 인식할 수 없습니다.</string>
@@ -110,7 +102,7 @@
     <string name="generate_bug_report">오류보고서 작성하기</string>
     <string name="troubleshooting">문제 해결</string>
     <string name="help_translate">이 앱의 번역을 도와주세요</string>
-    <string name="night_mode">야간 모드</string>
+    <string name="night_mode" comment="dark_theme">야간 모드</string>
     <string name="use_pure_black">야간 모드에서 검정색 사용하기</string>
     <string name="pure_black_description">야간 모드의 회색 배경을 검정색으로 대체합니다. AMOLED 디스플레이를 사용하는 기기에서 배터리 사용량을 감소시킵니다.</string>
     <string name="interface_preferences">인터페이스</string>
@@ -122,8 +114,7 @@
     <string name="quarter">분기</string>
     <string name="year">년</string>
     <string name="total">전체</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="yes_or_no">예 또는 아니요</string>
     <string name="every_x_days">%d일 마다</string>
     <string name="every_x_weeks">%d주 마다</string>
     <string name="score">점수</string>
@@ -134,6 +125,8 @@
     <string name="hide_archived">보관된 항목 숨기기</string>
     <string name="sticky_notifications">알림 고정하기</string>
     <string name="sticky_notifications_description">알림을 스와이프해서 제거하는 것을 방지합니다.</string>
+    <string name="led_notifications">알림 표시등</string>
+    <string name="led_notifications_description">리마인더가 있으면알림 표시등이 깜박입니다. LED 알림 표시등이있는 전화기에서만 사용할 수 있습니다.</string>
     <string name="repair_database">데이터베이스 복구</string>
     <string name="database_repaired">데이터베이스가 복구되었습니다.</string>
     <string name="uncheck">선택 해제</string>
@@ -146,4 +139,25 @@
     <string name="by_color">색상 순으로</string>
     <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>
+    <string name="question">질문</string>
+    <string name="target">목표</string>
+    <string name="yes">네</string>
+    <string name="no">아니요</string>
+    <string name="customize_notification_summary">소리, 진동, 밝기 및 기타 알림 설정</string>
+    <string name="customize_notification">알림 커스터마이징</string>
+    <string name="pref_view_privacy">개인 정보 취급 방침 보기</string>
+    <string name="view_all_contributors">모든 기여자보기&#8230;</string>
+    <string name="database">데이터베이스</string>
+    <string name="first_day_of_the_week">첫번째 요일</string>
+    <string name="default_reminder_question">오늘 습관을 지키셨나요?</string>
+    <string name="notes">메모</string>
+    <string name="example_notes">(선택사항)</string>
+    <string name="color">색</string>
+    <string name="every_month">매월</string>
+    <string name="today">오늘</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 f899a6007..f0f61bcfc 100644
--- a/uhabits-android/src/main/res/values-nl-rNL/strings.xml
+++ b/uhabits-android/src/main/res/values-nl-rNL/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Gewoonte tracker</string>
     <string name="main_activity_title">Gewoontes</string>
     <string name="action_settings">Instellingen</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Nieuwe gewoonte</string>
     <string name="color_picker_default_title">Verander kleur</string>
     <string name="toast_habit_created">Gewoonte aangemaakt.</string>
-    <string name="toast_habit_deleted">Gewoontes verwijderd</string>
-    <string name="toast_habit_changed">Gewoonte gewijzigd.</string>
-    <string name="toast_habit_archived">Gewoontes gearchiveerd</string>
-    <string name="toast_habit_unarchived">Gewoontes hersteld uit archief</string>
     <string name="overview">Overzicht</string>
     <string name="habit_strength">Gewoonte-sterkte</string>
     <string name="history">Geschiedenis</string>
     <string name="clear">Wis</string>
-    <string name="days">dagen</string>
     <string name="reminder">Herinnering</string>
     <string name="save">Opslaan</string>
     <string name="streaks">Reeksen</string>
@@ -64,20 +59,16 @@
     <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_snooze_interval_title">Snooze interval voor herinneringen</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>
     <string name="links">Links</string>
     <string name="name">Naam</string>
     <string name="settings">Instellingen</string>
-    <string name="snooze_interval">Snooze interval</string>
     <string name="select_snooze_delay">Snooze vertraging selecteren</string>
     <string name="hint_title">Wist je dat?</string>
     <string name="hint_drag">Om de rijen te ordenen, houdt de gewoonte ingedrukt en sleep het naar de gewenste plek.</string>
     <string name="hint_landscape">Je kunt meer dagen zien door de telefoon in horizontale modus te zetten.</string>
-    <string name="delete_habits">Verwijder gewoontes</string>
-    <string name="delete_habits_message">De gewoontes zullen permanent verwijderd worden. Deze actie kan niet ongedaan gemaakt worden.</string>
     <string name="habit_not_found">Gewoonte verwijderd / niet gevonden</string>
     <string name="weekends">Weekends</string>
     <string name="any_weekday">Maandag tot vrijdag</string>
@@ -111,7 +102,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">Nachtmodus</string>
+    <string name="night_mode" comment="dark_theme">Nachtmodus</string>
     <string name="use_pure_black">Gebruik puur zwart bij nachtmodus</string>
     <string name="pure_black_description">Vervangt grijze achtergronden door puur zwart in nachtmodus. Vermindert batterijgebruik bij telefoons met AMOLED scherm.</string>
     <string name="interface_preferences">Interface</string>
@@ -170,15 +161,14 @@
     <string name="example_notes">(Optioneel)</string>
     <string name="yes_or_no_example">bijv. Ben je vandaag vroeg wakker geworden? Heb je gesport? Heb je geschaakt?</string>
     <string name="measurable">Meetbaar</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">bijv. Hoeveel kilometer heb je vandaag hardgelopen? Hoeveel pagina\'s heb je gelezen? Hoeveel calorieën heb je gegeten?</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="yes_or_no_short_example">bijv. Sporten</string>
     <string name="color">Kleur</string>
     <string name="example_target">bijv. 15</string>
     <string name="measurable_short_example">bijv. Hardlopen</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">bijv. Hoeveel kilometer heb je vandaag hardgelopen?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">bijv. kilometers</string>
+    <string name="measurable_question_example">bijv. Hoeveel kilometer heb je vandaag hardgelopen?</string>
+    <string name="measurable_units_example">bijv. kilometers</string>
     <string name="every_month">Elke maand</string>
     <string name="validation_cannot_be_blank">Mag niet leeg zijn</string>
     <string name="today">Vandaag</string>
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 9876174d4..6ed9097fd 100644
--- a/uhabits-android/src/main/res/values-no-rNO/strings.xml
+++ b/uhabits-android/src/main/res/values-no-rNO/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Vaneoversikt</string>
     <string name="main_activity_title">Vaner</string>
     <string name="action_settings">Innstillinger</string>
@@ -30,16 +28,10 @@
     <string name="add_habit">Legg til vane</string>
     <string name="color_picker_default_title">Endr farge</string>
     <string name="toast_habit_created">Vane laget</string>
-    <string name="toast_habit_deleted">Vaner slettet</string>
-    <string name="toast_habit_changed">Vane endret</string>
-    <string name="toast_habit_archived">Vaner arkivert</string>
-    <string name="toast_habit_unarchived">Vaner uarkivert</string>
     <string name="overview">Oversikt</string>
     <string name="habit_strength">Vanestyrke</string>
     <string name="history">Logg</string>
     <string name="clear">Fjern</string>
-    <string name="times_every">ganger på</string>
-    <string name="days">dager</string>
     <string name="reminder">Påminnelse</string>
     <string name="save">Lagr</string>
     <string name="streaks">Gjentakelser</string>
@@ -50,7 +42,6 @@
     <string name="edit_habit">Redigér vane</string>
     <string name="check">Sjekk</string>
     <string name="snooze">Senere</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Velkommen</string>
     <string name="intro_description_1">Loop Vaneoversikt hjelper deg med å lage og beholde gode vaner.</string>
     <string name="intro_title_2">Lag noen nye vaner</string>
@@ -64,6 +55,7 @@
     <string name="interval_4_hour">4 timer</string>
     <string name="interval_8_hour">8 timer</string>
     <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>
@@ -75,8 +67,6 @@
     <string name="hint_title">Visste du at?</string>
     <string name="hint_drag">For å sortere innleggene, trykk og hold på navnet til vanen, deretter dra den til det korrekte stedet.</string>
     <string name="hint_landscape">Du kan se flere dager ved å sette telefonen din i landskapsmodus.</string>
-    <string name="delete_habits">Slett vaner</string>
-    <string name="delete_habits_message">Vanene vil bli slettet permanent. Denne handlingen kan ikke angres.</string>
     <string name="habit_not_found">Vane slettet / ikke funnet</string>
     <string name="weekends">Helger</string>
     <string name="any_weekday">Hverdager</string>
@@ -110,7 +100,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">Nattmodus</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -122,8 +112,7 @@
     <string name="quarter">Kvarter</string>
     <string name="year">År</string>
     <string name="total">Totalt</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="yes_or_no">Ja / Nei</string>
     <string name="every_x_days">Hver %d. dag</string>
     <string name="every_x_weeks">Hver %d. uke</string>
     <string name="score">Poengsum</string>
@@ -146,4 +135,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>
 </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 5c7f8f834..e3dda57ad 100644
--- a/uhabits-android/src/main/res/values-pl-rPL/strings.xml
+++ b/uhabits-android/src/main/res/values-pl-rPL/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Śledzenie Nawyków Loop</string>
     <string name="main_activity_title">Nawyki</string>
     <string name="action_settings">Ustawienia</string>
@@ -28,19 +28,15 @@
     <string name="add_habit">Dodaj nawyk</string>
     <string name="color_picker_default_title">Zmień kolor</string>
     <string name="toast_habit_created">Utworzono nawyk</string>
-    <string name="toast_habit_deleted">Usunięto nawyki</string>
-    <string name="toast_habit_changed">Zmieniono nawyk</string>
-    <string name="toast_habit_archived">Nawyki zarchiwizowane</string>
-    <string name="toast_habit_unarchived">Nawyki odarchiwizowane</string>
     <string name="overview">Przegląd</string>
     <string name="habit_strength">Siła nawyku</string>
     <string name="history">Historia</string>
     <string name="clear">Wyczyść</string>
-    <string name="days">dni</string>
     <string name="reminder">Przypomnienie</string>
     <string name="save">Zapisz</string>
     <string name="streaks">Serie</string>
     <string name="no_habits_found">Nie masz aktywnych nawyków</string>
+    <string name="no_habits_left_to_do">Na dziś to wszystko!</string>
     <string name="long_press_to_toggle">Naciśnij i przytrzymaj aby zaznaczyć lub odznaczyć</string>
     <string name="reminder_off">Wyłączone</string>
     <string name="create_habit">Utwórz nawyk</string>
@@ -61,23 +57,19 @@
     <string name="interval_8_hour">8 godzin</string>
     <string name="interval_24_hour">24 godziny</string>
     <string name="interval_always_ask">Zawsze pytaj</string>
-    <string name="interval_custom">Niestandardowe...</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_snooze_interval_title">Czas drzemki między przypomnieniami</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>
     <string name="links">Linki</string>
     <string name="name">Nazwa</string>
     <string name="settings">Ustawienia</string>
-    <string name="snooze_interval">Czas drzemki</string>
     <string name="select_snooze_delay">Wybierz długość drzemki</string>
     <string name="hint_title">Czy wiesz że?</string>
     <string name="hint_drag">Aby zmienić kolejność naciśnij i przytrzymaj na nazwie nawyku i przesuń go na odpowiednie miejsce.</string>
     <string name="hint_landscape">Możesz zobaczyć więcej dni trzymając telefon poziomo.</string>
-    <string name="delete_habits">Usuń nawyki</string>
-    <string name="delete_habits_message">Nawyki zostaną trwale usunięte. Tej operacji nie można cofnąć.</string>
     <string name="habit_not_found">Nawyk usunięty/nie znaleziony</string>
     <string name="weekends">Weekendy</string>
     <string name="any_weekday">Dni robocze</string>
@@ -111,7 +103,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">Tryb nocny</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -147,12 +139,13 @@
     <string name="by_name">Według nazwy</string>
     <string name="by_color">Według koloru</string>
     <string name="by_score">Według wyniku</string>
+    <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="calendar">Kalendarz</string>
     <string name="unit">Jednostka</string>
-    <string name="example_question_boolean">np, Czy ćwiczyłeś dzisiaj?</string>
+    <string name="example_question_boolean">np. Czy ćwiczyłeś dzisiaj?</string>
     <string name="question">Pytanie</string>
     <string name="target">Cel</string>
     <string name="yes">Tak</string>
@@ -170,16 +163,30 @@
     <string name="example_notes">(opcjonalne)</string>
     <string name="yes_or_no_example">np. Czy obudziłeś się dzisiaj wcześnie? Czy ćwiczyłeś? Czy grałeś w szachy?</string>
     <string name="measurable">Mierzalne</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">np. Ile kilometrów przejechałeś dzisiaj? Ile stron przeczytałeś? Ile kalorii zjadłeś?</string>
+    <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="yes_or_no_short_example">np. ćwiczenia</string>
     <string name="color">Kolor</string>
     <string name="example_target">np. 15</string>
     <string name="measurable_short_example">np. Bieg</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">np. Ile km przebiegłeś dzisiaj?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">np. kilometry</string>
+    <string name="measurable_question_example">np. Ile km przebiegłeś dzisiaj?</string>
+    <string name="measurable_units_example">np. kilometry</string>
     <string name="every_month">Co miesiąc</string>
     <string name="validation_cannot_be_blank">Nie może być puste</string>
     <string name="today">Dzisiaj</string>
+    <string name="enter">Wprowadź</string>
+    <string name="no_habits">Nie znaleziono nawyków</string>
+    <string name="no_numerical_habits">Nie znaleziono mierzalnych nawyków</string>
+    <string name="no_boolean_habits">Nie znaleziono nawyków typu tak/nie</string>
+    <string name="increment">Zwiększ</string>
+    <string name="decrement">Zmniejsz</string>
+    <string name="pref_skip_title">Włącz pomijanie dni</string>
+    <string name="pref_skip_description">Przełącz dwukrotnie, aby dodać pominięcie zamiast znacznika wyboru. Pomijanie utrzymuje niezmieniony wynik i nie przerywa passy.</string>
+    <string name="pref_unknown_title">Pokaż znaki zapytania dla brakujących danych</string>
+    <string name="pref_unknown_description">Odróżnij dni bez danych od faktycznych przerw. Aby wprowadzić przerwę, przełącz dwukrotnie.</string>
+    <string name="you_are_now_a_developer">Jesteś teraz programistą</string>
+    <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>
 </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 1874041eb..ae07c2e04 100644
--- a/uhabits-android/src/main/res/values-pt-rBR/strings.xml
+++ b/uhabits-android/src/main/res/values-pt-rBR/strings.xml
@@ -127,7 +127,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">Modo noturno</string>
+    <string name="night_mode" comment="dark_theme">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>
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 02d8c060f..6d9b58162 100644
--- a/uhabits-android/src/main/res/values-pt-rPT/strings.xml
+++ b/uhabits-android/src/main/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop - Acompanhador de Hábitos</string>
     <string name="main_activity_title">Hábitos</string>
     <string name="action_settings">Definições</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Adicionar hábito</string>
     <string name="color_picker_default_title">Alterar a cor</string>
     <string name="toast_habit_created">Hábito criado</string>
-    <string name="toast_habit_deleted">Hábito eliminado</string>
-    <string name="toast_habit_changed">Hábito alterado</string>
-    <string name="toast_habit_archived">Hábito arquivado</string>
-    <string name="toast_habit_unarchived">Hábito desarquivado</string>
     <string name="overview">Visão geral</string>
     <string name="habit_strength">Pontuação</string>
     <string name="history">Histórico</string>
     <string name="clear">Limpar</string>
-    <string name="days">dias</string>
     <string name="reminder">Lembrete</string>
     <string name="save">Guardar</string>
     <string name="streaks">Séries</string>
@@ -64,20 +59,16 @@
     <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_snooze_interval_title">Intervalo da opção \'Mais Tarde\' nos lembretes</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>
     <string name="links">Hiperligações</string>
     <string name="name">Nome</string>
     <string name="settings">Definições</string>
-    <string name="snooze_interval">Intervalo da opção \'Mais Tarde\'</string>
     <string name="select_snooze_delay">Definir tempo de suspensão</string>
     <string name="hint_title">Sabia que?</string>
     <string name="hint_drag">Para reorganizar a lista, mantenha pressionado o nome do hábito e arraste-o para o lugar certo.</string>
     <string name="hint_landscape">Pode ver mais dias se utilizar o telemóvel em modo paisagem.</string>
-    <string name="delete_habits">Apagar hábitos</string>
-    <string name="delete_habits_message">Os hábitos serão permanentemente eliminados. Esta ação é irreversível.</string>
     <string name="habit_not_found">Hábito eliminado / não encontrado</string>
     <string name="weekends">Fins de Semana</string>
     <string name="any_weekday">Segunda a Sexta</string>
@@ -111,7 +102,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">Modo noturno</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -170,15 +161,14 @@
     <string name="example_notes">(Opcional)</string>
     <string name="yes_or_no_example">ex. Acordou cedo hoje? Fez exercício? Jogou xadrez?</string>
     <string name="measurable">Mensurável</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">ex. Quantos km você correu hoje? Quantas páginas leu? Quantas calorias ingeriu?</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="yes_or_no_short_example">ex. Exercício</string>
     <string name="color">Cor</string>
     <string name="example_target">ex. 15</string>
     <string name="measurable_short_example">ex. Correr</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">ex. Quantas km você correu hoje?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">ex. km</string>
+    <string name="measurable_question_example">ex. Quantas km você correu hoje?</string>
+    <string name="measurable_units_example">ex. km</string>
     <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>
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 08ffc5031..d4cc5a3f8 100644
--- a/uhabits-android/src/main/res/values-ro-rRO/strings.xml
+++ b/uhabits-android/src/main/res/values-ro-rRO/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">Obiceiuri</string>
     <string name="action_settings">Setări</string>
@@ -30,16 +28,10 @@
     <string name="add_habit">Adaugă un obicei</string>
     <string name="color_picker_default_title">Schimbă culoarea</string>
     <string name="toast_habit_created">Obicei creat.</string>
-    <string name="toast_habit_deleted">Obicei șters.</string>
-    <string name="toast_habit_changed">Obicei schimbat.</string>
-    <string name="toast_habit_archived">Obicei arhivat.</string>
-    <string name="toast_habit_unarchived">Obicei dezarhivat.</string>
     <string name="overview">Prezentare generală</string>
     <string name="habit_strength">Graficul obiceiurilor</string>
     <string name="history">Istoric</string>
     <string name="clear">Golește</string>
-    <string name="times_every">ori în</string>
-    <string name="days">zile</string>
     <string name="reminder">Atenționare</string>
     <string name="save">Salvează</string>
     <string name="streaks">Zile consecutive</string>
@@ -50,7 +42,6 @@
     <string name="edit_habit">Editează obiceiul</string>
     <string name="check">Bifează</string>
     <string name="snooze">Mai târziu</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Bine ai venit</string>
     <string name="intro_description_1">Loop Habit Tracker te ajută să creezi și să menții obiceiurile bune.</string>
     <string name="intro_title_2">Creează noi obiceiuri</string>
@@ -64,6 +55,8 @@
     <string name="interval_4_hour">4 ore</string>
     <string name="interval_8_hour">8 ore</string>
     <string name="interval_24_hour">24 de ore</string>
+    <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>
@@ -72,11 +65,10 @@
     <string name="links">Aplicație</string>
     <string name="name">Nume</string>
     <string name="settings">Setări</string>
+    <string name="select_snooze_delay">Selectează durata amânării</string>
     <string name="hint_title">Știai?</string>
     <string name="hint_drag">Pentru a rearanja obiceiurile, apasă și ține numele obiceiului, apoi trage-l în locul corect.</string>
     <string name="hint_landscape">Poți vedea mai multe zile în modul peisaj.</string>
-    <string name="delete_habits">Șterge obiceiurile</string>
-    <string name="delete_habits_message">Obiceiurile vor fi șterse permanent. Această acțiune nu este reversibilă.</string>
     <string name="habit_not_found">Obicei șters / negăsit</string>
     <string name="weekends">Weekenduri</string>
     <string name="any_weekday">Zile de lucru</string>
@@ -110,7 +102,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">Mod întunecat</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -122,8 +114,7 @@
     <string name="quarter">Trimestru</string>
     <string name="year">An</string>
     <string name="total">Total</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="yes_or_no">Da sau Nu</string>
     <string name="every_x_days">La fiecare %d zile</string>
     <string name="every_x_weeks">La fiecare %d săptămâni</string>
     <string name="score">Scor</string>
@@ -134,6 +125,8 @@
     <string name="hide_archived">Ascunde cele arhivate</string>
     <string name="sticky_notifications">Notificări lipicioase</string>
     <string name="sticky_notifications_description">Împiedică eliminarea notificărilor.</string>
+    <string name="led_notifications">Lumină de notificare</string>
+    <string name="led_notifications_description">Afișează o lumină intermitentă la notificare. Disponibil doar în telefoanele care au bec LED pentru notificări.</string>
     <string name="repair_database">Repară baza de date</string>
     <string name="database_repaired">Baza de date reparată.</string>
     <string name="uncheck">Debifează</string>
@@ -146,4 +139,18 @@
     <string name="by_color">După culoare</string>
     <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>
+    <string name="question">Întrebare</string>
+    <string name="target">Obiectiv</string>
+    <string name="yes">Da</string>
+    <string name="no">Nu</string>
+    <string name="customize_notification_summary">Schimbați setările de sunet, vibrații, lumină și altele pentru notificări</string>
+    <string name="customize_notification">Personalizați notificările</string>
+    <string name="pref_view_privacy">Consultați politica de confidențialitate</string>
+    <string name="view_all_contributors">Vizualizați toți colaboratorii&#8230;</string>
+    <string name="database">Bază de date</string>
 </resources>
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 38e9e1c2f..c5e0e3583 100644
--- a/uhabits-android/src/main/res/values-ru-rRU/strings.xml
+++ b/uhabits-android/src/main/res/values-ru-rRU/strings.xml
@@ -139,7 +139,7 @@
     <string name="generate_bug_report">Сгенерировать отчёт об ошибке</string>
     <string name="troubleshooting">Устранение неполадок</string>
     <string name="help_translate">Помогите перевести это приложение</string>
-    <string name="night_mode">Ночной режим</string>
+    <string name="night_mode" comment="dark_theme">Ночной режим</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-sk-rSK/strings.xml b/uhabits-android/src/main/res/values-sk-rSK/strings.xml
index 9977e878e..6bf7b0e50 100644
--- a/uhabits-android/src/main/res/values-sk-rSK/strings.xml
+++ b/uhabits-android/src/main/res/values-sk-rSK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">Návyky</string>
     <string name="action_settings">Nastavenia</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Pridaj návyk</string>
     <string name="color_picker_default_title">Zmeniť farbu</string>
     <string name="toast_habit_created">Návyk vytvorený</string>
-    <string name="toast_habit_deleted">Návyky zmazané</string>
-    <string name="toast_habit_changed">Návyk zmenený</string>
-    <string name="toast_habit_archived">Návyky dosiahnuté</string>
-    <string name="toast_habit_unarchived">Návyky nedosiahnuté</string>
     <string name="overview">Prehľad</string>
     <string name="habit_strength">Sila návyku</string>
     <string name="history">História</string>
     <string name="clear">Zmazať</string>
-    <string name="days">dní</string>
     <string name="reminder">Pripomienka</string>
     <string name="save">Uložiť</string>
     <string name="streaks">Série</string>
@@ -64,20 +59,16 @@
     <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_snooze_interval_title">Interval odloženia pripomienok</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>
     <string name="links">Odkazy</string>
     <string name="name">Názov</string>
     <string name="settings">Nastavenia</string>
-    <string name="snooze_interval">Interval odloženia</string>
     <string name="select_snooze_delay">Nastaviť dĺžku odloženia</string>
     <string name="hint_title">Vedeli ste?</string>
     <string name="hint_drag">Pre zmenu usporiadania záznamov, stlačte a podržte názov návyku a potom ho presuňte na správne miesto.</string>
     <string name="hint_landscape">Môžete vidieť viac dní otočením telefónu do režimu na šírku.</string>
-    <string name="delete_habits">Zmazať návyky</string>
-    <string name="delete_habits_message">Návyky budú natrvalo odstránené. Túto akciu nie je možné vrátiť späť.</string>
     <string name="habit_not_found">Návyk bol odstránený / nenájdený</string>
     <string name="weekends">Víkendy</string>
     <string name="any_weekday">Od pondelka do piatku</string>
@@ -111,7 +102,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">Tmavá téma</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -170,15 +161,14 @@
     <string name="example_notes">(voliteľné)</string>
     <string name="yes_or_no_example">napr. Zobudili ste sa dnes skoro? Cvičili ste? Hrali ste šach?</string>
     <string name="measurable">Merateľné</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">napr. Koľko kilometrov ste dnes zabehli? Koľko stránok ste čítali? Koľko kalórií ste zjedli?</string>
     <string name="x_times_per_week">%d krát týždenne</string>
     <string name="x_times_per_month">%d krát za mesiac</string>
     <string name="yes_or_no_short_example">napr. Cvičenie</string>
     <string name="color">Farba</string>
     <string name="example_target">napr. 15</string>
     <string name="measurable_short_example">napr. Beh</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">napr. Koľko míľ ste dnes prešli?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">napr. míle</string>
+    <string name="measurable_question_example">napr. Koľko míľ ste dnes prešli?</string>
+    <string name="measurable_units_example">napr. míle</string>
     <string name="every_month">Každý mesiac</string>
     <string name="validation_cannot_be_blank">Nemôže byť prázdne</string>
     <string name="today">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 68d4b5da0..295c68c85 100644
--- a/uhabits-android/src/main/res/values-sl-rSI/strings.xml
+++ b/uhabits-android/src/main/res/values-sl-rSI/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Sledilnik Navad</string>
     <string name="main_activity_title">Navade</string>
     <string name="action_settings">Nastavitve</string>
@@ -30,16 +28,10 @@
     <string name="add_habit">Dodaj navado</string>
     <string name="color_picker_default_title">Spremeni barvo</string>
     <string name="toast_habit_created">Navada ustvarjena</string>
-    <string name="toast_habit_deleted">Navada izbrisana</string>
-    <string name="toast_habit_changed">Navada spremenjena.</string>
-    <string name="toast_habit_archived">Navada arhivirana.</string>
-    <string name="toast_habit_unarchived">Navada dearhivirana.</string>
     <string name="overview">Pregled</string>
     <string name="habit_strength">Moč navade</string>
     <string name="history">Zgodovina</string>
     <string name="clear">Počisti</string>
-    <string name="times_every">krat v</string>
-    <string name="days">dni</string>
     <string name="reminder">Opomnik</string>
     <string name="save">Shrani</string>
     <string name="streaks">Serije</string>
@@ -50,7 +42,6 @@
     <string name="edit_habit">Spremeni navado</string>
     <string name="check">Označi</string>
     <string name="snooze">Kasneje</string>
-    <!-- App introduction -->
     <string name="intro_title_1">Dobrodošli</string>
     <string name="intro_description_1">Loop Sledilnik Navad vam pomaga ustvariti in vzdrževati dobre navade.</string>
     <string name="intro_title_2">Ustvari nekaj novih navad</string>
@@ -75,8 +66,6 @@
     <string name="hint_title">Ali ste vedeli?</string>
     <string name="hint_drag">Če želite preurediti vnose, pritisnite-in-držite na ime navade, nato pa jo povlecite na željeno mestu.</string>
     <string name="hint_landscape">Ogledate si lahko več dni, s tem da telefon postavite v ležeči načinu.</string>
-    <string name="delete_habits">Izbriši Navade</string>
-    <string name="delete_habits_message">Navade bodo trajno izbrisane. Te operacije ni možno razveljaviti.</string>
     <string name="habit_not_found">Izbrisana navada / ni najdena</string>
     <string name="weekends">Vikendi</string>
     <string name="any_weekday">Ponedeljek do Petka</string>
@@ -110,7 +99,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">Nočni način</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -122,8 +111,6 @@
     <string name="quarter">Četrtletje</string>
     <string name="year">Leto</string>
     <string name="total">Skupaj</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
     <string name="every_x_days">Vsakih %d dni</string>
     <string name="every_x_weeks">Vsakih %d tednov</string>
     <string name="score">Ocena</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 7543902d6..0c6758362 100644
--- a/uhabits-android/src/main/res/values-sr-rCS/strings.xml
+++ b/uhabits-android/src/main/res/values-sr-rCS/strings.xml
@@ -133,7 +133,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">Tamna tema</string>
+    <string name="night_mode" comment="dark_theme">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>
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 2cd879630..95e931888 100644
--- a/uhabits-android/src/main/res/values-sr-rSP/strings.xml
+++ b/uhabits-android/src/main/res/values-sr-rSP/strings.xml
@@ -107,7 +107,7 @@
     <string name="select_weekdays">Избор дана</string>
     <string name="export_to_csv">Извези као CSV</string>
     <string name="done_label">Завршено</string>
-    <string name="clear_label">Очисти</string>
+    <string name="clear_label">Обриши</string>
     <string name="select_hours">Избор часова</string>
     <string name="select_minutes">Избор минута</string>
     <string name="about">О програму</string>
@@ -133,7 +133,7 @@
     <string name="generate_bug_report">Направи извештај о грешци</string>
     <string name="troubleshooting">Решавање проблема</string>
     <string name="help_translate">Помозите превођење</string>
-    <string name="night_mode">Тамна тема</string>
+    <string name="night_mode" comment="dark_theme">Тамна тема</string>
     <string name="use_pure_black">Чиста црна у тамној теми</string>
     <string name="pure_black_description">Мења сиву позадину са чистом црном у тамној теми. Смањује потрошњу батерије код телефона са АМОЛЕД екраном.</string>
     <string name="interface_preferences">Сучеље</string>
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 39ac2dad0..e0586ca77 100644
--- a/uhabits-android/src/main/res/values-sv-rSE/strings.xml
+++ b/uhabits-android/src/main/res/values-sv-rSE/strings.xml
@@ -136,7 +136,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">Nattläge</string>
+    <string name="night_mode" comment="dark_theme">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>
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 b232333c2..d8ecdd40c 100644
--- a/uhabits-android/src/main/res/values-ta-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-ta-rIN/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Habit Tracker</string>
     <string name="main_activity_title">பழக்கங்கள்</string>
     <string name="action_settings">அமைப்புகள்</string>
@@ -30,16 +28,10 @@
     <string name="add_habit">சேர்க்க</string>
     <string name="color_picker_default_title">நிறம் மாற்ற</string>
     <string name="toast_habit_created">பழக்கம் உருவாக்கப்பட்டது</string>
-    <string name="toast_habit_deleted">பழக்கம் நீக்கப்பட்டது</string>
-    <string name="toast_habit_changed">பழக்கம் மாற்றப்பட்டது</string>
-    <string name="toast_habit_archived">காப்பகப்படுத்தியப் பழக்கம்</string>
-    <string name="toast_habit_unarchived">பழக்கங்கள் ஆவண காப்பகத்தில் இருந்து நீக்கப் பட்டது</string>
     <string name="overview">மேற்பார்வை</string>
     <string name="habit_strength">பழக்கத்தின் வலிமை</string>
     <string name="history">வரலாறு</string>
     <string name="clear">அழி</string>
-    <string name="times_every">காலங்களில்</string>
-    <string name="days">நாட்கள்</string>
     <string name="reminder">நினைவூட்டல்கள்</string>
     <string name="save">சேமிக்கவும்</string>
     <string name="streaks">சாதனைகள்</string>
@@ -50,7 +42,6 @@
     <string name="edit_habit">பழக்கத்தை திருத்த</string>
     <string name="check">சரிப்பார்ப்பு குறி</string>
     <string name="snooze">பிறகு</string>
-    <!-- App introduction -->
     <string name="intro_title_1">வருக</string>
     <string name="intro_description_1">இந்த செயலி நல்ல பழக்க வழக்கங்களை துவங்க மற்றும் தொடர உதவுகிறது.</string>
     <string name="intro_title_2">சில புது பழக்கங்களை துவங்கவும்!</string>
@@ -64,6 +55,7 @@
     <string name="interval_4_hour">4 மணி நேரம்</string>
     <string name="interval_8_hour">8 மணி நேரம்</string>
     <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>
@@ -75,8 +67,6 @@
     <string name="hint_title">உங்களுக்கு தெரியுமா?</string>
     <string name="hint_drag">பதிவுகளை மறுசீரைமக்க, தேவையான பழக்க பதிவின் மீது அழுத்தி பிடித்து பின் தேவையான இடத்திற்கு அதை இழுக்கவும்.</string>
     <string name="hint_landscape">உங்கள் கைப்பேசியை அகலவாக்கில் வைக்கும்போது இன்னும் அதிக நாட்களை காண முடியும்.</string>
-    <string name="delete_habits">பழக்கங்களை நீக்கவும்</string>
-    <string name="delete_habits_message">பழக்கங்கள் நிரந்தரமாக நீக்கப்படும். இந்த செயலை மீட்டமைக்க இயலாது.</string>
     <string name="habit_not_found">பழக்கம் நீக்கப்பட்டுவிட்டது / காணவில்லை</string>
     <string name="weekends">வார இறுதிகள்</string>
     <string name="any_weekday">திங்கள் முதல் வெள்ளி வரை</string>
@@ -110,7 +100,7 @@
     <string name="generate_bug_report">பிழை அறிக்கை உருவாக்கு</string>
     <string name="troubleshooting">பழுது இடமறிதல்</string>
     <string name="help_translate">இந்த செயலியை மற்ற மொழிகளில் மொழிபெயர்க்க உதவி செய்யவும்</string>
-    <string name="night_mode">இருள் வண்ண பாங்கு</string>
+    <string name="night_mode" comment="dark_theme">இருள் வண்ண பாங்கு</string>
     <string name="use_pure_black">இருள் பாங்கில் முழு கருப்பு நிறத்தை பயண்படுத்து</string>
     <string name="pure_black_description">இதன் மூலம் செயலியில் உள்ள பழுப்பு பின்புலங்கள் நீக்கப்பட்டு முழுவதும் கருப்பு நிற பின்புலங்களாக மாற்றப்படும். இது AMOLED திரை கொண்ட கைப்பேசிகளில் மின்கல பயன்பாட்டை குறைக்கும்.</string>
     <string name="interface_preferences">இடைமுகம்</string>
@@ -122,8 +112,7 @@
     <string name="quarter">காற் பங்கு</string>
     <string name="year">வருடம்</string>
     <string name="total">மொத்தம்</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="yes_or_no">நீங்கள் செய்தீர்களா அல்லது செய்யவில்லை</string>
     <string name="every_x_days">ஓவ்வொரு %d நாளும்</string>
     <string name="every_x_weeks">ஒவ்வொரு %d வாரங்களும்</string>
     <string name="score">மதிப்பெண்கள்</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 a54847b17..60fab75e4 100644
--- a/uhabits-android/src/main/res/values-te-rIN/strings.xml
+++ b/uhabits-android/src/main/res/values-te-rIN/strings.xml
@@ -17,10 +17,38 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
-    <!-- App introduction -->
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="main_activity_title">అలవాట్లు</string>
+    <string name="action_settings">సెట్టింగులు</string>
+    <string name="edit">మార్చు</string>
+    <string name="delete">తొలగించు</string>
+    <string name="archive">ఆర్కైవ్ చేయి</string>
+    <string name="add_habit">అలవాటు జోడించండి</string>
+    <string name="color_picker_default_title">రంగు మార్చండి</string>
+    <string name="toast_habit_created">అలవాటు సృష్టించబడింది</string>
+    <string name="overview">అవలోకనం</string>
+    <string name="history">చరిత్ర</string>
+    <string name="clear">తొలగించుము</string>
+    <string name="reminder">జ్ఞాపిక</string>
+    <string name="save">సేవ్</string>
+    <string name="no_habits_found">మీకు క్రియాశీలమైన అలవాట్లు లేవు</string>
+    <string name="create_habit">అలవాటు సృష్టించండి</string>
+    <string name="edit_habit">అలవాటును సవరించండి</string>
+    <string name="check">తనిఖీ చేయి</string>
+    <string name="snooze">తరువాత</string>
+    <string name="intro_title_1">స్వాగతం</string>
+    <string name="intro_description_1">లూప్ అలవాటు ట్రాకర్ మంచి అలవాట్లను సృష్టించడానికి మరియు నిర్వహించడానికి మీకు సహాయపడుతుంది.</string>
+    <string name="intro_title_2">కొన్ని కొత్త అలవాట్లను సృష్టించండి</string>
+    <string name="intro_description_2">ప్రతి రోజు, మీ అలవాటు చేసిన తర్వాత, అనువర్తనంలో చెక్‌మార్క్ ఉంచండి.</string>
+    <string name="intro_description_4">కాలక్రమేణా మీ అలవాట్లు ఎలా మెరుగుపడ్డాయో వివరణాత్మక గ్రాఫ్‌లు మీకు చూపుతాయి.</string>
+    <string name="interval_15_minutes">15 నిమిషాలు</string>
+    <string name="interval_30_minutes">30 నిమిషాలు</string>
+    <string name="interval_1_hour">1 గంట</string>
+    <string name="interval_2_hour">2 గంటలు</string>
+    <string name="interval_4_hour">4 గంటలు</string>
+    <string name="interval_8_hour">8 గంటలు</string>
+    <string name="interval_24_hour">24 గంటలు</string>
+    <string name="interval_always_ask">ఎల్లప్పుడూ అడుగు</string>
+    <string name="settings">సెట్టింగులు</string>
+    <string name="clear_label">తొలగించుము</string>
 </resources>
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 a131baa40..07b0b18ff 100644
--- a/uhabits-android/src/main/res/values-tr-rTR/strings.xml
+++ b/uhabits-android/src/main/res/values-tr-rTR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop Alışkanlık Takibi</string>
     <string name="main_activity_title">Alışkanlıklar</string>
     <string name="action_settings">Ayarlar</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">Alışkanlık ekle</string>
     <string name="color_picker_default_title">Renk Değiştir</string>
     <string name="toast_habit_created">Alışkanlık oluşturuldu.</string>
-    <string name="toast_habit_deleted">Alışkanlık silindi.</string>
-    <string name="toast_habit_changed">Alışkanlık değiştirildi</string>
-    <string name="toast_habit_archived">Alışkanlık arşivlendi.</string>
-    <string name="toast_habit_unarchived">Alışkanlık arşivden çıkarıldı.</string>
     <string name="overview">Genel Bakış</string>
     <string name="habit_strength">Alışkanlık gücü</string>
     <string name="history">Geçmiş</string>
     <string name="clear">Temizle</string>
-    <string name="days">gün</string>
     <string name="reminder">Hatırlatma</string>
     <string name="save">Kaydet</string>
     <string name="streaks">Seriler</string>
@@ -64,20 +59,16 @@
     <string name="interval_custom">Özel...</string>
     <string name="pref_toggle_title">Tek dokunuşla işaretle veya işareti kaldır</string>
     <string name="pref_toggle_description">Alışkanlıklarınızı, uzun dokunuş yerine tek dokunuşla işaretlemenizi sağlar. Kullanımı daha kolaydır ancak hatalı olarak işaretleme yapılmasına neden olabilir.</string>
-    <string name="pref_snooze_interval_title">Hatırlatmalardaki erteleme süresi</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</string>
     <string name="links">Bağlantılar</string>
     <string name="name">Ad</string>
     <string name="settings">Ayarlar</string>
-    <string name="snooze_interval">Erteleme süresi</string>
     <string name="select_snooze_delay">Erteleme süresini ayarla</string>
     <string name="hint_title">Biliyor muydun?</string>
     <string name="hint_drag">Girdileri sıralamak için, alışkanlık adının üstüne basılı tut ve doğru yere sürükle.</string>
     <string name="hint_landscape">Cihazını yatay tutarak daha fazla gün görebilirsin.</string>
-    <string name="delete_habits">Alışkanlıkları Sil</string>
-    <string name="delete_habits_message">Alışkanlıklar kalıcı olarak silinecek. Bu eylem geri alınamaz.</string>
     <string name="habit_not_found">Alışkanlık silinmiş ya da bulunamadı</string>
     <string name="weekends">Hafta sonları</string>
     <string name="any_weekday">Pazartesinden Cumaya</string>
@@ -111,7 +102,7 @@
     <string name="generate_bug_report">Hata raporu üret</string>
     <string name="troubleshooting">Sorun Giderme</string>
     <string name="help_translate">Bu uygulamanın çevirisine yardım et</string>
-    <string name="night_mode">Gece kipi</string>
+    <string name="night_mode" comment="dark_theme">Gece kipi</string>
     <string name="use_pure_black">Gece kipinde saf siyah kullan</string>
     <string name="pure_black_description">Gece kipinde gri arkaplanını, saf siyah ile değiştir. AMOLED ekranlı cihazlarda pil kullanımını azaltabilir.</string>
     <string name="interface_preferences">Arayüz</string>
@@ -170,15 +161,14 @@
     <string name="example_notes">(Tercihe bağlı)</string>
     <string name="yes_or_no_example">Örneğin,  Bugün erken uyandın mı? Spor yaptın mı? Satranç oynadın mı?</string>
     <string name="measurable">Ölçülebilir</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">Örneğin, Bugün kaç km. koştunuz? Kaç sayfa kitap okudunuz? Kaç kalorilik yemek yediniz?</string>
     <string name="x_times_per_week">Haftada %d kez</string>
     <string name="x_times_per_month">Ayda %d kez</string>
     <string name="yes_or_no_short_example">Örneğin, Spor</string>
     <string name="color">Renk</string>
     <string name="example_target">Ör. 15</string>
     <string name="measurable_short_example">Örneğin, Koşu</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">Örneğin, Bugün kaç km. koştunuz?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">Örneğin, Km.</string>
+    <string name="measurable_question_example">Örneğin, Bugün kaç km. koştunuz?</string>
+    <string name="measurable_units_example">Örneğin, Km.</string>
     <string name="every_month">Her ay</string>
     <string name="validation_cannot_be_blank">Boş bırakılamaz</string>
     <string name="today">Bugün</string>
diff --git a/uhabits-android/src/main/res/values-ug-rCN/strings.xml b/uhabits-android/src/main/res/values-ug-rCN/strings.xml
index dcc3da83d..88cdb3db8 100644
--- a/uhabits-android/src/main/res/values-ug-rCN/strings.xml
+++ b/uhabits-android/src/main/res/values-ug-rCN/strings.xml
@@ -17,9 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-
-<!--Generated by crowdin.com-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="main_activity_title">ئادەت</string>
     <string name="action_settings">تەڭشەك</string>
     <string name="edit">تەھرىرلەش</string>
@@ -29,10 +27,5 @@
     <string name="add_habit">ئادەت قېتىلدى</string>
     <string name="color_picker_default_title">رەڭ ئۆزگەردى</string>
     <string name="toast_habit_created">ئادەت قۇرۇلدى</string>
-    <string name="toast_habit_deleted">ئادەت ئۆچۈرۈلدى</string>
-    <string name="toast_habit_changed">ئادەت ئۆزگەرتىلدى</string>
-    <!-- App introduction -->
     <string name="settings">تەڭشەك</string>
-    <!-- Different types of habits -->
-    <!-- Middle part of the sentence '1 time in xx days' -->
 </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 dbf8eb904..e33911ce0 100644
--- a/uhabits-android/src/main/res/values-uk-rUA/strings.xml
+++ b/uhabits-android/src/main/res/values-uk-rUA/strings.xml
@@ -148,7 +148,7 @@
     <string name="generate_bug_report">Створити звіт про помилку</string>
     <string name="troubleshooting">Усунення несправностей</string>
     <string name="help_translate">Допоможіть перекласти цю програму</string>
-    <string name="night_mode">Нічний режим</string>
+    <string name="night_mode" comment="dark_theme">Нічний режим</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-vi-rVN/strings.xml b/uhabits-android/src/main/res/values-vi-rVN/strings.xml
index 0371155aa..82006cd8f 100644
--- a/uhabits-android/src/main/res/values-vi-rVN/strings.xml
+++ b/uhabits-android/src/main/res/values-vi-rVN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Trình theo dõi thói quen Loop</string>
     <string name="main_activity_title">Thói quen</string>
     <string name="action_settings">Cài đặt</string>
@@ -28,19 +28,27 @@
     <string name="add_habit">Thêm thói quen</string>
     <string name="color_picker_default_title">Thay đổi màu sắc</string>
     <string name="toast_habit_created">Thói quen đã được tạo</string>
-    <string name="toast_habit_deleted">Thói quen đã bị xóa</string>
-    <string name="toast_habit_changed">Thói quen đã được thay đổi</string>
-    <string name="toast_habit_archived">Thói quen đã được lưu trữ</string>
-    <string name="toast_habit_unarchived">Thói quen đã bị huỷ lưu trữ</string>
+    <plurals name="toast_habits_changed">
+        <item quantity="other">Thói quen đã được thay đổi</item>
+    </plurals>
+    <plurals name="toast_habits_deleted">
+        <item quantity="other">Thói quen đã bị xóa</item>
+    </plurals>
+    <plurals name="toast_habits_archived">
+        <item quantity="other">Thói quen đã được lưu trữ</item>
+    </plurals>
+    <plurals name="toast_habits_unarchived">
+        <item quantity="other">Thói quen đã bị huỷ lưu trữ</item>
+    </plurals>
     <string name="overview">Tổng quan</string>
     <string name="habit_strength">Độ mạnh của thói quen</string>
     <string name="history">Lịch sử</string>
     <string name="clear">Xoá</string>
-    <string name="days">ngày</string>
     <string name="reminder">Nhắc nhở</string>
     <string name="save">Lưu</string>
     <string name="streaks">Mức độ</string>
     <string name="no_habits_found">Bạn có không có thói quen nào đang hoạt động</string>
+    <string name="no_habits_left_to_do">Bạn đã xong tất cả cho ngày hôm nay!</string>
     <string name="long_press_to_toggle">Nhấn giữ để đánh dấu hoặc bỏ đánh dấu</string>
     <string name="reminder_off">Tắt</string>
     <string name="create_habit">Tạo thói quen</string>
@@ -64,20 +72,22 @@
     <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_snooze_interval_title">Khoảng thời gian báo lại lời nhắc</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>
     <string name="links">Liên kết</string>
     <string name="name">Tên</string>
     <string name="settings">Cài đặt</string>
-    <string name="snooze_interval">Khoảng thời gian tạm dừng</string>
     <string name="select_snooze_delay">Chọn độ trễ báo lại</string>
-    <string name="hint_title">Bạn đã biết?</string>
+    <string name="hint_title">Bạn có biết?</string>
     <string name="hint_drag">Để sắp xếp lại các mục, nhấn giữ tên thói quen, sau đó kéo tới vị trí chính xác.</string>
     <string name="hint_landscape">Bạn có thể xoay ngang điện thoại để xem được nhiều ngày hơn.</string>
-    <string name="delete_habits">Xoá bỏ thói quen</string>
-    <string name="delete_habits_message">Thói quen sẽ bị xoá vĩnh viễn. Hành động này không thể khôi phục.</string>
+    <plurals name="delete_habits_title">
+        <item quantity="other">Xoá thói quen?</item>
+    </plurals>
+    <plurals name="delete_habits_message">
+        <item quantity="other">Thói quen sẽ bị xoá vĩnh viễn. Hành động này không thể được hoàn tác.</item>
+    </plurals>
     <string name="habit_not_found">Thói quen đã bị xoá hoặc không tìm thấy</string>
     <string name="weekends">Cuối tuần</string>
     <string name="any_weekday">Thứ hai đến thứ sáu</string>
@@ -94,24 +104,24 @@
     <string name="version_n">Phiên bản %s</string>
     <string name="frequency">Tần suất</string>
     <string name="checkmark">Đánh dấu</string>
-    <string name="best_streaks">Duy trì lâu nhất</string>
+    <string name="best_streaks">Chuỗi dài nhất</string>
     <string name="every_day">Hàng ngày</string>
     <string name="every_week">Hàng tuần</string>
     <string name="help">Trợ giúp &amp; Câu hỏi</string>
     <string name="could_not_export">Xuất dữ liệu thất bại.</string>
     <string name="could_not_import">Nhập dữ liệu thất bại.</string>
-    <string name="file_not_recognized">Không xác nhận được file.</string>
+    <string name="file_not_recognized">Không nhận ra được tệp.</string>
     <string name="habits_imported">Thói quen được nhập thành công.</string>
     <string name="import_data">Nhập dữ liệu</string>
-    <string name="export_full_backup">Xuất toàn bộ sao lưu</string>
+    <string name="export_full_backup">Xuất bản sao lưu đầy đủ</string>
     <string name="import_data_summary">Hỗ trợ các bản sao lưu đầy đủ được xuất ra bởi ứng dụng, cũng như các file được tạo bởi Tickmate, HabitBull hoặc Rewire. Xem FAQ để biết thêm thông tin.</string>
-    <string name="export_as_csv_summary">Các file tạo ra có thể mở bằng các phần mềm bảng tính như Microsoft Excel hoặc OpenOffice Calc. Nhưng file này không thể nhập lại.</string>
+    <string name="export_as_csv_summary">Tạo ra các tệp có thể được mở bằng các phần mềm bảng tính như Microsoft Excel hoặc OpenOffice Calc. Tệp này không thể được nhập lại.</string>
     <string name="export_full_backup_summary">Tạo ra một tệp chứa tất cả dữ liệu của bạn. Tệp này có thể nhập lại.</string>
     <string name="bug_report_failed">Tạo báo cáo về lỗi.</string>
     <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">Chế độ ban đêm</string>
+    <string name="night_mode" comment="dark_theme">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>
@@ -147,6 +157,7 @@
     <string name="by_name">Theo tên</string>
     <string name="by_color">Theo màu sắc</string>
     <string name="by_score">Theo điểm số</string>
+    <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>
@@ -170,16 +181,30 @@
     <string name="example_notes">(Không bắt buộc)</string>
     <string name="yes_or_no_example">Ví dụ: Hôm nay bạn có dậy sớm không? Bạn có tập thể dục? Bạn có chơi cờ vua không?</string>
     <string name="measurable">Có thể đo lường</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">Ví dụ như bạn chạy bao nhiêu dặm ngày hôm nay? Bạn đã đọc bao nhiêu trang sách? Bạn đã ăn bao nhiêu calo?</string>
+    <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="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>
     <string name="measurable_short_example">Ví dụ: Chạy</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">Ví dụ: Bao nhiêu dặm bạn đã chạy ngày hôm nay?</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">Ví dụ: Dặm</string>
+    <string name="measurable_question_example">Ví dụ: Bao nhiêu dặm bạn đã chạy ngày hôm nay?</string>
+    <string name="measurable_units_example">Ví dụ: Dặm</string>
     <string name="every_month">Hàng tháng</string>
     <string name="validation_cannot_be_blank">Không thể để trống</string>
     <string name="today">Hôm nay</string>
+    <string name="enter">Nhập</string>
+    <string name="no_habits">Không tìm thấy thói quen nào</string>
+    <string name="no_numerical_habits">Không tìm thấy thói quen có thể đo lường nào</string>
+    <string name="no_boolean_habits">Không tìm thấy thói quen có hoặc không nào</string>
+    <string name="increment">Tăng lên</string>
+    <string name="decrement">Giảm xuống</string>
+    <string name="pref_skip_title">Bật bỏ qua ngày</string>
+    <string name="pref_skip_description">Bật/tắt hai lần để thêm một lần bỏ qua thay vì dấu kiểm. Bỏ qua giữ cho số điểm của bạn không thay đổi và không phá vỡ chuỗi của bạn.</string>
+    <string name="pref_unknown_title">Hiện dấu hỏi cho dữ liệu bị thiếu</string>
+    <string name="pref_unknown_description">Phân biệt những ngày không có dữ liệu với những lần trôi đi thực tế. Để nhập một lần trôi đi, hãy bật/tắt hai lần.</string>
+    <string name="you_are_now_a_developer">Bạn đã là nhà phát triển</string>
+    <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>
 </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 d53511e00..d4a0ff450 100644
--- a/uhabits-android/src/main/res/values-zh-rCN/strings.xml
+++ b/uhabits-android/src/main/res/values-zh-rCN/strings.xml
@@ -121,7 +121,7 @@
     <string name="generate_bug_report">生成错误报告</string>
     <string name="troubleshooting">故障排除</string>
     <string name="help_translate">帮助翻译这个应用</string>
-    <string name="night_mode">夜间模式</string>
+    <string name="night_mode" comment="dark_theme">深色主题</string>
     <string name="use_pure_black">在夜间模式中使用纯黑色</string>
     <string name="pure_black_description">以纯黑色背景代替夜间模式中的灰色背景。
 这可以降低 AMOLED 屏幕手机的耗电量。</string>
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 e952075a4..888daadef 100644
--- a/uhabits-android/src/main/res/values-zh-rTW/strings.xml
+++ b/uhabits-android/src/main/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~ Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
   ~
   ~ This file is part of Loop Habit Tracker.
   ~
@@ -17,7 +17,7 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="app_name">Loop 習以為常</string>
     <string name="main_activity_title">習慣</string>
     <string name="action_settings">偏好設定</string>
@@ -28,15 +28,10 @@
     <string name="add_habit">加入新習慣</string>
     <string name="color_picker_default_title">選擇顏色</string>
     <string name="toast_habit_created">習慣已增加</string>
-    <string name="toast_habit_deleted">習慣已刪除</string>
-    <string name="toast_habit_changed">習慣已經被修改</string>
-    <string name="toast_habit_archived">習慣已封存</string>
-    <string name="toast_habit_unarchived">習慣已取消封存</string>
     <string name="overview">總覽</string>
     <string name="habit_strength">習慣強度</string>
     <string name="history">歴史紀錄</string>
     <string name="clear">清空</string>
-    <string name="days">日</string>
     <string name="reminder">提醒</string>
     <string name="save">儲存</string>
     <string name="streaks">記錄</string>
@@ -64,20 +59,16 @@
     <string name="interval_custom">自訂</string>
     <string name="pref_toggle_title">換成輕碰來記錄習慣</string>
     <string name="pref_toggle_description">雖然更方便，但有可能變成不小心就點到</string>
-    <string name="pref_snooze_interval_title">延後提醒的間隔</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>
     <string name="links">連結</string>
     <string name="name">習慣名稱</string>
     <string name="settings">偏好設定</string>
-    <string name="snooze_interval">延後時間間隔</string>
     <string name="select_snooze_delay">選擇延後通知</string>
     <string name="hint_title">你知道嗎？</string>
     <string name="hint_drag">如果要重新排列習慣，可以將其拖曳到理想的位置</string>
     <string name="hint_landscape">把手機橫放可以看到更多天數</string>
-    <string name="delete_habits">刪除習慣</string>
-    <string name="delete_habits_message">此習慣會被永久刪除，而且無法復原</string>
     <string name="habit_not_found">習慣已刪除 / 搜尋不到</string>
     <string name="weekends">週末</string>
     <string name="any_weekday">工作日</string>
@@ -115,7 +106,7 @@
     <string name="generate_bug_report">製作錯誤報告</string>
     <string name="troubleshooting">問題排除</string>
     <string name="help_translate">協助翻譯本程式</string>
-    <string name="night_mode">夜間模式</string>
+    <string name="night_mode" comment="dark_theme">夜間模式</string>
     <string name="use_pure_black">在夜間模式中使用深色設定</string>
     <string name="pure_black_description">在夜間模式中，使用黑色背景取代灰色背景。這樣可以減少 AMOLED 螢幕手機的電量消耗。</string>
     <string name="interface_preferences">介面</string>
@@ -174,15 +165,14 @@
     <string name="example_notes">（非必要的）</string>
     <string name="yes_or_no_example">例如： 你今天有早起嗎？你有運動嗎？你有下棋嗎？</string>
     <string name="measurable">可測量進度</string>
-    <string name="measurable_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot;">例如：你今天跑了幾英里？你閱讀了幾頁？你吃了多少卡路里？</string>
     <string name="x_times_per_week">每周 %d 次</string>
     <string name="x_times_per_month">每月 %d 次</string>
     <string name="yes_or_no_short_example">例如：運動</string>
     <string name="color">顏色</string>
     <string name="example_target">例如：15</string>
     <string name="measurable_short_example">例如：跑步</string>
-    <string name="measurable_question_example" comment="Feel free to replace &quot;miles&quot; by &quot;km&quot; if that is more common in your country">例如：你今天跑了幾英里？</string>
-    <string name="measurable_units_example" comment="Feel free to replace by &quot;km&quot; if that is more common in your country">例如：英里</string>
+    <string name="measurable_question_example">例如：你今天跑了幾英里？</string>
+    <string name="measurable_units_example">例如：英里</string>
     <string name="every_month">每個月</string>
     <string name="validation_cannot_be_blank">必填</string>
     <string name="today">今天</string>
diff --git a/uhabits-android/src/main/res/xml/widget_checkmark_info.xml b/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
index f4d13d90f..86172553b 100644
--- a/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
+++ b/uhabits-android/src/main/res/xml/widget_checkmark_info.xml
@@ -23,7 +23,7 @@
                     android:minWidth="40dp"
                     android:initialLayout="@layout/widget_wrapper"
                     android:previewImage="@drawable/widget_preview_checkmark"
-                    android:resizeMode="none"
+                    android:resizeMode="vertical|horizontal"
                     android:updatePeriodMillis="3600000"
                     android:configure="org.isoron.uhabits.widgets.activities.HabitPickerDialog"
                     android:widgetCategory="home_screen">
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt
index 11a2b146c..b5dff17de 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/ScoreList.kt
@@ -22,6 +22,7 @@ import org.isoron.uhabits.core.models.Score.Companion.compute
 import java.util.ArrayList
 import java.util.HashMap
 import javax.annotation.concurrent.ThreadSafe
+import kotlin.math.max
 import kotlin.math.min
 
 @ThreadSafe
@@ -93,11 +94,15 @@ class ScoreList {
         for (i in values.indices) {
             val offset = values.size - i - 1
             if (isNumerical) {
-                rollingSum += values[offset]
+                rollingSum += max(0, values[offset])
                 if (offset + denominator < values.size) {
                     rollingSum -= values[offset + denominator]
                 }
-                val percentageCompleted = min(1.0, rollingSum / 1000 / targetValue)
+                val percentageCompleted = if (targetValue > 0) {
+                    min(1.0, rollingSum / 1000 / targetValue)
+                } else {
+                    1.0
+                }
                 previousValue = compute(freq, previousValue, percentageCompleted)
             } else {
                 if (values[offset] == Entry.YES_MANUAL) {
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
index 9e0c8d1d9..7e240eecb 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/BarChart.kt
@@ -136,6 +136,7 @@ class BarChart(
             canvas.drawLine(0.0, y, width, y)
             canvas.setColor(theme.mediumContrastTextColor)
             canvas.setTextAlign(TextAlign.CENTER)
+            canvas.setFontSize(theme.smallTextSize)
             var prevMonth = -1
             var prevYear = -1
             val isLargeInterval = axis.size < 2 || (axis[0].distanceTo(axis[1]) > 300)
diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt
index c96d2ce46..f78af6d21 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/ScoreListTest.kt
@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.core.models
 
+import junit.framework.Assert.assertTrue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.number.IsCloseTo
 import org.hamcrest.number.OrderingComparison
@@ -121,6 +122,14 @@ class ScoreListTest : BaseUnitTest() {
         checkScoreValues(expectedValues)
     }
 
+    @Test
+    fun test_withZeroTarget() {
+        habit = fixtures.createNumericalHabit()
+        habit.targetValue = 0.0
+        habit.recompute()
+        assertTrue(habit.scores[today].value.isFinite())
+    }
+
     @Test
     fun test_imperfectNonDaily() {
         // If the habit should be performed 3 times per week and the user misses 1 repetition