diff --git a/CHANGELOG.md b/CHANGELOG.md
index 307b541c9..e21cd4365 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.7.6 (July 18, 2017)
+
+* Fix bug that caused widgets not to render sometimes
+* Fix other minor bugs
+* Update translations
+
 ### 1.7.3 (May 30, 2017)
 
 * Improve performance of 'sort by score'
diff --git a/app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java b/app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
index f9284b58e..ea31c54c7 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
@@ -171,13 +171,13 @@ public void testArchiveHabits()
         clickMenuItem(R.string.archive);
         assertHabitsDontExist(names);
 
-        clickMenuItem(R.string.show_archived);
+        clickMenuItem(R.string.hide_archived);
 
         assertHabitsExist(names);
         selectHabits(names);
         clickMenuItem(R.string.unarchive);
 
-        clickMenuItem(R.string.show_archived);
+        clickMenuItem(R.string.hide_archived);
 
         assertHabitsExist(names);
         deleteHabits(names);
diff --git a/app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java b/app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
index 32e6df853..45efec5e7 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
@@ -115,6 +115,41 @@ public void testInvalidateNewerThan()
         assertThat(records.get(0).timestamp, equalTo(today - 21 * day));
     }
 
+    @Test
+    public void testFixRecords() throws Exception
+    {
+        long day = DateUtils.millisecondsInOneDay;
+        long from = DateUtils.getStartOfToday();
+        long to = from + 5 * day;
+
+        List<CheckmarkRecord> original, actual, expected;
+        HabitRecord habit = new HabitRecord();
+
+        original = new ArrayList<>();
+        original.add(new CheckmarkRecord(habit, from + 8*day, 2));
+        original.add(new CheckmarkRecord(habit, from + 5*day, 0));
+        original.add(new CheckmarkRecord(habit, from + 4*day, 0));
+        original.add(new CheckmarkRecord(habit, from + 4*day, 2));
+        original.add(new CheckmarkRecord(habit, from + 3*day, 2));
+        original.add(new CheckmarkRecord(habit, from + 2*day, 1));
+        original.add(new CheckmarkRecord(habit, from + 2*day + 100, 1));
+        original.add(new CheckmarkRecord(habit, from, 0));
+        original.add(new CheckmarkRecord(habit, from, 2));
+        original.add(new CheckmarkRecord(habit, from - day, 2));
+
+        actual = SQLiteCheckmarkList.fixRecords(original, habit, from, to);
+
+        expected = new ArrayList<>();
+        expected.add(new CheckmarkRecord(habit, from + 5*day, 0));
+        expected.add(new CheckmarkRecord(habit, from + 4*day, 2));
+        expected.add(new CheckmarkRecord(habit, from + 3*day, 2));
+        expected.add(new CheckmarkRecord(habit, from + 2*day, 1));
+        expected.add(new CheckmarkRecord(habit, from + day, 0));
+        expected.add(new CheckmarkRecord(habit, from, 2));
+
+        assertThat(actual, equalTo(expected));
+    }
+
     private List<CheckmarkRecord> getAllRecords()
     {
         return new Select()
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9e7185d46..8491ec533 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="32"
-    android:versionName="1.7.5">
+    android:versionCode="33"
+    android:versionName="1.7.6">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 
diff --git a/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
index 620a2d59f..0a2e0d407 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
@@ -32,7 +32,8 @@
 import java.text.*;
 import java.util.*;
 
-import static org.isoron.uhabits.models.Checkmark.*;
+import static org.isoron.uhabits.models.Checkmark.CHECKED_EXPLICITLY;
+import static org.isoron.uhabits.models.Checkmark.UNCHECKED;
 
 public class HistoryChart extends ScrollableChart
 {
@@ -112,10 +113,21 @@ public boolean onSingleTapUp(MotionEvent e)
         if (!isEditable) return false;
 
         performHapticFeedback(HapticFeedbackConstants.KEYBOARD_TAP);
+        float x, y;
 
-        int pointerId = e.getPointerId(0);
-        float x = e.getX(pointerId);
-        float y = e.getY(pointerId);
+        try
+        {
+            int pointerId = e.getPointerId(0);
+            x = e.getX(pointerId);
+            y = e.getY(pointerId);
+        }
+        catch (RuntimeException ex)
+        {
+            // Android often throws IllegalArgumentException here. Apparently,
+            // the pointer id may become invalid shortly after calling
+            // e.getPointerId.
+            return false;
+        }
 
         final Long timestamp = positionToTimestamp(x, y);
         if (timestamp == null) return false;
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
index 1245668a0..e036f859c 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListAdapter.java
@@ -105,11 +105,10 @@ public void clearSelection()
      * Returns the item that occupies a certain position on the list
      *
      * @param position position of the item
-     * @return the item at given position
-     * @throws IndexOutOfBoundsException if position is not valid
+     * @return the item at given position or null if position is invalid
      */
     @Deprecated
-    @NonNull
+    @Nullable
     public Habit getItem(int position)
     {
         return cache.getHabitByPosition(position);
@@ -314,6 +313,8 @@ public void setOrder(HabitList.Order order)
     public void toggleSelection(int position)
     {
         Habit h = getItem(position);
+        if (h == null) return;
+
         int k = selected.indexOf(h);
         if (k < 0) selected.add(h);
         else selected.remove(h);
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java
index fbb4e51a6..228700768 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCache.java
@@ -93,12 +93,12 @@ public int[] getCheckmarks(long habitId)
      * Returns the habits that occupies a certain position on the list.
      *
      * @param position the position of the habit
-     * @return the habit at given position
-     * @throws IndexOutOfBoundsException if position is not valid
+     * @return the habit at given position or null if position is invalid
      */
-    @NonNull
-    public Habit getHabitByPosition(int position)
+    @Nullable
+    public synchronized Habit getHabitByPosition(int position)
     {
+        if(position < 0 || position >= data.habits.size()) return null;
         return data.habits.get(position);
     }
 
diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
index 8aeba9685..dd0e744fe 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
@@ -143,12 +143,13 @@ public void setSelected(boolean isSelected)
         updateBackground(isSelected);
     }
 
-    public void triggerRipple(long timestamp)
+    public synchronized void triggerRipple(long timestamp)
     {
         long today = DateUtils.getStartOfToday();
         long day = DateUtils.millisecondsInOneDay;
         int offset = (int) ((today - timestamp) / day) - dataOffset;
         CheckmarkButtonView button = checkmarkPanel.indexToButton(offset);
+        if (button == null) return;
 
         float y = button.getHeight() / 2.0f;
         float x = checkmarkPanel.getX() + button.getX() + button.getWidth() / 2;
diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
index a9c9ae871..d41a8684a 100644
--- a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
+++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
@@ -53,38 +53,27 @@ public class SQLiteCheckmarkList extends CheckmarkList
     @Nullable
     private CachedData cache;
 
-    @NonNull
-    private final SQLiteStatement invalidateStatement;
-
-    @NonNull
-    private final SQLiteStatement addStatement;
-
-    @NonNull
-    private final SQLiteDatabase db;
-
     public SQLiteCheckmarkList(Habit habit)
     {
         super(habit);
         sqlite = new SQLiteUtils<>(CheckmarkRecord.class);
-
-        db = Cache.openDatabase();
-        addStatement = db.compileStatement(ADD_QUERY);
-        invalidateStatement = db.compileStatement(INVALIDATE_QUERY);
     }
 
     @Override
     public void add(List<Checkmark> checkmarks)
     {
         check(habit.getId());
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(ADD_QUERY);
         db.beginTransaction();
         try
         {
             for (Checkmark c : checkmarks)
             {
-                addStatement.bindLong(1, habit.getId());
-                addStatement.bindLong(2, c.getTimestamp());
-                addStatement.bindLong(3, c.getValue());
-                addStatement.execute();
+                statement.bindLong(1, habit.getId());
+                statement.bindLong(2, c.getTimestamp());
+                statement.bindLong(3, c.getValue());
+                statement.execute();
             }
 
             db.setTransactionSuccessful();
@@ -115,14 +104,7 @@ public List<Checkmark> getByInterval(long fromTimestamp, long toTimestamp)
         List<CheckmarkRecord> records = sqlite.query(query, params);
         for (CheckmarkRecord record : records) record.habit = habitRecord;
 
-        int nDays = DateUtils.getDaysBetween(fromTimestamp, toTimestamp) + 1;
-        if (records.size() != nDays)
-        {
-            throw new InconsistentDatabaseException(
-                String.format("habit=%s, %d expected, %d found",
-                    habit.getName(), nDays, records.size()));
-        }
-
+        records = fixRecords(records, habitRecord, fromTimestamp, toTimestamp);
         return toCheckmarks(records);
     }
 
@@ -139,9 +121,11 @@ public int getTodayValue()
     public void invalidateNewerThan(long timestamp)
     {
         cache = null;
-        invalidateStatement.bindLong(1, habit.getId());
-        invalidateStatement.bindLong(2, timestamp);
-        invalidateStatement.execute();
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(INVALIDATE_QUERY);
+        statement.bindLong(1, habit.getId());
+        statement.bindLong(2, timestamp);
+        statement.execute();
         observable.notifyListeners();
     }
 
@@ -198,6 +182,28 @@ private List<Checkmark> toCheckmarks(@NonNull List<CheckmarkRecord> records)
         return checkmarks;
     }
 
+    public static List<CheckmarkRecord> fixRecords(List<CheckmarkRecord> original,
+                                                   HabitRecord habit,
+                                                   long fromTimestamp,
+                                                   long toTimestamp)
+    {
+        long day = DateUtils.millisecondsInOneDay;
+        ArrayList<CheckmarkRecord> records = new ArrayList<>();
+
+        for (long t = toTimestamp; t >= fromTimestamp; t -= day)
+            records.add(new CheckmarkRecord(habit, t, Checkmark.UNCHECKED));
+
+        for (CheckmarkRecord record : original)
+        {
+            if ((toTimestamp - record.timestamp) % day != 0) continue;
+            int offset = (int) ((toTimestamp - record.timestamp) / day);
+            if (offset < 0 || offset >= records.size()) continue;
+            records.set(offset, record);
+        }
+
+        return records;
+    }
+
     private static class CachedData
     {
         int todayValue;
diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
index 7bf739cd2..bfd1af1da 100644
--- a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
+++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
@@ -49,14 +49,6 @@ public class SQLiteScoreList extends ScoreList
     @NonNull
     private final SQLiteUtils<ScoreRecord> sqlite;
 
-    @NonNull
-    private final SQLiteStatement invalidateStatement;
-
-    @NonNull
-    private final SQLiteStatement addStatement;
-
-    private final SQLiteDatabase db;
-
     @Nullable
     private CachedData cache = null;
 
@@ -69,25 +61,23 @@ public SQLiteScoreList(@NonNull Habit habit)
     {
         super(habit);
         sqlite = new SQLiteUtils<>(ScoreRecord.class);
-
-        db = Cache.openDatabase();
-        addStatement = db.compileStatement(ADD_QUERY);
-        invalidateStatement = db.compileStatement(INVALIDATE_QUERY);
     }
 
     @Override
     public void add(List<Score> scores)
     {
         check(habit.getId());
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(ADD_QUERY);
         db.beginTransaction();
         try
         {
             for (Score s : scores)
             {
-                addStatement.bindLong(1, habit.getId());
-                addStatement.bindLong(2, s.getTimestamp());
-                addStatement.bindLong(3, s.getValue());
-                addStatement.execute();
+                statement.bindLong(1, habit.getId());
+                statement.bindLong(2, s.getTimestamp());
+                statement.bindLong(3, s.getValue());
+                statement.execute();
             }
 
             db.setTransactionSuccessful();
@@ -150,9 +140,11 @@ public synchronized int getTodayValue()
     public synchronized void invalidateNewerThan(long timestamp)
     {
         cache = null;
-        invalidateStatement.bindLong(1, habit.getId());
-        invalidateStatement.bindLong(2, timestamp);
-        invalidateStatement.execute();
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(INVALIDATE_QUERY);
+        statement.bindLong(1, habit.getId());
+        statement.bindLong(2, timestamp);
+        statement.execute();
         getObservable().notifyListeners();
     }
 
diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
index 8d6068579..a14811b45 100644
--- a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
+++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
@@ -37,22 +37,19 @@
  */
 public class SQLiteStreakList extends StreakList
 {
+
+    private static final String INVALIDATE_QUERY =
+        "delete from Streak where habit = ? and end >= ?";
+
     private HabitRecord habitRecord;
 
     @NonNull
     private final SQLiteUtils<StreakRecord> sqlite;
 
-    private final SQLiteStatement invalidateStatement;
-
     public SQLiteStreakList(Habit habit)
     {
         super(habit);
         sqlite = new SQLiteUtils<>(StreakRecord.class);
-
-        SQLiteDatabase db = Cache.openDatabase();
-        String invalidateQuery = "delete from Streak where habit = ? " +
-                                 "and end >= ?";
-        invalidateStatement = db.compileStatement(invalidateQuery);
     }
 
     @Override
@@ -81,9 +78,11 @@ public Streak getNewestComputed()
     @Override
     public void invalidateNewerThan(long timestamp)
     {
-        invalidateStatement.bindLong(1, habit.getId());
-        invalidateStatement.bindLong(2, timestamp - DateUtils.millisecondsInOneDay);
-        invalidateStatement.execute();
+        SQLiteDatabase db = Cache.openDatabase();
+        SQLiteStatement statement = db.compileStatement(INVALIDATE_QUERY);
+        statement.bindLong(1, habit.getId());
+        statement.bindLong(2, timestamp - DateUtils.millisecondsInOneDay);
+        statement.execute();
         observable.notifyListeners();
     }
 
diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
index 6938b505d..31dd8f35d 100644
--- a/app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
+++ b/app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
@@ -24,6 +24,7 @@
 import com.activeandroid.*;
 import com.activeandroid.annotation.*;
 
+import org.apache.commons.lang3.builder.*;
 import org.isoron.uhabits.models.*;
 
 /**
@@ -53,6 +54,17 @@ public class CheckmarkRecord extends Model implements SQLiteRecord
     @Column(name = "value")
     public Integer value;
 
+    public CheckmarkRecord()
+    {
+    }
+
+    public CheckmarkRecord(HabitRecord habit, Long timestamp, Integer value)
+    {
+        this.habit = habit;
+        this.timestamp = timestamp;
+        this.value = value;
+    }
+
     @Override
     public void copyFrom(Cursor c)
     {
@@ -64,4 +76,40 @@ public Checkmark toCheckmark()
     {
         return new Checkmark(timestamp, value);
     }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if (this == o) return true;
+
+        if (o == null || getClass() != o.getClass()) return false;
+
+        CheckmarkRecord that = (CheckmarkRecord) o;
+
+        return new EqualsBuilder()
+            .append(habit, that.habit)
+            .append(timestamp, that.timestamp)
+            .append(value, that.value)
+            .isEquals();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return new HashCodeBuilder(17, 37)
+            .append(habit)
+            .append(timestamp)
+            .append(value)
+            .toHashCode();
+    }
+
+    @Override
+    public String toString()
+    {
+        return new ToStringBuilder(this)
+            .append("habit", habit)
+            .append("timestamp", timestamp)
+            .append("value", value)
+            .toString();
+    }
 }
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 2f7ca5cb0..1768b2c4c 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -146,6 +146,14 @@
                     style="@style/About.Item"
                     android:text="Angga Rifandi (Bahasa Indonesia)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="raden20 (Bahasa Indonesia)"/>
+
+                <TextView
+                    style="@style/About.Item"
+                    android:text="azzamsa (Bahasa Indonesia)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="David Nos (Català)"/>
@@ -230,6 +238,10 @@
                     style="@style/About.Item"
                     android:text="Jelle den Butter (Nederlands)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="nitovf9292 (Norsk)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Adam Jurkiewicz (Polski)"/>
@@ -256,7 +268,7 @@
 
                 <TextView
                     style="@style/About.Item"
-                    android:text="Dalecarlian (Svenska)"/>
+                    android:text="Alexander Jansson (Svenska)"/>
 
                 <TextView
                     style="@style/About.Item"
@@ -278,6 +290,10 @@
                     style="@style/About.Item"
                     android:text="Rystard (Українська)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Oglaigh Rystard (Українська)"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Limin Lu (中文)"/>
@@ -314,6 +330,10 @@
                     style="@style/About.Item"
                     android:text="Josh Graham (한국어 )"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Seoyul (한국어 )"/>
+
                 <TextView
                     style="@style/About.Item"
                     android:text="Aman Satnami (हिन्दी)"/>
@@ -326,6 +346,10 @@
                     style="@style/About.Item"
                     android:text="Yoav Argov (עברית‎)"/>
 
+                <TextView
+                    style="@style/About.Item"
+                    android:text="Mahdi Nasiri (فارسی‎)"/>
+
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index fc043bc6a..85d70798d 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -37,7 +37,7 @@
   <string name="toast_habit_changed_back">Промяната на навика е отменена.</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>
@@ -65,8 +65,8 @@
   <string name="intro_title_2">Създайте нови навици</string>
   <string name="intro_description_2">Всеки ден, след изпълнението на навика, поставете отметка в приложението.</string>
   <string name="intro_title_3">Продължавайте да го изпълнявате</string>
-  <string name="intro_description_3">Навици изпълнявани редовно за дълго време ще получат пълна звезда.</string>
-  <string name="intro_title_4">Следете прогреса си</string>
+  <string name="intro_description_3">Навици изпълнявани редовно за дълго време ще ви спечелят пълна звезда.</string>
+  <string name="intro_title_4">Следете напредъка си</string>
   <string name="intro_description_4">Подробни диаграми ви показват как вашите навици са се подобрили с времето.</string>
   <string name="interval_15_minutes">15 минути</string>
   <string name="interval_30_minutes">30 минути</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 14b5a64ff..2b783e1d3 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -57,7 +57,7 @@
   <string name="validation_at_most_one_rep_per_day">Můžete mít maximálně jedno označení denně.</string>
   <string name="create_habit">Vytvořit zvyk</string>
   <string name="edit_habit">Upravit zvyk</string>
-  <string name="check">Označeno</string>
+  <string name="check">Hotovo</string>
   <string name="snooze">Odložit</string>
   <!-- App introduction -->
   <string name="intro_title_1">Vítejte</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 61d6bada5..79910b24b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -48,26 +48,26 @@
   <string name="reminder">Erinnerung</string>
   <string name="discard">Verwerfen</string>
   <string name="save">Speichern</string>
-  <string name="streaks">Strähnen</string>
+  <string name="streaks">Serien</string>
   <string name="no_habits_found">Du hast keine aktiven Gewohnheiten</string>
   <string name="long_press_to_toggle">Tippe und halte um aus- bzw. abzuwählen</string>
   <string name="reminder_off">Aus</string>
   <string name="validation_name_should_not_be_blank">Name darf nicht leer sein.</string>
   <string name="validation_number_should_be_positive">Zahl muss positiv sein.</string>
-  <string name="validation_at_most_one_rep_per_day">Du musst wenigstens eine Wiederholung pro Tag haben</string>
+  <string name="validation_at_most_one_rep_per_day">Du kannst höchstens eine Wiederholung pro Tag haben</string>
   <string name="create_habit">Gewohnheit erstellen</string>
   <string name="edit_habit">Gewohnheit bearbeiten</string>
-  <string name="check">Abhaken</string>
+  <string name="check">Markieren</string>
   <string name="snooze">Später</string>
   <!-- App introduction -->
   <string name="intro_title_1">Willkommen</string>
-  <string name="intro_description_1">Loop Habit Tracker hilft dir gute Gewohnheiten implementieren.</string>
+  <string name="intro_description_1">Loop Habit Tracker hilft dir gute Gewohnheiten anzueignen.</string>
   <string name="intro_title_2">Erstelle neue Gewohnheiten</string>
-  <string name="intro_description_2">Jeden Tag, nachdem du die Gewohnheit gemacht hast, hake sie in der App ab.</string>
+  <string name="intro_description_2">Hake die Gewohnheit jeden Tag in der App ab, nachdem du sie erledigt hast.</string>
   <string name="intro_title_3">Bleib dran</string>
   <string name="intro_description_3">Gewohnheiten, die über einen längeren Zeitraum absolviert werden, bekommen einen ganzen Stern.</string>
   <string name="intro_title_4">Verfolge deinen Fortschritt</string>
-  <string name="intro_description_4">Detaillierte Diagramme zeigen dir an wie sich deine Gewohnheiten entwickelt haben.</string>
+  <string name="intro_description_4">Detaillierte Diagramme zeigen dir an, wie sich deine Gewohnheiten entwickelt haben.</string>
   <string name="interval_15_minutes">15 Minuten</string>
   <string name="interval_30_minutes">30 Minuten</string>
   <string name="interval_1_hour">1 Stunde</string>
@@ -75,29 +75,29 @@
   <string name="interval_4_hour">4 Stunden</string>
   <string name="interval_8_hour">8 Stunden</string>
   <string name="interval_24_hour">24 Stunden</string>
-  <string name="pref_toggle_title">Gewohnheiten durch kurzes Tippen abhaken</string>
-  <string name="pref_toggle_description">Abhaken durch einfaches Tippen, anstatt durch Tippen und Halten. Bequemer, kann aber eine falsche Auswahl verursachen.</string>
+  <string name="pref_toggle_title">Markierung durch kurzes Tippen ändern</string>
+  <string name="pref_toggle_description">Markierungen durch einfaches Tippen setzen anstatt durch Tippen und Halten. Bequemer, kann aber versehentlich eine Markierung ändern.</string>
   <string name="pref_snooze_interval_title">\"Später erinnern\"-Intervall bei Erinnerungen</string>
   <string name="pref_rate_this_app">Bewerte diese App auf Google Play</string>
   <string name="pref_send_feedback">Sende dem Entwickler Feedback</string>
   <string name="pref_view_source_code">Zeige den Quellcode auf GitHub</string>
-  <string name="pref_view_app_introduction">Zeige die Anleitung</string>
+  <string name="pref_view_app_introduction">Zeige die App-Einführung</string>
   <string name="links">Links</string>
   <string name="behavior">Verhalten</string>
   <string name="name">Name</string>
   <string name="settings">Einstellungen</string>
   <string name="snooze_interval">\"Später erinnern\"-Intervall</string>
   <string name="hint_title">Wusstest du?</string>
-  <string name="hint_drag">Um Einträge umzusortieren, tippe und ziehe sie an die richtige Stelle.</string>
+  <string name="hint_drag">Um Einträge umzusortieren, tippe, halte und ziehe sie an die richtige Stelle.</string>
   <string name="hint_landscape">Du kannst mehr Tage sehen, wenn du dein Smartphone quer hältst.</string>
-  <string name="delete_habits">Gewohnheiten löschen</string>
-  <string name="delete_habits_message">Diese Gewohnheit wird permanent gelöscht. Dies kann nicht rückgängig gemacht werden.</string>
+  <string name="delete_habits">Lösche Gewohnheiten</string>
+  <string name="delete_habits_message">Die Gewohnheit wird für immer gelöscht. Dies kann nicht rückgängig gemacht werden.</string>
   <string name="habit_not_found">Gewohnheit gelöscht / nicht gefunden</string>
   <string name="weekends">An Wochenenden</string>
   <string name="any_weekday">Werktags</string>
   <string name="any_day">Jeden Tag</string>
-  <string name="select_weekdays">Wähle die Tage</string>
-  <string name="export_to_csv">als CSV exportieren</string>
+  <string name="select_weekdays">Wähle Tage aus</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">Wähle Stunden</string>
@@ -106,11 +106,11 @@
   <string name="translators">Übersetzer</string>
   <string name="developers">Entwickler</string>
   <string name="version_n">Version %s</string>
-  <string name="frequency">Frequenz</string>
+  <string name="frequency">Häufigkeit</string>
   <string name="checkmark">Häkchen</string>
   <string name="strength">Stärke</string>
-  <string name="best_streaks">Beste Strähnen</string>
-  <string name="current_streaks">Derzeitige Strähne</string>
+  <string name="best_streaks">Beste Serien</string>
+  <string name="current_streaks">Derzeitige Serie</string>
   <string name="number_of_repetitions">Anzahl der Wiederholungen</string>
   <string name="last_x_days">Letzten %d Tage</string>
   <string name="last_x_weeks">Letzten %d Wochen</string>
@@ -123,25 +123,25 @@
   <string name="five_times_per_week">5 Mal pro Woche</string>
   <string name="custom_frequency">Benutzerdefiniert</string>
   <string name="help">Hilfe &amp; FAQ</string>
-  <string name="could_not_export">Der Export von Daten ist fehlgeschlagen.</string>
-  <string name="could_not_import">Der Import von Daten ist fehlgeschlagen.</string>
+  <string name="could_not_export">Fehler beim Exportieren der Daten.</string>
+  <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 wurden erfolgreich importiert.</string>
+  <string name="habits_imported">Gewohnheiten erfolgreich importiert.</string>
   <string name="full_backup_success">Vollständige Sicherung erfolgreich exportiert.</string>
   <string name="import_data">Importiere Daten</string>
   <string name="export_full_backup">Exportiere vollständige Sicherung</string>
-  <string name="import_data_summary">Unterstützt vollständige Sicherungen dieser App, sowie erstellte Sicherungen von Tickmate, HabitBull oder Rewire. Siehe FAQ für mehr Information.</string>
-  <string name="export_as_csv_summary">Erzeugt 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">Erzeugt eine Datei, die alle deine Daten enthält. Diese Datei kann wieder importiert werden.</string>
-  <string name="bug_report_failed">Fehlermeldung konnte nicht erstellt werden.</string>
-  <string name="generate_bug_report">Einen Fehler melden</string>
+  <string name="import_data_summary">Unterstützt vollständige Sicherungen dieser App sowie Sicherungen 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 diese App zu übersetzen</string>
+  <string name="help_translate">Hilf mit, diese App zu übersetzen</string>
   <string name="night_mode">Nachtmodus</string>
-  <string name="use_pure_black">Reines Schwarz im Nachtmodus verwenden</string>
-  <string name="pure_black_description">Ersetzt das Grau im Hintergrund durch ein reines Schwarz im Nachtmodus. Reduziert den Stromverbrauch von Smartphones mit einem AMOLED Display.</string>
+  <string name="use_pure_black">Verwende reines Schwarz im Nachtmodus</string>
+  <string name="pure_black_description">Ersetzt im Nachtmodus das Grau im Hintergrund durch ein reines Schwarz. Reduziert den Stromverbrauch von Smartphones mit einem AMOLED Display.</string>
   <string name="interface_preferences">Oberfläche</string>
-  <string name="reverse_days">Die Reihenfolge der Tage umkehren</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>
   <string name="day">Tag</string>
   <string name="week">Woche</string>
@@ -151,18 +151,18 @@
   <string name="total">Gesamt</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">Mal in</string>
-  <string name="every_x_days">Jeden %d Tag</string>
-  <string name="every_x_weeks">Jede %d Woche</string>
-  <string name="every_x_months">Jeden %d Monat</string>
+  <string name="every_x_days">Alle %d Tage</string>
+  <string name="every_x_weeks">Alle %d Wochen</string>
+  <string name="every_x_months">Alle %d Monate</string>
   <string name="score">Wertung</string>
-  <string name="reminder_sound">Benachrichtigungston</string>
-  <string name="none">Kein Ton</string>
+  <string name="reminder_sound">Erinnerungston</string>
+  <string name="none">Keiner</string>
   <string name="filter">Filter</string>
-  <string name="hide_completed">Erledigte Gewohnheiten ausblenden</string>
-  <string name="hide_archived">Archivierte Gewohnheiten ausblenden</string>
-  <string name="sticky_notifications">Permanente Benachrichtigungen</string>
+  <string name="hide_completed">Abgeschlossene verbergen</string>
+  <string name="hide_archived">Archivierte verbergen</string>
+  <string name="sticky_notifications">Fixiere Benachrichtigungen</string>
   <string name="sticky_notifications_description">Verhindert das Wegwischen von Benachrichtigungen.</string>
-  <string name="repair_database">Datenbank reparieren</string>
+  <string name="repair_database">Repariere Datenbank</string>
   <string name="database_repaired">Datenbank repariert.</string>
   <string name="uncheck">Abwählen</string>
   <string name="toggle">Umschalten</string>
@@ -174,5 +174,5 @@
   <string name="by_color">Nach Farbe</string>
   <string name="by_score">Nach Wertung</string>
   <string name="download">Runterladen</string>
-  <string name="export">Export</string>
+  <string name="export">Exportieren</string>
 </resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index d95d59bfe..75e38eb2c 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -19,6 +19,7 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+  <string name="app_name">Ohitura Tracker Loop</string>
   <string name="main_activity_title">Ohiturak</string>
   <string name="action_settings">Ezarpenak</string>
   <string name="edit">Editatu</string>
@@ -149,6 +150,7 @@
   <string name="year">Urtea</string>
   <string name="total">Guztira</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
+  <string name="time_every">denbora</string>
   <string name="every_x_days">%d egunero</string>
   <string name="every_x_weeks">%d astero</string>
   <string name="every_x_months">%d hilabetero</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index efddd8c5c..c3512ccde 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -19,34 +19,34 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="app_name">عادت‌سنج</string>
+  <string name="app_name">عادت‌سنج لوپ</string>
   <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="unarchive">خارج کردن از آرشیو</string>
+  <string name="delete">حذف کن</string>
+  <string name="archive">بایگانی کن</string>
+  <string name="unarchive">خارج کردن از بایگانی</string>
   <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_restored">عادت بازگردانده شد.</string>
-  <string name="toast_nothing_to_undo">چیزی برای واکردن وجود ندارد.</string>
-  <string name="toast_nothing_to_redo">چیزی برای برگشت وجود ندارد.</string>
+  <string name="toast_nothing_to_undo">چیزی برای بازگرداندن به حالت قبلی وجود ندارد</string>
+  <string name="toast_nothing_to_redo">چیزی برای انجام مجدد وجود ندارد</string>
   <string name="toast_habit_changed">عادت تغییر کرد.</string>
-  <string name="toast_habit_changed_back">عادت به حالت قبل برگشت.</string>
-  <string name="toast_habit_archived">عادت آرشیو شد.</string>
-  <string name="toast_habit_unarchived">عادت از آرشیو خارج شد.</string>
+  <string name="toast_habit_changed_back">عادت به حالت قبل برگشت</string>
+  <string name="toast_habit_archived">عادات بایگانی شدند</string>
+  <string name="toast_habit_unarchived">عادت از بایگانی خارج شدند</string>
   <string name="overview">مرور</string>
-  <string name="habit_strength">قوت عادت</string>
+  <string name="habit_strength">قدرت عادت</string>
   <string name="history">تاریخچه</string>
-  <string name="clear">حذف</string>
+  <string name="clear">بی‌خیال</string>
   <string name="description_hint">سوال (آیا امروز شما&#8230;؟)</string>
   <string name="repeat">تکرار</string>
   <string name="times_every">بار در هر</string>
-  <string name="days">روزها</string>
+  <string name="days">روز</string>
   <string name="reminder">یادآور</string>
-  <string name="discard">حذف تغییرات</string>
+  <string name="discard">بی‌خیال</string>
   <string name="save">ذخیره</string>
   <string name="streaks">روزهای پیوسته</string>
   <string name="no_habits_found">شما هیچ عادت فعالی ندارید</string>
@@ -55,18 +55,18 @@
   <string name="validation_name_should_not_be_blank">جای اسم نمی‌تواند خالی باشد.</string>
   <string name="validation_number_should_be_positive">عدد بایستی مثبت باشد.</string>
   <string name="validation_at_most_one_rep_per_day">شما در نهایت می‌توانید یک تکرار در یک روز داشته باشید.</string>
-  <string name="create_habit">ساخت عادت</string>
+  <string name="create_habit">درج عادت جدید</string>
   <string name="edit_habit">ویرایش عادت</string>
   <string name="check">تیک زدن</string>
-  <string name="snooze">بعدا</string>
+  <string name="snooze">بعداً</string>
   <!-- App introduction -->
   <string name="intro_title_1">خوش آمدید</string>
-  <string name="intro_description_1">رهگیر عادت به شما کمک می‌کند تا برای خودتان عادت‌های خوبی بسازید.</string>
+  <string name="intro_description_1">رهگیر عادت لوپ به شما کمک می‌کند تا برای خودتان عادت‌های خوبی بسازید.</string>
   <string name="intro_title_2">ساخت چند عادت جدید</string>
-  <string name="intro_description_2">هر روز، بعد از اینکه کار مربوط به عادت را انجام دادید، تیک مربوط به آن در برنامه را بزنید.</string>
+  <string name="intro_description_2">هر روز، بعد از انجام عادت، آن را در برنامه تیک بزنید.</string>
   <string name="intro_title_3">ادامه دهید</string>
   <string name="intro_description_3">عادت‌هایی که به صورت پیوسته برای مدت طولانی انجام شده‌اند یک ستاره‌ی کامل دریافت می‌کنند.</string>
-  <string name="intro_title_4">پشرفت خود را رهگیری کنید</string>
+  <string name="intro_title_4">پیشرفت خود را رهگیری کنید</string>
   <string name="intro_description_4">نمودار جزئیات به شما نشان می‌دهد که چطور عادت‌هایتان با گذشت زمان بهبود پیدا کرده‌اند.</string>
   <string name="interval_15_minutes">۱۵ دقیقه</string>
   <string name="interval_30_minutes">۳۰ دقیقه</string>
@@ -74,30 +74,40 @@
   <string name="interval_2_hour">۲ ساعت</string>
   <string name="interval_4_hour">۴ ساعت</string>
   <string name="interval_8_hour">۸ ساعت</string>
+  <string name="interval_24_hour">۲۴ ساعت</string>
   <string name="pref_toggle_title">با اشاره‌ی کوتاه‌مدت وضعیت عادت را تغییر بده</string>
-  <string name="pref_toggle_description">راحت‌تر است ولی ممکن است باعث شود اشتباهی عادتی را تیک بزنید.</string>
-  <string name="pref_rate_this_app">دادن امتیاز به اپ در گوگل‌پلی</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="pref_view_app_introduction">دیدن معرفی اپ</string>
+  <string name="pref_view_source_code">دیدن منبع برنامه در گیت‌هاب</string>
+  <string name="pref_view_app_introduction">مشاهده معرفی برنامه</string>
   <string name="links">لینک‌ها</string>
   <string name="behavior">رفتار</string>
   <string name="name">نام</string>
   <string name="settings">تنظیمات</string>
-  <string name="hint_title">آیا می‌دانید؟</string>
+  <string name="snooze_interval">بازه به تعویق انداختن</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>
-  <string name="any_day">هر روز از هفته</string>
+  <string name="any_day">هر روز هفته</string>
   <string name="select_weekdays">انتخاب روزها</string>
-  <string name="export_to_csv">دخیره به عنوان فایل CSV</string>
-  <string name="done_label">انجام شده</string>
-  <string name="clear_label">حذف</string>
-  <string name="select_hours">انتخاب ساعت‌ها</string>
+  <string name="export_to_csv">صدور فایل CSV</string>
+  <string name="done_label">انجام شد</string>
+  <string name="clear_label">بی‌خیال</string>
+  <string name="select_hours">انتخاب ساعت</string>
+  <string name="select_minutes">انتخاب دقیقه</string>
   <string name="about">درباره</string>
-  <string name="translators">مترجمین</string>
+  <string name="translators">مترجمان</string>
   <string name="developers">توسعه‌دهندگان</string>
   <string name="version_n">نسخه %s</string>
+  <string name="frequency">تناوب</string>
+  <string name="checkmark">علامت</string>
   <string name="strength">قدرت</string>
   <string name="best_streaks">بهترین استمرار</string>
   <string name="current_streaks">استمرار فعلی</string>
@@ -106,20 +116,39 @@
   <string name="last_x_weeks">%d هفته اخیر</string>
   <string name="last_x_months">%d ماه اخیر</string>
   <string name="last_x_years">%d سال اخیر</string>
+  <string name="all_time">همیشه</string>
   <string name="every_day">هر روز</string>
   <string name="every_week">هر هفته</string>
   <string name="two_times_per_week">۲ بار در هفته</string>
   <string name="five_times_per_week">۵ بار در هفته</string>
   <string name="custom_frequency">سفارشی‌سازی ...</string>
   <string name="help">راهنما و سوالات متداول</string>
+  <string name="could_not_export">خطا در صدور اطلاعات.</string>
+  <string name="could_not_import">خطا در وارد کردن اطلاعات.</string>
+  <string name="file_not_recognized">پرونده شناخته شده نیست.</string>
+  <string name="habits_imported">عادت‌ها با موفقیت وارد شدند.</string>
+  <string name="full_backup_success">پرونده پشتیبان کامل، با موفقیت صادر شد.</string>
+  <string name="import_data">ورود اطلاعات</string>
+  <string name="export_full_backup">پشتیبان گیری کامل</string>
+  <string name="import_data_summary">علاوه بر پشتیبان کامل تهیه شده توسط این برنامه، از پرونده‌های تولید شده توسط Tickmate، HabitbBull و یا Rewire هم پشتیبانی می‌شود. برای اطلاعات بیشتر سوالات متداول را ببینید.</string>
+  <string name="export_as_csv_summary">پرونده‌ای تولید می‌کند که می‌توان توسط برنامه‌های صفحه گسترده مانند Microsoft Excel و یا OpenOffice Calc بازشان کرد. این پرونده قابلیت وارد کردن مجدد به این برنامه را ندارد.</string>
+  <string name="export_full_backup_summary">پرونده‌ای تولید می‌کند که شامل تمام اطلاعات شما است. این پرونده قابل بازیابی توسط این برنامه می‌باشد.</string>
+  <string name="bug_report_failed">خطایی در تولید گزارش مشکلات بوجود آمد.</string>
+  <string name="generate_bug_report">ایجاد گزارش مشکلات</string>
   <string name="troubleshooting">ایرادیابی</string>
-  <string name="night_mode">حالت شبانه</string>
+  <string name="help_translate">کمک برای ترجمه این برنامه</string>
+  <string name="night_mode">حالت شب</string>
   <string name="use_pure_black">استفاده از رنگ سیاه خالص در حالت شبانه</string>
+  <string name="pure_black_description">جایگزینی پس زمینه خاکستری با سیاه خالص در حالت شب. استفاده از باتری در گوشی‌های با صفحه نمایش AMOLED را کاهش می‌دهد.</string>
+  <string name="interface_preferences">رابط کاربری</string>
+  <string name="reverse_days">معکوس کردن ترتیب روزها</string>
+  <string name="reverse_days_description">روزها را در صفحه اصلی با ترتیب معکوس نمایش می‌دهد</string>
   <string name="day">روز</string>
   <string name="week">هفته</string>
   <string name="month">ماه</string>
   <string name="quarter">فصل</string>
   <string name="year">سال</string>
+  <string name="total">مجموع</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">بار در هر</string>
   <string name="every_x_days">هر %d روز یک‌بار</string>
@@ -128,4 +157,22 @@
   <string name="score">امتیاز</string>
   <string name="reminder_sound">صدای یادآور</string>
   <string name="none">هیچ‌کدام</string>
+  <string name="filter">فیلتر</string>
+  <string name="hide_completed">مخفی کردن کامل شده‌ها</string>
+  <string name="hide_archived">مخفی کردن بایگانی شده‌ها</string>
+  <string name="sticky_notifications">چسبناک کردن اعلان‌ها</string>
+  <string name="sticky_notifications_description">از رد کردن اعلان با کشیدن جلوگیری می‌کند.</string>
+  <string name="repair_database">تعمیر پایگاه داده</string>
+  <string name="database_repaired">پایگاه داده تعمیر شد.</string>
+  <string name="uncheck">برداشتن تیک</string>
+  <string name="toggle">تغییر وضعیت</string>
+  <string name="action">اقدام</string>
+  <string name="habit">عادت</string>
+  <string name="sort">مرتب‌سازی</string>
+  <string name="manually">دستی</string>
+  <string name="by_name">بر اساس نام</string>
+  <string name="by_color">بر اساس رنگ</string>
+  <string name="by_score">بر اساس امتیاز</string>
+  <string name="download">بارگيری</string>
+  <string name="export">صدور</string>
 </resources>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
deleted file mode 100644
index 4602cbfd6..000000000
--- a/app/src/main/res/values-id/strings.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ 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>
-  <string name="app_name">Loop Habit Tracker</string>
-  <string name="main_activity_title">Kebiasaan</string>
-  <string name="action_settings">Pengaturan</string>
-  <string name="edit">Ubah</string>
-  <string name="delete">Hapus</string>
-  <string name="archive">Arsip</string>
-  <string name="unarchive">Keluarkan dari arsip</string>
-  <string name="add_habit">Tambah Kebiasaan</string>
-  <string name="color_picker_default_title">Ganti warna</string>
-  <string name="toast_habit_created">Kebiasaan ditambahkan.</string>
-  <string name="toast_habit_deleted">Kebiasaan dihapus.</string>
-  <string name="toast_habit_restored">Kebiasaan dikembalikan.</string>
-  <string name="toast_nothing_to_undo">Tidak ada aksi sebelumnya.</string>
-  <string name="toast_nothing_to_redo">Tidak ada aksi sesudahnya.</string>
-  <string name="toast_habit_changed">Kebiasaan diubah.</string>
-  <string name="toast_habit_changed_back">Kebiasaan telah dikembalikan.</string>
-  <string name="toast_habit_archived">Kebiasaan diarsipkan.</string>
-  <string name="toast_habit_unarchived">Kebiasaan dikeluarkan dari arsip.</string>
-  <string name="overview">Keseluruhan</string>
-  <string name="habit_strength">Kekuatan Kebiasaan</string>
-  <string name="history">Riwayat</string>
-  <string name="clear">Bersihkan</string>
-  <string name="description_hint">Pertanyaan (Apakah kamu ... hari ini?)</string>
-  <string name="repeat">Ulangi</string>
-  <string name="times_every">kali dalam</string>
-  <string name="days">hari</string>
-  <string name="reminder">Pengingat</string>
-  <string name="discard">Batalkan</string>
-  <string name="save">Simpan</string>
-  <string name="streaks">Rentetan</string>
-  <string name="no_habits_found">Anda tidak memiliki Kebiasaan yang aktif</string>
-  <string name="long_press_to_toggle">Tekan dan tahan untuk menambah atau menghapus tanda cek</string>
-  <string name="reminder_off">Mati</string>
-  <string name="validation_name_should_not_be_blank">Nama tidak boleh kosong.</string>
-  <string name="validation_number_should_be_positive">Angka harus positif.</string>
-  <string name="validation_at_most_one_rep_per_day">Maksimal satu kali pengulangan dalam satu hari</string>
-  <string name="create_habit">Buat Kebiasaan</string>
-  <string name="edit_habit">Ubah Kebiasaan</string>
-  <string name="check">Tanda cek</string>
-  <string name="snooze">Tunda</string>
-  <!-- App introduction -->
-  <string name="intro_title_1">Selamat datang</string>
-  <string name="intro_description_1">Loop Habit Tracker membantu mencatat dan mengelola Kebiasaan baik Anda.</string>
-  <string name="intro_title_2">Buat beberapa Kebiasaan baru</string>
-  <string name="intro_description_2">Berikan tanda cek setiap kali Anda selesai melakukannya.</string>
-  <string name="intro_title_3">Terus lakukan</string>
-  <string name="intro_description_3">Kebiasaan yang dilakukan secara konsisten dalam jangka waktu panjang akan mendapatkan tanda bintang penuh.</string>
-  <string name="intro_title_4">Catat perkembangan Anda</string>
-  <string name="intro_description_4">Detail grafik menampilkan perkembangan Kebiasaanmu dari waktu ke waktu.</string>
-  <string name="interval_15_minutes">15 menit</string>
-  <string name="interval_30_minutes">30 menit</string>
-  <string name="interval_1_hour">1 jam</string>
-  <string name="interval_2_hour">2 jam</string>
-  <string name="interval_4_hour">4 jam</string>
-  <string name="interval_8_hour">8 jam</string>
-  <string name="interval_24_hour">24 jam</string>
-  <string name="pref_toggle_title">Tandai dengan cepat.</string>
-  <string name="pref_toggle_description">Lebih nyaman namun memungkinkan kesalahan.</string>
-  <string name="pref_snooze_interval_title">Durasi tunda sejenak pada pengingat</string>
-  <string name="pref_rate_this_app">Berikan rating aplikasi ini di Google Play</string>
-  <string name="pref_send_feedback">Kirimkan umpan balik kepada Developer</string>
-  <string name="pref_view_source_code">Lihat kode aplikasi di GitHub</string>
-  <string name="pref_view_app_introduction">Perkenalan aplikasi</string>
-  <string name="links">Tautan</string>
-  <string name="behavior">Kebiasaan</string>
-  <string name="name">Nama</string>
-  <string name="settings">Pengaturan</string>
-  <string name="snooze_interval">Durasi tunda sejenak</string>
-  <string name="hint_title">Tahukah kamu?</string>
-  <string name="hint_drag">Untuk mengatur urutan, tekan dan tahan judul Kebiasaan lalu tempatkan pada posisi yang Anda inginkan.</string>
-  <string name="hint_landscape">Anda dapat melihat tampilan hari dengan merubah posisi menjadi mode landscape.</string>
-  <string name="delete_habits">Hapus Kebiasaan</string>
-  <string name="delete_habits_message">Kebiasaan ini akan dihapus permanen. Tidak dapat dikembalikan.</string>
-  <string name="weekends">Akhir pekan</string>
-  <string name="any_weekday">Senin - Jumat</string>
-  <string name="any_day">Seluruh hari dalam satu minggu</string>
-  <string name="select_weekdays">Pilih hari</string>
-  <string name="export_to_csv">Ekspor (CSV)</string>
-  <string name="done_label">Selesai</string>
-  <string name="clear_label">Hapus</string>
-  <string name="select_hours">Pilih jam</string>
-  <string name="select_minutes">Pilih menit</string>
-  <string name="about">Tentang</string>
-  <string name="translators">Penerjemah</string>
-  <string name="developers">Developer</string>
-  <string name="version_n">Versi %s</string>
-  <string name="frequency">Frekuensi</string>
-  <string name="checkmark">Cek</string>
-  <string name="strength">Kekuatan</string>
-  <string name="best_streaks">Rentetan terbaik</string>
-  <string name="current_streaks">Rentetan saat ini</string>
-  <string name="number_of_repetitions">Jumlah pengulangan</string>
-  <string name="last_x_days">%d hari terakhir</string>
-  <string name="last_x_weeks">%d minggu terakhir</string>
-  <string name="last_x_months">%d bulan terakhir</string>
-  <string name="last_x_years">%d tahun terakhir</string>
-  <string name="all_time">Seluruh waktu</string>
-  <string name="every_day">Setiap hari</string>
-  <string name="every_week">Setiap minggu</string>
-  <string name="two_times_per_week">2 kali setiap minggu</string>
-  <string name="five_times_per_week">5 kali setiap minggu</string>
-  <string name="custom_frequency">Tersuai ...</string>
-  <string name="help">Bantuan &amp; FAQ</string>
-  <string name="could_not_export">Ekspor data gagal.</string>
-  <string name="could_not_import">Impor data gagal.</string>
-  <string name="file_not_recognized">File tidak dikenali.</string>
-  <string name="habits_imported">Impor data berhasil.</string>
-  <string name="full_backup_success">Ekspor data berhasil.</string>
-  <string name="import_data">Impor data</string>
-  <string name="export_full_backup">Ekspor data</string>
-  <string name="import_data_summary">Mendukung ekspor data dan file dari aplikasi Tickmate, HabitBull atau Rewire. Lihat FAQ untuk informasi lebih lanjut.</string>
-  <string name="export_as_csv_summary">Menghasilkan lembar kerja yang dapat dibuka menggunakan aplikasi seperti Microsoft Excel atau OpenOffice Calc. File ini tidak dapat di-impor kembali.</string>
-  <string name="export_full_backup_summary">Menghasilkan file yang berisikan seluruh data. File ini dapat di-impor kembali.</string>
-  <string name="bug_report_failed">Gagal membuat laporan masalah.</string>
-  <string name="generate_bug_report">Membuat laporan masalah</string>
-  <string name="troubleshooting">Troubleshoot</string>
-  <string name="help_translate">Bantu terjemahkan</string>
-  <string name="night_mode">Mode malam</string>
-  <string name="use_pure_black">Gunakan warna hitam 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">Antar muka</string>
-  <string name="reverse_days">Ubah urutan hari</string>
-  <string name="reverse_days_description">Tampilkan hari dalam urutan terbalik pada layar utama</string>
-  <string name="day">Hari</string>
-  <string name="week">Minggu</string>
-  <string name="month">Bulan</string>
-  <string name="quarter">Perempat</string>
-  <string name="year">Tahun</string>
-  <!-- Middle part of the sentence '1 time in xx days' -->
-  <string name="time_every">kali dalam</string>
-  <string name="every_x_days">Setiap %d hari</string>
-  <string name="every_x_weeks">Setiap %d minggu</string>
-  <string name="every_x_months">Setiap %d bulan</string>
-  <string name="score">Nilai</string>
-  <string name="reminder_sound">Suara pengingat</string>
-  <string name="none">Hening</string>
-</resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 92602f02f..0b1435380 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,181 +1,178 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ 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>
-<string name="app_name">"Loop Habit Tracker"</string>
-<string name="main_activity_title">"Kebiasaan"</string>
-<string name="action_settings">"Pengaturan"</string>
-<string name="edit">"Ubah"</string>
-<string name="delete">"Hapus"</string>
-<string name="archive">"Arsip"</string>
-<string name="unarchive">"Keluarkan dari arsip"</string>
-<string name="add_habit">"Tambah Kebiasaan"</string>
-<string name="color_picker_default_title">"Ganti warna"</string>
-<string name="toast_habit_created">"Kebiasaan ditambahkan."</string>
-<string name="toast_habit_deleted">"Kebiasaan dihapus."</string>
-<string name="toast_habit_restored">"Kebiasaan dikembalikan."</string>
-<string name="toast_nothing_to_undo">"Tidak ada aksi sebelumnya."</string>
-<string name="toast_nothing_to_redo">"Tidak ada aksi sesudahnya."</string>
-<string name="toast_habit_changed">"Kebiasaan diubah."</string>
-
-<!-- This appears when the user edits a habit, and then undoes the action. The habit is "changed back" to what is was before. Alternatively, "Habit restored". -->
-<string name="toast_habit_changed_back">"Kebiasaan telah dikembalikan."</string>
-<string name="toast_habit_archived">"Kebiasaan diarsipkan."</string>
-<string name="toast_habit_unarchived">"Kebiasaan dikeluarkan dari arsip."</string>
-<string name="overview">"Keseluruhan"</string>
-<string name="habit_strength">"Kekuatan Kebiasaan"</string>
-<string name="history">"Riwayat"</string>
-<string name="clear">"Bersihkan"</string>
-<string name="description_hint">"Pertanyaan (Apakah kamu ... hari ini?)"</string>
-
-<!-- This and the next two terms form the sentence "Repeat 3 times in 7 days" that you see when you create a habit. Let me know if you have trouble adapting this into your language. -->
-<string name="repeat">"Ulangi"</string>
-<string name="times_every">"kali dalam"</string>
-<string name="days">"hari"</string>
-<string name="reminder">"Pengingat"</string>
-<string name="discard">"Batalkan"</string>
-<string name="save">"Simpan"</string>
-
-<!-- Streak as in "winning streak". That is, the number of times a user has performed a habit consecutively. Similar terms are "chains" or "series". -->
-<string name="streaks">"Rentetan"</string>
-<string name="no_habits_found">"Anda tidak memiliki Kebiasaan yang aktif"</string>
-<string name="long_press_to_toggle">"Tekan dan tahan untuk menambah atau menghapus tanda cek"</string>
-<string name="reminder_off">"Mati"</string>
-<string name="validation_name_should_not_be_blank">"Nama tidak boleh kosong."</string>
-<string name="validation_number_should_be_positive">"Angka harus positif."</string>
-<string name="validation_at_most_one_rep_per_day">"Maksimal satu kali pengulangan dalam satu hari"</string>
-<string name="create_habit">"Buat Kebiasaan"</string>
-<string name="edit_habit">"Ubah Kebiasaan"</string>
-<string name="check">"Tanda cek"</string>
-<string name="snooze">"Tunda"</string>
-
-<!-- App introduction -->
-<string name="intro_title_1">"Selamat datang"</string>
-<string name="intro_description_1">"Loop Habit Tracker membantu mencatat dan mengelola Kebiasaan baik Anda."</string>
-<string name="intro_title_2">"Buat beberapa Kebiasaan baru"</string>
-<string name="intro_description_2">"Berikan tanda cek setiap kali Anda selesai melakukannya."</string>
-<string name="intro_title_3">"Terus lakukan"</string>
-<string name="intro_description_3">"Kebiasaan yang dilakukan secara konsisten dalam jangka waktu panjang akan mendapatkan tanda bintang penuh."</string>
-<string name="intro_title_4">"Catat perkembangan Anda"</string>
-<string name="intro_description_4">"Detail grafik menampilkan perkembangan Kebiasaanmu dari waktu ke waktu."</string>
-<string name="interval_15_minutes">"15 menit"</string>
-<string name="interval_30_minutes">"30 menit"</string>
-<string name="interval_1_hour">"1 jam"</string>
-<string name="interval_2_hour">"2 jam"</string>
-<string name="interval_4_hour">"4 jam"</string>
-<string name="interval_8_hour">"8 jam"</string>
-<string name="pref_toggle_title">"Tandai dengan cepat."</string>
-<string name="pref_toggle_description">"Lebih nyaman namun memungkinkan kesalahan."</string>
-<string name="pref_snooze_interval_title">"Durasi tunda sejenak pada pengingat"</string>
-<string name="pref_rate_this_app">"Berikan rating aplikasi ini di Google Play"</string>
-<string name="pref_send_feedback">"Kirimkan umpan balik kepada Developer"</string>
-<string name="pref_view_source_code">"Lihat kode aplikasi di GitHub"</string>
-<string name="pref_view_app_introduction">"Perkenalan aplikasi"</string>
-<string name="links">"Tautan"</string>
-<string name="behavior">"Kebiasaan"</string>
-<string name="name">"Nama"</string>
-<string name="show_archived">"Tampilkan arsip"</string>
-<string name="settings">"Pengaturan"</string>
-<string name="snooze_interval">"Durasi tunda sejenak"</string>
-<string name="hint_title">"Tahukah kamu?"</string>
-<string name="hint_drag">"Untuk mengatur urutan, tekan dan tahan judul Kebiasaan lalu tempatkan pada posisi yang Anda inginkan."</string>
-<string name="hint_landscape">"Anda dapat melihat tampilan hari dengan merubah posisi menjadi mode landscape."</string>
-<string name="delete_habits">"Hapus Kebiasaan"</string>
-<string name="delete_habits_message">"Kebiasaan ini akan dihapus permanen. Tidak dapat dikembalikan."</string>
-<string name="weekends">"Akhir pekan"</string>
-<string name="any_weekday">"Senin - Jumat"</string>
-<string name="any_day">"Seluruh hari dalam satu minggu"</string>
-<string name="select_weekdays">"Pilih hari"</string>
-<string name="export_to_csv">"Ekspor (CSV)"</string>
-<string name="done_label">"Selesai"</string>
-<string name="clear_label">"Hapus"</string>
-<string name="select_hours">"Pilih jam"</string>
-<string name="select_minutes">"Pilih menit"</string>
-
-<!-- Short description used on the Google Play store. There is an 80-character limit. -->
-<string name="store_short_description">"Buat Kebiasaan baik dan catat perkembangannya setiap waktu (bebas iklan)"</string>
-<string name="store_description_1">"Loop membantu Anda untuk membuat dan mengelola Kebiasaan baik, memungkinkan Anda mencapai gol jangka panjang. Grafik detail dan statistik menampilkan perkembangan Kebiasaan Anda dari waktu ke waktu. Aplikasi ini bebas iklan dan open-source."</string>
-<string name="store_feature_interface">"&lt;b&gt;Sederhana, minimalis dengan balutan antarmuka yang modern&lt;/b&gt;
-Loop memiliki tampilan minimalis yang mudah digunakan dan mengikuti panduan material design."</string>
-<string name="store_feature_score">"&lt;b&gt;Skor Kebiasaan&lt;/b&gt;
-Algoritma Loop akan menghitung kekuatan Kebiasaan Anda. Setiap kali Anda melakukan pengulangan maka skor Anda akan bertambah, sebaliknya jika Anda tidak mengerjakan Kebiasaan maka nilai akan dikurangi. Beberapa hari yang terlewat tidak akan menghapus seluruh perkembangan Kebiasaan Anda."</string>
-<string name="store_feature_statistics">"&lt;b&gt;Detail Grafik dan Statistik&lt;/b&gt;
-Lihat perkembangan Kebiasaan dari waktu ke waktu dengan tampilan yang menarik dan detail. Geser ke bawah untuk melihat seluruh catatan Kebiasaan Anda."</string>
-<string name="store_feature_schedules">"&lt;b&gt;Pengaturan jadwal fleksibel&lt;/b&gt;
-Mendukung kebiasaan harian dan kebiasaan dengan penjadwalan yang kompleks, seperti 3 kali dalam setiap minggu; 2 minggu sekali; hingga 2 hari sekali."</string>
-<string name="store_feature_reminders">"&lt;b&gt;Pengingat&lt;/b&gt;
-Anda dapat membuat pengingat untuk setiap Kebiasaan, dengan waktu yang telah Anda tentukan setiap harinya. Mudah untuk di-cek, batalkan ataupun tunda melalui panel notifikasi tanpa perlu membuka aplikasi."</string>
-<string name="store_feature_opensource">"&lt;b&gt;Bebas dari iklan dan open-source&lt;/b&gt;
-Tidak ada iklan, notifikasi menyebalkan dan juga hak akses yang tidak dibutuhkan.
-Kode aplikasi tersedia dengan lisensi GPLv3"</string>
-<string name="store_feature_wear">"&lt;b&gt;Mendukung Smartwatch&lt;/b&gt;
-Anda dapat dengan mudah mengecek, menunda ataupun membatalkan pengingat melalui smartwatch Anda."</string>
-<string name="about">"Tentang"</string>
-<string name="translators">"Penerjemah"</string>
-<string name="developers">"Developer"</string>
-
-<!-- %s will get replaced by the version number. For example, "Versão %d" will become "Versão 1.2.0". -->
-<string name="version_n">"Versi %s"</string>
-<string name="frequency">"Frekuensi"</string>
-<string name="checkmark">"Cek"</string>
-
-<!-- This is a shorter version of "Habit Strength" -->
-<string name="strength">"Kekuatan"</string>
-<string name="best_streaks">"Rentetan terbaik"</string>
-<string name="current_streaks">"Rentetan saat ini"</string>
-<string name="number_of_repetitions">"Jumlah pengulangan"</string>
-<string name="last_x_days">"%d hari terakhir"</string>
-<string name="last_x_weeks">"%d minggu terakhir"</string>
-<string name="last_x_months">"%d bulan terakhir"</string>
-<string name="last_x_years">"%d tahun terakhir"</string>
-
-<!-- "All time" number of repetitions. Or number of repetitions "since the beginning". -->
-<string name="all_time">"Seluruh waktu"</string>
-<string name="every_day">"Setiap hari"</string>
-<string name="every_week">"Setiap minggu"</string>
-<string name="two_times_per_week">"2 kali setiap minggu"</string>
-<string name="five_times_per_week">"5 kali setiap minggu"</string>
-<string name="custom_frequency">"Tersuai ..."</string>
-<string name="help">"Bantuan &amp; FAQ"</string>
-<string name="could_not_export">"Ekspor data gagal."</string>
-<string name="could_not_import">"Impor data gagal."</string>
-
-<!-- Appears when the user tries to import a file which we do not support or recognize. -->
-<string name="file_not_recognized">"File tidak dikenali."</string>
-<string name="habits_imported">"Impor data berhasil."</string>
-<string name="full_backup_success">"Ekspor data berhasil."</string>
-<string name="import_data">"Impor data"</string>
-<string name="export_full_backup">"Ekspor data"</string>
-<string name="import_data_summary">"Mendukung ekspor data dan file dari aplikasi Tickmate, HabitBull atau Rewire. Lihat FAQ untuk informasi lebih lanjut."</string>
-<string name="export_as_csv_summary">"Menghasilkan lembar kerja yang dapat dibuka menggunakan aplikasi seperti Microsoft Excel atau OpenOffice Calc. File ini tidak dapat di-impor kembali."</string>
-<string name="export_full_backup_summary">"Menghasilkan file yang berisikan seluruh data. File ini dapat di-impor kembali."</string>
-<string name="bug_report_failed">"Gagal membuat laporan masalah."</string>
-<string name="generate_bug_report">"Membuat laporan masalah"</string>
-<string name="troubleshooting">"Troubleshoot"</string>
-<string name="help_translate">"Bantu terjemahkan"</string>
-<string name="night_mode">"Mode malam"</string>
-<string name="use_pure_black">"Gunakan warna hitam 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">"Antar muka"</string>
-<string name="reverse_days">"Ubah urutan hari"</string>
-<string name="reverse_days_description">"Tampilkan hari dalam urutan terbalik pada layar utama"</string>
-<string name="day">"Hari"</string>
-<string name="week">"Minggu"</string>
-<string name="month">"Bulan"</string>
-
-<!-- Three-month period -->
-<string name="quarter">"Perempat"</string>
-<string name="year">"Tahun"</string>
-
-<!-- Middle part of the sentence '1 time in xx days' -->
-<!-- Middle part of the sentence '1 time in xx days' -->
-<string name="time_every">"kali dalam"</string>
-<string name="every_x_days">"Setiap %d hari"</string>
-<string name="every_x_weeks">"Setiap %d minggu"</string>
-<string name="every_x_months">"Setiap %d bulan"</string>
-
-<!-- The old "habit strength" has been replaced by "score". Feel free to translate "score" as "strength" or "stability" if it sounds more natural in your language. -->
-<string name="score">"Nilai"</string>
-<string name="reminder_sound">"Suara pengingat"</string>
-
-<!-- Appears when the user disables the reminder sound. Could also be "no sound", "mute" or "silent". -->
-<string name="none">"Hening"</string>
-</resources>
\ No newline at end of file
+    <string name="app_name">Loop Habit Tracker</string>
+    <string name="main_activity_title">Kebiasaan</string>
+    <string name="action_settings">Pengaturan</string>
+    <string name="edit">Sunting</string>
+    <string name="delete">Hapus</string>
+    <string name="archive">Arsip</string>
+    <string name="unarchive">Keluarkan dari arsip</string>
+    <string name="add_habit">Tambah Kebiasaan</string>
+    <string name="color_picker_default_title">Ganti warna</string>
+    <string name="toast_habit_created">Kebiasaan ditambahkan.</string>
+    <string name="toast_habit_deleted">Kebiasaan dihapus.</string>
+    <string name="toast_habit_restored">Kebiasaan dipulihkan</string>
+    <string name="toast_nothing_to_undo">Tidak ada aksi sebelumnya.</string>
+    <string name="toast_nothing_to_redo">Tidak ada aksi sesudahnya.</string>
+    <string name="toast_habit_changed">Kebiasaan diubah.</string>
+    <string name="toast_habit_changed_back">Kebiasaan telah dikembalikan.</string>
+    <string name="toast_habit_archived">Kebiasaan diarsipkan.</string>
+    <string name="toast_habit_unarchived">Kebiasaan dikeluarkan dari arsip.</string>
+    <string name="overview">Keseluruhan</string>
+    <string name="habit_strength">Kekuatan Kebiasaan</string>
+    <string name="history">Riwayat</string>
+    <string name="clear">Bersihkan</string>
+    <string name="description_hint">Pertanyaan (Sudahkah Anda ... hari ini?)</string>
+    <string name="repeat">Ulangi</string>
+    <string name="times_every">kali dalam</string>
+    <string name="days">hari</string>
+    <string name="reminder">Pengingat</string>
+    <string name="discard">Batalkan</string>
+    <string name="save">Simpan</string>
+    <string name="streaks">Rentetan</string>
+    <string name="no_habits_found">Anda tidak memiliki Kebiasaan yang aktif</string>
+    <string name="long_press_to_toggle">Tekan dan tahan untuk menambah atau menghapus tanda cek</string>
+    <string name="reminder_off">Mati</string>
+    <string name="validation_name_should_not_be_blank">Nama tidak boleh kosong.</string>
+    <string name="validation_number_should_be_positive">Angka harus positif.</string>
+    <string name="validation_at_most_one_rep_per_day">Maksimal satu kali pengulangan dalam satu hari</string>
+    <string name="create_habit">Buat Kebiasaan</string>
+    <string name="edit_habit">Sunting Kebiasaan</string>
+    <string name="check">Tanda cek</string>
+    <string name="snooze">Tunda</string>
+    <!-- App introduction -->
+    <string name="intro_title_1">Selamat datang</string>
+    <string name="intro_description_1">Loop Habit Tracker membantu mencatat dan mengelola Kebiasaan baik Anda.</string>
+    <string name="intro_title_2">Buat beberapa Kebiasaan baru</string>
+    <string name="intro_description_2">Berikan tanda cek setiap kali Anda selesai melakukannya.</string>
+    <string name="intro_title_3">Terus lakukan</string>
+    <string name="intro_description_3">Kebiasaan yang dilakukan secara konsisten dalam jangka waktu panjang akan mendapatkan tanda bintang penuh.</string>
+    <string name="intro_title_4">Catat perkembangan Anda</string>
+    <string name="intro_description_4">Detail grafik menampilkan perkembangan Kebiasaanmu dari waktu ke waktu.</string>
+    <string name="interval_15_minutes">15 menit</string>
+    <string name="interval_30_minutes">30 menit</string>
+    <string name="interval_1_hour">1 jam</string>
+    <string name="interval_2_hour">2 jam</string>
+    <string name="interval_4_hour">4 jam</string>
+    <string name="interval_8_hour">8 jam</string>
+    <string name="interval_24_hour">24 jam</string>
+    <string name="pref_toggle_title">Tandai dengan cepat.</string>
+    <string name="pref_toggle_description">Lebih nyaman namun memungkinkan kesalahan.</string>
+    <string name="pref_snooze_interval_title">Durasi tunda sejenak pada pengingat</string>
+    <string name="pref_rate_this_app">Berikan rating aplikasi ini di Google Play</string>
+    <string name="pref_send_feedback">Kirimkan umpan balik kepada Developer</string>
+    <string name="pref_view_source_code">Lihat kode aplikasi di GitHub</string>
+    <string name="pref_view_app_introduction">Perkenalan aplikasi</string>
+    <string name="links">Tautan</string>
+    <string name="behavior">Kebiasaan</string>
+    <string name="name">Nama</string>
+    <string name="settings">Pengaturan</string>
+    <string name="snooze_interval">Durasi tunda sejenak</string>
+    <string name="hint_title">Sudahkah Anda tahu?</string>
+    <string name="hint_drag">Untuk mengatur urutan, tekan dan tahan judul Kebiasaan lalu tempatkan pada posisi yang Anda inginkan.</string>
+    <string name="hint_landscape">Anda dapat melihat tampilan hari dengan merubah posisi menjadi mode landscape.</string>
+    <string name="delete_habits">Hapus Kebiasaan</string>
+    <string name="delete_habits_message">Kebiasaan ini akan dihapus secara permanen. Tindakan ini tidak dapat dibatalkan.</string>
+    <string name="habit_not_found">Kebiasaan telah dihapus / tidak ditemukan</string>
+    <string name="weekends">Akhir pekan</string>
+    <string name="any_weekday">Senin - Jumat</string>
+    <string name="any_day">Seluruh hari dalam satu minggu</string>
+    <string name="select_weekdays">Pilih hari</string>
+    <string name="export_to_csv">Ekspor (CSV)</string>
+    <string name="done_label">Selesai</string>
+    <string name="clear_label">Hapus</string>
+    <string name="select_hours">Pilih jam</string>
+    <string name="select_minutes">Pilih menit</string>
+    <string name="about">Tentang</string>
+    <string name="translators">Penerjemah</string>
+    <string name="developers">Developer</string>
+    <string name="version_n">Versi %s</string>
+    <string name="frequency">Frekuensi</string>
+    <string name="checkmark">Cek</string>
+    <string name="strength">Kekuatan</string>
+    <string name="best_streaks">Rentetan terbaik</string>
+    <string name="current_streaks">Rentetan saat ini</string>
+    <string name="number_of_repetitions">Jumlah pengulangan</string>
+    <string name="last_x_days">%d hari terakhir</string>
+    <string name="last_x_weeks">%d minggu terakhir</string>
+    <string name="last_x_months">%d bulan terakhir</string>
+    <string name="last_x_years">%d tahun terakhir</string>
+    <string name="all_time">Seluruh waktu</string>
+    <string name="every_day">Setiap hari</string>
+    <string name="every_week">Setiap minggu</string>
+    <string name="two_times_per_week">2 kali per minggu</string>
+    <string name="five_times_per_week">5 kali per minggu</string>
+    <string name="custom_frequency">Sesuaikan &#8230;</string>
+    <string name="help">Bantuan &amp; FAQ</string>
+    <string name="could_not_export">Gagal mengekspor data.</string>
+    <string name="could_not_import">Gagal mengimpor data.</string>
+    <string name="file_not_recognized">File tidak dikenali.</string>
+    <string name="habits_imported">Impor data berhasil.</string>
+    <string name="full_backup_success">Ekspor data berhasil.</string>
+    <string name="import_data">Impor data</string>
+    <string name="export_full_backup">Ekspor data</string>
+    <string name="import_data_summary">Mendukung ekspor data dan file dari aplikasi Tickmate, HabitBull atau Rewire. Lihat FAQ untuk informasi lebih lanjut.</string>
+    <string name="export_as_csv_summary">Menghasilkan lembar kerja yang dapat dibuka menggunakan aplikasi seperti Microsoft Excel atau OpenOffice Calc. File ini tidak dapat di-impor kembali.</string>
+    <string name="export_full_backup_summary">Menghasilkan file yang berisikan seluruh data. File ini dapat di-impor kembali.</string>
+    <string name="bug_report_failed">Gagal membuat laporan masalah.</string>
+    <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="use_pure_black">Gunakan warna hitam 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">Antar muka</string>
+    <string name="reverse_days">Ubah urutan hari</string>
+    <string name="reverse_days_description">Tampilkan hari dalam urutan terbalik pada layar utama</string>
+    <string name="day">Hari</string>
+    <string name="week">Minggu</string>
+    <string name="month">Bulan</string>
+    <string name="quarter">Kuartal</string>
+    <string name="year">Tahun</string>
+    <string name="total">Total</string>
+    <!-- Middle part of the sentence '1 time in xx days' -->
+    <string name="time_every">kali dalam</string>
+    <string name="every_x_days">Setiap %d hari</string>
+    <string name="every_x_weeks">Setiap %d minggu</string>
+    <string name="every_x_months">Setiap %d bulan</string>
+    <string name="score">Skor</string>
+    <string name="reminder_sound">Suara pengingat</string>
+    <string name="none">Hening</string>
+    <string name="filter">Saring</string>
+    <string name="hide_completed">Sembunyikan yang selesai</string>
+    <string name="hide_archived">Sembunyikan arsip</string>
+    <string name="sticky_notifications">Jadikan notifikasi lengket</string>
+    <string name="sticky_notifications_description">Cegah pemberitahuan dari sapuan.</string>
+    <string name="repair_database">Perbaiki Basis Data</string>
+    <string name="database_repaired">Basis Data diperbaiki.</string>
+    <string name="uncheck">Hapus centang</string>
+    <string name="toggle">Alih</string>
+    <string name="action">Tindakan</string>
+    <string name="habit">Kebiasaan</string>
+    <string name="sort">Urutkan</string>
+    <string name="manually">Secara manual</string>
+    <string name="by_name">Berdasarkan nama</string>
+    <string name="by_color">Berdasarkan Warna</string>
+    <string name="by_score">Berdasarkan Skor</string>
+    <string name="download">Unduh</string>
+    <string name="export">Ekspor</string>
+</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 1290477c9..a213fa211 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -25,21 +25,21 @@
   <string name="edit">수정</string>
   <string name="delete">삭제</string>
   <string name="archive">보관</string>
-  <string name="unarchive">제거</string>
-  <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_restored">습관을 복원합니다.</string>
-  <string name="toast_nothing_to_undo">복원할 것이 없습니다.</string>
+  <string name="unarchive">보관 해제</string>
+  <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_restored">습관이 복원되었습니다.</string>
+  <string name="toast_nothing_to_undo">취소할 것이 없습니다.</string>
   <string name="toast_nothing_to_redo">복원할 것이 없습니다.</string>
-  <string name="toast_habit_changed">습관을 수정했습니다.</string>
-  <string name="toast_habit_changed_back">습관을 복원했습니다.</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="toast_habit_changed">습관이 수정되었습니다.</string>
+  <string name="toast_habit_changed_back">습관이 복원되었습니다.</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="description_hint">질문 (오늘 ... 했나요?)</string>
   <string name="repeat">반복</string>
@@ -49,64 +49,66 @@
   <string name="discard">취소</string>
   <string name="save">저장</string>
   <string name="streaks">길게 이은 기록</string>
-  <string name="no_habits_found">습관이 없습니다</string>
-  <string name="long_press_to_toggle">길게 눌러 기록</string>
+  <string name="no_habits_found">활성화된 습관이 없습니다.</string>
+  <string name="long_press_to_toggle">체크하거나 해제하려면 길게 누르세요.</string>
   <string name="reminder_off">끔</string>
   <string name="validation_name_should_not_be_blank">제목을 적어주세요.</string>
   <string name="validation_number_should_be_positive">숫자는 0보다 커야합니다.</string>
-  <string name="validation_at_most_one_rep_per_day">하루에 한 번 반복만 가능합니다.</string>
+  <string name="validation_at_most_one_rep_per_day">하루에 한 번만 반복 가능합니다.</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_title_1">환영합니다</string>
   <string name="intro_description_1">Loop은 당신이 좋은 습관을 만들고 유지하도록 도와줍니다.</string>
   <string name="intro_title_2">새로운 습관을 만들어 보세요.</string>
-  <string name="intro_description_2">매일매일, 습관을 수행한 뒤에, 앱에 기록하세요.</string>
+  <string name="intro_description_2">매일 습관을 수행하고 앱에 기록하세요.</string>
   <string name="intro_title_3">계속 반복하세요</string>
-  <string name="intro_description_3">일정 시간동안 유지된 습관은 참잘했어요도장을 얻습니다.</string>
+  <string name="intro_description_3">오랫동안 지속적으로 유지한 습관은 별표를 얻습니다.</string>
   <string name="intro_title_4">습관을 관리하세요</string>
-  <string name="intro_description_4">그래프를 보고 습관이 유지되는지를 체크할 수 있습니다.</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="pref_toggle_title">짧게 터치해 기록 하세요.</string>
-  <string name="pref_toggle_description">실수로 체크가 될 수 있지만, 더 편한 체크박스.</string>
-  <string name="pref_snooze_interval_title">반복알림을 미루기</string>
+  <string name="interval_24_hour">24시간</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_send_feedback">개발자에게 피드백 보내기</string>
   <string name="pref_view_source_code">Github에서 소스보기</string>
   <string name="pref_view_app_introduction">앱 안내메시지 보기</string>
   <string name="links">링크</string>
   <string name="behavior">행동</string>
   <string name="name">제목</string>
   <string name="settings">설정</string>
-  <string name="snooze_interval">미루기</string>
-  <string name="hint_title">알고 계시나요?</string>
-  <string name="hint_drag">습관 순서를 조정하려면, 습관을 길게 눌러 끌어당겨서 다른 위치로 옮길 수 있습니다.</string>
-  <string name="hint_landscape">화면을 눕혀서 보면 더 많은 날들을 볼 수 있씁니다.</string>
+  <string name="snooze_interval">스누즈 간격</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="delete_habits_message">습관을 영구적으로 삭제합니다. 이 작업은 취소할 수 없습니다.</string>
+  <string name="habit_not_found">습관 삭제 / 찾을 수 없음</string>
   <string name="weekends">주말</string>
   <string name="any_weekday">주중</string>
   <string name="any_day">매일</string>
-  <string name="select_weekdays">몇일 선택</string>
-  <string name="export_to_csv">정보 내보내기 (CSV)</string>
+  <string name="select_weekdays">요일 선택</string>
+  <string name="export_to_csv">CSV로 내보내기</string>
   <string name="done_label">완료</string>
   <string name="clear_label">지우기</string>
   <string name="select_hours">시간 선택</string>
   <string name="select_minutes">분 선택</string>
   <string name="about">정보</string>
-  <string name="translators">번역가</string>
-  <string name="developers">계발자</string>
+  <string name="translators">번역자</string>
+  <string name="developers">개발자</string>
   <string name="version_n">버전 %s</string>
-  <string name="frequency">반복수</string>
-  <string name="checkmark">습관기록</string>
-  <string name="strength">습관 완성정도</string>
+  <string name="frequency">빈도</string>
+  <string name="checkmark">체크</string>
+  <string name="strength">강도</string>
   <string name="best_streaks">가장 길게 이은 기록</string>
   <string name="current_streaks">현재 기록</string>
   <string name="number_of_repetitions">반복한 횟수</string>
@@ -121,37 +123,56 @@
   <string name="five_times_per_week">일주일에 5번</string>
   <string name="custom_frequency">직접 정하기</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>
-  <string name="habits_imported">가져오기 완료.</string>
-  <string name="full_backup_success">백업 완료.</string>
+  <string name="could_not_export">데이터 내보내기에 실패했습니다.</string>
+  <string name="could_not_import">데이터 가져오기에 실패했습니다.</string>
+  <string name="file_not_recognized">파일을 인식할 수 없습니다.</string>
+  <string name="habits_imported">습관 가져오기에 성공했습니다.</string>
+  <string name="full_backup_success">전체 백업 내보내기에 성공했습니다.</string>
   <string name="import_data">데이터 가져오기</string>
   <string name="export_full_backup">백업 내보내기</string>
-  <string name="import_data_summary">Tickmate, HabitBull, Rewire의 백업파일도 지원합니다. 더 자세한 설명은 FAQ에 있습니다.</string>
-  <string name="export_as_csv_summary">Microsoft Excel 혹은, OpenOffice Calc 같은 스프레드시트 프로그램으로 열 수 있는 CSV파일로 내보냅니다. 다만, CSV파일을 다시 가져올 수는 없습니다.</string>
-  <string name="export_full_backup_summary">모든 데이터를 백업합니다. 나중에 이 파일을 가져올 수 있습니다.</string>
-  <string name="bug_report_failed">오류보고서를 작성하지 못했습니다.</string>
+  <string name="import_data_summary">Tickmate, HabitBull, Rewire에서 생성된 파일도 지원합니다. 더 자세한 설명은 FAQ에 있습니다.</string>
+  <string name="export_as_csv_summary">Microsoft Excel나 OpenOffice Calc 같은 스프레드시트 소프트웨어로 열 수 있는 파일을 생성합니다. 이 파일은 다시 가져올 수 없습니다.</string>
+  <string name="export_full_backup_summary">모든 데이터를 포함한 파일을 생성합니다. 이 파일은 다시 가져올 수 있습니다.</string>
+  <string name="bug_report_failed">오류보고서 작성에 실패했습니다.</string>
   <string name="generate_bug_report">오류보고서 작성하기</string>
-  <string name="troubleshooting">문제가 있나요?</string>
-  <string name="help_translate">변역을 도와주세요</string>
-  <string name="night_mode">어두운 배경</string>
-  <string name="use_pure_black">검정색 배경</string>
-  <string name="pure_black_description">야간모드의 회색 바탕을 검정 바탕색으로 바꿉니다. AMOLED를 사용하는 기기는 검정바탕으로 배터리를 절약할 수 있습니다.</string>
-  <string name="interface_preferences">바탕화면 설정</string>
+  <string name="troubleshooting">문제 해결</string>
+  <string name="help_translate">이 앱의 번역을 도와주세요</string>
+  <string name="night_mode">야간 모드</string>
+  <string name="use_pure_black">야간 모드에서 검정색 사용하기</string>
+  <string name="pure_black_description">야간 모드의 회색 배경을 검정색으로 대체합니다. AMOLED 디스플레이를 사용하는 기기에서 배터리 사용량을 감소시킵니다.</string>
+  <string name="interface_preferences">인터페이스</string>
   <string name="reverse_days">날짜 순서 뒤집기</string>
-  <string name="reverse_days_description">날짜 순서를 뒤바꾸어 보여줍니다.</string>
+  <string name="reverse_days_description">메인 화면의 날짜를 역순으로 보여줍니다.</string>
   <string name="day">일</string>
   <string name="week">주</string>
   <string name="month">월</string>
-  <string name="quarter">4분기-1년</string>
+  <string name="quarter">분기</string>
   <string name="year">년</string>
+  <string name="total">전체</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">번</string>
-  <string name="every_x_days">%d 일 마다</string>
-  <string name="every_x_weeks">%d 주 마다</string>
-  <string name="every_x_months">%d 개월 마다</string>
-  <string name="score">습관점수</string>
-  <string name="reminder_sound">알림 소리</string>
+  <string name="every_x_days">%d일 마다</string>
+  <string name="every_x_weeks">%d주 마다</string>
+  <string name="every_x_months">%d개월 마다</string>
+  <string name="score">점수</string>
+  <string name="reminder_sound">알림음</string>
   <string name="none">무음</string>
+  <string name="filter">필터</string>
+  <string name="hide_completed">완료된 항목 숨기기</string>
+  <string name="hide_archived">보관된 항목 숨기기</string>
+  <string name="sticky_notifications">알림 고정하기</string>
+  <string name="sticky_notifications_description">알림을 스와이프해서 제거하는 것을 방지합니다.</string>
+  <string name="repair_database">데이터베이스 복구</string>
+  <string name="database_repaired">데이터베이스가 복구되었습니다.</string>
+  <string name="uncheck">선택 해제</string>
+  <string name="toggle">전환</string>
+  <string name="action">동작</string>
+  <string name="habit">습관</string>
+  <string name="sort">정렬</string>
+  <string name="manually">수동으로</string>
+  <string name="by_name">이름 순으로</string>
+  <string name="by_color">색상 순으로</string>
+  <string name="by_score">점수 순으로</string>
+  <string name="download">다운로드</string>
+  <string name="export">내보내기</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e268a137e..d6fd34d0d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -26,29 +26,28 @@
   <string name="delete">Verwijder</string>
   <string name="archive">Archiveer</string>
   <string name="unarchive">Dearchiveren</string>
-  <string name="add_habit">Voeg gewoonte toe</string>
+  <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">Gewoonte verwijderd.</string>
-  <string name="toast_habit_restored">Gewoonte hersteld.</string>
+  <string name="toast_habit_restored">Gewoontes hersteld</string>
   <string name="toast_nothing_to_undo">Niets om ongedaan te maken.</string>
   <string name="toast_nothing_to_redo">Niets om over te doen.</string>
   <string name="toast_habit_changed">Gewoonte gewijzigd.</string>
   <string name="toast_habit_changed_back">Wijziging gewoonte ongedaan gemaakt.</string>
-  <string name="toast_habit_archived">Gewoonte gearchiveerd.</string>
-  <string name="toast_habit_unarchived">Gewoonte hersteld uit archief.</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="description_hint">Vraag (Heb jij vandaag .... ?)</string>
+  <string name="description_hint">Vraag (Heb je vandaag .... ?)</string>
   <string name="repeat">Herhaal</string>
   <string name="times_every">keer in </string>
   <string name="days">dagen</string>
   <string name="reminder">Herinnering</string>
   <string name="discard">Verwijder</string>
-  <string name="save">\"Opslaan
-\"</string>
+  <string name="save">Opslaan</string>
   <string name="streaks">Reeksen</string>
   <string name="no_habits_found">Je hebt geen actieve gewoontes</string>
   <string name="long_press_to_toggle">Houdt ingedrukt om te selecteren of deselecteren</string>
@@ -77,7 +76,7 @@
   <string name="interval_8_hour">8 uur</string>
   <string name="interval_24_hour">24 uur</string>
   <string name="pref_toggle_title">Wijzig herhalingen door kort indrukken</string>
-  <string name="pref_toggle_description">Handiger, maar kan onbedoelde wijzigingen veroorzaken.</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>
@@ -87,14 +86,14 @@
   <string name="behavior">Gedrag</string>
   <string name="name">Naam</string>
   <string name="settings">Instellingen</string>
-  <string name="snooze_interval">Later interval</string>
+  <string name="snooze_interval">Snooze interval</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 landschapmodus te zetten.</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">In het weekend</string>
+  <string name="weekends">Weekends</string>
   <string name="any_weekday">Maandag tot vrijdag</string>
   <string name="any_day">Elke dag van de week</string>
   <string name="select_weekdays">Selecteer dagen</string>
@@ -109,7 +108,7 @@
   <string name="version_n">Versie %s</string>
   <string name="frequency">Frequentie</string>
   <string name="checkmark">Vinkje</string>
-  <string name="strength">Sterkte</string>
+  <string name="strength">Kracht</string>
   <string name="best_streaks">Beste reeksen</string>
   <string name="current_streaks">Huidige reeks</string>
   <string name="number_of_repetitions">Aantal herhalingen</string>
@@ -122,7 +121,7 @@
   <string name="every_week">Iedere week</string>
   <string name="two_times_per_week">2 keer per week</string>
   <string name="five_times_per_week">5 keer per week</string>
-  <string name="custom_frequency">Aangepast</string>
+  <string name="custom_frequency">Aangepast &#8230;</string>
   <string name="help">Hulp en veelgestelde vragen</string>
   <string name="could_not_export">Het exporteren van de data is mislukt.</string>
   <string name="could_not_import">Importeren van data mislukt.</string>
@@ -141,7 +140,7 @@
   <string name="night_mode">Nachtmodus</string>
   <string name="use_pure_black">Gebruik puur zwart in nachtmodus</string>
   <string name="pure_black_description">Vervangt grijze achtergronden door puur zwart in nachtmodus. Vermindert batterijgebruik in telefoons met AMOLED scherm.</string>
-  <string name="interface_preferences">Uiterlijk</string>
+  <string name="interface_preferences">Interface</string>
   <string name="reverse_days">Omgekeerde volgorde van dagen</string>
   <string name="reverse_days_description">Toon dagen in omgekeerde volgorde op het hoofdscherm</string>
   <string name="day">Dag</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index d994b3aca..b16128dc0 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -19,6 +19,160 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+  <string name="app_name">Loop Vaneoversikt</string>
+  <string name="main_activity_title">Vaner</string>
+  <string name="action_settings">Innstillinger</string>
+  <string name="edit">Redigér</string>
+  <string name="delete">Slett</string>
+  <string name="archive">Arkivér</string>
+  <string name="unarchive">Uarkivér</string>
+  <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_restored">Vaner gjenopprettet</string>
+  <string name="toast_nothing_to_undo">Ingenting å angre</string>
+  <string name="toast_nothing_to_redo">Ingenting å ta tilbake</string>
+  <string name="toast_habit_changed">Vane endret</string>
+  <string name="toast_habit_changed_back">Vane tilbakeendret</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">Historie</string>
+  <string name="clear">Fjern</string>
+  <string name="description_hint">Spørsmål (Gjorde du &#8230; i dag?)</string>
+  <string name="repeat">Gjenta</string>
+  <string name="times_every">ganger på</string>
+  <string name="days">dager</string>
+  <string name="reminder">Påminnelse</string>
+  <string name="discard">Kast</string>
+  <string name="save">Lagr</string>
+  <string name="streaks">Gjentakelser</string>
+  <string name="no_habits_found">Du har ingen aktive vaner</string>
+  <string name="long_press_to_toggle">Trykk og hold for å sjekke eller usjekke</string>
+  <string name="reminder_off">Av</string>
+  <string name="validation_name_should_not_be_blank">Navnet kan ikke stå tomt.</string>
+  <string name="validation_number_should_be_positive">Nummeret må være positivt.</string>
+  <string name="validation_at_most_one_rep_per_day">Du kan maks ha én repetisjon om dagen</string>
+  <string name="create_habit">Lag vane</string>
+  <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>
+  <string name="intro_description_2">Hver dag, etter du utfører vanen din, sett en hake på appen.</string>
+  <string name="intro_title_3">Fortsett med å gjøre det</string>
+  <string name="intro_description_3">Vaner utført konsekvent over lang tid vil få en hel stjerne.</string>
+  <string name="intro_title_4">Hold oversikt over fremgangen din</string>
+  <string name="intro_description_4">Detaljerte grafer viser deg hvordan vanene dine forbedrer seg over tid.</string>
+  <string name="interval_15_minutes">15 minutter</string>
+  <string name="interval_30_minutes">30 minutter</string>
+  <string name="interval_1_hour">1 time</string>
+  <string name="interval_2_hour">2 timer</string>
+  <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="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_snooze_interval_title">Snooze-intervall på påminnelser</string>
+  <string name="pref_rate_this_app">Vurdér denne appen på Google Play</string>
+  <string name="pref_send_feedback">Send tilbakemelding til utviklerne</string>
+  <string name="pref_view_source_code">Vis kildekode på GitHub</string>
+  <string name="pref_view_app_introduction">Se på appintroduksjon</string>
+  <string name="links">Lenker</string>
+  <string name="behavior">Oppførsel</string>
+  <string name="name">Navn</string>
+  <string name="settings">Innstillinger</string>
+  <string name="snooze_interval">Snooze-intervall</string>
+  <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>
+  <string name="any_day">Hvilken som helst dag i uken</string>
+  <string name="select_weekdays">Velg dager</string>
+  <string name="export_to_csv">Eksportér som CSV</string>
+  <string name="done_label">Ferdig</string>
+  <string name="clear_label">Fjern</string>
+  <string name="select_hours">Velg timer</string>
+  <string name="select_minutes">Velg minutter</string>
+  <string name="about">Om</string>
+  <string name="translators">Translatører</string>
+  <string name="developers">Utviklere</string>
+  <string name="version_n">Versjon %s</string>
+  <string name="frequency">Hyppighet</string>
+  <string name="checkmark">Hake</string>
+  <string name="strength">Styrke</string>
+  <string name="best_streaks">Beste gjentakelser</string>
+  <string name="current_streaks">Nåværende gjentakelse</string>
+  <string name="number_of_repetitions">Repetisjonsantall</string>
+  <string name="last_x_days">Siste %d dager</string>
+  <string name="last_x_weeks">Siste %d uker</string>
+  <string name="last_x_months">Siste %d måneder</string>
+  <string name="last_x_years">Siste %d år</string>
+  <string name="all_time">Alltid</string>
+  <string name="every_day">Hver dag</string>
+  <string name="every_week">Hver uke</string>
+  <string name="two_times_per_week">2 ganger i uken</string>
+  <string name="five_times_per_week">5 ganger i uken</string>
+  <string name="custom_frequency">Tilpasset &#8230;</string>
+  <string name="help">Hjelp og FAQ</string>
+  <string name="could_not_export">Mislyktes i å eksportere data.</string>
+  <string name="could_not_import">Mislyktes i å importere data.</string>
+  <string name="file_not_recognized">Fil ikke gjenkjent.</string>
+  <string name="habits_imported">Vaner suksessfullt importert.</string>
+  <string name="full_backup_success">Hel sikkerhetskopi suksessfullt eksportert.</string>
+  <string name="import_data">Importér data</string>
+  <string name="export_full_backup">Eksportér hel sikkerhetskopi</string>
+  <string name="import_data_summary">Støtter hele sikkerhetskopier eksportert av denne appen, i tillegg til filer generert av Tickmate, HabitBull, og Rewire. Sjekk ut FAQ for mer informasjon.</string>
+  <string name="export_as_csv_summary">Genererer filer som kan bli åpnet av regnearkprogrammer som Microsoft Excel og OpenOffice Calc. Disse filene kan ikke importeres tilbake.</string>
+  <string name="export_full_backup_summary">Genererer en fil som inneholder all dataen din. Denne filen kan ikke importeres tilbake.</string>
+  <string name="bug_report_failed">Mislyktes i å generere feilrapport.</string>
+  <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="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>
+  <string name="reverse_days">Omvendt dagsrekkefølge</string>
+  <string name="reverse_days_description">Vis dager i omvendt rekkefølge på hovedmenyen</string>
+  <string name="day">Dag</string>
+  <string name="week">Uke</string>
+  <string name="month">Måned</string>
+  <string name="quarter">Kvarter</string>
+  <string name="year">År</string>
+  <string name="total">Totalt</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
+  <string name="time_every">gang på</string>
+  <string name="every_x_days">Hver %d. dag</string>
+  <string name="every_x_weeks">Hver %d. uke</string>
+  <string name="every_x_months">Hver %d. måned</string>
+  <string name="score">Poengsum</string>
+  <string name="reminder_sound">Påminnelseslyd</string>
+  <string name="none">Ingen</string>
+  <string name="filter">Filtrér</string>
+  <string name="hide_completed">Gjem fullførte</string>
+  <string name="hide_archived">Gjem arkiverte</string>
+  <string name="sticky_notifications">Gjør varslinger klebrige</string>
+  <string name="sticky_notifications_description">Forhindrer varslinger fra å bli sveipet vekk.</string>
+  <string name="repair_database">Reparér database</string>
+  <string name="database_repaired">Database reparert.</string>
+  <string name="uncheck">Usjekk</string>
+  <string name="toggle">Veksl</string>
+  <string name="action">Handling</string>
+  <string name="habit">Vane</string>
+  <string name="sort">Sortér</string>
+  <string name="manually">Manuelt</string>
+  <string name="by_name">Etter navn</string>
+  <string name="by_color">Etter farge</string>
+  <string name="by_score">Etter poengsum</string>
+  <string name="download">Last ned</string>
+  <string name="export">Eksportér</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 00942bfa6..352e98215 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -43,7 +43,7 @@
   <string name="clear">Очистить</string>
   <string name="description_hint">Вопрос (пример: \"Делали ли вы сегодня зарядку?\")</string>
   <string name="repeat">Повторять</string>
-  <string name="times_every">раза за</string>
+  <string name="times_every">раз в</string>
   <string name="days">дней</string>
   <string name="reminder">Напоминание</string>
   <string name="discard">Отменить</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index e1b2983eb..dc6217f97 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -19,79 +19,82 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
+  <string name="app_name">Loop Habit Tracker</string>
   <string name="main_activity_title">Vanor</string>
   <string name="action_settings">Inställningar</string>
   <string name="edit">Redigera</string>
   <string name="delete">Ta bort</string>
   <string name="archive">Arkivera</string>
-  <string name="unarchive">Avarkivera</string>
+  <string name="unarchive">Ångra arkivering</string>
   <string name="add_habit">Lägg till vana</string>
   <string name="color_picker_default_title">Byt färg</string>
   <string name="toast_habit_created">Vana skapad</string>
-  <string name="toast_habit_deleted">Vana borttagen</string>
-  <string name="toast_habit_restored">Vana återställd</string>
+  <string name="toast_habit_deleted">Vanor borttagna</string>
+  <string name="toast_habit_restored">Vanor återställda</string>
   <string name="toast_nothing_to_undo">Inget att ångra</string>
-  <string name="toast_nothing_to_redo">Inget att göra om</string>
+  <string name="toast_nothing_to_redo">Inget att ångra</string>
   <string name="toast_habit_changed">Vana ändrad</string>
-  <string name="toast_habit_changed_back">Vana ändrad tillbaka</string>
+  <string name="toast_habit_changed_back">Vana ändrad</string>
   <string name="toast_habit_archived">Vanor arkiverade</string>
-  <string name="toast_habit_unarchived">Vanor avakriverade</string>
+  <string name="toast_habit_unarchived">Vanor återställda</string>
   <string name="overview">Översikt</string>
   <string name="habit_strength">Vanestyrka</string>
   <string name="history">Historik</string>
   <string name="clear">Rensa</string>
   <string name="description_hint">Fråga (Har du ... idag?)</string>
   <string name="repeat">Upprepa</string>
-  <string name="times_every">gånger under</string>
-  <string name="days">dag</string>
+  <string name="times_every">gånger i</string>
+  <string name="days">dagar</string>
   <string name="reminder">Påminnelse</string>
   <string name="discard">Avbryt</string>
   <string name="save">Spara</string>
-  <string name="streaks">Framgångar</string>
+  <string name="streaks">Streaks</string>
   <string name="no_habits_found">Du har inga aktiva vanor</string>
-  <string name="long_press_to_toggle">Tryck och håll in för att markera och avmarkera</string>
+  <string name="long_press_to_toggle">Tryck-och-håll för att markera eller avmarkera</string>
   <string name="reminder_off">Av</string>
-  <string name="validation_name_should_not_be_blank">Namn får inte vara blank.</string>
-  <string name="validation_number_should_be_positive">Nummer måste vara positiv.</string>
-  <string name="validation_at_most_one_rep_per_day">Du kan ha max en upprepning per dag</string>
+  <string name="validation_name_should_not_be_blank">Namn får inte vara tomt.</string>
+  <string name="validation_number_should_be_positive">Talet måste vara positivt.</string>
+  <string name="validation_at_most_one_rep_per_day">Du kan ha högst en repetition per dag</string>
   <string name="create_habit">Skapa vana</string>
   <string name="edit_habit">Redigera vana</string>
   <string name="check">Markera</string>
   <string name="snooze">Senare</string>
   <!-- App introduction -->
   <string name="intro_title_1">Välkommen</string>
-  <string name="intro_description_1">Loop Habit Tracker Hjälper dig att skapa och underhålla bra vanor.</string>
+  <string name="intro_description_1">Loop Habit Tracker hjälper dig att skapa och bibehålla goda vanor.</string>
   <string name="intro_title_2">Skapa några nya vanor</string>
-  <string name="intro_description_2">Varje dag, efter att du utfört dina vanor, lägg till en markering i appen.</string>
-  <string name="intro_title_3">Fortsätt göra det</string>
-  <string name="intro_description_3">Vanor som utförs konstant över en lång period kommer att tjäna dig en full stjärna.</string>
+  <string name="intro_description_2">Efter varje dag när du utfört din vana så markerar du den i appen.</string>
+  <string name="intro_title_3">Fortsätt att göra det</string>
+  <string name="intro_description_3">Vanor som du utför konsekvent över en lång period ger dig en stjärna.</string>
   <string name="intro_title_4">Följ dina framsteg</string>
-  <string name="intro_description_4">Detaljerade grafer visar dig hur dina vanor har utvecklats över tid.</string>
+  <string name="intro_description_4">Detaljerade grafer visar dig hur dina vanor förbättras över tid.</string>
   <string name="interval_15_minutes">15 minuter</string>
   <string name="interval_30_minutes">30 minuter</string>
   <string name="interval_1_hour">1 timme</string>
   <string name="interval_2_hour">2 timmar</string>
   <string name="interval_4_hour">4 timmar</string>
   <string name="interval_8_hour">8 timmar</string>
-  <string name="pref_toggle_title">Aktivera repetitioner med kort tryckning</string>
-  <string name="pref_toggle_description">Mer bekvämt, men kan orsaka oavsiktliga aktiveringar. </string>
-  <string name="pref_snooze_interval_title">Snooza intervall på påminnelsen</string>
-  <string name="pref_rate_this_app">Betygsätt denna app på Google Play</string>
-  <string name="pref_send_feedback">Skicka feedback till utvecklaren</string>
-  <string name="pref_view_source_code">Visa källkod på Github</string>
-  <string name="pref_view_app_introduction">Visa appintroduktion</string>
+  <string name="interval_24_hour">24 timmar</string>
+  <string name="pref_toggle_title">Växla med snabb tryckning</string>
+  <string name="pref_toggle_description">Markera genom att trycka snabbt istället för att hålla ner. Mer bekvämt, men kan orsaka oavsiktliga aktiveringar.</string>
+  <string name="pref_snooze_interval_title">Standard tid på snooze</string>
+  <string name="pref_rate_this_app">Betygsätt oss på Google Play</string>
+  <string name="pref_send_feedback">Skicka feedback till utvecklarna</string>
+  <string name="pref_view_source_code">Visa källkod på GitHub</string>
+  <string name="pref_view_app_introduction">Visa introduktion till appen</string>
   <string name="links">Länkar</string>
   <string name="behavior">Beteende</string>
   <string name="name">Namn</string>
   <string name="settings">Inställningar</string>
-  <string name="snooze_interval">Snooze intervall</string>
-  <string name="hint_title">Visste du? </string>
-  <string name="hint_drag">För att arrangera inlägg, tryck och håll in på namnet av inlägget, dra den sedan till rätt plats.</string>
-  <string name="hint_landscape">Du kan se fler dagar genom att hålla telefon i landskapsläge.</string>
+  <string name="snooze_interval">Intervall snooze</string>
+  <string name="hint_title">Visste du att?</string>
+  <string name="hint_drag">För att flytta på poster - tryck och håll nere på den vana du vill flytta, sedan flytta den till önskad plats.</string>
+  <string name="hint_landscape">Du kan se mer dagar genom att hålla telefonen i landskapsläge.</string>
   <string name="delete_habits">Ta bort vanor</string>
-  <string name="delete_habits_message">Vanorna kommer att tas bort permanent. Denna åtgärd kan inte ångras.</string>
+  <string name="delete_habits_message">Vanorna kommer att tas bort permanent. Du kan inte ångra detta.</string>
+  <string name="habit_not_found">Vana borttagen / hittades inte</string>
   <string name="weekends">Helger</string>
-  <string name="any_weekday">Veckodagar</string>
+  <string name="any_weekday">Måndag till fredag</string>
   <string name="any_day">Vilken dag som helst</string>
   <string name="select_weekdays">Välj dagar</string>
   <string name="export_to_csv">Exportera data (CSV)</string>
@@ -102,11 +105,12 @@
   <string name="about">Om</string>
   <string name="translators">Översättare</string>
   <string name="developers">Utvecklare</string>
+  <string name="version_n">Version %s</string>
   <string name="frequency">Frekvens</string>
-  <string name="checkmark">Check</string>
+  <string name="checkmark">Avklarat/ej avklarat</string>
   <string name="strength">Styrka</string>
-  <string name="best_streaks">Bästa framgångar</string>
-  <string name="current_streaks">Nuvarande framgång</string>
+  <string name="best_streaks">Bästa streak</string>
+  <string name="current_streaks">Nuvarande streak</string>
   <string name="number_of_repetitions">Antal repetitioner</string>
   <string name="last_x_days">Sista %d dagarna</string>
   <string name="last_x_weeks">Sista %d veckorna</string>
@@ -119,18 +123,56 @@
   <string name="five_times_per_week">5 gånger per vecka</string>
   <string name="custom_frequency">Anpassa ...</string>
   <string name="help">Hjälp och FAQ</string>
-  <string name="could_not_export">Misslyckades med att exportera data.</string>
-  <string name="could_not_import">Misslyckades med att importera data.</string>
-  <string name="file_not_recognized">Fil inte igenkänd.</string>
-  <string name="habits_imported">Vanor importerade.</string>
-  <string name="full_backup_success">Backup har exporterats.</string>
+  <string name="could_not_export">Det gick inte att exportera.</string>
+  <string name="could_not_import">Det gick inte att importera.</string>
+  <string name="file_not_recognized">Kunde inte känna igen filen.</string>
+  <string name="habits_imported">Import av dina vanor lyckades.</string>
+  <string name="full_backup_success">Fullständig backup har exporterats.</string>
   <string name="import_data">Importera data</string>
   <string name="export_full_backup">Exportera backup</string>
-  <string name="import_data_summary">Stöder backuper exporterade av den här appen, så väl filer genererade av Tickmate, Habitbull eller Rewire. Läs FAQ för mer information.</string>
-  <string name="export_as_csv_summary">Genererade filer kan öppnas av mjukvara som Microsoft Excel eller Openoffice Calc. Denna filen kan inte importeras tillbaka.</string>
-  <string name="export_full_backup_summary">Genererar en fil som innehåller all din data. Den här filen kan importeras tillbaka.</string>
-  <string name="bug_report_failed">Misslyckades med att generera bugrapport. </string>
-  <string name="generate_bug_report">Generera bugrapport</string>
+  <string name="import_data_summary">Appen har stöd att importera data från denna app, men även backuper från Tickmate, Habitbull eller Rewire. Läs FAQ om du vill meta mer.</string>
+  <string name="export_as_csv_summary">Filerna genererade kan öppnas i Microsoft Excel eller OpenOffice Calc. Däremot kan denna fil inte importeras tillbaka till appen.</string>
+  <string name="export_full_backup_summary">Generera en fil som innehåller all din data. Denna fil kan importas tillbaka till appen.</string>
+  <string name="bug_report_failed">Det gick inte att generera felrapport.</string>
+  <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="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>
+  <string name="reverse_days">Omvänd ordning på dagar</string>
+  <string name="reverse_days_description">Visar dagar i omvänd ordning i appen</string>
+  <string name="day">Dag</string>
+  <string name="week">Vecka</string>
+  <string name="month">Månad</string>
+  <string name="quarter">Kvartal</string>
+  <string name="year">År</string>
+  <string name="total">Totalt</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
+  <string name="time_every">gånger var</string>
+  <string name="every_x_days">Var %d:e dag</string>
+  <string name="every_x_weeks">Var %d:e vecka</string>
+  <string name="every_x_months">Var %d:e månad</string>
+  <string name="score">Poäng</string>
+  <string name="reminder_sound">Påminnelseljud</string>
+  <string name="none">Inget</string>
+  <string name="filter">Filtrera</string>
+  <string name="hide_completed">Dölj slutförda</string>
+  <string name="hide_archived">Dölj arkiverade</string>
+  <string name="sticky_notifications">Gör notifikationer permanenta</string>
+  <string name="sticky_notifications_description">Förhindrar att notifikationer stängs.</string>
+  <string name="repair_database">Reparera databas</string>
+  <string name="database_repaired">Databasen reparerad.</string>
+  <string name="uncheck">Avmarkera</string>
+  <string name="toggle">Växla</string>
+  <string name="action">Åtgärd</string>
+  <string name="habit">Vana</string>
+  <string name="sort">Sortera</string>
+  <string name="manually">Manuellt</string>
+  <string name="by_name">Efter namn</string>
+  <string name="by_color">Efter färg</string>
+  <string name="by_score">Efter poäng</string>
+  <string name="download">Ladda ner</string>
+  <string name="export">Exportera</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f0ba8ce69..b9f926409 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -19,7 +19,7 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="app_name">Loop Alışkanlık Takip</string>
+  <string name="app_name">Döngü Alışkanlık Takibi</string>
   <string name="main_activity_title">Alışkanlıklar</string>
   <string name="action_settings">Ayarlar</string>
   <string name="edit">Düzenle</string>
@@ -30,11 +30,11 @@
   <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_restored">Alışkanlık</string>
-  <string name="toast_nothing_to_undo">Geri alınacak birşey yok.</string>
-  <string name="toast_nothing_to_redo">Tekrar yapılacak birşey yok.</string>
-  <string name="toast_habit_changed">Alışkanlık değişti.</string>
-  <string name="toast_habit_changed_back">Alışkanlık eski haline getirildi.</string>
+  <string name="toast_habit_restored">Alışkanlıklar geri getirildi</string>
+  <string name="toast_nothing_to_undo">Geri alınacak bir şey yok</string>
+  <string name="toast_nothing_to_redo">Tekrar edilecek bir şey yok</string>
+  <string name="toast_habit_changed">Alışkanlık değişti</string>
+  <string name="toast_habit_changed_back">Alışkanlık eski haline getirildi</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>
@@ -92,6 +92,7 @@
   <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ş yada bulunamadı</string>
   <string name="weekends">Hafta sonları</string>
   <string name="any_weekday">Pazartesinden Cumaya</string>
   <string name="any_day">Haftanın herhangi bir günü</string>
@@ -147,6 +148,7 @@
   <string name="month">Ay</string>
   <string name="quarter">3 Ay</string>
   <string name="year">Yıl</string>
+  <string name="total">Tümü</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">kez</string>
   <string name="every_x_days">Her %d gün</string>
@@ -155,11 +157,15 @@
   <string name="score">Puan</string>
   <string name="reminder_sound">Hatırlatma sesi</string>
   <string name="none">Sessiz</string>
+  <string name="filter">Filtre</string>
   <string name="hide_completed">Tamamlananları gizle</string>
   <string name="hide_archived">Arşivlenenleri gizle</string>
+  <string name="sticky_notifications">Bildirimleri kalıcı yap</string>
+  <string name="sticky_notifications_description">Bildirimin kaydırılarak götürülmesini engelle.</string>
   <string name="repair_database">Verıtabanını onar</string>
   <string name="database_repaired">Verıtabanı onarıldı.</string>
   <string name="uncheck">Yapmadım</string>
+  <string name="toggle">Değiştir</string>
   <string name="action">Eylem</string>
   <string name="habit">Alışkanlık</string>
   <string name="sort">Sırala</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 33bead31d..0937c381a 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -25,7 +25,7 @@
   <string name="edit">Змінити</string>
   <string name="delete">Вилучити</string>
   <string name="archive">Архівувати</string>
-  <string name="unarchive">Повернути з архіву</string>
+  <string name="unarchive">Розархівувати</string>
   <string name="add_habit">Додати звичку</string>
   <string name="color_picker_default_title">Змінити колір</string>
   <string name="toast_habit_created">Звичку створено</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 185e48d64..585663c45 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -46,7 +46,7 @@
   <string name="times_every">次每</string>
   <string name="days">日</string>
   <string name="reminder">提醒</string>
-  <string name="discard">放棄</string>
+  <string name="discard">取消</string>
   <string name="save">保存</string>
   <string name="streaks">記錄</string>
   <string name="no_habits_found">你還沒有任何習慣</string>
@@ -74,6 +74,7 @@
   <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="pref_toggle_title">短按來記錄習慣</string>
   <string name="pref_toggle_description">但有可能造成意外記錄</string>
   <string name="pref_snooze_interval_title">提醒延遲間隔</string>
@@ -91,6 +92,7 @@
   <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>
   <string name="any_day">每天</string>
@@ -120,7 +122,7 @@
   <string name="two_times_per_week">每週兩次</string>
   <string name="five_times_per_week">每週五次</string>
   <string name="custom_frequency">自訂週期</string>
-  <string name="help">幫助&amp;amp;常見問題</string>
+  <string name="help">幫助&amp; 常見問題</string>
   <string name="could_not_export">輸出資料失敗</string>
   <string name="could_not_import">輸入資料失敗</string>
   <string name="file_not_recognized">無法辨識</string>
@@ -146,6 +148,7 @@
   <string name="month">月</string>
   <string name="quarter">季</string>
   <string name="year">年</string>
+  <string name="total">總計</string>
   <!-- Middle part of the sentence '1 time in xx days' -->
   <string name="time_every">次每</string>
   <string name="every_x_days">每 %d 天</string>
@@ -154,4 +157,22 @@
   <string name="score">分數</string>
   <string name="reminder_sound">提醒音效</string>
   <string name="none">無</string>
+  <string name="filter">篩選</string>
+  <string name="hide_completed">隱藏已完成的習慣</string>
+  <string name="hide_archived">隱藏已封存習慣</string>
+  <string name="sticky_notifications">使提醒保持常駐</string>
+  <string name="sticky_notifications_description">防止提醒被滑動移除</string>
+  <string name="repair_database">修復資料庫</string>
+  <string name="database_repaired">資料庫已修復</string>
+  <string name="uncheck">取消選取</string>
+  <string name="toggle">切換</string>
+  <string name="action">操作</string>
+  <string name="habit">習慣</string>
+  <string name="sort">排序</string>
+  <string name="manually">手動</string>
+  <string name="by_name">根據名稱</string>
+  <string name="by_color">根據顏色</string>
+  <string name="by_score">根據分數</string>
+  <string name="download">下載</string>
+  <string name="export">匯出</string>
 </resources>
diff --git a/app/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java b/app/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
index aabf6527a..ae229f1b1 100644
--- a/app/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
+++ b/app/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
@@ -65,7 +65,7 @@ public void testOnSnooze() throws Exception
     {
         Habit habit = mock(Habit.class);
         long now = timestamp(2015, 1, 1);
-        DateUtils.setFixedLocalTime(now);
+        DateUtils.setFixedLocalTime(DateUtils.removeTimezone(now));
         when(preferences.getSnoozeInterval()).thenReturn(15L);
 
         controller.onSnooze(habit);